Use dynamically allocated WSS URL

Author: vikramdattu

esp_port/components/credential/aws_signer_v4.c

@@ -235,7 +235,7 @@ STATUS signAwsRequestInfoQueryParam(PRequestInfo pRequestInfo)
                               (UINT32)((pRequestInfo->pAwsCredentials->expiration - pRequestInfo->currentTime) / HUNDREDS_OF_NANOS_IN_A_SECOND));
     expirationInSeconds = MAX(MIN_AWS_SIGV4_CREDENTIALS_EXPIRATION_IN_SECONDS, expirationInSeconds);
 
-#if 0 // Get the required size for the signedURL
+#if USE_DYNAMIC_URL // Get the required size for the signedURL
     UINT32 signedUrlLen = 0;
     {
         UINT32 encodedReqLen = 0;
@@ -276,9 +276,6 @@ STATUS signAwsRequestInfoQueryParam(PRequestInfo pRequestInfo)
                    strlen(SIGNATURE_PARAM_TEMPLATE), NULL, &encodedReqLen));
         signedUrlLen += encodedReqLen;
         signedUrlLen += KVS_MAX_HMAC_SIZE; // Hex signature value size;
-
-        // + 200 lumpsum bytes to encode other extra requirements (&, =)
-        // signedUrlLen += 200;
     }
 
     // Replace the URL with the larger buffer which could hold signed URL

esp_port/components/kvs_utils/include/common_defs.h

@@ -832,6 +832,8 @@ struct __RequestHeader {
 };
 typedef struct __RequestHeader* PRequestHeader;
 
+#define USE_DYNAMIC_URL 1
+
 /**
  * @brief Request info structure
  */
@@ -843,7 +845,11 @@ struct __RequestInfo {
                                               //!< NOTE: In streaming mode the body will be NULL
                                               //!< NOTE: The body will follow the main struct
     UINT32 bodySize;                          //!< Size of the body in bytes
+#if USE_DYNAMIC_URL
+    PCHAR url;                                //!< The URL for the request
+#else
     CHAR url[MAX_URI_CHAR_LEN + 1];           //!< The URL for the request
+#endif
     CHAR certPath[MAX_PATH_LEN + 1];          //!< CA Certificate path to use - optional
     CHAR sslCertPath[MAX_PATH_LEN + 1];       //!< SSL Certificate file path to use - optional
     CHAR sslPrivateKeyPath[MAX_PATH_LEN + 1]; //!< SSL Certificate private key file path to use - optional

esp_port/components/kvs_utils/src/request_info.c

@@ -112,16 +112,16 @@ PUBLIC_API STATUS createRequestInfo
     pRequestInfo->currentTime = GETTIME();
     pRequestInfo->callAfter = pRequestInfo->currentTime;
     STRNCPY(pRequestInfo->region, region, MAX_REGION_NAME_LEN);
-#if 1
-    STRNCPY(pRequestInfo->url, url, MAX_URI_CHAR_LEN);
-#else
+#if USE_DYNAMIC_URL
     UINT32 urlLen = strlen(url);
     pRequestInfo->url = MEMALLOC(urlLen + 1);
     if (pRequestInfo->url) {
         // if allocation was not successful, user function of url will abort
         pRequestInfo->url[urlLen] = '\0';
         MEMCPY(pRequestInfo->url, url, urlLen);
     }
+#else
+    STRNCPY(pRequestInfo->url, url, MAX_URI_CHAR_LEN);
 #endif
     if (certPath != NULL) {
         STRNCPY(pRequestInfo->certPath, certPath, MAX_PATH_LEN);
@@ -189,8 +189,10 @@ PUBLIC_API STATUS freeRequestInfo(PRequestInfo* ppRequestInfo)
     // Free the header list itself
     singleListFree(pRequestInfo->pRequestHeaders);
 
+#if USE_DYNAMIC_URL
     // Release the url
-    // SAFE_MEMFREE(pRequestInfo->url);
+    SAFE_MEMFREE(pRequestInfo->url);
+#endif
 
     // Release the object
     MEMFREE(pRequestInfo);