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

Author: stgates

Build_iOS/CMakeLists.txt

@@ -35,7 +35,6 @@ execute_process(WORKING_DIRECTORY ${ARM_BINARY_DIR}
 add_custom_target(sim
   COMMAND ${CMAKE_COMMAND}
     --build ${SIM_BINARY_DIR}
-    --target cpprest
     --config ${CMAKE_BUILD_TYPE}
   COMMENT "Building for i386 (simulator)"
   VERBATIM
@@ -45,7 +44,6 @@ add_custom_target(sim
 add_custom_target(arm
   COMMAND ${CMAKE_COMMAND}
     --build ${ARM_BINARY_DIR}
-    --target cpprest
     --config ${CMAKE_BUILD_TYPE}
   COMMENT "Building for armv7, armv7s, arm64"
   VERBATIM

Build_iOS/configure.sh

@@ -3,8 +3,7 @@ set -e
 
 git clone https://git.gitorious.org/boostoniphone/galbraithjosephs-boostoniphone.git boostoniphone
 pushd boostoniphone
-sed -e 's/\${IPHONE_SDKVERSION:=7.0}/\${IPHONE_SDKVERSION:=8.0}/' -i .bak boost.sh
-sed -e 's/\${BOOST_LIBS:=".*"}/\${BOOST_LIBS:="random thread filesystem regex locale system date_time"}/g' -i .bak boost.sh
+git apply ../fix_boost_version.patch
 ./boost.sh
 pushd ios/framework/boost.framework/Versions/A
 mkdir Headers2

Build_iOS/fix_boost_version.patch

@@ -0,0 +1,36 @@
+From e5b3bf1392d3dc04f1391c4ad60118a394b5219f Mon Sep 17 00:00:00 2001
+From: Steve Gates <[email protected]>
+Date: Thu, 30 Oct 2014 17:42:43 -0700
+Subject: [PATCH] Fixing boost.sh to use Boost version 1.56 and iOS 8.0.
+
+---
+ boost.sh | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/boost.sh b/boost.sh
+index 8847aac..2a76aec 100755
+--- a/boost.sh
++++ b/boost.sh
+@@ -18,8 +18,8 @@
+ # same directory as this script, and run "./boost.sh". Grab a cuppa. And voila.
+ #===============================================================================
+ 
+-: ${BOOST_LIBS:="filesystem date_time system"}
+-: ${IPHONE_SDKVERSION:=7.0}
++: ${BOOST_LIBS:="thread chrono filesystem regex locale system random"}
++: ${IPHONE_SDKVERSION:=8.0}
+ : ${OSX_SDKVERSION:=10.9}
+ : ${XCODE_ROOT:=`xcode-select -print-path`}
+ : ${EXTRA_CPPFLAGS:="-DBOOST_AC_USE_PTHREADS -DBOOST_SP_USE_PTHREADS -std=c++11 -stdlib=libc++"}
+@@ -84,7 +84,7 @@ updateBoost()
+ 	then
+ 		git checkout $BOOST_SRC/tools/build/v2/user-config.jam
+ 	else
+-		git clone --recursive https://github.com/boostorg/boost.git $BOOST_SRC
++		git clone --recursive --branch boost-1.56.0 https://github.com/boostorg/boost.git $BOOST_SRC
+ 		pushd $BOOST_SRC
+ 		./bootstrap.sh
+ 		./b2 headers
+-- 
+1.9.3 (Apple Git-50)
+

Build_iOS/ios_cmake_clang3.patch

@@ -62,7 +62,7 @@ namespace concurrency = Concurrency;
 
 namespace Concurrency 
 { 
-/// Library for asychronous streams.
+/// Library for asynchronous streams.
 namespace streams
 {
     /// <summary>

Release/include/cpprest/astreambuf.h

@@ -148,13 +148,20 @@ class request_context
         finish();
     }
 
-    void report_error(unsigned long error_code, const utility::string_t & errorMessage)
+    void report_error(unsigned long error_code, const std::string &errorMessage)
     {
-        report_exception(http_exception((int)error_code, errorMessage));
+        report_exception(http_exception(static_cast<int>(error_code), errorMessage));
     }
 
+#ifdef _MS_WINDOWS
+    void report_error(unsigned long error_code, const std::wstring &errorMessage)
+    {
+        report_exception(http_exception(static_cast<int>(error_code), errorMessage));
+    }
+#endif
+
     template<typename _ExceptionType>
-    void report_exception(_ExceptionType e)
+    void report_exception(const _ExceptionType &e)
     {
         report_exception(std::make_exception_ptr(e));
     }

Release/include/cpprest/http_client_impl.h

@@ -168,6 +168,14 @@ class http_exception : public std::exception
     http_exception(const utility::string_t &whatArg)
         : m_msg(utility::conversions::to_utf8string(whatArg)) {}
 
+#ifdef _MS_WINDOWS
+    /// <summary>
+    /// Creates an <c>http_exception</c> with just a string message and no error code.
+    /// </summary>
+    /// <param name="whatArg">Error message string.</param>
+    http_exception(std::string whatArg) : m_msg(std::move(whatArg)) {}
+#endif
+
     /// <summary>
     /// Creates an <c>http_exception</c> with from a error code using the current platform error category.
     /// The message of the error code will be used as the what() string message.
@@ -189,6 +197,18 @@ class http_exception : public std::exception
           m_msg(utility::conversions::to_utf8string(whatArg))
     {}
 
+#ifdef _MS_WINDOWS
+    /// <summary>
+    /// Creates an <c>http_exception</c> with from a error code using the current platform error category.
+    /// </summary>
+    /// <param name="errorCode">Error code value.</param>
+    /// <param name="whatArg">Message to use in what() string.</param>
+    http_exception(int errorCode, std::string whatArg) :
+        m_errorCode(utility::details::create_error_code(errorCode)),
+        m_msg(std::move(whatArg))
+    {}
+#endif
+
     /// <summary>
     /// Creates an <c>http_exception</c> with from a error code and category. The message of the error code will be used
     /// as the <c>what</c> string message.
@@ -200,8 +220,10 @@ class http_exception : public std::exception
         m_msg = m_errorCode.message();
     }
 
-    ~http_exception() CPPREST_NOEXCEPT {}
-
+    /// <summary>
+    /// Gets a string identifying the cause of the exception.
+    /// </summary>
+    /// <returns>A null terminated character string.</returns>
     const char* what() const CPPREST_NOEXCEPT
     {
         return m_msg.c_str();

Release/include/cpprest/http_msg.h

@@ -35,6 +35,12 @@ namespace web
 {
 namespace http
 {
+namespace client
+{
+    // Forward declaration to avoid circular include dependency.
+    class http_client_config;
+}
+
 /// oAuth 1.0 library.
 namespace oauth1
 {

Release/include/cpprest/oauth1.h

@@ -35,6 +35,12 @@ namespace web
 {
 namespace http
 {
+namespace client
+{
+    // Forward declaration to avoid circular include dependency.
+    class http_client_config;
+}
+
 /// oAuth 2.0 library.
 namespace oauth2
 {

Release/include/cpprest/oauth2.h

@@ -32,61 +32,144 @@
 
 namespace web
 {
-    class web_proxy;
-namespace http { namespace client {
-    class http_client_config;
-}}
 
-namespace experimental { namespace websockets { namespace client {
-    class websocket_client_config;
+namespace http { namespace client { namespace details {
+class winhttp_client;
+class winrt_client;
 }}}
+namespace websockets { namespace client { namespace details {
+class winrt_client;
+}}}
+
+namespace details
+{
+#if defined(_MS_WINDOWS)
+class zero_memory_deleter
+{
+public:
+    _ASYNCRTIMP void operator()(::utility::string_t *data) const;
+};
+typedef std::unique_ptr<std::wstring, zero_memory_deleter> plaintext_string;
+#if defined(__cplusplus_winrt)
+#if !(WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP && _MSC_VER < 1800)
+class winrt_encryption
+{
+public:
+    winrt_encryption() {}
+    _ASYNCRTIMP winrt_encryption(const std::wstring &data);
+    _ASYNCRTIMP plaintext_string decrypt() const;
+private:
+    ::pplx::task<Windows::Storage::Streams::IBuffer ^> m_buffer;
+};
+#endif
+#else
+class win32_encryption
+{
+public:
+    win32_encryption() {}
+    _ASYNCRTIMP win32_encryption(const std::wstring &data);
+    _ASYNCRTIMP ~win32_encryption();
+    _ASYNCRTIMP plaintext_string decrypt() const;
+private:
+    std::vector<char> m_buffer;
+    size_t m_numCharacters;
+};
+#endif
+#endif
+}
 
 /// <summary>
-/// credentials represents a set of user credentials (username and password) to be used
-/// for the client and proxy authentication
+/// Represents a set of user credentials (user name and password) to be used
+/// for authentication.
 /// </summary>
 class credentials
 {
 public:
-    credentials(utility::string_t username, utility::string_t password) :
-        m_is_set(true),
-        m_username(std::move(username)),
-        m_password(std::move(password))
+    /// <summary>
+    /// Constructs an empty set of credentials without a user name or password.
+    /// </summary>
+    credentials() {}
+
+    /// <summary>
+    /// Constructs credentials from given user name and password.
+    /// </summary>
+    /// <param name="username">User name as a string.</param>
+    /// <param name="password">Password as a string.</param>
+    credentials(utility::string_t username, const utility::string_t &
+#if defined(_MS_WINDOWS)
+        password
+#endif
+        ) :
+        m_username(std::move(username))
+#if defined(_MS_WINDOWS)
+        , m_password(password)
+#endif
     {}
 
     /// <summary>
     /// The user name associated with the credentials.
     /// </summary>
-    /// <returns>A reference to the username string.</returns>
-    const utility::string_t& username() const { return m_username; }
+    /// <returns>A string containing the user name.</returns>
+    const utility::string_t &username() const { return m_username; }
 
     /// <summary>
     /// The password for the user name associated with the credentials.
     /// </summary>
-    /// <returns>A reference to the password string.</returns>
-    const utility::string_t& password() const { return m_password; }
+    /// <returns>A string containing the password.</returns>
+    CASABLANCA_DEPRECATED("This API is deprecated for security reasons to avoid unnecessary password copies stored in plaintext.")
+        utility::string_t password() const
+    {
+#if defined(_MS_WINDOWS)
+#if defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP && _MSC_VER < 1800
+        return m_password;
+#else
+        return utility::string_t(*m_password.decrypt());
+#endif
+#else
+        throw std::runtime_error("Credentials are not supported on this platform yet.");
+#endif
+    }
 
     /// <summary>
     /// Checks if credentials have been set
     /// </summary>
-    /// <returns><c>true</c> if username and password is set, <c>false</c> otherwise.</returns>
-    bool is_set() const { return m_is_set; }
+    /// <returns><c>true</c> if user name and password is set, <c>false</c> otherwise.</returns>
+    bool is_set() const { return !m_username.empty(); }
 
 private:
-    friend class web::web_proxy;
-    friend class web::http::client::http_client_config;
-    friend class web::experimental::websockets::client::websocket_client_config;
-
-    credentials() : m_is_set(false) {}
+    friend class http::client::details::winhttp_client;
+    friend class http::client::details::winrt_client;
+    friend class websockets::client::details::winrt_client;
+
+#if defined(_MS_WINDOWS)
+    details::plaintext_string decrypt() const
+    {
+        // Encryption APIs not supported on Windows Phone 8.0
+#if defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP && _MSC_VER < 1800
+        return details::plaintext_string(new ::utility::string_t(m_password));
+#else
+        return m_password.decrypt();
+#endif
+    }
+#endif
 
-    bool m_is_set;
-    utility::string_t m_username;
-    utility::string_t m_password;
+    ::utility::string_t m_username;
+#if defined(_MS_WINDOWS)
+#if defined(__cplusplus_winrt)
+#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP && _MSC_VER < 1800
+    ::utility::string_t m_password;
+#else
+    details::winrt_encryption m_password;
+#endif
+#else
+    details::win32_encryption m_password;
+#endif
+#endif
 };
 
 /// <summary>
 /// web_proxy represents the concept of the web proxy, which can be auto-discovered,
-/// disabled, or specified explicitly by the user
+/// disabled, or specified explicitly by the user.
 /// </summary>
 class web_proxy
 {
@@ -160,7 +243,7 @@ class web_proxy
     bool is_specified() const { return m_mode == user_provided_; }
 
 private:
-    uri m_address;
+    web::uri m_address;
     web_proxy_mode_internal m_mode;
     web::credentials m_credentials;
 };