Integrate aws-c-auth; logging; misc tweaks (aws#41)

* Integrate aws-c-auth; logging; misc tweaks

Author: bretambrose

CMakeLists.txt

@@ -102,6 +102,10 @@ file(GLOB AWS_CRT_HEADERS
         "include/aws/crt/*.h"
 )
 
+file(GLOB AWS_CRT_AUTH_HEADERS
+        "include/aws/crt/auth/*.h"
+)
+
 file(GLOB AWS_CRT_CRYPTO_HEADERS
         "include/aws/crt/crypto/*.h"
 )
@@ -128,6 +132,7 @@ file(GLOB AWS_CRT_EXTERNAL_HEADERS
 
 file(GLOB AWS_CRT_CPP_HEADERS
         ${AWS_CRT_HEADERS}
+        ${AWS_CRT_AUTH_HEADERS}
         ${AWS_CRT_CRYPTO_HEADERS}
         ${AWS_CRT_IO_HEADERS}
         ${AWS_CRT_IOT_HEADERS}
@@ -140,6 +145,10 @@ file(GLOB AWS_CRT_SRC
        "source/*.cpp"
 )
 
+file(GLOB AWS_CRT_AUTH_SRC
+        "source/auth/*.cpp"
+)
+
 file(GLOB AWS_CRT_CRYPTO_SRC
        "source/crypto/*.cpp"
 )
@@ -166,6 +175,7 @@ file(GLOB AWS_CRT_EXTERNAL_CRC
 
 file(GLOB AWS_CRT_CPP_SRC
         ${AWS_CRT_SRC}
+        ${AWS_CRT_AUTH_SRC}
         ${AWS_CRT_CRYPTO_SRC}
         ${AWS_CRT_IO_SRC}
         ${AWS_CRT_IOT_SRC}
@@ -177,6 +187,7 @@ file(GLOB AWS_CRT_CPP_SRC
 if (WIN32)
     if (MSVC)
         source_group("Header Files\\aws\\crt" FILES ${AWS_CRT_HEADERS})
+        source_group("Header Files\\aws\\crt\\auth" FILES ${AWS_CRT_AUTH_HEADERS})
         source_group("Header Files\\aws\\crt\\crypto" FILES ${AWS_CRT_CRYPTO_HEADERS})
         source_group("Header Files\\aws\\crt\\io" FILES ${AWS_CRT_IO_HEADERS})
         source_group("Header Files\\aws\\iot" FILES ${AWS_CRT_IOT_HEADERS})
@@ -185,6 +196,7 @@ if (WIN32)
         source_group("Header Files\\aws\\crt\\external" FILES ${AWS_CRT_EXTERNAL_HEADERS})
 
         source_group("Source Files" FILES ${AWS_CRT_SRC})
+        source_group("Source Files\\auth" FILES ${AWS_CRT_AUTH_SRC})
         source_group("Source Files\\crypto" FILES ${AWS_CRT_CRYPTO_SRC})
         source_group("Source Files\\io" FILES ${AWS_CRT_IO_SRC})
         source_group("Source Files\\iot" FILES ${AWS_CRT_IOT_SRC})
@@ -224,9 +236,11 @@ target_include_directories(${CMAKE_PROJECT_NAME} PUBLIC
 find_package(aws-c-http REQUIRED)
 find_package(aws-c-mqtt REQUIRED)
 find_package(aws-c-cal REQUIRED)
-target_link_libraries(${CMAKE_PROJECT_NAME} AWS::aws-c-cal AWS::aws-c-http AWS::aws-c-mqtt)
+find_package(aws-c-auth REQUIRED)
+target_link_libraries(${CMAKE_PROJECT_NAME} AWS::aws-c-auth AWS::aws-c-cal AWS::aws-c-http AWS::aws-c-mqtt)
 
 install(FILES ${AWS_CRT_HEADERS} DESTINATION "include/aws/crt" COMPONENT Development)
+install(FILES ${AWS_CRT_AUTH_HEADERS} DESTINATION "include/aws/crt/auth" COMPONENT Development)
 install(FILES ${AWS_CRT_CRYPTO_HEADERS} DESTINATION "include/aws/crt/crypto" COMPONENT Development)
 install(FILES ${AWS_CRT_IO_HEADERS} DESTINATION "include/aws/crt/io" COMPONENT Development)
 install(FILES ${AWS_CRT_IOT_HEADERS} DESTINATION "include/aws/iot" COMPONENT Development)

aws-common-runtime/CMakeLists.txt

@@ -17,7 +17,7 @@ set(AWS_DEPS_DOWNLOAD_DIR "${AWS_DEPS_BUILD_DIR}/downloads" CACHE PATH "Dependen
 
 message("install dir ${AWS_DEPS_INSTALL_DIR}")
 set(AWS_C_COMMON_URL "https://github.com/awslabs/aws-c-common.git")
-set(AWS_C_COMMON_SHA "v0.3.15")
+set(AWS_C_COMMON_SHA "v0.4.1")
 include(BuildAwsCCommon)
 
 if (UNIX AND NOT APPLE)
@@ -27,29 +27,34 @@ if (UNIX AND NOT APPLE)
 endif()
 
 set(AWS_C_IO_URL "https://github.com/awslabs/aws-c-io.git")
-set(AWS_C_IO_SHA "v0.3.15")
+set(AWS_C_IO_SHA "v0.4.1")
 include(BuildAwsCIO)
 
 set(AWS_C_COMPRESSION_URL "https://github.com/awslabs/aws-c-compression.git")
-set(AWS_C_COMPRESSION_SHA "v0.2.1")
+set(AWS_C_COMPRESSION_SHA "v0.2.2")
 include(BuildAwsCCompression)
 
 set(AWS_C_HTTP_URL "https://github.com/awslabs/aws-c-http.git")
-set(AWS_C_HTTP_SHA "v0.2.18")
+set(AWS_C_HTTP_SHA "v0.3.1")
 include(BuildAwsCHttp)
 
 set(AWS_C_MQTT_URL "https://github.com/awslabs/aws-c-mqtt.git")
-set(AWS_C_MQTT_SHA "v0.3.11")
+set(AWS_C_MQTT_SHA "v0.4.1")
 include(BuildAwsCMqtt)
 
 set(AWS_C_CAL_URL "https://github.com/awslabs/aws-c-cal.git")
 set(AWS_C_CAL_SHA "v0.1.5")
 include(BuildAwsCCal)
 
+set(AWS_C_AUTH_URL "https://github.com/awslabs/aws-c-auth.git")
+set(AWS_C_AUTH_SHA "v0.1.1")
+include(BuildAwsCAuth)
+
 add_dependencies(AwsCCompression AwsCCommon)
 add_dependencies(AwsCMqtt AwsCHttp)
 add_dependencies(AwsCHttp AwsCIO AwsCCompression)
 add_dependencies(AwsCCal AwsCCommon)
+add_dependencies(AwsCAuth AwsCHttp AwsCCal)
 
 if (UNIX AND NOT APPLE)
     add_dependencies(AwsCIO S2N AwsCCommon)

aws-common-runtime/cmake/BuildAwsCAuth.cmake

@@ -0,0 +1,53 @@
+if("${TARGET_ARCH}" STREQUAL ANDROID)
+    ExternalProject_Add(AwsCAuth
+            PREFIX ${AWS_DEPS_BUILD_DIR}
+            GIT_REPOSITORY ${AWS_C_AUTH_URL}
+            GIT_TAG ${AWS_C_AUTH_SHA}
+            BUILD_IN_SOURCE 0
+            UPDATE_COMMAND ""
+            CMAKE_ARGS
+            -DCMAKE_INSTALL_PREFIX=${AWS_DEPS_INSTALL_DIR}
+            -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
+            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+            -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
+            -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+            -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL}
+            -DANDROID_ABI=${ANDROID_ABI}
+            -DANDROID_TOOLCHAIN_NAME=${ANDROID_TOOLCHAIN_NAME}
+            -DANDROID_STANDALONE_TOOLCHAIN=${ANDROID_STANDALONE_TOOLCHAIN}
+            -DANDROID_STL=${ANDROID_STL}
+            -DENABLE_HW_OPTIMIZATION=OFF
+            -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+            )
+elseif(MSVC)
+    ExternalProject_Add(AwsCAuth
+            PREFIX ${AWS_DEPS_BUILD_DIR}
+            GIT_REPOSITORY ${AWS_C_AUTH_URL}
+            GIT_TAG ${AWS_C_AUTH_SHA}
+            BUILD_IN_SOURCE 0
+            UPDATE_COMMAND ""
+            CMAKE_ARGS
+            -DCMAKE_INSTALL_PREFIX=${AWS_DEPS_INSTALL_DIR}
+            -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
+            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+            -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
+            -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+            -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+            -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+            )
+else()
+    ExternalProject_Add(AwsCAuth
+            PREFIX ${AWS_DEPS_BUILD_DIR}
+            GIT_REPOSITORY ${AWS_C_AUTH_URL}
+            GIT_TAG ${AWS_C_AUTH_SHA}
+            BUILD_IN_SOURCE 0
+            UPDATE_COMMAND ""
+            CMAKE_ARGS
+            -DCMAKE_INSTALL_PREFIX=${AWS_DEPS_INSTALL_DIR}
+            -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
+            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+            -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
+            -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+            -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+            )
+endif()

cmake/aws-crt-cpp-config.cmake

@@ -3,5 +3,6 @@ include(CMakeFindDependencyMacro)
 find_dependency(aws-c-http)
 find_dependency(aws-c-mqtt)
 find_dependency(aws-c-cal)
+find_dependency(aws-c-auth)
 
 include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake)

include/aws/crt/Api.h

@@ -19,10 +19,25 @@
 #include <aws/crt/io/TlsOptions.h>
 #include <aws/crt/mqtt/MqttClient.h>
 
+#include <aws/common/logging.h>
+
 namespace Aws
 {
     namespace Crt
     {
+        enum class LogLevel
+        {
+            None = AWS_LL_NONE,
+            Fatal = AWS_LL_FATAL,
+            Error = AWS_LL_ERROR,
+            Warn = AWS_LL_WARN,
+            Info = AWS_LL_INFO,
+            Debug = AWS_LL_DEBUG,
+            Trace = AWS_LL_TRACE,
+
+            Count
+        };
+
         class AWS_CRT_CPP_API ApiHandle
         {
           public:
@@ -33,9 +48,16 @@ namespace Aws
             ApiHandle(ApiHandle &&) = delete;
             ApiHandle &operator=(const ApiHandle &) = delete;
             ApiHandle &operator=(ApiHandle &&) = delete;
+
+            void InitializeLogging(LogLevel level, const char *filename);
+            void InitializeLogging(LogLevel level, FILE *fp);
+
+          private:
+            void InitializeLoggingCommon(struct aws_logger_standard_options &options);
+
+            aws_logger logger;
         };
 
-        AWS_CRT_CPP_API void LoadErrorStrings() noexcept;
         AWS_CRT_CPP_API const char *ErrorDebugString(int error) noexcept;
         AWS_CRT_CPP_API int LastError() noexcept;
     } // namespace Crt

include/aws/crt/Types.h

@@ -93,5 +93,15 @@ namespace Aws
             return new (t) T(std::forward<Args>(args)...);
         }
 
+        template <typename T, typename... Args> std::shared_ptr<T> MakeShared(Allocator *allocator, Args &&... args)
+        {
+            T *t = reinterpret_cast<T *>(aws_mem_acquire(allocator, sizeof(T)));
+            if (!t)
+                return nullptr;
+            new (t) T(std::forward<Args>(args)...);
+
+            return std::shared_ptr<T>(t, [allocator](T *obj) { Delete(obj, allocator); });
+        }
+
     } // namespace Crt
 } // namespace Aws

samples/mqtt_pub_sub/main.cpp

@@ -62,11 +62,6 @@ int main(int argc, char *argv[])
 {
 
     /************************ Setup the Lib ****************************/
-    /*
-     * These make debug output via ErrorDebugString() work.
-     */
-    LoadErrorStrings();
-
     /*
      * Do the global initialization for the API.
      */

source/Api.cpp

@@ -17,6 +17,7 @@
 #include <aws/crt/external/cJSON.h>
 #include <aws/crt/io/TlsOptions.h>
 
+#include <aws/auth/auth.h>
 #include <aws/http/http.h>
 
 namespace Aws
@@ -36,6 +37,13 @@ namespace Aws
             Io::InitTlsStaticState(allocator);
             aws_http_library_init(allocator);
             aws_mqtt_library_init(allocator);
+            aws_auth_library_init(allocator);
+
+            aws_load_error_strings();
+            aws_io_load_error_strings();
+
+            aws_common_load_log_subject_strings();
+            aws_io_load_log_subject_strings();
 
             cJSON_Hooks hooks;
             hooks.malloc_fn = s_cJSONAlloc;
@@ -46,21 +54,68 @@ namespace Aws
         static void s_cleanUpApi()
         {
             g_allocator = nullptr;
+            aws_auth_library_clean_up();
             aws_mqtt_library_clean_up();
             aws_http_library_clean_up();
             Io::CleanUpTlsStaticState();
         }
 
-        ApiHandle::ApiHandle(Allocator *allocator) noexcept { s_initApi(allocator); }
+        ApiHandle::ApiHandle(Allocator *allocator) noexcept : logger() { s_initApi(allocator); }
 
-        ApiHandle::ApiHandle() noexcept { s_initApi(DefaultAllocator()); }
+        ApiHandle::ApiHandle() noexcept : logger() { s_initApi(DefaultAllocator()); }
 
-        ApiHandle::~ApiHandle() { s_cleanUpApi(); }
+        ApiHandle::~ApiHandle()
+        {
+            s_cleanUpApi();
 
-        void LoadErrorStrings() noexcept
+            if (aws_logger_get() == &logger)
+            {
+                aws_logger_set(NULL);
+                aws_logger_clean_up(&logger);
+            }
+        }
+
+        void ApiHandle::InitializeLogging(Aws::Crt::LogLevel level, const char *filename)
         {
-            aws_load_error_strings();
-            aws_io_load_error_strings();
+            struct aws_logger_standard_options options;
+            AWS_ZERO_STRUCT(options);
+
+            options.level = (enum aws_log_level)level;
+            options.filename = filename;
+
+            InitializeLoggingCommon(options);
+        }
+
+        void ApiHandle::InitializeLogging(Aws::Crt::LogLevel level, FILE *fp)
+        {
+            struct aws_logger_standard_options options;
+            AWS_ZERO_STRUCT(options);
+
+            options.level = (enum aws_log_level)level;
+            options.file = fp;
+
+            InitializeLoggingCommon(options);
+        }
+
+        void ApiHandle::InitializeLoggingCommon(struct aws_logger_standard_options &options)
+        {
+            if (aws_logger_get() == &logger)
+            {
+                aws_logger_set(NULL);
+                aws_logger_clean_up(&logger);
+                if (options.level == AWS_LL_NONE)
+                {
+                    AWS_ZERO_STRUCT(logger);
+                    return;
+                }
+            }
+
+            if (aws_logger_init_standard(&logger, g_allocator, &options))
+            {
+                return;
+            }
+
+            aws_logger_set(&logger);
         }
 
         const char *ErrorDebugString(int error) noexcept { return aws_error_debug_str(error); }