Merge branch 'development' of https://git01.codeplex.com/casablanca into automatemanualtests

stgates · stgates · commit 982d7dcbec0b · 2014-08-15T15:05:14.000-07:00
diff --git a/Build/version.props b/Build/version.props
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <CppRestBaseFileName>cpprest</CppRestBaseFileName>
     <CppRestSDKVersionMajor>2</CppRestSDKVersionMajor>
-    <CppRestSDKVersionMinor>1</CppRestSDKVersionMinor>
+    <CppRestSDKVersionMinor>2</CppRestSDKVersionMinor>
     <CppRestSDKVersionRevision>0</CppRestSDKVersionRevision>
     <CppRestSDKVersionFileSuffix>$(CppRestSDKVersionMajor)_$(CppRestSDKVersionMinor)</CppRestSDKVersionFileSuffix>
     <CppRestSDKVersionString>$(CppRestSDKVersionMajor).$(CppRestSDKVersionMinor)</CppRestSDKVersionString>
diff --git a/Release/include/cpprest/http_client.h b/Release/include/cpprest/http_client.h
@@ -73,7 +73,7 @@ namespace client
 {
 
 // credentials and web_proxy class has been moved from web::http::client namespace to web namespace.
-// The below using declarations ensure we dont break existing code.
+// The below using declarations ensure we don't break existing code.
 // Please use the web::credentials and web::web_proxy class going forward.
 using web::credentials;
 using web::web_proxy;
@@ -125,9 +125,11 @@ class http_client_config
     /// Set OAuth 1.0 configuration.
     /// </summary>
     /// <param name="config">OAuth 1.0 configuration to set.</param>
-    void set_oauth1(oauth1::experimental::oauth1_config config)
+    void set_oauth1(oauth1::experimental::oauth1_config)
     {
-        m_oauth1 = std::make_shared<oauth1::experimental::oauth1_config>(std::move(config));
+        // CodePlex #230
+        throw std::runtime_error("oauth1 is not implemented yet.");
+        //m_oauth1 = std::make_shared<oauth1::experimental::oauth1_config>(std::move(config));
     }
 #endif
 
diff --git a/Release/include/cpprest/version.h b/Release/include/cpprest/version.h
@@ -16,7 +16,7 @@
 * ==--==
 */
 #define CPPREST_VERSION_REVISION 0
-#define CPPREST_VERSION_MINOR 1
+#define CPPREST_VERSION_MINOR 2
 #define CPPREST_VERSION_MAJOR 2
 
 #define CPPREST_VERSION (CPPREST_VERSION_MAJOR*100000+CPPREST_VERSION_MINOR*100+CPPREST_VERSION_REVISION)
diff --git a/Release/include/cpprest/ws_client.h b/Release/include/cpprest/ws_client.h
@@ -37,6 +37,7 @@
 
 #include "cpprest/xxpublic.h"
 
+#if _NOT_PHONE8_
 #if defined(_MSC_VER) && (_MSC_VER >= 1800)
 #include <ppltasks.h>
 namespace pplx = Concurrency;
@@ -397,5 +398,6 @@ class websocket_client
 
 }}}}
 
+#endif  // _NOT_PHONE8_
 #endif
 #endif  /* _CASA_WS_CLIENT_H */
diff --git a/Release/include/cpprest/ws_msg.h b/Release/include/cpprest/ws_msg.h
@@ -35,6 +35,7 @@
 #include "cpprest/xxpublic.h"
 #include "cpprest/containerstream.h"
 
+#if _NOT_PHONE8_
 #if defined(_MSC_VER) && (_MSC_VER >= 1800)
 #include <ppltasks.h>
 namespace pplx = Concurrency;
@@ -239,6 +240,6 @@ class websocket_incoming_message
 
 }}}}
 
+#endif  // _NOT_PHONE8_
 #endif
-
 #endif  /* _CASA_WS_MSG_H */
diff --git a/Release/include/cpprest/xxpublic.h b/Release/include/cpprest/xxpublic.h
@@ -68,3 +68,6 @@
 #ifdef __clang__
 #include <cstdio>
 #endif
