Merge pull request #23 from awslabs/UUID

Uuid implementation

Author: bretambrose

CMakeLists.txt

@@ -1033,8 +1033,10 @@ endif()
 
 # default libraries to link in per-platform
 if(PLATFORM_WINDOWS)
-    set(PLATFORM_DEP_LIBS Userenv )
-elseif(PLATFORM_LINUX OR PLATFORM_APPLE)
+    set(PLATFORM_DEP_LIBS Userenv Rpcrt4)
+elseif(PLATFORM_LINUX)
+    set(PLATFORM_DEP_LIBS pthread uuid)
+elseif(PLATFORM_APPLE)
     set(PLATFORM_DEP_LIBS pthread)
 elseif(PLATFORM_ANDROID)
     set(PLATFORM_DEP_LIBS log atomic)

README.md

@@ -0,0 +1,58 @@
+/*
+* Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+#include <aws/external/gtest.h>
+#include <aws/core/utils/UUID.h>
+#include <aws/core/utils/HashingUtils.h>
+#include <aws/core/utils/memory/stl/AWSSet.h>
+
+using namespace Aws::Utils;
+
+TEST(UUIDTest, TestPlatformGeneratesUUID)
+{
+    Aws::Set<Aws::String> generatedUUids;
+
+    for(size_t i = 0u; i < 1000u; ++i)
+    {
+        UUID uuid = UUID::RandomUUID();
+        Aws::String uuidStr = uuid;
+        ASSERT_EQ(36u, uuidStr.length());
+        ByteBuffer rawUUID = uuid;
+        ASSERT_EQ(16u, rawUUID.GetLength());
+
+        ASSERT_EQ(generatedUUids.end(), generatedUUids.find(uuidStr));
+        generatedUUids.insert(uuidStr);
+    }    
+}
+
+TEST(UUIDTest, TestUUIDToStringConversion)
+{
+    ByteBuffer rawUuuid = HashingUtils::HexDecode("f81d4fae7dec11d0a76500a0c91e6bf6");
+    const char* expectedStr = "F81D4FAE-7DEC-11D0-A765-00A0C91E6BF6";
+
+    UUID uuid(rawUuuid.GetUnderlyingData());
+    Aws::String convertedStr = uuid;
+    ASSERT_STREQ(expectedStr, convertedStr.c_str());
+}
+
+TEST(UUIDTest, TestUUIDFromStringConversion)
+{
+    Aws::String originalStr = "F81D4FAE-7DEC-11D0-A765-00A0C91E6BF6";
+
+    UUID uuid(originalStr);
+    Aws::String convertedStr = uuid;
+    ASSERT_STREQ(originalStr.c_str(), convertedStr.c_str());
+}
+
+

aws-cpp-sdk-core-tests/utils/UUIDTest.cpp

@@ -1,5 +1,5 @@
 /*
-  * Copyright 2010-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
   *
   * Licensed under the Apache License, Version 2.0 (the "License").
   * You may not use this file except in compliance with the License.

aws-cpp-sdk-core/include/aws/core/utils/StringUtils.h

@@ -0,0 +1,63 @@
+/*
+* Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#pragma once
+
+#include <aws/core/Core_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/core/utils/Array.h>
+
+namespace Aws
+{
+    namespace Utils
+    {
+        static const size_t UUID_BINARY_SIZE = 0x10;
+        static const size_t UUID_STR_SIZE = 0x24;
+
+        /**
+         * Class encapsulating a UUID. This is platform dependent. The method you are most likely interested in is RandomUUID().
+         */
+        class AWS_CORE_API UUID
+        {
+        public:
+            /**
+             * Parses a GUID string into the raw data.
+             */
+            UUID(const Aws::String&);
+            /**
+             * Sets the raw uuid data
+             */
+            UUID(const unsigned char uuid[UUID_BINARY_SIZE]);
+
+            /**
+             * Returns the current UUID as a GUID string
+             */
+            operator Aws::String();
+            /**
+             * Returns a copy of the raw uuid
+             */
+            inline operator ByteBuffer() { return ByteBuffer(m_uuid, sizeof(m_uuid)); }
+
+            /**
+             * Generates a UUID. It will always try to prefer a random implementation from the entropy source on the machine. If none, is available, it will
+             * fallback to the mac address and timestamp implementation.
+             */
+            static UUID RandomUUID();
+
+        private:
+            unsigned char m_uuid[UUID_BINARY_SIZE];
+        };
+    }
+}

aws-cpp-sdk-core/include/aws/core/utils/UUID.h

@@ -13,7 +13,7 @@ nuget {
         id = AWSSDKCPP-Core;
 
         // Version number. Follows NuGet standards. (currently SemVer 1.0)
-        version : 0.13.11;
+        version : 0.13.11;
 
         // Display name for package.
         title: AWS SDK for C++ (Core Runtime);
@@ -151,7 +151,8 @@ nuget {
         Libraries += winhttp.lib;
         Libraries += wininet.lib;
         Libraries += bcrypt.lib;
-        Libraries += userenv.lib;        
+        Libraries += userenv.lib;
+        Libraries += Rpcrt4.lib;
     }
 }    
 

aws-cpp-sdk-core/nuget/aws-cpp-sdk-core.autopkg

