Changeset 36883 in vbox for trunk/src/VBox/Main/glue

Timestamp:

Apr 29, 2011 9:40:55 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

71461

Message:

webservice: pass octet arrays as base64 strings

File:

• trunk/src/VBox/Main/glue/glue-java.xsl (modified) (8 diffs)

trunk/src/VBox/Main/glue/glue-java.xsl

@@ -288 +288 @@
   <xsl:param name="type" />
   <xsl:param name="safearray" />
-  <xsl:param name="forceelem" />
-
-  <xsl:variable name="needarray" select="($safearray='yes') and not($forceelem='yes')" />
-
-  <xsl:choose>
+  <xsl:param name="forceelem" />  
+
+  <xsl:choose>     
     <xsl:when test="($G_vboxGlueStyle='xpcom')">
+      <xsl:variable name="needarray" select="($safearray='yes') and not($forceelem='yes')" />
+
       <xsl:choose>
         <xsl:when test="$type='long long'">
@@ -368 +368 @@
 
     <xsl:when test="($G_vboxGlueStyle='jaxws')">
+      <xsl:variable name="needarray" select="($safearray='yes' and not($type='octet')) and not($forceelem='yes')" />
+      
       <xsl:if test="$needarray">
         <xsl:value-of select="'List&lt;'" />
@@ -388 +390 @@
         </xsl:when>
 
+        <!-- we encode byte arrays as Base64 strings. -->
+        <xsl:when test="$type='octet'">
+          <xsl:value-of select="'/*base64*/String'" />
+        </xsl:when>
+
         <xsl:when test="$type='long long'">
           <xsl:value-of select="'Long'" />
@@ -405 +412 @@
 
         <xsl:when test="$type='short'">
-          <xsl:value-of select="'Short'" />
-        </xsl:when>
-
-        <xsl:when test="$type='octet'">
           <xsl:value-of select="'Short'" />
         </xsl:when>
@@ -650 +653 @@
         </xsl:when>
         <xsl:when test="$idltype='octet'">
-          <xsl:value-of select="concat('Helper.wrapBytes(',$value,')')"/>
+          <xsl:value-of select="concat('Helper.decodeBase64(',$value,')')"/>
         </xsl:when>
         <xsl:otherwise>
@@ -957 +960 @@
 
     <xsl:when test="($idltype='octet') and ($safearray='yes')">
-      <xsl:value-of select="concat('Helper.unwrapBytes(', $value,')')"/>
+      <xsl:value-of select="concat('Helper.encodeBase64(', $value,')')"/>
     </xsl:when>
 
@@ -1031 +1034 @@
 
      <xsl:when test="($idltype='octet') and ($safearray='yes')">
-       <xsl:value-of select="concat('Helper.unwrapBytes(',$value,')')"/>
+       <xsl:value-of select="concat('Helper.encodeBase64(',$value,')')"/>
      </xsl:when>
 
@@ -3240 +3243 @@
         }
     }