+
+// Define the _NOT_PHONE8_ as non-windows or windows desktop without arm configuration or windows store app or windows phone8.1
+#define _NOT_PHONE8_ !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP && !defined(_M_ARM)) || WINAPI_FAMILY == WINAPI_FAMILY_APP || (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP && _WIN32_WINNT == _WIN32_WINNT_WINBLUE)
diff --git a/Release/src/CMakeLists.txt b/Release/src/CMakeLists.txt
@@ -62,6 +62,7 @@ elseif(WIN32)
     http/client/http_win7.cpp
     http/listener/http_windows_server.cpp
     http/oauth/oauth1.cpp
+    http/oauth/oauth2.cpp
     streams/windows/fileio.cpp
     streams/windows/ioscheduler.cpp
     utilities/dllmain.cpp
@@ -96,7 +97,7 @@ target_link_libraries(${Casablanca_LIBRARY}
 
 # Portions specific to cpprest binary versioning.
 set (CPPREST_VERSION_MAJOR 2)
-set (CPPREST_VERSION_MINOR 1)
+set (CPPREST_VERSION_MINOR 2)
 set (CPPREST_VERSION_REVISION 0)
 
 if(WIN32)
diff --git a/Release/src/build/casablanca110.wp8.vcxproj b/Release/src/build/casablanca110.wp8.vcxproj
@@ -34,7 +34,7 @@
 
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>_ASYNCRT_EXPORT;_PPLX_EXPORT;_PHONE8_;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP;_ASYNCRT_EXPORT;_PPLX_EXPORT;_PHONE8_;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
       <CompileAsWinRT>true</CompileAsWinRT>
       <AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CasablancaSrcDir)\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
diff --git a/Release/src/build/casablanca120.wp81.vcxproj b/Release/src/build/casablanca120.wp81.vcxproj
@@ -37,7 +37,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>WINAPI_FAMILY=WINAPI_PARTITION_PHONE_APP;_ASYNCRT_EXPORT;_PPLX_EXPORT;_PHONE81_;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP;_ASYNCRT_EXPORT;_PPLX_EXPORT;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalUsingDirectories>$(WindowsSdkDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
       <CompileAsWinRT>true</CompileAsWinRT>
       <AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CasablancaSrcDir)\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
diff --git a/Release/src/build/sources.proj b/Release/src/build/sources.proj
@@ -221,7 +221,7 @@
   
     <!-- non-TargetXP and non-Phone8.0 files go here-->
   <ItemGroup Condition ="'$(TargetXP)' != 'true' and '$(PlatformToolset)' != 'v110_wp80'">
-	<ClInclude Include="$(CasablancaIncludeDir)\cpprest\oauth1.h">
+    <ClInclude Include="$(CasablancaIncludeDir)\cpprest\oauth1.h">
       <Filter>Header Files\cpprest</Filter>
     </ClInclude>
     <ClCompile Include="$(CasablancaSrcDir)\http\oauth\oauth1.cpp">
diff --git a/Release/src/http/oauth/oauth1.cpp b/Release/src/http/oauth/oauth1.cpp
@@ -59,60 +59,10 @@ namespace experimental
 #include <winternl.h>
 #include <bcrypt.h>
 
