Bump coreHTTP submodule to dev branch (#1786)

* Bump coreHTTP submodule to dev branch

* Replace http-parser functions

* Update manifest.yml

* Update integration test cmake

* Ignore llhttp warnings in demos

* Consolidate http demo utils files

Author: muneebahmed10

demos/ota/common/include/http_demo_utils.h renamed to demos/http/common/include/http_demo_url_utils.h

@@ -20,8 +20,18 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef _HTTP_UTILS_H_
-#define _HTTP_UTILS_H_
+#ifndef HTTP_DEMO_URL_UTILS_H_
+#define HTTP_DEMO_URL_UTILS_H_
+
+/* Standard includes. */
+#include <stdlib.h>
+#include <stdbool.h>
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+    extern "C" {
+#endif
+/* *INDENT-ON* */
 
 /* HTTP API header. */
 #include "core_http_client.h"
@@ -86,4 +96,10 @@ HTTPStatus_t getUrlAddress( const char * pUrl,
                             const char ** pAddress,
                             size_t * pAddressLen );
 
-#endif /* ifndef _HTTP_UTILS_H_ */
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+    }
+#endif
+/* *INDENT-ON* */
+
+#endif /* ifndef HTTP_DEMO_URL_UTILS_H_ */

demos/http/common/include/http_demo_utils.h

@@ -36,8 +36,8 @@
 /* Transport interface include. */
 #include "transport_interface.h"
 
-/* HTTP API header. */
-#include "core_http_client.h"
+/* Other HTTP utils header. */
+#include "http_demo_url_utils.h"
 
 /**
  * @brief Function pointer for establishing connection to a server.
@@ -63,66 +63,6 @@ typedef int32_t ( * TransportConnect_t )( NetworkContext_t * pNetworkContext );
 int32_t connectToServerWithBackoffRetries( TransportConnect_t connectFunction,
                                            NetworkContext_t * pNetworkContext );
 
-/**
- * @brief Retrieve the path from the input URL.
- *
- * This function retrieves the location and length of the path from within the
- * input the URL. The query is not included in the length returned.
- *
- * The URL MUST start with "http://" or "https://" to find the path.
- *
- * For example, if pUrl is:
- * "https://www.somewebsite.com/path/to/item.txt?optionalquery=stuff"
- *
- * Then pPath and pPathLen will be the following:
- * *pPath = "/path/to/item.txt?optionalquery=stuff"
- * *pPathLen = 17
- *
- * @param[in] pUrl URL string to parse.
- * @param[in] urlLen The length of the URL string input.
- * @param[out] pPath pointer within input url that the path starts at.
- * @param[out] pPathLen Length of the path.
- *
- * @return The status of the parsing attempt:
- * HTTPSuccess if the path was successfully parsed,
- * HTTPParserInternalError if there was an error parsing the URL,
- * or HTTPNoResponse if the path was not found.
- */
-HTTPStatus_t getUrlPath( const char * pUrl,
-                         size_t urlLen,
-                         const char ** pPath,
-                         size_t * pPathLen );
-
-/**
- * @brief Retrieve the Address from the input URL.
- *
- * This function retrieves the location and length of the address from within
- * the input URL. The path and query are not included in the length returned.
- *
- * The URL MUST start with "http://" or "https://" to find the address.
- *
- * For example, if pUrl is:
- * "https://www.somewebsite.com/path/to/item.txt?optionalquery=stuff"
- *
- * Then pAddress and pAddressLen will be the following:
- * *pAddress = "www.somewebsite.com/path/to/item.txt?optionalquery=stuff"
- * *pAddressLen = 19
- *
- * @param[in] pUrl URL string to parse.
- * @param[in] urlLen The length of the URL string input.
- * @param[out] pAddress pointer within input url that the address starts at.
- * @param[out] pAddressLen Length of the address.
- *
- * @return The status of the parsing attempt:
- * HTTPSuccess if the path was successfully parsed,
- * HTTPParserInternalError if there was an error parsing the URL,
- * or HTTPNoResponse if the path was not found.
- */
-HTTPStatus_t getUrlAddress( const char * pUrl,
-                            size_t urlLen,
-                            const char ** pAddress,
-                            size_t * pAddressLen );
-
 /* *INDENT-OFF* */
 #ifdef __cplusplus
     }

demos/ota/common/src/http_demo_utils.c renamed to demos/http/common/src/http_demo_url_utils.c

@@ -20,11 +20,28 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+/* Standard includes. */
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* Include Demo Config as the first non-system header. */
+#include "demo_config.h"
+
 /* Demo utils header. */
-#include "http_demo_utils.h"
+#include "http_demo_url_utils.h"
+
+/*-----------------------------------------------------------*/
 
-/* Third party parser utilities. */
-#include "http_parser.h"
+/**
+ * @brief The separator between the "https" scheme and the host in a URL.
+ */
+#define SCHEME_SEPARATOR        "://"
+
+/**
+ * @brief The length of the "://" separator.
+ */
+#define SCHEME_SEPARATOR_LEN    ( sizeof( SCHEME_SEPARATOR ) - 1 )
 
 /*-----------------------------------------------------------*/
 