@@ -1,5 +1,5 @@
 /*
-  * Copyright 2010-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
   *
   * Licensed under the Apache License, Version 2.0 (the "License").
   * You may not use this file except in compliance with the License.

aws-cpp-sdk-core/source/platform/android/Environment.cpp

@@ -0,0 +1,38 @@
+/*
+  * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  *
+  * Licensed under the Apache License, Version 2.0 (the "License").
+  * You may not use this file except in compliance with the License.
+  * A copy of the License is located at
+  *
+  *  http://aws.amazon.com/apache2.0
+  *
+  * or in the "license" file accompanying this file. This file is distributed
+  * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+  * express or implied. See the License for the specific language governing
+  * permissions and limitations under the License.
+  */
+
+#include <aws/core/utils/UUID.h>
+
+namespace Aws
+{
+    namespace Utils
+    {
+        UUID UUID::RandomUUID()
+        {
+            char uuid[UUID_STR_SIZE];
+            memset(uuid, 0, sizeof(uuid));
+
+            int fd = fopen("/proc/sys/kernel/random/uuid", "r");
+
+            if(fd)
+            {
+                fread(uuid, sizeof(uuid), sizeof(uuid), fd);
+                fclose(fd);
+            }
+            Aws::String uuidStr(uuid);
+            return UUID(uuidStr);
+        }
+    }
+}

aws-cpp-sdk-core/source/platform/android/UUID_Impl.cpp

@@ -0,0 +1,30 @@
+/*
+  * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  *
+  * Licensed under the Apache License, Version 2.0 (the "License").
+  * You may not use this file except in compliance with the License.
+  * A copy of the License is located at
+  *
+  *  http://aws.amazon.com/apache2.0
+  *
+  * or in the "license" file accompanying this file. This file is distributed
+  * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+  * express or implied. See the License for the specific language governing
+  * permissions and limitations under the License.
+  */
+
+#include <aws/core/utils/UUID.h>
+#include <uuid/uuid.h>
+
+namespace Aws
+{
+    namespace Utils
+    {
+        UUID UUID::RandomUUID()
+        {
+            uuid_t uuid;
+            uuid_generate(uuid);
+            return UUID(uuid);
+        }
+    }
+}

aws-cpp-sdk-core/source/platform/linux-shared/UUID_Impl.cpp

@@ -0,0 +1,36 @@
+/*
+* Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/core/utils/UUID.h>
+#include <rpc.h>
+
+namespace Aws
+{
+    namespace Utils
+    {
+        Aws::Utils::UUID Aws::Utils::UUID::RandomUUID()
+        {
+            ::UUID uuidStruct;
+            UuidCreate(&uuidStruct);
+
+            unsigned char newUuid[UUID_BINARY_SIZE];
+            memcpy(newUuid, &uuidStruct.Data1, sizeof(uuidStruct.Data1));
+            memcpy(newUuid + 4, &uuidStruct.Data2, sizeof(uuidStruct.Data2));
+            memcpy(newUuid + 6, &uuidStruct.Data3, sizeof(uuidStruct.Data3));
+            memcpy(newUuid + 8, &uuidStruct.Data4, sizeof(uuidStruct.Data4));
+            return Aws::Utils::UUID(newUuid);
+        }
+    }
+}

aws-cpp-sdk-core/source/platform/windows/UUID_Impl.cpp

@@ -24,7 +24,7 @@
 
 using namespace Aws::Utils;
 
-void StringUtils::Replace(Aws::String &s, const char* search, const char* replace)
+void StringUtils::Replace(Aws::String& s, const char* search, const char* replace)
 {
     if(!search || !replace)
     {

aws-cpp-sdk-core/source/utils/StringUtils.cpp

@@ -0,0 +1,71 @@
+/*
+* Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/core/utils/UUID.h>
+#include <aws/core/utils/HashingUtils.h>
+#include <aws/core/utils/StringUtils.h>
+#include <iomanip>
+
+namespace Aws
+{
+    namespace Utils
+    {
+        void WriteRangeOutToStream(Aws::StringStream& ss, unsigned char* toWrite, size_t min, size_t max)
+        {
+            for (size_t i = min; i < max; ++i)
+            {
+                ss << std::uppercase << std::hex << std::setfill('0') << std::setw(2)
+                    << (unsigned int)toWrite[i];
+            }
+        }
+
+        UUID::UUID(const Aws::String& uuidToConvert)
+        {
+            //GUID has 2 characters per byte + 4 dashes = 36 bytes
+            assert(uuidToConvert.length() == UUID_STR_SIZE);
+            memset(m_uuid, 0, sizeof(m_uuid));
+            Aws::String escapedHexStr(uuidToConvert);
+            StringUtils::Replace(escapedHexStr, "-", "");
+            assert(escapedHexStr.length() == UUID_BINARY_SIZE * 2);
+            ByteBuffer&& rawUuid = HashingUtils::HexDecode(escapedHexStr);
+            memcpy(m_uuid, rawUuid.GetUnderlyingData(), rawUuid.GetLength());
+        }
+
+        UUID::UUID(const unsigned char toCopy[UUID_BINARY_SIZE])
+        {
+            memcpy(m_uuid, toCopy, sizeof(m_uuid));
+        }
+
+        UUID::operator Aws::String()
+        {
+            Aws::StringStream ss;
+            WriteRangeOutToStream(ss, m_uuid, 0, 4);
+            ss << "-";
+
+            WriteRangeOutToStream(ss, m_uuid, 4, 6);
+            ss << "-";
+
+            WriteRangeOutToStream(ss, m_uuid, 6, 8);
+            ss << "-";
+
+            WriteRangeOutToStream(ss, m_uuid, 8, 10);
+            ss << "-";
+
+            WriteRangeOutToStream(ss, m_uuid, 10, 16);
+            
+            return ss.str();
+        }        
+    }
+}