-std::vector<unsigned char> oauth1_config::_hmac_sha1(const utility::string_t& key, const utility::string_t& data)
+std::vector<unsigned char> oauth1_config::_hmac_sha1(const utility::string_t&, const utility::string_t&)
 {
-    NTSTATUS status;
-    BCRYPT_ALG_HANDLE alg_handle = nullptr;
-    BCRYPT_HASH_HANDLE hash_handle = nullptr;
-
-    std::vector<unsigned char> hash;
-    DWORD hash_len = 0;
-    ULONG result_len = 0;
-
-    auto key_c = conversions::utf16_to_utf8(key);
-    auto data_c = conversions::utf16_to_utf8(data);
-
-    status = BCryptOpenAlgorithmProvider(&alg_handle, BCRYPT_SHA1_ALGORITHM, nullptr, BCRYPT_ALG_HANDLE_HMAC_FLAG);
-    if (!NT_SUCCESS(status))
-    {
-        goto cleanup;
-    }
-    status = BCryptGetProperty(alg_handle, BCRYPT_HASH_LENGTH, (PBYTE) &hash_len, sizeof(hash_len), &result_len, 0);
-    if (!NT_SUCCESS(status))
-    {
-        goto cleanup;
-    }
-    hash.resize(hash_len);
-
-    status = BCryptCreateHash(alg_handle, &hash_handle, nullptr, 0, (PBYTE) key_c.c_str(), (ULONG) key_c.length(), 0);
-    if (!NT_SUCCESS(status))
-    {
-        goto cleanup;
-    }
-    status = BCryptHashData(hash_handle, (PBYTE) data_c.c_str(), (ULONG) data_c.length(), 0);
-    if (!NT_SUCCESS(status))
-    {
-        goto cleanup;
-    }
-    status = BCryptFinishHash(hash_handle, hash.data(), hash_len, 0);
-    if (!NT_SUCCESS(status))
-    {
-        goto cleanup;
-    }
-
-    return hash;
-
-cleanup:
-    if (hash_handle)
-    {
-        BCryptDestroyHash(hash_handle);
-    }
-    if (alg_handle)
-    {
-        BCryptCloseAlgorithmProvider(alg_handle, 0);
-    }
-
-    return hash;
+    // CodePlex #230
+    return std::vector<unsigned char>();
 }
 
 #elif defined(_MS_WINDOWS) && defined(__cplusplus_winrt) // Windows RT
@@ -121,37 +71,20 @@ using namespace Windows::Security::Cryptography;
 using namespace Windows::Security::Cryptography::Core;
 using namespace Windows::Storage::Streams;
  
-std::vector<unsigned char> oauth1_config::_hmac_sha1(const utility::string_t& key, const utility::string_t& data)
+std::vector<unsigned char> oauth1_config::_hmac_sha1(const utility::string_t&, const utility::string_t&)
 {
-    Platform::String^ data_str = ref new Platform::String(data.c_str());
-    Platform::String^ key_str = ref new Platform::String(key.c_str());
-
-    MacAlgorithmProvider^ HMACSha1Provider = MacAlgorithmProvider::OpenAlgorithm(MacAlgorithmNames::HmacSha1);
-    IBuffer^ content_buffer = CryptographicBuffer::ConvertStringToBinary(data_str, BinaryStringEncoding::Utf8);
-    IBuffer^ key_buffer = CryptographicBuffer::ConvertStringToBinary(key_str, BinaryStringEncoding::Utf8);
-
-    auto signature_key = HMACSha1Provider->CreateKey(key_buffer);
-    auto signed_buffer = CryptographicEngine::Sign(signature_key, content_buffer);
-
-    Platform::Array<unsigned char, 1>^ arr;
-    CryptographicBuffer::CopyToByteArray(signed_buffer, &arr);
-    return std::vector<unsigned char>(arr->Data, arr->Data + arr->Length);
+    // CodePlex #230
+    return std::vector<unsigned char>();
 }
 
 #else // Linux, Mac OS X
 
 #include <openssl/hmac.h>
 
-std::vector<unsigned char> oauth1_config::_hmac_sha1(const utility::string_t& key, const utility::string_t& data)
+std::vector<unsigned char> oauth1_config::_hmac_sha1(const utility::string_t&, const utility::string_t&)
 {
-    unsigned char digest[HMAC_MAX_MD_CBLOCK];
-    unsigned int digest_len = 0;
-
-    HMAC(EVP_sha1(), key.c_str(), static_cast<int>(key.length()),
-            (const unsigned char*) data.c_str(), data.length(),
-            digest, &digest_len);
-
-    return std::vector<unsigned char>(digest, digest + digest_len);
+    // CodePlex #230
+    return std::vector<unsigned char>();
 }
 
 #endif
diff --git a/Release/src/websockets/client/ws_msg.cpp b/Release/src/websockets/client/ws_msg.cpp
@@ -32,14 +32,7 @@
 #include "cpprest/ws_client.h"
 
 #if !defined(_M_ARM) || defined(__cplusplus_winrt)
-#if defined(WINAPI_FAMILY_APP) && WINAPI_FAMILY == WINAPI_FAMILY_APP
-
-using namespace ::Windows::Foundation;
-using namespace ::Windows::Storage;
-using namespace ::Windows::Storage::Streams;
-using namespace ::Windows::Networking;
-using namespace ::Windows::Networking::Sockets;
-#endif /* WINAPI_FAMILY == WINAPI_FAMILY_APP */
+#if _NOT_PHONE8_
 
 using namespace concurrency;
 using namespace concurrency::streams::details;