-    // temporary methods, will bo away soon
-    public static byte[] wrapBytes(List<Short> arr)
-    {
-       if (arr == null)
-          return null;
-       int i = 0;
-       byte[] rv = new byte[arr.size()];
-       for (short s : arr)
-           rv[i++] = (byte)(s & 0xff);
-       return rv;
-    }
-
-    public static List<Short> unwrapBytes(byte[] arr)
-    {
-       if (arr == null)
-          return null;
-       List<Short> ret = new ArrayList<Short>(arr.length);
-       for (byte b : arr) {
-          ret.add((short)b);
-       }
-       return ret;
+    
+    /* Pretty naive Base64 encoder/decoder. */
+    private static final char[] valToChar = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".toCharArray();
+    private static final int[] charToVal = new int[256];
+
+    /* Initialize recoding alphabet. */ 
+    static 
+    {
+        for (int i = 0; i < charToVal.length; i++)
+            charToVal[i] = -1;
+
+        for (int i = 0; i < valToChar.length; i++)
+           charToVal[valToChar[i]] = i;
+
+        charToVal['='] = 0;
+    }
+
+    public static String encodeBase64(byte[] data)
+    {
+        if (data == null)
+            return null;
+
+        if (data.length == 0)
+            return "";
+
+        int fullTriplets = data.length / 3;
+        int resultLen = ((data.length - 1) / 3 + 1) * 4;
+        char[] result = new char[resultLen];
+        int dataIndex = 0, stringIndex = 0;
+
+        for (int i = 0; i < fullTriplets; i++)
+        {
+            int ch1 = data[dataIndex++] & 0xff;
+            result[stringIndex++] = valToChar[ch1 >> 2];
+            int ch2 = data[dataIndex++] & 0xff;
+            result[stringIndex++] = valToChar[((ch1 << 4) & 0x3f) | (ch2 >> 4)];
+            int ch3 = data[dataIndex++] & 0xff;
+            result[stringIndex++] = valToChar[((ch2 << 2) & 0x3f) | (ch3 >> 6)];
+            result[stringIndex++] = valToChar[ch3 & 0x3f];
+        }
+        
+        switch (data.length - dataIndex)
+        {
+            case 0:
+                // do nothing
+                break;
+            case 1:
+            {
+                int ch1 = data[dataIndex++] & 0xff;
+                result[stringIndex++] = valToChar[ch1 >> 2];
+                result[stringIndex++] = valToChar[(ch1 << 4) & 0x3f];
+                result[stringIndex++] = '=';
+                result[stringIndex++] = '=';
+                break;
+            }
+            case 2:
+            {
+                int ch1 = data[dataIndex++] & 0xff;
+                result[stringIndex++] = valToChar[ch1 >> 2];
+                int ch2 = data[dataIndex++] & 0xff;
+                result[stringIndex++] = valToChar[((ch1 << 4) & 0x3f) | (ch2 >> 4)];
+                result[stringIndex++] = valToChar[(ch2 << 2) & 0x3f];
+                result[stringIndex++] = '=';
+                break;
+            }
+            default:
+                throw new RuntimeException("bug!");
+        }
+
+        return new String(result);
+    }
+
+    private static int skipInvalid(String str, int stringIndex)
+    {
+        while (charToVal[str.charAt(stringIndex)] < 0)
+            stringIndex++;
+
+        return stringIndex;
+    }
+
+    public static byte[] decodeBase64(String str)
+    {
+        if (str == null)
+            return null;
+        
+        int stringLength = str.length();
+        if (stringLength == 0)
+            return new byte[0];
+
+        int validChars = 0, padChars = 0;
+        for (int i = 0; i < str.length(); i++)
+        {
+            char ch = str.charAt(i);
+
+            if (charToVal[ch] >= 0)
+                validChars++;
+
+            if (ch == '=')
+                padChars++;
+        }
+        
+        if ((validChars * 3 % 4) != 0)
+            throw new RuntimeException("invalid encoded string "+str);
+
+        int resultLength = validChars * 3 / 4 - padChars;
+        byte[] result = new byte[resultLength];
+
+        int dataIndex = 0, stringIndex = 0;
+        int quadraplets = validChars / 4;
+
+        for (int i=0; i<quadraplets; i++)
+        {
+            stringIndex = skipInvalid(str, stringIndex);
+            int ch1 = str.charAt(stringIndex++);
+            stringIndex = skipInvalid(str, stringIndex);
+            int ch2 = str.charAt(stringIndex++);
+            stringIndex = skipInvalid(str, stringIndex);
+            int ch3 = str.charAt(stringIndex++);
+            stringIndex = skipInvalid(str, stringIndex);
+            int ch4 = str.charAt(stringIndex++);
+
+            result[dataIndex++] = (byte)(((charToVal[ch1] << 2) | charToVal[ch2] >> 4) & 0xff);
+            /* we check this to ensure that we don't override data with '=' padding. */ 
+            if (dataIndex < result.length)
+                result[dataIndex++] = (byte)(((charToVal[ch2] << 4) | charToVal[ch3] >> 2) & 0xff);
+            if (dataIndex < result.length)
+                result[dataIndex++] = (byte)(((charToVal[ch3] << 6) | charToVal[ch4]) & 0xff);
+        }
+        
+        return result;
     }
 }