@@ -33,13 +50,10 @@ HTTPStatus_t getUrlPath( const char * pUrl,
                          const char ** pPath,
                          size_t * pPathLen )
 {
-    /* http-parser status. Initialized to 1 to signify failure. */
-    int parserStatus = 1;
-    struct http_parser_url urlParser;
     HTTPStatus_t httpStatus = HTTPSuccess;
-
-    /* Sets all members in urlParser to 0. */
-    http_parser_url_init( &urlParser );
+    const char * pHostStart = NULL;
+    const char * pPathStart = NULL;
+    size_t hostLen = 0, i = 0, pathStartIndex = 0, pathLen = 0;
 
     if( ( pUrl == NULL ) || ( pPath == NULL ) || ( pPathLen == NULL ) )
     {
@@ -49,33 +63,53 @@ HTTPStatus_t getUrlPath( const char * pUrl,
 
     if( httpStatus == HTTPSuccess )
     {
-        parserStatus = http_parser_parse_url( pUrl, urlLen, 0, &urlParser );
-
-        if( parserStatus != 0 )
-        {
-            LogError( ( "Error parsing the input URL %.*s. Error code: %d.",
-                        ( int32_t ) urlLen,
-                        pUrl,
-                        parserStatus ) );
-            httpStatus = HTTPParserInternalError;
-        }
+        httpStatus = getUrlAddress( pUrl, urlLen, &pHostStart, &hostLen );
     }
 
     if( httpStatus == HTTPSuccess )
     {
-        *pPathLen = ( size_t ) ( urlParser.field_data[ UF_PATH ].len );
+        /* Search for the start of the path. */
+        for( i = ( pHostStart - pUrl ) + hostLen; i < urlLen; i++ )
+        {
+            if( pUrl[ i ] == '/' )
+            {
+                pPathStart = &pUrl[ i ];
+                pathStartIndex = i;
+                break;
+            }
+        }
 
-        if( *pPathLen == 0 )
+        if( pPathStart != NULL )
         {
-            httpStatus = HTTPNoResponse;
-            *pPath = NULL;
+            /* The end of the path will be either the start of the query,
+             * start of the fragment, or end of the URL. If this is an S3
+             * presigned URL, then there must be a query. */
+            for( i = pathStartIndex; i < urlLen; i++ )
+            {
+                if( pUrl[ i ] == '?' )
+                {
+                    break;
+                }
+            }
+
+            pathLen = i - pathStartIndex;
         }
-        else
+
+        if( pathLen == 0 )
         {
-            *pPath = &pUrl[ urlParser.field_data[ UF_PATH ].off ];
+            LogError( ( "Could not parse path from input URL %.*s",
+                        ( int32_t ) urlLen,
+                        pUrl ) );
+            httpStatus = HTTPNoResponse;
         }
     }
 
+    if( httpStatus == HTTPSuccess )
+    {
+        *pPathLen = pathLen;
+        *pPath = pPathStart;
+    }
+
     if( httpStatus != HTTPSuccess )
     {
         LogError( ( "Error parsing the path from URL %s. Error code: %d",
@@ -93,13 +127,10 @@ HTTPStatus_t getUrlAddress( const char * pUrl,
                             const char ** pAddress,
                             size_t * pAddressLen )
 {
-    /* http-parser status. Initialized to 1 to signify failure. */
-    int parserStatus = 1;
-    struct http_parser_url urlParser;
     HTTPStatus_t httpStatus = HTTPSuccess;
-
-    /* Sets all members in urlParser to 0. */
-    http_parser_url_init( &urlParser );
+    const char * pHostStart = NULL;
+    const char * pHostEnd = NULL;
+    size_t i = 0, hostLen = 0;
 
     if( ( pUrl == NULL ) || ( pAddress == NULL ) || ( pAddressLen == NULL ) )
     {
@@ -109,30 +140,54 @@ HTTPStatus_t getUrlAddress( const char * pUrl,
 
     if( httpStatus == HTTPSuccess )
     {
-        parserStatus = http_parser_parse_url( pUrl, urlLen, 0, &urlParser );
+        /* Search for the start of the hostname using the "://" separator. */
+        for( i = 0; i < ( urlLen - SCHEME_SEPARATOR_LEN ); i++ )
+        {
+            if( strncmp( &( pUrl[ i ] ), SCHEME_SEPARATOR, SCHEME_SEPARATOR_LEN ) == 0 )
+            {
+                pHostStart = pUrl + i + SCHEME_SEPARATOR_LEN;
+                break;
+            }
+        }
 
-        if( parserStatus != 0 )
+        if( pHostStart == NULL )
         {
-            LogError( ( "Error parsing the input URL %.*s. Error code: %d.",
+            LogError( ( "Could not find \"://\" scheme separator in input URL %.*s",
                         ( int32_t ) urlLen,
-                        pUrl,
-                        parserStatus ) );
+                        pUrl ) );
             httpStatus = HTTPParserInternalError;
         }
+        else
+        {
+            /* Search for the end of the hostname assuming that the object path
+             * is next. Assume that there is no port number as this is used for
+             * S3 presigned URLs. */
+            for( pHostEnd = pHostStart; pHostEnd < ( pUrl + urlLen ); pHostEnd++ )
+            {
+                if( *pHostEnd == '/' )
+                {
+                    hostLen = ( size_t ) ( pHostEnd - pHostStart );
+                    break;
+                }
+            }
+        }
     }
 
     if( httpStatus == HTTPSuccess )
     {
-        *pAddressLen = ( size_t ) ( urlParser.field_data[ UF_HOST ].len );
+        *pAddressLen = hostLen;
 
-        if( *pAddressLen == 0 )
+        if( hostLen == 0 )
         {
+            LogError( ( "Could not find end of host in input URL %.*s",
+                        ( int32_t ) urlLen,
+                        pUrl ) );
             httpStatus = HTTPNoResponse;
             *pAddress = NULL;
         }
         else
         {
-            *pAddress = &pUrl[ urlParser.field_data[ UF_HOST ].off ];
+            *pAddress = pHostStart;
         }
     }