@@ -94,4 +87,5 @@ pplx::task<std::string> websocket_incoming_message::extract_string() const
 }
 
 }}}}
+#endif  //  _NOT_PHONE8_
 #endif
diff --git a/Release/src/websockets/client/ws_winrt.cpp b/Release/src/websockets/client/ws_winrt.cpp
@@ -27,7 +27,8 @@
 #include "stdafx.h"
 #include <concrt.h>
 
-#if WINAPI_FAMILY == WINAPI_FAMILY_APP
+// ws_winrt only available for windows storea app or window phone8.1
+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PC_APP) || (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP) && _WIN32_WINNT == _WIN32_WINNT_WINBLUE)
 
 using namespace ::Windows::Foundation;
 using namespace ::Windows::Storage;
diff --git a/Release/tests/Functional/http/client/CMakeLists.txt b/Release/tests/Functional/http/client/CMakeLists.txt
@@ -12,7 +12,6 @@ set(SOURCES
   http_client_tests.cpp
   http_methods_tests.cpp
   multiple_requests.cpp
-  oauth1_tests.cpp
   oauth2_tests.cpp
   outside_tests.cpp
   pipeline_stage_tests.cpp
diff --git a/Release/tests/Functional/http/client/VS11.winrt/HttpClient110_test.winrt.vcxproj b/Release/tests/Functional/http/client/VS11.winrt/HttpClient110_test.winrt.vcxproj
@@ -217,7 +217,6 @@
     <ClCompile Include="..\header_tests.cpp" />
     <ClCompile Include="..\http_client_tests.cpp" />
     <ClCompile Include="..\http_methods_tests.cpp" />
-    <ClCompile Include="..\oauth1_tests.cpp" />
     <ClCompile Include="..\oauth2_tests.cpp" />
     <ClCompile Include="..\outside_tests.cpp" />
     <ClCompile Include="..\multiple_requests.cpp" />
diff --git a/Release/tests/Functional/http/client/VS11.xp/HttpClient110_test.xp.vcxproj b/Release/tests/Functional/http/client/VS11.xp/HttpClient110_test.xp.vcxproj
@@ -199,7 +199,6 @@
     <ClCompile Include="..\header_tests.cpp" />
     <ClCompile Include="..\http_client_tests.cpp" />
     <ClCompile Include="..\http_methods_tests.cpp" />
-    <ClCompile Include="..\oauth1_tests.cpp" />
     <ClCompile Include="..\oauth2_tests.cpp" />
     <ClCompile Include="..\outside_tests.cpp" />
     <ClCompile Include="..\multiple_requests.cpp" />
diff --git a/Release/tests/Functional/http/client/VS11/HttpClient110_test.vcxproj b/Release/tests/Functional/http/client/VS11/HttpClient110_test.vcxproj
@@ -205,7 +205,6 @@
     <ClCompile Include="..\header_tests.cpp" />
     <ClCompile Include="..\http_client_tests.cpp" />
     <ClCompile Include="..\http_methods_tests.cpp" />
-    <ClCompile Include="..\oauth1_tests.cpp" />
     <ClCompile Include="..\oauth2_tests.cpp" />
     <ClCompile Include="..\outside_tests.cpp" />
     <ClCompile Include="..\multiple_requests.cpp" />
diff --git a/Release/tests/Functional/http/client/VS12.winrt/HttpClient120_test.winrt.vcxproj b/Release/tests/Functional/http/client/VS12.winrt/HttpClient120_test.winrt.vcxproj
@@ -237,7 +237,6 @@
     <ClCompile Include="..\header_tests.cpp" />
     <ClCompile Include="..\http_client_tests.cpp" />
     <ClCompile Include="..\http_methods_tests.cpp" />
-    <ClCompile Include="..\oauth1_tests.cpp" />
     <ClCompile Include="..\oauth2_tests.cpp" />
     <ClCompile Include="..\outside_tests.cpp" />
     <ClCompile Include="..\multiple_requests.cpp" />
diff --git a/Release/tests/Functional/http/client/VS12/HttpClient120_test.vcxproj b/Release/tests/Functional/http/client/VS12/HttpClient120_test.vcxproj
@@ -217,7 +217,6 @@
     <ClCompile Include="..\header_tests.cpp" />
     <ClCompile Include="..\http_client_tests.cpp" />
     <ClCompile Include="..\http_methods_tests.cpp" />
-    <ClCompile Include="..\oauth1_tests.cpp" />
     <ClCompile Include="..\oauth2_tests.cpp" />
     <ClCompile Include="..\outside_tests.cpp" />
     <ClCompile Include="..\multiple_requests.cpp" />
diff --git a/Release/tests/Functional/http/client/oauth1_tests.cpp b/Release/tests/Functional/http/client/oauth1_tests.cpp
@@ -90,7 +90,7 @@ TEST(oauth1_token_accessors)
 TEST(oauth1_config_accessors)
 {
     oauth1_config t(U(""), U(""), U(""), U(""), U(""), U(""), oauth1_methods::hmac_sha1);
-    TEST_ACCESSOR(U("Foo123"), consumer_key)
+    TEST_ACCESSOR(U("Test123"), consumer_key)
     TEST_ACCESSOR(U("bar456"), consumer_secret)
     TEST_ACCESSOR(U("file:///123?123=a&1="), temp_endpoint)
     TEST_ACCESSOR(U("x:yxw#0"), auth_endpoint)
@@ -222,12 +222,12 @@ TEST_FIXTURE(oauth1_server_setup, oauth1_build_authorization_uri)
         // Reply with temporary token and secret.
         std::map<utility::string_t, utility::string_t> headers;
         headers[header_names::content_type] = mime_types::application_x_www_form_urlencoded;
-        request->reply(status_codes::OK, U(""), headers, "oauth_token=foobar&oauth_token_secret=xyzzy&oauth_callback_confirmed=true");
+        request->reply(status_codes::OK, U(""), headers, "oauth_token=testbar&oauth_token_secret=xyzzy&oauth_callback_confirmed=true");
     });
     
     VERIFY_IS_FALSE(m_oauth1_config.token().is_valid_access_token());
     utility::string_t auth_uri = m_oauth1_config.build_authorization_uri().get();
