Changeset 79427 in vbox for trunk/src/VBox/Runtime/common/rest/RTCRestClientApiBaseOci.cpp

Timestamp:

Jun 29, 2019 12:06:56 AM (5 years ago)

Author:

vboxsync

Message:

IPRT/rest: Fix inverted logic to specify kDoCall_RequireBody flag. We
need it precisely when the body parameter is *not* required at the
REST level - we need to sign the body even if it's empty.

Regen the C++ API sources, where InstanceAction is now the only
operation affected by the (cumulative) mustache changes.

bugref:9436 bugref:9167

File:

• trunk/src/VBox/Runtime/common/rest/RTCRestClientApiBaseOci.cpp (modified) (2 diffs)

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

@@ -144 +144 @@
     if (RT_SUCCESS(rc))
     {
-        if (   a_rStrXmitBody.isNotEmpty()
-            || (a_fFlags & kDoCall_RequireBody)
+        bool fHasBody = a_rStrXmitBody.isNotEmpty() || (a_fFlags & kDoCall_RequireBody);
+
+        if (   fHasBody
             || a_enmHttpMethod == RTHTTPMETHOD_POST
             || a_enmHttpMethod == RTHTTPMETHOD_PUT)
             rc = ociSignRequestEnsureContentLength(a_hHttp, a_rStrXmitBody.length());
         if (   RT_SUCCESS(rc)
-            && a_rStrXmitBody.isNotEmpty())
+            && fHasBody)
             rc = ociSignRequestEnsureXContentSha256(a_hHttp, a_rStrXmitBody.c_str(), a_rStrXmitBody.length());
         if (RT_SUCCESS(rc))
@@ -162 +163 @@
         }
     }
-    RT_NOREF_PV(a_fFlags); /* We don't need to use the kDoCall_OciReqSignExcludeBody flag it turns out. */
     return rc;
 }