Changeset 87303 in vbox

Timestamp:

Jan 18, 2021 6:39:18 PM (4 years ago)

Author:

vboxsync

Message:

IPRT/rest: for POST and PUT OCI wants even an empty body signed. May
be the caller should use kDoCall_RequireBody, but it's not immediately
obvious that's the right thing to do and doing it right requires some
rearrangements. (This should logically be in the request, but the
flag comes from the doCall in the api template, so the same logic
would end up duplicated in different files). For now just tweak the
local logic in a well isolated fix. bugref:9167.

File:

• trunk/src/VBox/Runtime/common/rest/RTCRestClientApiBaseOci.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/rest/RTCRestClientApiBaseOci.cpp

@@ -144 +144 @@
     if (RT_SUCCESS(rc))
     {
-        bool fHasBody = a_rStrXmitBody.isNotEmpty() || (a_fFlags & kDoCall_RequireBody);
+        bool fHasBody
+            =  a_rStrXmitBody.isNotEmpty()
+               /* but sometimes we need an empty body signed too */
+            || (a_fFlags & kDoCall_RequireBody)
+            || a_enmHttpMethod == RTHTTPMETHOD_POST
+            || a_enmHttpMethod == RTHTTPMETHOD_PUT;
 
-        if (   fHasBody
-            || a_enmHttpMethod == RTHTTPMETHOD_POST
-            || a_enmHttpMethod == RTHTTPMETHOD_PUT)
+        if (fHasBody)
+        {
             rc = ociSignRequestEnsureContentLength(a_hHttp, a_rStrXmitBody.length());
-        if (   RT_SUCCESS(rc)
-            && fHasBody)
-            rc = ociSignRequestEnsureXContentSha256(a_hHttp, a_rStrXmitBody.c_str(), a_rStrXmitBody.length());
+            if (RT_SUCCESS(rc))
+                rc = ociSignRequestEnsureXContentSha256(a_hHttp, a_rStrXmitBody.c_str(), a_rStrXmitBody.length());
+        }
         if (RT_SUCCESS(rc))
             rc = ociSignRequestEnsureDateOrXDate(a_hHttp);