Changeset 43136 in vbox for trunk/src/VBox/Main/webservice

Timestamp:

Aug 31, 2012 12:23:58 PM (12 years ago)

Author:

vboxsync

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

80508

Message:

Main/webservices: Raise SOAP FAULT in case of invalid string to Base64DecodeArray.

Location:

trunk/src/VBox/Main/webservice

Files:

• vboxweb.cpp (modified) (1 diff)
• vboxweb.h (modified) (1 diff)
• websrv-cpp.xsl (modified) (1 diff)

trunk/src/VBox/Main/webservice/vboxweb.cpp

@@ -1437 +1437 @@
     return aStr.c_str();
 }
-
-void Base64DecodeByteArray(std::string& aStr, ComSafeArrayOut(BYTE, aData))
+#define DECODE_STR_MAX 0x100000
+void Base64DecodeByteArray(struct soap *soap, std::string& aStr, ComSafeArrayOut(BYTE, aData))
 {
     const char* pszStr = aStr.c_str();
     ssize_t cbOut = RTBase64DecodedSize(pszStr, NULL);
 
-    Assert(cbOut > 0);
+    if(cbOut > DECODE_STR_MAX)
+    {
+        WebLog("Decode string too long.\n");
+        RaiseSoapRuntimeFault(soap, VERR_BUFFER_OVERFLOW, (ComPtr<IUnknown>)NULL);
+    }
 
     com::SafeArray<BYTE> result(cbOut);
     int rc = RTBase64Decode(pszStr, result.raw(), cbOut, NULL, NULL);
-    AssertRC(rc);
+    if (FAILED(rc))
+    {
+        WebLog("String Decoding Failed. ERROR: 0x%lX\n", rc);
+        RaiseSoapRuntimeFault(soap, rc, (ComPtr<IUnknown>)NULL);
+    }
 
     result.detachTo(ComSafeArrayOutArg(aData));

trunk/src/VBox/Main/webservice/vboxweb.h

@@ -99 +99 @@
 std::string Base64EncodeByteArray(ComSafeArrayIn(BYTE, aData));
 
-void Base64DecodeByteArray(std::string& aStr, ComSafeArrayOut(BYTE, aData));
+void Base64DecodeByteArray(struct soap *soap, std::string& aStr, ComSafeArrayOut(BYTE, aData));
 /****************************************************************************
  *

trunk/src/VBox/Main/webservice/websrv-cpp.xsl

@@ -547 +547 @@
        <xsl:value-of select="concat('com::SafeArray&lt;BYTE&gt; comcall_',$name, ';')" />
        <xsl:call-template name="emitNewlineIndent8" />
-       <xsl:value-of select="concat('Base64DecodeByteArray(',$structprefix,$name,', ComSafeArrayAsOutParam(comcall_',$name, '));')" />
+       <xsl:value-of select="concat('Base64DecodeByteArray(soap, ',$structprefix,$name,', ComSafeArrayAsOutParam(comcall_',$name, '));')" />
     </xsl:when>