-    VERIFY_ARE_EQUAL(auth_uri, U("http://localhost:17778/?oauth_token=foobar"));
+    VERIFY_ARE_EQUAL(auth_uri, U("http://localhost:17778/?oauth_token=testbar"));
     VERIFY_IS_FALSE(m_oauth1_config.token().is_valid_access_token());
 }
 
@@ -253,7 +253,7 @@ TEST_FIXTURE(oauth1_server_setup, oauth1_token_from_redirected_uri)
         // Reply with access token and secret.
         std::map<utility::string_t, utility::string_t> headers;
         headers[header_names::content_type] = mime_types::application_x_www_form_urlencoded;
-        request->reply(status_codes::OK, U(""), headers, "oauth_token=foo&oauth_token_secret=bar");
+        request->reply(status_codes::OK, U(""), headers, "oauth_token=test&oauth_token_secret=bar");
     });
     
     m_oauth1_config.set_token(oauth1_token(U("xyzzy"), U(""))); // Simulate temporary token.
@@ -262,7 +262,7 @@ TEST_FIXTURE(oauth1_server_setup, oauth1_token_from_redirected_uri)
     m_oauth1_config.token_from_redirected_uri(redirected_uri).wait();
 
     VERIFY_IS_TRUE(m_oauth1_config.token().is_valid_access_token());
-    VERIFY_ARE_EQUAL(m_oauth1_config.token().access_token(), U("foo"));
+    VERIFY_ARE_EQUAL(m_oauth1_config.token().access_token(), U("test"));
     VERIFY_ARE_EQUAL(m_oauth1_config.token().secret(), U("bar"));
 }
 
diff --git a/Release/tests/Functional/http/client/oauth2_tests.cpp b/Release/tests/Functional/http/client/oauth2_tests.cpp
diff --git a/Release/tests/Functional/json/parsing_tests.cpp b/Release/tests/Functional/json/parsing_tests.cpp
