check max frame size

* add file

* CMake freebsd fix

.github/workflows/ccpp.yml

@@ -0,0 +1,50 @@
+name: C/C++ CI
+
+on: [push]
+
+jobs:
+  linux:
+    runs-on: ubuntu-latest
+    
+    steps:
+    - uses: actions/checkout@v1
+    - name: make test
+      run: make test
+
+  mac:
+    runs-on: macOS-latest
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: install redis
+      run: brew install redis
+
+    - name: start redis server
+      run: brew services start redis
+
+    - name: make test
+      run: make test
+
+      #  # Windows does not work yet, I'm stuck at getting CMake to run + finding vcpkg
+      #  win:
+      #    runs-on: windows-2016
+      #
+      #    steps:
+      #    - uses: actions/checkout@v1
+      #
+      #    - name: run cmake
+      #      run: |
+      #        "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+      #        mkdir build
+      #        cd build
+      #        cmake -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALLATION_ROOT%\scripts\buildsystems\vcpkg.cmake -DUSE_WS=1 -DUSE_TEST=1 -DUSE_TLS=1 -G"NMake Makefiles" ..
+      #    - name: build
+      #      run: |
+      #        "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+      #        cd build
+      #        nmake
+      #    - name: run tests
+      #      run: 
+      #        cd test
+      #        ..\build\test\ixwebsocket_unittest.exe

CMakeLists.txt

@@ -35,6 +35,7 @@ set( IXWEBSOCKET_SOURCES
     ixwebsocket/IXSocketConnect.cpp
     ixwebsocket/IXSocketFactory.cpp
     ixwebsocket/IXSocketServer.cpp
+    ixwebsocket/IXSocketTLSOptions.cpp
     ixwebsocket/IXUrlParser.cpp
     ixwebsocket/IXUserAgent.cpp
     ixwebsocket/IXWebSocket.cpp
@@ -67,6 +68,7 @@ set( IXWEBSOCKET_HEADERS
     ixwebsocket/IXSocketConnect.h
     ixwebsocket/IXSocketFactory.h
     ixwebsocket/IXSocketServer.h
+    ixwebsocket/IXSocketTLSOptions.h
     ixwebsocket/IXUrlParser.h
     ixwebsocket/IXUtf8Validator.h
     ixwebsocket/IXUserAgent.h
@@ -76,6 +78,7 @@ set( IXWEBSOCKET_HEADERS
     ixwebsocket/IXWebSocketErrorInfo.h
     ixwebsocket/IXWebSocketHandshake.h
     ixwebsocket/IXWebSocketHttpHeaders.h
+    ixwebsocket/IXWebSocketInitResult.h
     ixwebsocket/IXWebSocketMessage.h
     ixwebsocket/IXWebSocketMessageQueue.h
     ixwebsocket/IXWebSocketMessageType.h
@@ -102,7 +105,9 @@ if (APPLE)
     list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/apple/IXSetThreadName_apple.cpp)
 elseif (WIN32)
     list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/windows/IXSetThreadName_windows.cpp)
-else()
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+    list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/freebsd/IXSetThreadName_freebsd.cpp)
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/linux/IXSetThreadName_linux.cpp)
     list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/IXSelectInterruptEventFd.cpp)
     list( APPEND IXWEBSOCKET_HEADERS ixwebsocket/IXSelectInterruptEventFd.h)
@@ -112,12 +117,11 @@ if (WIN32)
   set(USE_MBED_TLS TRUE)
 endif()
 
-set(USE_OPEN_SSL FALSE)
 if (USE_TLS)
     if (USE_MBED_TLS)
         list( APPEND IXWEBSOCKET_HEADERS ixwebsocket/IXSocketMbedTLS.h)
         list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/IXSocketMbedTLS.cpp)
-    elseif (APPLE)
+    elseif (APPLE AND NOT USE_OPEN_SSL)
         list( APPEND IXWEBSOCKET_HEADERS ixwebsocket/IXSocketAppleSSL.h)
         list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/IXSocketAppleSSL.cpp)
     elseif (WIN32)
@@ -139,6 +143,8 @@ if (USE_TLS)
     target_compile_definitions(ixwebsocket PUBLIC IXWEBSOCKET_USE_TLS)
     if (USE_MBED_TLS)
         target_compile_definitions(ixwebsocket PUBLIC IXWEBSOCKET_USE_MBED_TLS)
+    elseif (USE_OPEN_SSL)
+        target_compile_definitions(ixwebsocket PUBLIC IXWEBSOCKET_USE_OPEN_SSL)
     elseif (APPLE)
     elseif (WIN32)
     else()
@@ -161,6 +167,13 @@ if (UNIX)
 endif()
 
 if (USE_TLS AND USE_OPEN_SSL)
+
+  # Help finding Homebrew's OpenSSL on macOS
+  if (APPLE)
+    set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /usr/local/opt/openssl/lib)
+    set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} /usr/local/opt/openssl/include)
+  endif()
+
   find_package(OpenSSL REQUIRED)
   add_definitions(${OPENSSL_DEFINITIONS})
   message(STATUS "OpenSSL: " ${OPENSSL_VERSION})
@@ -214,6 +227,10 @@ if (USE_WS OR USE_TEST)
   add_subdirectory(ixcore)
   add_subdirectory(ixcrypto)
   add_subdirectory(ixcobra)
+  add_subdirectory(ixsnake)
+  add_subdirectory(ixsentry)
+
+  add_subdirectory(third_party/spdlog spdlog)
 
   if (USE_WS)
       add_subdirectory(ws)

DOCKER_VERSION

@@ -1 +1 @@
-6.2.1
+7.2.1

Dockerfile

@@ -1 +0,0 @@
-docker/Dockerfile.alpine

Dockerfile

@@ -0,0 +1,34 @@
+FROM alpine as build
+
+RUN apk add --no-cache gcc g++ musl-dev linux-headers cmake openssl-dev 
+RUN apk add --no-cache make
+RUN apk add --no-cache zlib-dev
+
+RUN addgroup -S app && adduser -S -G app app 
+RUN chown -R app:app /opt
+RUN chown -R app:app /usr/local
+
+# There is a bug in CMake where we cannot build from the root top folder
+# So we build from /opt
+COPY --chown=app:app . /opt
+WORKDIR /opt
+
+USER app
+RUN [ "make", "ws_install" ]
+
+FROM alpine as runtime
+
+RUN apk add --no-cache libstdc++
+
+RUN addgroup -S app && adduser -S -G app app 
+COPY --chown=app:app --from=build /usr/local/bin/ws /usr/local/bin/ws
+RUN chmod +x /usr/local/bin/ws
+RUN ldd /usr/local/bin/ws
+
+# Now run in usermode
+USER app
+WORKDIR /home/app
+
+ENTRYPOINT ["ws"]
+EXPOSE 8008
+CMD ["--help"]

SECURITY.md

@@ -0,0 +1,11 @@
+# Security Policy
+
+## Supported Versions
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 7.x.x   | :white_check_mark: |
+
+## Reporting a Vulnerability
+
+Users should send an email to bsergean@gmail.com to report a vulnerability.

docker/Dockerfile.alpine

@@ -14,7 +14,7 @@ COPY --chown=app:app . /opt
 WORKDIR /opt
 
 USER app
-RUN [ "make" ]
+RUN [ "make", "ws_install" ]
 
 FROM alpine as runtime
 
@@ -30,4 +30,5 @@ USER app
 WORKDIR /home/app
 
 ENTRYPOINT ["ws"]
+EXPOSE 8008
 CMD ["--help"]

docker/Dockerfile.ubuntu_disco

@@ -20,4 +20,5 @@ COPY . .
 ARG CMAKE_BIN_PATH=/tmp/cmake/cmake-3.14.0-Linux-x86_64/bin
 ENV PATH="${CMAKE_BIN_PATH}:${PATH}"
 
-RUN ["make", "test"]
+# RUN ["make", "test"]
+CMD ["sh"]

docs/CHANGELOG.md

@@ -1,6 +1,79 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [7.2.1] - 2019-10-26
+
+- Add unittest to IXSentryClient to lua backtrace parsing code
+
+## [7.2.0] - 2019-10-24
+
+- Add cobra_metrics_to_redis sub-command to create streams for each cobra metric event being received.
+
+## [7.1.0] - 2019-10-13
+
+- Add client support for websocket subprotocol. Look for the new addSubProtocol method for details.
+
+## [7.0.0] - 2019-10-01
+
+- TLS support in server code, only implemented for the OpenSSL SSL backend for now.
+
+## [6.3.4] - 2019-09-30
+
+- all ws subcommands propagate tls options to servers (unimplemented) or ws or http client (implemented) (contributed by Matt DeBoer)
+
+## [6.3.3] - 2019-09-30
+
+- ws has a --version option
+
+## [6.3.2] - 2019-09-29
+
+- (http + websocket clients) can specify cacert and some other tls options (not implemented on all backend). This makes it so that server certs can finally be validated on windows.
+
+## [6.3.1] - 2019-09-29
+
+- Add ability to use OpenSSL on apple platforms.
+
+## [6.3.0] - 2019-09-28
+
+- ixcobra / fix crash in CobraConnection::publishNext when the queue is empty + handle CobraConnection_PublishMode_Batch in CobraMetricsThreadedPublisher
+
+## [6.2.9] - 2019-09-27
+
+- mbedtls fixes / the unittest now pass on macOS, and hopefully will on Windows/AppVeyor as well.
+
+## [6.2.8] - 2019-09-26
+
+- Http server: add options to ws https to redirect all requests to a given url. POST requests will get a 200 and an empty response.
+
+```
+ws httpd -L --redirect_url https://www.google.com
+```
+
+## [6.2.7] - 2019-09-25
+
+- Stop having ws send subcommand send a binary message in text mode, which would cause error in `make ws_test` shell script test.
+
+## [6.2.6] - 2019-09-24
+
+- Fix 2 race conditions detected with TSan, one in CobraMetricsPublisher::push and another one in WebSocketTransport::sendData (that one was bad).
+
+## [6.2.5] - 2019-09-23
+
+- Add simple Redis Server which is only capable of doing publish / subscribe. New ws redis_server sub-command to use it. The server is used in the unittest, so that we can run on CI in environment where redis isn not available like github actions env.
+
+## [6.2.4] - 2019-09-22
+
+- Add options to configure TLS ; contributed by Matt DeBoer. Only implemented for OpenSSL TLS backend for now.
+
+## [6.2.3] - 2019-09-21
+
+- Fix crash in the Linux unittest in the HTTP client code, in Socket::readBytes
+- Cobra Metrics Publisher code returns the message id of the message that got published, to be used to validated that it got sent properly when receiving an ack.
+
+## [6.2.2] - 2019-09-19
+
+- In DNS lookup code, make sure the weak pointer we use lives through the expected scope (if branch)
+
 ## [6.2.1] - 2019-09-17
 
 - On error while doing a client handshake, additionally display port number next to the host name

docs/usage.md

@@ -187,6 +187,21 @@ headers["foo"] = "bar";
 webSocket.setExtraHeaders(headers);
 ```
 
+### Subprotocols
+
+You can specify subprotocols to be set during the WebSocket handshake. For more info you can refer to [this doc](https://hpbn.co/websocket/#subprotocol-negotiation).
+
+```
+webSocket.addSubprotocol("appProtocol-v1");
+webSocket.addSubprotocol("appProtocol-v2");
+```
+
+The protocol that the server did accept is available in the open info `protocol` field.
+
+```
+std::cout << "protocol: " << msg->openInfo.protocol << std::endl;
+```
+
 ### Automatic reconnection
 
 Automatic reconnection kicks in when the connection is disconnected without the user consent. This feature is on by default and can be turned off.
@@ -229,6 +244,39 @@ webSocket.setMaxWaitBetweenReconnectionRetries(5 * 1000); // 5000ms = 5s
 uint32_t m = webSocket.getMaxWaitBetweenReconnectionRetries();
 ```
 
+### TLS support and configuration
+
+To leverage TLS features, the library must be compiled with the option `USE_TLS=1`.
+
+Then, secure sockets are automatically used when connecting to a `wss://*` url.
+
+Additional TLS options can be configured by passing a `ix::SocketTLSOptions` instance to the
+`setTLSOptions` on `ix::WebSocket` (or `ix::WebSocketServer` or `ix::HttpServer`)
+
+```
+webSocket.setTLSOptions({
+    .certFile = "path/to/cert/file.pem",
+    .keyFile = "path/to/key/file.pem",
+    .caFile = "path/to/trust/bundle/file.pem"
+});
+```
+
+Specifying `certFile` and `keyFile` configures the certificate that will be used to communicate with TLS peers.
+
+On a client, this is only necessary for connecting to servers that require a client certificate.
+
+On a server, this is necessary for TLS support.
+
+Specifying `caFile` configures the trusted roots bundle file (in PEM format) that will be used to verify peer certificates.
+ - The special value of `SYSTEM` (the default) indicates that the system-configured trust bundle should be used; this is generally what you want when connecting to any publicly exposed API/server.
+ - The special value of `NONE` can be used to disable peer verification; this is only recommended to rule out certificate verification when testing connectivity.
+
+For a client, specifying `caFile` can be used if connecting to a server that uses a self-signed cert, or when using a custom CA in an internal environment.
+
+For a server, specifying `caFile` implies that:
+1. You require clients to present a certificate
+1. It must be signed by one of the trusted roots in the file
+
 ## WebSocket server API
 
 ```

docs/ws.md

@@ -29,6 +29,172 @@ Subcommands:
   httpd                       HTTP server
 ```
 
+## curl
+
+The curl subcommand try to be compatible with the curl syntax, to fetch http pages.
+
+Making a HEAD request with the -I parameter.
+
+```
+$ ws curl -I https://www.google.com/
+
+Accept-Ranges: none
+Alt-Svc: quic=":443"; ma=2592000; v="46,43",h3-Q048=":443"; ma=2592000,h3-Q046=":443"; ma=2592000,h3-Q043=":443"; ma=2592000
+Cache-Control: private, max-age=0
+Content-Type: text/html; charset=ISO-8859-1
+Date: Tue, 08 Oct 2019 21:36:57 GMT
+Expires: -1
+P3P: CP="This is not a P3P policy! See g.co/p3phelp for more info."
+Server: gws
+Set-Cookie: NID=188=ASwfz8GrXQrHCLqAz-AndLOMLcz0rC9yecnf3h0yXZxRL3rTufTU_GDDwERp7qQL7LZ_EB8gCRyPXGERyOSAgaqgnrkoTmvWrwFemRLMaOZ896GrHobi5fV7VLklnSG2w48Gj8xMlwxfP7Z-bX-xR9UZxep1tHM6UmFQdD_GkBE; expires=Wed, 08-Apr-2020 21:36:57 GMT; path=/; domain=.google.com; HttpOnly
+Transfer-Encoding: chunked
+Vary: Accept-Encoding
+X-Frame-Options: SAMEORIGIN
+X-XSS-Protection: 0
+Upload size: 143
+Download size: 0
+Status: 200
+```
+
+Making a POST request with the -F parameter.
+
+```
+$ ws curl -F foo=bar https://httpbin.org/post
+foo: bar
+Downloaded 438 bytes out of 438
+Access-Control-Allow-Credentials: true
+Access-Control-Allow-Origin: *
+Connection: keep-alive
+Content-Encoding:
+Content-Length: 438
+Content-Type: application/json
+Date: Tue, 08 Oct 2019 21:47:54 GMT
+Referrer-Policy: no-referrer-when-downgrade
+Server: nginx
+X-Content-Type-Options: nosniff
+X-Frame-Options: DENY
+X-XSS-Protection: 1; mode=block
+Upload size: 219
+Download size: 438
+Status: 200
+payload: {
+  "args": {},
+  "data": "",
+  "files": {},
+  "form": {
+    "foo": "bar"
+  },
+  "headers": {
+    "Accept": "*/*",
+    "Content-Length": "7",
+    "Content-Type": "application/x-www-form-urlencoded",
+    "Host": "httpbin.org",
+    "User-Agent": "ixwebsocket/7.0.0 macos ssl/OpenSSL OpenSSL 1.0.2q  20 Nov 2018 zlib 1.2.11"
+  },
+  "json": null,
+  "origin": "155.94.127.118, 155.94.127.118",
+  "url": "https://httpbin.org/post"
+}
+```
+
+Passing in a custom header with -H.
+
+```
+$ ws curl -F foo=bar -H 'my_custom_header: baz' https://httpbin.org/post
+my_custom_header:  baz
+foo: bar
+Downloaded 470 bytes out of 470
+Access-Control-Allow-Credentials: true
+Access-Control-Allow-Origin: *
+Connection: keep-alive
+Content-Encoding:
+Content-Length: 470
+Content-Type: application/json
+Date: Tue, 08 Oct 2019 21:50:25 GMT
+Referrer-Policy: no-referrer-when-downgrade
+Server: nginx
+X-Content-Type-Options: nosniff
+X-Frame-Options: DENY
+X-XSS-Protection: 1; mode=block
+Upload size: 243
+Download size: 470
+Status: 200
+payload: {
+  "args": {},
+  "data": "",
+  "files": {},
+  "form": {
+    "foo": "bar"
+  },
+  "headers": {
+    "Accept": "*/*",
+    "Content-Length": "7",
+    "Content-Type": "application/x-www-form-urlencoded",
+    "Host": "httpbin.org",
+    "My-Custom-Header": "baz",
+    "User-Agent": "ixwebsocket/7.0.0 macos ssl/OpenSSL OpenSSL 1.0.2q  20 Nov 2018 zlib 1.2.11"
+  },
+  "json": null,
+  "origin": "155.94.127.118, 155.94.127.118",
+  "url": "https://httpbin.org/post"
+}
+```
+
+## connect
+
+The connect command connects to a websocket endpoint, and starts an interactive prompt. Line editing, such as using the direction keys to fetch the last thing you tried to type) is provided. That command is pretty useful to try to send random data to an endpoint and verify that the service handles it with grace (such as sending invalid json).
+
+```
+ws connect wss://echo.websocket.org
+Type Ctrl-D to exit prompt...
+Connecting to url: wss://echo.websocket.org
+> ws_connect: connected
+Uri: /
+Handshake Headers:
+Connection: Upgrade
+Date: Tue, 08 Oct 2019 21:38:44 GMT
+Sec-WebSocket-Accept: 2j6LBScZveqrMx1W/GJkCWvZo3M=
+sec-websocket-extensions:
+Server: Kaazing Gateway
+Upgrade: websocket
+Received ping
+Received ping
+Received ping
+Hello world !
+> Received 13 bytes
+ws_connect: received message: Hello world !
+> Hello world !
+> Received 13 bytes
+ws_connect: received message: Hello world !
+```
+
+```
+ws connect 'ws://jeanserge.com/v2?appkey=_pubsub'
+Type Ctrl-D to exit prompt...
+Connecting to url: ws://jeanserge.com/v2?appkey=_pubsub
+> ws_connect: connected
+Uri: /v2?appkey=_pubsub
+Handshake Headers:
+Connection: Upgrade
+Date: Tue, 08 Oct 2019 21:45:28 GMT
+Sec-WebSocket-Accept: LYHmjh9Gsu/Yw7aumQqyPObOEV4=
+Sec-WebSocket-Extensions: permessage-deflate; server_max_window_bits=15; client_max_window_bits=15
+Server: Python/3.7 websockets/8.0.2
+Upgrade: websocket
+bababababababab
+> ws_connect: connection closed: code 1000 reason
+
+ws_connect: connected
+Uri: /v2?appkey=_pubsub
+Handshake Headers:
+Connection: Upgrade
+Date: Tue, 08 Oct 2019 21:45:44 GMT
+Sec-WebSocket-Accept: I1rqxdLgTU+opPi5/zKPBTuXdLw=
+Sec-WebSocket-Extensions: permessage-deflate; server_max_window_bits=15; client_max_window_bits=15
+Server: Python/3.7 websockets/8.0.2
+Upgrade: websocket
+```
+
 ## File transfer
 
 ```

ixcobra/ixcobra/IXCobraConnection.cpp

@@ -21,16 +21,18 @@ namespace ix
     TrafficTrackerCallback CobraConnection::_trafficTrackerCallback = nullptr;
     PublishTrackerCallback CobraConnection::_publishTrackerCallback = nullptr;
     constexpr size_t CobraConnection::kQueueMaxSize;
+    constexpr CobraConnection::MsgId CobraConnection::kInvalidMsgId;
 
     CobraConnection::CobraConnection() :
         _webSocket(new WebSocket()),
         _publishMode(CobraConnection_PublishMode_Immediate),
         _authenticated(false),
         _eventCallback(nullptr),
-        _id(0)
+        _id(1)
     {
         _pdu["action"] = "rtm/publish";
 
+        _webSocket->addSubProtocol("json");
         initWebSocketOnMessageCallback();
     }
 
@@ -232,6 +234,11 @@ namespace ix
         _publishMode = publishMode;
     }
 
+    CobraConnectionPublishMode CobraConnection::getPublishMode()
+    {
+        return _publishMode;
+    }
+
     void CobraConnection::configure(const std::string& appkey,
                                     const std::string& endpoint,
                                     const std::string& rolename,
@@ -456,12 +463,13 @@ namespace ix
         return _jsonWriter.write(value);
     }
 
-    //
-    // publish is not thread safe as we are trying to reuse some Json objects.
-    //
-    CobraConnection::MsgId CobraConnection::publish(const Json::Value& channels,
-                                                    const Json::Value& msg)
+    std::pair<CobraConnection::MsgId, std::string> CobraConnection::prePublish(
+        const Json::Value& channels,
+        const Json::Value& msg,
+        bool addToQueue)
     {
+        std::lock_guard<std::mutex> lock(_prePublishMutex);
+
         invokePublishTrackerCallback(true, false);
 
         CobraConnection::MsgId msgId = _id;
@@ -473,6 +481,39 @@ namespace ix
 
         std::string serializedJson = serializeJson(_pdu);
 
+        if (addToQueue)
+        {
+            enqueue(serializedJson);
+        }
+
+        return std::make_pair(msgId, serializedJson);
+    }
+
+    bool CobraConnection::publishNext()
+    {
+        std::lock_guard<std::mutex> lock(_queueMutex);
+
+        if (_messageQueue.empty()) return true;
+
+        auto&& msg = _messageQueue.back();
+        if (!publishMessage(msg))
+        {
+            return false;
+        }
+        _messageQueue.pop_back();
+        return true;
+    }
+
+    //
+    // publish is not thread safe as we are trying to reuse some Json objects.
+    //
+    CobraConnection::MsgId CobraConnection::publish(const Json::Value& channels,
+                                                    const Json::Value& msg)
+    {
+        auto p = prePublish(channels, msg, false);
+        auto msgId = p.first;
+        auto serializedJson = p.second;
+
         //
         // 1. When we use batch mode, we just enqueue and will do the flush explicitely
         // 2. When we aren't authenticated yet to the cobra server, we need to enqueue
@@ -567,22 +608,21 @@ namespace ix
     //
     bool CobraConnection::flushQueue()
     {
-        std::lock_guard<std::mutex> lock(_queueMutex);
-
-        while (!_messageQueue.empty())
+        while (!isQueueEmpty())
         {
-            auto&& msg = _messageQueue.back();
-            if (!publishMessage(msg))
-            {
-                _messageQueue.push_back(msg);
-                return false;
-            }
-            _messageQueue.pop_back();
+            bool ok = publishNext();
+            if (!ok) return false;
         }
 
         return true;
     }
 
+    bool CobraConnection::isQueueEmpty()
+    {
+        std::lock_guard<std::mutex> lock(_queueMutex);
+        return _messageQueue.empty();
+    }
+
     bool CobraConnection::publishMessage(const std::string& serializedJson)
     {
         auto webSocketSendInfo = _webSocket->send(serializedJson);

ixcobra/ixcobra/IXCobraConnection.h

@@ -114,10 +114,26 @@ namespace ix
         /// Set the publish mode
         void setPublishMode(CobraConnectionPublishMode publishMode);
 
+        /// Query the publish mode
+        CobraConnectionPublishMode getPublishMode();
+
         /// Lifecycle management. Free resources when backgrounding
         void suspend();
         void resume();
 
+        /// Prepare a message for transmission
+        /// (update the pdu, compute a msgId, serialize json to a string)
+        std::pair<CobraConnection::MsgId, std::string> prePublish(
+            const Json::Value& channels,
+            const Json::Value& msg,
+            bool addToQueue);
+
+        /// Attempt to send next message from the internal queue
+        bool publishNext();
+
+        // An invalid message id, signifying an error.
+        static constexpr MsgId kInvalidMsgId = 0;
+
     private:
         bool sendHandshakeMessage();
         bool handleHandshakeResponse(const Json::Value& data);
@@ -147,6 +163,9 @@ namespace ix
                                  uint64_t msgId = std::numeric_limits<uint64_t>::max());
         void invokeErrorCallback(const std::string& errorMsg, const std::string& serializedPdu);
 
+        /// Tells whether the internal queue is empty or not
+        bool isQueueEmpty();
+
         ///
         /// Member variables
         ///
@@ -165,6 +184,7 @@ namespace ix
         Json::Value _pdu;
         Json::FastWriter _jsonWriter;
         mutable std::mutex _jsonWriterMutex;
+        std::mutex _prePublishMutex;
 
         /// Traffic tracker callback
         static TrafficTrackerCallback _trafficTrackerCallback;

ixcobra/ixcobra/IXCobraMetricsPublisher.cpp

@@ -135,23 +135,23 @@ namespace ix
         return ms;
     }
 
-    void CobraMetricsPublisher::push(const std::string& id,
-                                     const std::string& data,
-                                     bool shouldPushTest)
+    CobraConnection::MsgId CobraMetricsPublisher::push(const std::string& id,
+                                                       const std::string& data,
+                                                       bool shouldPushTest)
     {
-        if (!_enabled) return;
+        if (!_enabled) return CobraConnection::kInvalidMsgId;
 
         Json::Value root;
         Json::Reader reader;
-        if (!reader.parse(data, root)) return;
+        if (!reader.parse(data, root)) return CobraConnection::kInvalidMsgId;
 
-        push(id, root, shouldPushTest);
+        return push(id, root, shouldPushTest);
     }
 
-    void CobraMetricsPublisher::push(const std::string& id,
-                                     const CobraMetricsPublisher::Message& data)
+    CobraConnection::MsgId CobraMetricsPublisher::push(const std::string& id,
+                                                       const CobraMetricsPublisher::Message& data)
     {
-        if (!_enabled) return;
+        if (!_enabled) return CobraConnection::kInvalidMsgId;
 
         Json::Value root;
         for (auto it : data)
@@ -159,7 +159,7 @@ namespace ix
             root[it.first] = it.second;
         }
 
-        push(id, root);
+        return push(id, root);
     }
 
     bool CobraMetricsPublisher::shouldPush(const std::string& id) const
@@ -171,11 +171,12 @@ namespace ix
         return true;
     }
 
-    void CobraMetricsPublisher::push(const std::string& id,
-                                     const Json::Value& data,
-                                     bool shouldPushTest)
+    CobraConnection::MsgId CobraMetricsPublisher::push(
+        const std::string& id,
+        const Json::Value& data,
+        bool shouldPushTest)
     {
-        if (shouldPushTest && !shouldPush(id)) return;
+        if (shouldPushTest && !shouldPush(id)) return CobraConnection::kInvalidMsgId;
 
         setLastUpdate(id);
 
@@ -205,7 +206,7 @@ namespace ix
         }
 
         // Now actually enqueue the task
-        _cobra_metrics_theaded_publisher.push(msg);
+        return _cobra_metrics_theaded_publisher.push(msg);
     }
 
     void CobraMetricsPublisher::setPublishMode(CobraConnectionPublishMode publishMode)

ixcobra/ixcobra/IXCobraMetricsPublisher.h

@@ -59,8 +59,9 @@ namespace ix
 
         /// Simple interface, list of key value pairs where typeof(key) == typeof(value) == string
         typedef std::unordered_map<std::string, std::string> Message;
-        void push(const std::string& id,
-                  const CobraMetricsPublisher::Message& data = CobraMetricsPublisher::Message());
+        CobraConnection::MsgId push(
+            const std::string& id,
+            const CobraMetricsPublisher::Message& data = CobraMetricsPublisher::Message());
 
         /// Richer interface using json, which supports types (bool, int, float) and hierarchies of
         /// elements
@@ -69,10 +70,10 @@ namespace ix
         /// shouldPush method for places where we want to be as lightweight as possible when
         /// collecting metrics. When set to false, it is used so that we don't do double work when
         /// computing whether a metrics should be sent or not.
-        void push(const std::string& id, const Json::Value& data, bool shouldPushTest = true);
+        CobraConnection::MsgId push(const std::string& id, const Json::Value& data, bool shouldPushTest = true);
 
         /// Interface used by lua. msg is a json encoded string.
-        void push(const std::string& id, const std::string& data, bool shouldPushTest = true);
+        CobraConnection::MsgId push(const std::string& id, const std::string& data, bool shouldPushTest = true);
 
         /// Tells whether a metric can be pushed.
         /// A metric can be pushed if it satisfies those conditions:

ixcobra/ixcobra/IXCobraMetricsThreadedPublisher.cpp

@@ -101,17 +101,12 @@ namespace ix
                                     webSocketPerMessageDeflateOptions);
     }
 
-    void CobraMetricsThreadedPublisher::pushMessage(MessageKind messageKind,
-                                                    const Json::Value& msg)
+    void CobraMetricsThreadedPublisher::pushMessage(MessageKind messageKind)
     {
-        // Enqueue the task
         {
-            // acquire lock
             std::unique_lock<std::mutex> lock(_queue_mutex);
-
-            // add the task
-            _queue.push(std::make_pair(messageKind, msg));
-        } // release lock
+            _queue.push(messageKind);
+        }
 
         // wake up one thread
         _condition.notify_one();
@@ -131,11 +126,6 @@ namespace ix
     {
         setThreadName("CobraMetricsPublisher");
 
-        Json::Value channels;
-        channels.append(std::string());
-        channels.append(std::string());
-        const std::string messageIdKey("id");
-
         _cobra_connection.connect();
 
         while (true)
@@ -156,11 +146,8 @@ namespace ix
                     return;
                 }
 
-                auto item = _queue.front();
+                messageKind = _queue.front();
                 _queue.pop();
-
-                messageKind = item.first;
-                msg = item.second;
             }
 
             switch (messageKind)
@@ -179,37 +166,47 @@ namespace ix
 
                 case MessageKind::Message:
                 {
-                    ;
+                    if (_cobra_connection.getPublishMode() == CobraConnection_PublishMode_Immediate)
+                    {
+                        _cobra_connection.publishNext();
+                    }
                 }; break;
             }
-
-            //
-            // Publish to multiple channels. This let the consumer side
-            // easily subscribe to all message of a certain type, without having
-            // to do manipulations on the messages on the server side.
-            //
-            channels[0] = _channel;
-            if (msg.isMember(messageIdKey))
-            {
-                channels[1] = msg[messageIdKey];
-            }
-            _cobra_connection.publish(channels, msg);
         }
     }
 
-    void CobraMetricsThreadedPublisher::push(const Json::Value& msg)
+    CobraConnection::MsgId CobraMetricsThreadedPublisher::push(const Json::Value& msg)
     {
-        pushMessage(MessageKind::Message, msg);
+        static const std::string messageIdKey("id");
+
+        //
+        // Publish to multiple channels. This let the consumer side
+        // easily subscribe to all message of a certain type, without having
+        // to do manipulations on the messages on the server side.
+        //
+        Json::Value channels;
+
+        channels.append(_channel);
+        if (msg.isMember(messageIdKey))
+        {
+            channels.append(msg[messageIdKey]);
+        }
+        auto res = _cobra_connection.prePublish(channels, msg, true);
+        auto msgId = res.first;
+
+        pushMessage(MessageKind::Message);
+
+        return msgId;
     }
 
     void CobraMetricsThreadedPublisher::suspend()
     {
-        pushMessage(MessageKind::Suspend, Json::Value());
+        pushMessage(MessageKind::Suspend);
     }
 
     void CobraMetricsThreadedPublisher::resume()
     {
-        pushMessage(MessageKind::Resume, Json::Value());
+        pushMessage(MessageKind::Resume);
     }
 
     bool CobraMetricsThreadedPublisher::isConnected() const

ixcobra/ixcobra/IXCobraMetricsThreadedPublisher.h

@@ -37,7 +37,7 @@ namespace ix
 
         /// Push a msg to our queue of messages to be published to cobra on the background
         //  thread. Main user right now is the Cobra Metrics System
-        void push(const Json::Value& msg);
+        CobraConnection::MsgId push(const Json::Value& msg);
 
         /// Set cobra connection publish mode
         void setPublishMode(CobraConnectionPublishMode publishMode);
@@ -64,7 +64,7 @@ namespace ix
         };
 
         /// Push a message to be processed by the background thread
-        void pushMessage(MessageKind messageKind, const Json::Value& msg);
+        void pushMessage(MessageKind messageKind);
 
         /// Get a wait time which is increasing exponentially based on the number of retries
         uint64_t getWaitTimeExp(int retry_count);
@@ -94,7 +94,7 @@ namespace ix
         /// that it should wake up and take care of publishing it to cobra
         /// To shutdown the worker thread one has to set the _stop boolean to true.
         /// This is done in the destructor
-        std::queue<std::pair<MessageKind, Json::Value>> _queue;
+        std::queue<MessageKind> _queue;
         mutable std::mutex _queue_mutex;
         std::condition_variable _condition;
         std::atomic<bool> _stop;

ixcrypto/ixcrypto/IXBase64.cpp

@@ -35,15 +35,21 @@ namespace ix
     "0123456789+/";
 
     std::string base64_encode(const std::string& data, size_t len)
+    {
+        const char* bytes_to_encode = data.c_str();
+        return base64_encode(bytes_to_encode, len);
+    }
+
+    std::string base64_encode(const char* bytes_to_encode, size_t len)
     {
         std::string ret;
+        ret.reserve(((len + 2) / 3) * 4);
+
         int i = 0;
         int j = 0;
         unsigned char char_array_3[3];
         unsigned char char_array_4[4];
 
-        const char* bytes_to_encode = data.c_str();
-
         while(len--)
         {
             char_array_3[i++] = *(bytes_to_encode++);
@@ -95,6 +101,7 @@ namespace ix
         int in_ = 0;
         unsigned char char_array_4[4], char_array_3[3];
         std::string ret;
+        ret.reserve(((in_len + 3) / 4) * 3);
 
         while(in_len-- && ( encoded_string[in_] != '=') && is_base64(encoded_string[in_]))
         {

ixcrypto/ixcrypto/IXBase64.h

@@ -11,5 +11,6 @@
 namespace ix
 {
     std::string base64_encode(const std::string& data, size_t len);
+    std::string base64_encode(const char* data, size_t len);
     std::string base64_decode(const std::string& encoded_string);
 } // namespace ix

ixsentry/CMakeLists.txt

@@ -0,0 +1,25 @@
+#
+# Author: Benjamin Sergeant
+# Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
+#
+
+set (IXSENTRY_SOURCES
+    ixsentry/IXSentryClient.cpp
+)
+
+set (IXSENTRY_HEADERS
+    ixsentry/IXSentryClient.h
+)
+
+add_library(ixsentry STATIC
+  ${IXSENTRY_SOURCES}
+  ${IXSENTRY_HEADERS}
+)
+
+set(IXSENTRY_INCLUDE_DIRS
+    .
+    ..
+    ../third_party
+    ../third_party/spdlog/include)
+
+target_include_directories( ixsentry PUBLIC ${IXSENTRY_INCLUDE_DIRS} )

ixsentry/ixsentry/IXSentryClient.cpp

@@ -8,17 +8,16 @@
 
 #include <chrono>
 #include <iostream>
-#include <spdlog/spdlog.h>
-
 #include <ixwebsocket/IXWebSocketHttpHeaders.h>
+#include <spdlog/spdlog.h>
 
 
 namespace ix
 {
-    SentryClient::SentryClient(const std::string& dsn) :
-        _dsn(dsn),
-        _validDsn(false),
-        _luaFrameRegex("\t([^/]+):([0-9]+): in function '([^/]+)'")
+    SentryClient::SentryClient(const std::string& dsn)
+        : _dsn(dsn)
+        , _validDsn(false)
+        , _luaFrameRegex("\t([^/]+):([0-9]+): in function ['<]([^/]+)['>]")
     {
         const std::regex dsnRegex("(http[s]?)://([^:]+):([^@]+)@([^/]+)/([0-9]+)");
         std::smatch group;
@@ -168,8 +167,7 @@ namespace ix
         return _jsonWriter.write(payload);
     }
 
-    std::pair<HttpResponsePtr, std::string> SentryClient::send(const Json::Value& msg,
-                                                               bool verbose)
+    std::pair<HttpResponsePtr, std::string> SentryClient::send(const Json::Value& msg, bool verbose)
     {
         auto args = _httpClient.createRequest();
         args->extraHeaders["X-Sentry-Auth"] = SentryClient::computeAuthHeader();
@@ -177,10 +175,7 @@ namespace ix
         args->transferTimeout = 5 * 60;
         args->followRedirects = true;
         args->verbose = verbose;
-        args->logger = [](const std::string& msg)
-        {
-            spdlog::info("request logger: {}", msg);
-        };
+        args->logger = [](const std::string& msg) { spdlog::info("request logger: {}", msg); };
 
         std::string body = computePayload(msg);
         HttpResponsePtr response = _httpClient.post(_url, body, args);

ixsentry/ixsentry/IXSentryClient.h

@@ -21,14 +21,14 @@ namespace ix
 
         std::pair<HttpResponsePtr, std::string> send(const Json::Value& msg, bool verbose);
 
+        Json::Value parseLuaStackTrace(const std::string& stack);
+
     private:
         int64_t getTimestamp();
         std::string computeAuthHeader();
         std::string getIso8601();
         std::string computePayload(const Json::Value& msg);
 
-        Json::Value parseLuaStackTrace(const std::string& stack);
-
         std::string _dsn;
         bool _validDsn;
         std::string _url;

ixsnake/CMakeLists.txt

@@ -0,0 +1,35 @@
+#
+# Author: Benjamin Sergeant
+# Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
+#
+
+set (IXSNAKE_SOURCES
+    ixsnake/IXSnakeServer.cpp
+    ixsnake/IXSnakeProtocol.cpp
+    ixsnake/IXAppConfig.cpp
+    ixsnake/IXRedisClient.cpp
+    ixsnake/IXRedisServer.cpp
+)
+
+set (IXSNAKE_HEADERS
+    ixsnake/IXSnakeServer.h
+    ixsnake/IXSnakeProtocol.h
+    ixsnake/IXAppConfig.h
+    ixsnake/IXRedisClient.h
+    ixsnake/IXRedisServer.h
+)
+
+add_library(ixsnake STATIC
+    ${IXSNAKE_SOURCES}
+    ${IXSNAKE_HEADERS}
+)
+
+set(IXSNAKE_INCLUDE_DIRS
+    .
+    ..
+    ../ixcore
+    ../ixcrypto
+    ../ixwebsocket
+    ../third_party)
+
+target_include_directories( ixsnake PUBLIC ${IXSNAKE_INCLUDE_DIRS} )

ixsnake/ixsnake/IXAppConfig.cpp

@@ -4,24 +4,20 @@
  *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
  */
 
-#include "IXSnakeProtocol.h"
 #include "IXAppConfig.h"
+
+#include "IXSnakeProtocol.h"
 #include <iostream>
 #include <ixcrypto/IXUuid.h>
 
 namespace snake
 {
-    bool isAppKeyValid(
-        const AppConfig& appConfig,
-        std::string appkey)
+    bool isAppKeyValid(const AppConfig& appConfig, std::string appkey)
     {
         return appConfig.apps.count(appkey) != 0;
     }
 
-    std::string getRoleSecret(
-        const AppConfig& appConfig,
-        std::string appkey,
-        std::string role)
+    std::string getRoleSecret(const AppConfig& appConfig, std::string appkey, std::string role)
     {
         if (!isAppKeyValid(appConfig, appkey))
         {
@@ -49,4 +45,4 @@ namespace snake
         std::cout << "redis password: " << appConfig.redisPassword << std::endl;
         std::cout << "redis port: " << appConfig.redisPort << std::endl;
     }
-}
+} // namespace snake

ixsnake/ixsnake/IXRedisClient.cpp

@@ -5,14 +5,15 @@
  */
 
 #include "IXRedisClient.h"
-#include <ixwebsocket/IXSocketFactory.h>
-#include <ixwebsocket/IXSocket.h>
 
-#include <iostream>
-#include <sstream>
-#include <iomanip>
-#include <vector>
 #include <cstring>
+#include <iomanip>
+#include <iostream>
+#include <ixwebsocket/IXSocket.h>
+#include <ixwebsocket/IXSocketFactory.h>
+#include <ixwebsocket/IXSocketTLSOptions.h>
+#include <sstream>
+#include <vector>
 
 namespace ix
 {
@@ -20,7 +21,8 @@ namespace ix
     {
         bool tls = false;
         std::string errorMsg;
-        _socket = createSocket(tls, errorMsg);
+        SocketTLSOptions tlsOptions;
+        _socket = createSocket(tls, -1, errorMsg, tlsOptions);
 
         if (!_socket)
         {
@@ -31,8 +33,12 @@ namespace ix
         return _socket->connect(hostname, port, errMsg, nullptr);
     }
 
-    bool RedisClient::auth(const std::string& password,
-                           std::string& response)
+    void RedisClient::stop()
+    {
+        _stop = true;
+    }
+
+    bool RedisClient::auth(const std::string& password, std::string& response)
     {
         response.clear();
 
@@ -133,9 +139,9 @@ namespace ix
         if (!_socket) return false;
 
         std::stringstream ss;
-        ss << "SUBSCRIBE ";
-        ss << channel;
-        ss << "\r\n";
+        ss << "*2\r\n";
+        ss << writeString("SUBSCRIBE");
+        ss << writeString(channel);
 
         bool sent = _socket->writeBytes(ss.str(), nullptr);
         if (!sent)
@@ -203,7 +209,7 @@ namespace ix
             int arraySize;
             {
                 std::stringstream ss;
-                ss << line.substr(1, line.size()-1);
+                ss << line.substr(1, line.size() - 1);
                 ss >> arraySize;
             }
 
@@ -220,7 +226,7 @@ namespace ix
                 // => $7 (7 bytes)
                 int stringSize;
                 std::stringstream ss;
-                ss << line.substr(1, line.size()-1);
+                ss << line.substr(1, line.size() - 1);
                 ss >> stringSize;
 
                 auto readResult = _socket->readBytes(stringSize, nullptr, nullptr);
@@ -242,8 +248,102 @@ namespace ix
         return true;
     }
 
-    void RedisClient::stop()
+    std::string RedisClient::prepareXaddCommand(
+        const std::string& stream,
+        const std::string& message)
     {
-        _stop = true;
+        std::stringstream ss;
+        ss << "*5\r\n";
+        ss << writeString("XADD");
+        ss << writeString(stream);
+        ss << writeString("*");
+        ss << writeString("field");
+        ss << writeString(message);
+
+        return ss.str();
     }
-}
+
+    std::string RedisClient::xadd(const std::string& stream,
+                                  const std::string& message,
+                                  std::string& errMsg)
+    {
+        errMsg.clear();
+
+        if (!_socket)
+        {
+            errMsg = "socket is not initialized";
+            return std::string();
+        }
+
+        std::string command = prepareXaddCommand(stream, message);
+
+        bool sent = _socket->writeBytes(command, nullptr);
+        if (!sent)
+        {
+            errMsg = "Cannot write bytes to socket";
+            return std::string();
+        }
+
+        return readXaddReply(errMsg);
+    }
+
+    std::string RedisClient::readXaddReply(std::string& errMsg)
+    {
+        // Read result
+        auto pollResult = _socket->isReadyToRead(-1);
+        if (pollResult == PollResultType::Error)
+        {
+            errMsg = "Error while polling for result";
+            return std::string();
+        }
+
+        // First line is the string length
+        auto lineResult = _socket->readLine(nullptr);
+        auto lineValid = lineResult.first;
+        auto line = lineResult.second;
+
+        if (!lineValid)
+        {
+            errMsg = "Error while polling for result";
+            return std::string();
+        }
+
+        int stringSize;
+        {
+            std::stringstream ss;
+            ss << line.substr(1, line.size() - 1);
+            ss >> stringSize;
+        }
+
+        // Read the result, which is the stream id computed by the redis server
+        lineResult = _socket->readLine(nullptr);
+        lineValid = lineResult.first;
+        line = lineResult.second;
+
+        std::string streamId = line.substr(0, stringSize - 1);
+        return streamId;
+    }
+
+    bool RedisClient::sendCommand(const std::string& commands, int commandsCount, std::string& errMsg)
+    {
+        bool sent = _socket->writeBytes(commands, nullptr);
+        if (!sent)
+        {
+            errMsg = "Cannot write bytes to socket";
+            return false;
+        }
+
+        bool success = true;
+
+        for (int i = 0; i < commandsCount; ++i)
+        {
+            auto reply = readXaddReply(errMsg);
+            if (reply == std::string())
+            {
+                success = false;
+            }
+        }
+
+        return success;
+    }
+} // namespace ix

ixsnake/ixsnake/IXRedisClient.h

@@ -6,9 +6,9 @@
 
 #pragma once
 
+#include <atomic>
 #include <functional>
 #include <memory>
-#include <atomic>
 
 namespace ix
 {
@@ -20,19 +20,37 @@ namespace ix
         using OnRedisSubscribeResponseCallback = std::function<void(const std::string&)>;
         using OnRedisSubscribeCallback = std::function<void(const std::string&)>;
 
-        RedisClient() : _stop(false) {}
+        RedisClient()
+            : _stop(false)
+        {
+        }
         ~RedisClient() = default;
 
         bool connect(const std::string& hostname, int port);
 
         bool auth(const std::string& password, std::string& response);
 
+        // Publish / Subscribe
         bool publish(const std::string& channel, const std::string& message, std::string& errMsg);
 
         bool subscribe(const std::string& channel,
                        const OnRedisSubscribeResponseCallback& responseCallback,
                        const OnRedisSubscribeCallback& callback);
 
+        // XADD
+        std::string xadd(
+            const std::string& channel,
+            const std::string& message,
+            std::string& errMsg);
+
+        std::string prepareXaddCommand(
+            const std::string& stream,
+            const std::string& message);
+
+        std::string readXaddReply(std::string& errMsg);
+
+        bool sendCommand(const std::string& commands, int commandsCount, std::string& errMsg);
+
         void stop();
 
     private:

ixsnake/ixsnake/IXRedisServer.cpp

@@ -0,0 +1,299 @@
+/*
+ *  IXRedisServer.cpp
+ *  Author: Benjamin Sergeant
+ *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
+ */
+
+#include "IXRedisServer.h"
+
+#include <ixwebsocket/IXNetSystem.h>
+#include <ixwebsocket/IXSocketConnect.h>
+#include <ixwebsocket/IXSocket.h>
+#include <ixwebsocket/IXCancellationRequest.h>
+#include <fstream>
+#include <iostream>
+#include <sstream>
+#include <vector>
+
+namespace ix
+{
+    RedisServer::RedisServer(int port, const std::string& host, int backlog, size_t maxConnections)
+        : SocketServer(port, host, backlog, maxConnections)
+        , _connectedClientsCount(0)
+        , _stopHandlingConnections(false)
+    {
+        ;
+    }
+
+    RedisServer::~RedisServer()
+    {
+        stop();
+    }
+
+    void RedisServer::stop()
+    {
+        stopAcceptingConnections();
+
+        _stopHandlingConnections = true;
+        while (_connectedClientsCount != 0)
+        {
+            std::this_thread::sleep_for(std::chrono::milliseconds(10));
+        }
+        _stopHandlingConnections = false;
+
+        SocketServer::stop();
+    }
+
+    void RedisServer::handleConnection(std::shared_ptr<Socket> socket,
+                                       std::shared_ptr<ConnectionState> connectionState)
+    {
+        _connectedClientsCount++;
+
+        while (!_stopHandlingConnections)
+        {
+            std::vector<std::string> tokens;
+            if (!parseRequest(socket, tokens))
+            {
+                if (_stopHandlingConnections)
+                {
+                    logError("Cancellation requested");
+                }
+                else
+                {
+                    logError("Error parsing request");
+                }
+                break;
+            }
+
+            bool success = false;
+
+            // publish
+            if (tokens[0] == "COMMAND")
+            {
+                success = handleCommand(socket, tokens);
+            }
+            else if (tokens[0] == "PUBLISH")
+            {
+                success = handlePublish(socket, tokens);
+            }
+            else if (tokens[0] == "SUBSCRIBE")
+            {
+                success = handleSubscribe(socket, tokens);
+            }
+
+            if (!success)
+            {
+                if (_stopHandlingConnections)
+                {
+                    logError("Cancellation requested");
+                }
+                else
+                {
+                    logError("Error processing request for command: " + tokens[0]);
+                }
+                break;
+            }
+        }
+
+        cleanupSubscribers(socket);
+
+        logInfo("Connection closed for connection id " + connectionState->getId());
+        connectionState->setTerminated();
+
+        _connectedClientsCount--;
+    }
+
+    void RedisServer::cleanupSubscribers(std::shared_ptr<Socket> socket)
+    {
+        std::lock_guard<std::mutex> lock(_mutex);
+
+        for (auto&& it : _subscribers)
+        {
+            it.second.erase(socket);
+        }
+
+        for (auto it : _subscribers)
+        {
+            std::stringstream ss;
+            ss << "Subscription id: " << it.first
+               << " #subscribers: " << it.second.size();
+
+            logInfo(ss.str());
+        }
+    }
+
+    size_t RedisServer::getConnectedClientsCount()
+    {
+        return _connectedClientsCount;
+    }
+
+    bool RedisServer::startsWith(const std::string& str,
+                                 const std::string& start)
+    {
+        return str.compare(0, start.length(), start) == 0;
+    }
+
+    std::string RedisServer::writeString(const std::string& str)
+    {
+        std::stringstream ss;
+        ss << "$";
+        ss << str.size();
+        ss << "\r\n";
+        ss << str;
+        ss << "\r\n";
+
+        return ss.str();
+    }
+
+    bool RedisServer::parseRequest(
+        std::shared_ptr<Socket> socket,
+        std::vector<std::string>& tokens)
+    {
+        // Parse first line
+        auto cb = makeCancellationRequestWithTimeout(30, _stopHandlingConnections);
+        auto lineResult = socket->readLine(cb);
+        auto lineValid = lineResult.first;
+        auto line = lineResult.second;
+
+        if (!lineValid) return false;
+
+        std::string str = line.substr(1);
+        std::stringstream ss;
+        ss << str;
+        int count;
+        ss >> count;
+
+        for (int i = 0; i < count; ++i)
+        {
+            auto lineResult = socket->readLine(cb);
+            auto lineValid = lineResult.first;
+            auto line = lineResult.second;
+
+            if (!lineValid) return false;
+
+            int stringSize;
+            std::stringstream ss;
+            ss << line.substr(1, line.size() - 1);
+            ss >> stringSize;
+
+            auto readResult = socket->readBytes(stringSize, nullptr, nullptr);
+
+            if (!readResult.first) return false;
+
+            // read last 2 bytes (\r\n)
+            char c;
+            socket->readByte(&c, nullptr);
+            socket->readByte(&c, nullptr);
+
+            tokens.push_back(readResult.second);
+        }
+
+        for (auto&& token : tokens)
+        {
+            std::cerr << token << " ";
+        }
+        std::cerr << std::endl;
+
+        return true;
+    }
+
+    bool RedisServer::handleCommand(
+        std::shared_ptr<Socket> socket,
+        const std::vector<std::string>& tokens)
+    {
+        if (tokens.size() != 1) return false;
+
+        auto cb = makeCancellationRequestWithTimeout(30, _stopHandlingConnections);
+        std::stringstream ss;
+
+        // return 2 nested arrays
+        ss << "*2\r\n";
+
+        //
+        // publish
+        //
+        ss << "*6\r\n";
+        ss << writeString("publish"); // 1
+        ss << ":3\r\n"; // 2
+        ss << "*0\r\n"; // 3
+        ss << ":1\r\n"; // 4
+        ss << ":2\r\n"; // 5
+        ss << ":1\r\n"; // 6
+
+        //
+        // subscribe
+        //
+        ss << "*6\r\n";
+        ss << writeString("subscribe"); // 1
+        ss << ":2\r\n"; // 2
+        ss << "*0\r\n"; // 3
+        ss << ":1\r\n"; // 4
+        ss << ":1\r\n"; // 5
+        ss << ":1\r\n"; // 6
+
+        socket->writeBytes(ss.str(), cb);
+
+        return true;
+    }
+
+    bool RedisServer::handleSubscribe(
+        std::shared_ptr<Socket> socket,
+        const std::vector<std::string>& tokens)
+    {
+        if (tokens.size() != 2) return false;
+
+        auto cb = makeCancellationRequestWithTimeout(30, _stopHandlingConnections);
+        std::string channel = tokens[1];
+
+        // Respond
+        socket->writeBytes("*3\r\n", cb);
+        socket->writeBytes(writeString("subscribe"), cb);
+        socket->writeBytes(writeString(channel), cb);
+        socket->writeBytes(":1\r\n", cb);
+
+        std::lock_guard<std::mutex> lock(_mutex);
+        _subscribers[channel].insert(socket);
+
+        return true;
+    }
+
+    bool RedisServer::handlePublish(
+        std::shared_ptr<Socket> socket,
+        const std::vector<std::string>& tokens)
+    {
+        if (tokens.size() != 3) return false;
+
+        auto cb = makeCancellationRequestWithTimeout(30, _stopHandlingConnections);
+        std::string channel = tokens[1];
+        std::string data = tokens[2];
+
+        // now dispatch the message to subscribers (write custom method)
+        std::lock_guard<std::mutex> lock(_mutex);
+        auto it = _subscribers.find(channel);
+        if (it == _subscribers.end())
+        {
+            // return the number of clients that received the message, 0 in that case
+            socket->writeBytes(":0\r\n", cb);
+            return true;
+        }
+
+        auto subscribers = it->second;
+        for (auto jt : subscribers)
+        {
+            jt->writeBytes("*3\r\n", cb);
+            jt->writeBytes(writeString("message"), cb);
+            jt->writeBytes(writeString(channel), cb);
+            jt->writeBytes(writeString(data), cb);
+        }
+
+        // return the number of clients that received the message.
+        std::stringstream ss;
+        ss << ":"
+           << std::to_string(subscribers.size())
+           << "\r\n";
+        socket->writeBytes(ss.str(), cb);
+
+        return true;
+    }
+
+} // namespace ix

ixsnake/ixsnake/IXRedisServer.h

@@ -0,0 +1,67 @@
+/*
+ *  IXRedisServer.h
+ *  Author: Benjamin Sergeant
+ *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
+ */
+
+#pragma once
+
+#include "IXSocketServer.h"
+#include "IXSocket.h"
+#include <functional>
+#include <memory>
+#include <mutex>
+#include <set>
+#include <map>
+#include <string>
+#include <thread>
+#include <utility> // pair
+
+namespace ix
+{
+    class RedisServer final : public SocketServer
+    {
+    public:
+        RedisServer(int port = SocketServer::kDefaultPort,
+                    const std::string& host = SocketServer::kDefaultHost,
+                    int backlog = SocketServer::kDefaultTcpBacklog,
+                    size_t maxConnections = SocketServer::kDefaultMaxConnections);
+        virtual ~RedisServer();
+        virtual void stop() final;
+
+    private:
+        // Member variables
+        std::atomic<int> _connectedClientsCount;
+
+        // Subscribers
+        // We could store connection states in there, to add better debugging
+        // since a connection state has a readable ID
+        std::map<std::string, std::set<std::shared_ptr<Socket>>> _subscribers;
+        std::mutex _mutex;
+
+        std::atomic<bool> _stopHandlingConnections;
+
+        // Methods
+        virtual void handleConnection(std::shared_ptr<Socket>,
+                                      std::shared_ptr<ConnectionState> connectionState) final;
+        virtual size_t getConnectedClientsCount() final;
+
+        bool startsWith(const std::string& str, const std::string& start);
+        std::string writeString(const std::string& str);
+
+        bool parseRequest(
+            std::shared_ptr<Socket> socket,
+            std::vector<std::string>& tokens);
+
+        bool handlePublish(std::shared_ptr<Socket> socket,
+                           const std::vector<std::string>& tokens);
+
+        bool handleSubscribe(std::shared_ptr<Socket> socket,
+                             const std::vector<std::string>& tokens);
+
+        bool handleCommand(std::shared_ptr<Socket> socket,
+                           const std::vector<std::string>& tokens);
+
+        void cleanupSubscribers(std::shared_ptr<Socket> socket);
+    };
+} // namespace ix

ixsnake/ixsnake/IXSnakeConnectionState.h

@@ -0,0 +1,60 @@
+/*
+ *  IXSnakeConnectionState.h
+ *  Author: Benjamin Sergeant
+ *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
+ */
+
+#pragma once
+
+#include "IXRedisClient.h"
+#include <future>
+#include <ixwebsocket/IXConnectionState.h>
+#include <string>
+
+namespace snake
+{
+    class SnakeConnectionState : public ix::ConnectionState
+    {
+    public:
+        std::string getNonce()
+        {
+            return _nonce;
+        }
+        void setNonce(const std::string& nonce)
+        {
+            _nonce = nonce;
+        }
+
+        std::string appkey()
+        {
+            return _appkey;
+        }
+        void setAppkey(const std::string& appkey)
+        {
+            _appkey = appkey;
+        }
+
+        std::string role()
+        {
+            return _role;
+        }
+        void setRole(const std::string& role)
+        {
+            _role = role;
+        }
+
+        ix::RedisClient& redisClient()
+        {
+            return _redisClient;
+        }
+
+        std::future<void> fut;
+
+    private:
+        std::string _nonce;
+        std::string _role;
+        std::string _appkey;
+
+        ix::RedisClient _redisClient;
+    };
+} // namespace snake

ixsnake/ixsnake/IXSnakeProtocol.cpp

@@ -6,41 +6,33 @@
 
 #include "IXSnakeProtocol.h"
 
-#include <ixwebsocket/IXWebSocket.h>
-#include <ixcrypto/IXHMac.h>
-
-#include "IXSnakeConnectionState.h"
 #include "IXAppConfig.h"
-
+#include "IXSnakeConnectionState.h"
 #include "nlohmann/json.hpp"
-#include <sstream>
 #include <iostream>
+#include <ixcrypto/IXHMac.h>
+#include <ixwebsocket/IXWebSocket.h>
+#include <ixcore/utils/IXCoreLogger.h>
+#include <sstream>
 
 namespace snake
 {
-    void handleError(
-        const std::string& action,
-        std::shared_ptr<ix::WebSocket> ws,
-        nlohmann::json pdu,
-        const std::string& errMsg)
+    void handleError(const std::string& action,
+                     std::shared_ptr<ix::WebSocket> ws,
+                     nlohmann::json pdu,
+                     const std::string& errMsg)
     {
         std::string actionError(action);
         actionError += "/error";
 
         nlohmann::json response = {
-            {"action", actionError},
-            {"id", pdu.value("id", 1)},
-            {"body", {
-                {"reason", errMsg}
-            }}
-        };
+            {"action", actionError}, {"id", pdu.value("id", 1)}, {"body", {{"reason", errMsg}}}};
         ws->sendText(response.dump());
     }
 
-    void handleHandshake(
-        std::shared_ptr<SnakeConnectionState> state,
-        std::shared_ptr<ix::WebSocket> ws,
-        const nlohmann::json& pdu)
+    void handleHandshake(std::shared_ptr<SnakeConnectionState> state,
+                         std::shared_ptr<ix::WebSocket> ws,
+                         const nlohmann::json& pdu)
     {
         std::string role = pdu["body"]["data"]["role"];
 
@@ -50,39 +42,29 @@ namespace snake
         nlohmann::json response = {
             {"action", "auth/handshake/ok"},
             {"id", pdu.value("id", 1)},
-            {"body", {
-                {"data", {
-                    {"nonce", state->getNonce()},
-                    {"connection_id", state->getId()}
-                }},
-            }}
-        };
+            {"body",
+             {
+                 {"data", {{"nonce", state->getNonce()}, {"connection_id", state->getId()}}},
+             }}};
 
         auto serializedResponse = response.dump();
-        std::cout << "response = " << serializedResponse << std::endl;
 
         ws->sendText(serializedResponse);
     }
 
-    void handleAuth(
-        std::shared_ptr<SnakeConnectionState> state,
-        std::shared_ptr<ix::WebSocket> ws,
-        const AppConfig& appConfig,
-        const nlohmann::json& pdu)
+    void handleAuth(std::shared_ptr<SnakeConnectionState> state,
+                    std::shared_ptr<ix::WebSocket> ws,
+                    const AppConfig& appConfig,
+                    const nlohmann::json& pdu)
     {
         auto secret = getRoleSecret(appConfig, state->appkey(), state->role());
-        std::cout << "secret = " << secret << std::endl;
 
         if (secret.empty())
         {
             nlohmann::json response = {
                 {"action", "auth/authenticate/error"},
                 {"id", pdu.value("id", 1)},
-                {"body", {
-                    {"error", "authentication_failed"},
-                    {"reason", "invalid secret"}
-                }}
-            };
+                {"body", {{"error", "authentication_failed"}, {"reason", "invalid secret"}}}};
             ws->sendText(response.dump());
             return;
         }
@@ -91,39 +73,25 @@ namespace snake
         auto serverHash = ix::hmac(nonce, secret);
         std::string clientHash = pdu["body"]["credentials"]["hash"];
 
-        if (appConfig.verbose)
-        {
-            std::cout << serverHash << std::endl;
-            std::cout << clientHash << std::endl;
-        }
-
         if (serverHash != clientHash)
         {
             nlohmann::json response = {
                 {"action", "auth/authenticate/error"},
                 {"id", pdu.value("id", 1)},
-                {"body", {
-                    {"error", "authentication_failed"},
-                    {"reason", "invalid hash"}
-                }}
-            };
+                {"body", {{"error", "authentication_failed"}, {"reason", "invalid hash"}}}};
             ws->sendText(response.dump());
             return;
         }
 
         nlohmann::json response = {
-            {"action", "auth/authenticate/ok"},
-            {"id", pdu.value("id", 1)},
-            {"body", {}}
-        };
+            {"action", "auth/authenticate/ok"}, {"id", pdu.value("id", 1)}, {"body", {}}};
 
         ws->sendText(response.dump());
     }
 
-    void handlePublish(
-        std::shared_ptr<SnakeConnectionState> state,
-        std::shared_ptr<ix::WebSocket> ws,
-        const nlohmann::json& pdu)
+    void handlePublish(std::shared_ptr<SnakeConnectionState> state,
+                       std::shared_ptr<ix::WebSocket> ws,
+                       const nlohmann::json& pdu)
     {
         std::vector<std::string> channels;
 
@@ -150,9 +118,7 @@ namespace snake
         for (auto&& channel : channels)
         {
             std::stringstream ss;
-            ss << state->appkey()
-               << "::"
-               << channel;
+            ss << state->appkey() << "::" << channel;
 
             std::string errMsg;
             if (!state->redisClient().publish(ss.str(), pdu.dump(), errMsg))
@@ -165,10 +131,7 @@ namespace snake
         }
 
         nlohmann::json response = {
-            {"action", "rtm/publish/ok"},
-            {"id", pdu.value("id", 1)},
-            {"body", {}}
-        };
+            {"action", "rtm/publish/ok"}, {"id", pdu.value("id", 1)}, {"body", {}}};
 
         ws->sendText(response.dump());
     }
@@ -176,19 +139,16 @@ namespace snake
     //
     // FIXME: this is not cancellable. We should be able to cancel the redis subscription
     //
-    void handleRedisSubscription(
-        std::shared_ptr<SnakeConnectionState> state,
-        std::shared_ptr<ix::WebSocket> ws,
-        const AppConfig& appConfig,
-        const nlohmann::json& pdu)
+    void handleRedisSubscription(std::shared_ptr<SnakeConnectionState> state,
+                                 std::shared_ptr<ix::WebSocket> ws,
+                                 const AppConfig& appConfig,
+                                 const nlohmann::json& pdu)
     {
         std::string channel = pdu["body"]["channel"];
         std::string subscriptionId = channel;
 
         std::stringstream ss;
-        ss << state->appkey()
-           << "::"
-           << channel;
+        ss << state->appkey() << "::" << channel;
 
         std::string appChannel(ss.str());
 
@@ -207,8 +167,6 @@ namespace snake
             return;
         }
 
-        std::cout << "Connected to redis host " << hostname << ":" << port << std::endl;
-
         // Now authenticate, if needed
         if (!appConfig.redisPassword.empty())
         {
@@ -220,12 +178,10 @@ namespace snake
                 handleError("rtm/subscribe", ws, pdu, ss.str());
                 return;
             }
-            std::cout << "Auth response: " << authResponse << ":" << port << std::endl;
         }
 
         int id = 0;
-        auto callback = [ws, &id, &subscriptionId](const std::string& messageStr)
-        {
+        auto callback = [ws, &id, &subscriptionId](const std::string& messageStr) {
             auto msg = nlohmann::json::parse(messageStr);
 
             msg = msg["body"]["message"];
@@ -233,31 +189,29 @@ namespace snake
             nlohmann::json response = {
                 {"action", "rtm/subscription/data"},
                 {"id", id++},
-                {"body", {
-                    {"subscription_id", subscriptionId},
-                    {"messages", {msg}}
-                }}
-            };
+                {"body", {{"subscription_id", subscriptionId}, {"messages", {msg}}}}};
 
             ws->sendText(response.dump());
         };
 
-        auto responseCallback = [ws, pdu, &subscriptionId](const std::string& redisResponse)
-        {
-            std::cout << "Redis subscribe response: " << redisResponse << std::endl;
+        auto responseCallback = [ws, pdu, &subscriptionId](const std::string& redisResponse) {
+            std::stringstream ss;
+            ss << "Redis Response: " << redisResponse << "...";
+            ix::IXCoreLogger::Log(ss.str().c_str());
 
             // Success
-            nlohmann::json response = {
-                {"action", "rtm/subscribe/ok"},
-                {"id", pdu.value("id", 1)},
-                {"body", {
-                    {"subscription_id", subscriptionId}
-                }}
-            };
+            nlohmann::json response = {{"action", "rtm/subscribe/ok"},
+                                       {"id", pdu.value("id", 1)},
+                                       {"body", {{"subscription_id", subscriptionId}}}};
             ws->sendText(response.dump());
         };
 
-        std::cerr << "Subscribing to " << appChannel << "..." << std::endl;
+        {
+            std::stringstream ss;
+            ss << "Subscribing to " << appChannel << "...";
+            ix::IXCoreLogger::Log(ss.str().c_str());
+        }
+
         if (!redisClient.subscribe(appChannel, responseCallback, callback))
         {
             std::stringstream ss;
@@ -267,24 +221,18 @@ namespace snake
         }
     }
 
-    void handleSubscribe(
-        std::shared_ptr<SnakeConnectionState> state,
-        std::shared_ptr<ix::WebSocket> ws,
-        const AppConfig& appConfig,
-        const nlohmann::json& pdu)
+    void handleSubscribe(std::shared_ptr<SnakeConnectionState> state,
+                         std::shared_ptr<ix::WebSocket> ws,
+                         const AppConfig& appConfig,
+                         const nlohmann::json& pdu)
     {
-        state->fut = std::async(std::launch::async,
-                                handleRedisSubscription,
-                                state,
-                                ws,
-                                appConfig,
-                                pdu);
+        state->fut =
+            std::async(std::launch::async, handleRedisSubscription, state, ws, appConfig, pdu);
     }
 
-    void handleUnSubscribe(
-        std::shared_ptr<SnakeConnectionState> state,
-        std::shared_ptr<ix::WebSocket> ws,
-        const nlohmann::json& pdu)
+    void handleUnSubscribe(std::shared_ptr<SnakeConnectionState> state,
+                           std::shared_ptr<ix::WebSocket> ws,
+                           const nlohmann::json& pdu)
     {
         // extract subscription_id
         auto body = pdu["body"];
@@ -292,27 +240,19 @@ namespace snake
 
         state->redisClient().stop();
 
-        nlohmann::json response = {
-            {"action", "rtm/unsubscribe/ok"},
-            {"id", pdu.value("id", 1)},
-            {"body", {
-                {"subscription_id", subscriptionId}
-            }}
-        };
+        nlohmann::json response = {{"action", "rtm/unsubscribe/ok"},
+                                   {"id", pdu.value("id", 1)},
+                                   {"body", {{"subscription_id", subscriptionId}}}};
         ws->sendText(response.dump());
     }
 
-    void processCobraMessage(
-        std::shared_ptr<SnakeConnectionState> state,
-        std::shared_ptr<ix::WebSocket> ws,
-        const AppConfig& appConfig,
-        const std::string& str)
+    void processCobraMessage(std::shared_ptr<SnakeConnectionState> state,
+                             std::shared_ptr<ix::WebSocket> ws,
+                             const AppConfig& appConfig,
+                             const std::string& str)
     {
         auto pdu = nlohmann::json::parse(str);
-        std::cout << "Got " << str << std::endl;
-
         auto action = pdu["action"];
-        std::cout << "action = " << action << std::endl;
 
         if (action == "auth/handshake")
         {
@@ -339,4 +279,4 @@ namespace snake
             std::cerr << "Unhandled action: " << action << std::endl;
         }
     }
-}
+} // namespace snake

ixsnake/ixsnake/IXSnakeServer.cpp

@@ -5,18 +5,20 @@
  */
 
 #include "IXSnakeServer.h"
-#include "IXSnakeProtocol.h"
-#include "IXSnakeConnectionState.h"
-#include "IXAppConfig.h"
 
+#include "IXAppConfig.h"
+#include "IXSnakeConnectionState.h"
+#include "IXSnakeProtocol.h"
 #include <iostream>
 #include <sstream>
+#include <ixcore/utils/IXCoreLogger.h>
+
 
 namespace snake
 {
-    SnakeServer::SnakeServer(const AppConfig& appConfig) :
-        _appConfig(appConfig),
-        _server(appConfig.port, appConfig.hostname)
+    SnakeServer::SnakeServer(const AppConfig& appConfig)
+        : _appConfig(appConfig)
+        , _server(appConfig.port, appConfig.hostname)
     {
         ;
     }
@@ -32,7 +34,7 @@ namespace snake
         idx = path.rfind('=');
         if (idx != std::string::npos)
         {
-            std::string appkey = path.substr(idx+1);
+            std::string appkey = path.substr(idx + 1);
             return appkey;
         }
         else
@@ -43,32 +45,28 @@ namespace snake
 
     bool SnakeServer::run()
     {
-        std::cout << "Listening on " << _appConfig.hostname << ":" << _appConfig.port << std::endl;
-
-        auto factory = []() -> std::shared_ptr<ix::ConnectionState>
-        {
+        auto factory = []() -> std::shared_ptr<ix::ConnectionState> {
             return std::make_shared<SnakeConnectionState>();
         };
         _server.setConnectionStateFactory(factory);
 
         _server.setOnConnectionCallback(
             [this](std::shared_ptr<ix::WebSocket> webSocket,
-                   std::shared_ptr<ix::ConnectionState> connectionState)
-            {
+                   std::shared_ptr<ix::ConnectionState> connectionState) {
                 auto state = std::dynamic_pointer_cast<SnakeConnectionState>(connectionState);
 
                 webSocket->setOnMessageCallback(
-                    [this, webSocket, state](const ix::WebSocketMessagePtr& msg)
-                    {
+                    [this, webSocket, state](const ix::WebSocketMessagePtr& msg) {
+                        std::stringstream ss;
                         if (msg->type == ix::WebSocketMessageType::Open)
                         {
-                            std::cerr << "New connection" << std::endl;
-                            std::cerr << "id: " << state->getId() << std::endl;
-                            std::cerr << "Uri: " << msg->openInfo.uri << std::endl;
-                            std::cerr << "Headers:" << std::endl;
+                            ss << "New connection" << std::endl;
+                            ss << "id: " << state->getId() << std::endl;
+                            ss << "Uri: " << msg->openInfo.uri << std::endl;
+                            ss << "Headers:" << std::endl;
                             for (auto it : msg->openInfo.headers)
                             {
-                                std::cerr << it.first << ": " << it.second << std::endl;
+                                ss << it.first << ": " << it.second << std::endl;
                             }
 
                             std::string appkey = parseAppKey(msg->openInfo.uri);
@@ -78,37 +76,36 @@ namespace snake
                             if (!state->redisClient().connect(_appConfig.redisHosts[0],
                                                               _appConfig.redisPort))
                             {
-                                std::cerr << "Cannot connect to redis host" << std::endl;
+                                ss << "Cannot connect to redis host" << std::endl;
                             }
                         }
                         else if (msg->type == ix::WebSocketMessageType::Close)
                         {
-                            std::cerr << "Closed connection"
-                                      << " code " << msg->closeInfo.code
-                                      << " reason " << msg->closeInfo.reason << std::endl;
+                            ss << "Closed connection"
+                               << " code " << msg->closeInfo.code << " reason "
+                               << msg->closeInfo.reason << std::endl;
                         }
                         else if (msg->type == ix::WebSocketMessageType::Error)
                         {
                             std::stringstream ss;
-                            ss << "Connection error: " << msg->errorInfo.reason      << std::endl;
-                            ss << "#retries: "         << msg->errorInfo.retries     << std::endl;
-                            ss << "Wait time(ms): "    << msg->errorInfo.wait_time   << std::endl;
-                            ss << "HTTP Status: "      << msg->errorInfo.http_status << std::endl;
-                            std::cerr << ss.str();
+                            ss << "Connection error: " << msg->errorInfo.reason << std::endl;
+                            ss << "#retries: " << msg->errorInfo.retries << std::endl;
+                            ss << "Wait time(ms): " << msg->errorInfo.wait_time << std::endl;
+                            ss << "HTTP Status: " << msg->errorInfo.http_status << std::endl;
                         }
                         else if (msg->type == ix::WebSocketMessageType::Fragment)
                         {
-                            std::cerr << "Received message fragment" << std::endl;
+                            ss << "Received message fragment" << std::endl;
                         }
                         else if (msg->type == ix::WebSocketMessageType::Message)
                         {
-                            std::cerr << "Received " << msg->wireSize << " bytes" << std::endl;
+                            ss << "Received " << msg->wireSize << " bytes" << std::endl;
                             processCobraMessage(state, webSocket, _appConfig, msg->str);
                         }
-                    }
-                );
-            }
-        );
+
+                        ix::IXCoreLogger::Log(ss.str().c_str());
+                    });
+            });
 
         auto res = _server.listen();
         if (!res.first)
@@ -133,4 +130,4 @@ namespace snake
     {
         _server.stop();
     }
-}
+} // namespace snake

ixwebsocket/IXCancellationRequest.cpp

@@ -10,14 +10,13 @@
 
 namespace ix
 {
-    CancellationRequest makeCancellationRequestWithTimeout(int secs,
-                                                           std::atomic<bool>& requestInitCancellation)
+    CancellationRequest makeCancellationRequestWithTimeout(
+        int secs, std::atomic<bool>& requestInitCancellation)
     {
         auto start = std::chrono::system_clock::now();
         auto timeout = std::chrono::seconds(secs);
 
-        auto isCancellationRequested = [&requestInitCancellation, start, timeout]() -> bool
-        {
+        auto isCancellationRequested = [&requestInitCancellation, start, timeout]() -> bool {
             // Was an explicit cancellation requested ?
             if (requestInitCancellation) return true;
 
@@ -30,4 +29,4 @@ namespace ix
 
         return isCancellationRequested;
     }
-}
+} // namespace ix

ixwebsocket/IXConnectionState.cpp

@@ -10,7 +10,8 @@ namespace ix
 {
     std::atomic<uint64_t> ConnectionState::_globalId(0);
 
-    ConnectionState::ConnectionState() : _terminated(false)
+    ConnectionState::ConnectionState()
+        : _terminated(false)
     {
         computeId();
     }
@@ -39,5 +40,4 @@ namespace ix
     {
         _terminated = true;
     }
-}
-
+} // namespace ix

ixwebsocket/IXDNSLookup.cpp

@@ -5,22 +5,22 @@
  */
 
 #include "IXDNSLookup.h"
-#include "IXNetSystem.h"
 
-#include <string.h>
+#include "IXNetSystem.h"
 #include <chrono>
+#include <string.h>
 #include <thread>
 
 namespace ix
 {
     const int64_t DNSLookup::kDefaultWait = 1; // ms
 
-    DNSLookup::DNSLookup(const std::string& hostname, int port, int64_t wait) :
-        _hostname(hostname),
-        _port(port),
-        _wait(wait),
-        _res(nullptr),
-        _done(false)
+    DNSLookup::DNSLookup(const std::string& hostname, int port, int64_t wait)
+        : _hostname(hostname)
+        , _port(port)
+        , _wait(wait)
+        , _res(nullptr)
+        , _done(false)
     {
         ;
     }
@@ -38,8 +38,7 @@ namespace ix
         std::string sport = std::to_string(port);
 
         struct addrinfo* res;
-        int getaddrinfo_result = getaddrinfo(hostname.c_str(), sport.c_str(),
-                                             &hints, &res);
+        int getaddrinfo_result = getaddrinfo(hostname.c_str(), sport.c_str(), &hints, &res);
         if (getaddrinfo_result)
         {
             errMsg = gai_strerror(getaddrinfo_result);
@@ -56,8 +55,8 @@ namespace ix
                            : resolveUnCancellable(errMsg, isCancellationRequested);
     }
 
-    struct addrinfo* DNSLookup::resolveUnCancellable(std::string& errMsg,
-                                                     const CancellationRequest& isCancellationRequested)
+    struct addrinfo* DNSLookup::resolveUnCancellable(
+        std::string& errMsg, const CancellationRequest& isCancellationRequested)
     {
         errMsg = "no error";
 
@@ -71,8 +70,8 @@ namespace ix
         return getAddrInfo(_hostname, _port, errMsg);
     }
 
-    struct addrinfo* DNSLookup::resolveCancellable(std::string& errMsg,
-                                                   const CancellationRequest& isCancellationRequested)
+    struct addrinfo* DNSLookup::resolveCancellable(
+        std::string& errMsg, const CancellationRequest& isCancellationRequested)
     {
         errMsg = "no error";
 
@@ -126,7 +125,9 @@ namespace ix
         return getRes();
     }
 
-    void DNSLookup::run(std::weak_ptr<DNSLookup> self, std::string hostname, int port) // thread runner
+    void DNSLookup::run(std::weak_ptr<DNSLookup> self,
+                        std::string hostname,
+                        int port) // thread runner
     {
         // We don't want to read or write into members variables of an object that could be
         // gone, so we use temporary variables (res) or we pass in by copy everything that
@@ -134,7 +135,7 @@ namespace ix
         std::string errMsg;
         struct addrinfo* res = getAddrInfo(hostname, port, errMsg);
 
-        if (self.lock())
+        if (auto lock = self.lock())
         {
             // Copy result into the member variables
             setRes(res);
@@ -167,4 +168,4 @@ namespace ix
         std::lock_guard<std::mutex> lock(_resMutex);
         return _res;
     }
-}
+} // namespace ix

ixwebsocket/IXExponentialBackoff.cpp

@@ -10,9 +10,8 @@
 
 namespace ix
 {
-    uint32_t calculateRetryWaitMilliseconds(
-        uint32_t retry_count,
-        uint32_t maxWaitBetweenReconnectionRetries)
+    uint32_t calculateRetryWaitMilliseconds(uint32_t retry_count,
+                                            uint32_t maxWaitBetweenReconnectionRetries)
     {
         uint32_t wait_time = std::pow(2, retry_count) * 100;
 
@@ -23,4 +22,4 @@ namespace ix
 
         return wait_time;
     }
-}
+} // namespace ix

ixwebsocket/IXExponentialBackoff.h

@@ -10,7 +10,6 @@
 
 namespace ix
 {
-    uint32_t calculateRetryWaitMilliseconds(
-        uint32_t retry_count,
-        uint32_t maxWaitBetweenReconnectionRetries);
+    uint32_t calculateRetryWaitMilliseconds(uint32_t retry_count,
+                                            uint32_t maxWaitBetweenReconnectionRetries);
 } // namespace ix

ixwebsocket/IXHttp.cpp

@@ -5,9 +5,9 @@
  */
 
 #include "IXHttp.h"
+
 #include "IXCancellationRequest.h"
 #include "IXSocket.h"
-
 #include <sstream>
 #include <vector>
 
@@ -57,7 +57,8 @@ namespace ix
         return std::make_pair(httpVersion, statusCode);
     }
 
-    std::tuple<std::string, std::string, std::string> Http::parseRequestLine(const std::string& line)
+    std::tuple<std::string, std::string, std::string> Http::parseRequestLine(
+        const std::string& line)
     {
         // Request-Line   = Method SP Request-URI SP HTTP-Version CRLF
         std::string token;
@@ -114,8 +115,8 @@ namespace ix
 
         // Parse request line (GET /foo HTTP/1.1\r\n)
         auto requestLine = Http::parseRequestLine(line);
-        auto method      = std::get<0>(requestLine);
-        auto uri         = std::get<1>(requestLine);
+        auto method = std::get<0>(requestLine);
+        auto uri = std::get<1>(requestLine);
         auto httpVersion = std::get<2>(requestLine);
 
         // Retrieve and validate HTTP headers
@@ -161,8 +162,6 @@ namespace ix
             return false;
         }
 
-        return response->payload.empty()
-            ? true
-            : socket->writeBytes(response->payload, nullptr);
+        return response->payload.empty() ? true : socket->writeBytes(response->payload, nullptr);
     }
-}
+} // namespace ix

ixwebsocket/IXHttp.h

@@ -115,8 +115,7 @@ namespace ix
             std::shared_ptr<Socket> socket);
         static bool sendResponse(HttpResponsePtr response, std::shared_ptr<Socket> socket);
 
-        static std::pair<std::string, int> parseStatusLine(
-            const std::string& line);
+        static std::pair<std::string, int> parseStatusLine(const std::string& line);
         static std::tuple<std::string, std::string, std::string> parseRequestLine(
             const std::string& line);
         static std::string trim(const std::string& str);

ixwebsocket/IXHttpClient.cpp

@@ -5,17 +5,16 @@
  */
 
 #include "IXHttpClient.h"
+
+#include "IXSocketFactory.h"
 #include "IXUrlParser.h"
 #include "IXUserAgent.h"
 #include "IXWebSocketHttpHeaders.h"
-#include "IXSocketFactory.h"
-
-#include <sstream>
-#include <iomanip>
-#include <vector>
-#include <cstring>
-
 #include <assert.h>
+#include <cstring>
+#include <iomanip>
+#include <sstream>
+#include <vector>
 #include <zlib.h>
 
 namespace ix
@@ -26,7 +25,9 @@ namespace ix
     const std::string HttpClient::kDel = "DEL";
     const std::string HttpClient::kPut = "PUT";
 
-    HttpClient::HttpClient(bool async) : _async(async), _stop(false)
+    HttpClient::HttpClient(bool async)
+        : _async(async)
+        , _stop(false)
     {
         if (!_async) return;
 
@@ -42,8 +43,12 @@ namespace ix
         _thread.join();
     }
 
-    HttpRequestArgsPtr HttpClient::createRequest(const std::string& url,
-                                                 const std::string& verb)
+    void HttpClient::setTLSOptions(const SocketTLSOptions& tlsOptions)
+    {
+        _tlsOptions = tlsOptions;
+    }
+
+    HttpRequestArgsPtr HttpClient::createRequest(const std::string& url, const std::string& verb)
     {
         auto request = std::make_shared<HttpRequestArgs>();
         request->url = url;
@@ -106,12 +111,11 @@ namespace ix
         }
     }
 
-    HttpResponsePtr HttpClient::request(
-        const std::string& url,
-        const std::string& verb,
-        const std::string& body,
-        HttpRequestArgsPtr args,
-        int redirects)
+    HttpResponsePtr HttpClient::request(const std::string& url,
+                                        const std::string& verb,
+                                        const std::string& body,
+                                        HttpRequestArgsPtr args,
+                                        int redirects)
     {
         // We only have one socket connection, so we cannot
         // make multiple requests concurrently.
@@ -131,20 +135,30 @@ namespace ix
         {
             std::stringstream ss;
             ss << "Cannot parse url: " << url;
-            return std::make_shared<HttpResponse>(code, description, HttpErrorCode::UrlMalformed,
-                                                  headers, payload, ss.str(),
-                                                  uploadSize, downloadSize);
+            return std::make_shared<HttpResponse>(code,
+                                                  description,
+                                                  HttpErrorCode::UrlMalformed,
+                                                  headers,
+                                                  payload,
+                                                  ss.str(),
+                                                  uploadSize,
+                                                  downloadSize);
         }
 
         bool tls = protocol == "https";
         std::string errorMsg;
-        _socket = createSocket(tls, errorMsg);
+        _socket = createSocket(tls, -1, errorMsg, _tlsOptions);
 
         if (!_socket)
         {
-            return std::make_shared<HttpResponse>(code, description, HttpErrorCode::CannotCreateSocket,
-                                                  headers, payload, errorMsg,
-                                                  uploadSize, downloadSize);
+            return std::make_shared<HttpResponse>(code,
+                                                  description,
+                                                  HttpErrorCode::CannotCreateSocket,
+                                                  headers,
+                                                  payload,
+                                                  errorMsg,
+                                                  uploadSize,
+                                                  downloadSize);
         }
 
         // Build request string
@@ -154,7 +168,8 @@ namespace ix
 
         if (args->compress)
         {
-            ss << "Accept-Encoding: gzip" << "\r\n";
+            ss << "Accept-Encoding: gzip"
+               << "\r\n";
         }
 
         // Append extra headers
@@ -166,7 +181,8 @@ namespace ix
         // Set a default Accept header if none is present
         if (headers.find("Accept") == headers.end())
         {
-            ss << "Accept: */*" << "\r\n";
+            ss << "Accept: */*"
+               << "\r\n";
         }
 
         // Set a default User agent if none is present
@@ -182,7 +198,8 @@ namespace ix
             // Set default Content-Type if unspecified
             if (args->extraHeaders.find("Content-Type") == args->extraHeaders.end())
             {
-                ss << "Content-Type: application/x-www-form-urlencoded" << "\r\n";
+                ss << "Content-Type: application/x-www-form-urlencoded"
+                   << "\r\n";
             }
             ss << "\r\n";
             ss << body;
@@ -205,9 +222,14 @@ namespace ix
         {
             std::stringstream ss;
             ss << "Cannot connect to url: " << url << " / error : " << errMsg;
-            return std::make_shared<HttpResponse>(code, description, HttpErrorCode::CannotConnect,
-                                                  headers, payload, ss.str(),
-                                                  uploadSize, downloadSize);
+            return std::make_shared<HttpResponse>(code,
+                                                  description,
+                                                  HttpErrorCode::CannotConnect,
+                                                  headers,
+                                                  payload,
+                                                  ss.str(),
+                                                  uploadSize,
+                                                  downloadSize);
         }
 
         // Make a new cancellation object dealing with transfer timeout
@@ -221,8 +243,7 @@ namespace ix
                << "to " << host << ":" << port << std::endl
                << "request size: " << req.size() << " bytes" << std::endl
                << "=============" << std::endl
-               << req
-               << "=============" << std::endl
+               << req << "=============" << std::endl
                << std::endl;
 
             log(ss.str(), args);
@@ -231,9 +252,14 @@ namespace ix
         if (!_socket->writeBytes(req, isCancellationRequested))
         {
             std::string errorMsg("Cannot send request");
-            return std::make_shared<HttpResponse>(code, description, HttpErrorCode::SendError,
-                                                  headers, payload, errorMsg,
-                                                  uploadSize, downloadSize);
+            return std::make_shared<HttpResponse>(code,
+                                                  description,
+                                                  HttpErrorCode::SendError,
+                                                  headers,
+                                                  payload,
+                                                  errorMsg,
+                                                  uploadSize,
+                                                  downloadSize);
         }
 
         uploadSize = req.size();
@@ -245,9 +271,14 @@ namespace ix
         if (!lineValid)
         {
             std::string errorMsg("Cannot retrieve status line");
-            return std::make_shared<HttpResponse>(code, description, HttpErrorCode::CannotReadStatusLine,
-                                                  headers, payload, errorMsg,
-                                                  uploadSize, downloadSize);
+            return std::make_shared<HttpResponse>(code,
+                                                  description,
+                                                  HttpErrorCode::CannotReadStatusLine,
+                                                  headers,
+                                                  payload,
+                                                  errorMsg,
+                                                  uploadSize,
+                                                  downloadSize);
         }
 
         if (args->verbose)
@@ -260,9 +291,14 @@ namespace ix
         if (sscanf(line.c_str(), "HTTP/1.1 %d", &code) != 1)
         {
             std::string errorMsg("Cannot parse response code from status line");
-            return std::make_shared<HttpResponse>(code, description, HttpErrorCode::MissingStatus,
-                                                  headers, payload, errorMsg,
-                                                  uploadSize, downloadSize);
+            return std::make_shared<HttpResponse>(code,
+                                                  description,
+                                                  HttpErrorCode::MissingStatus,
+                                                  headers,
+                                                  payload,
+                                                  errorMsg,
+                                                  uploadSize,
+                                                  downloadSize);
         }
 
         auto result = parseHttpHeaders(_socket, isCancellationRequested);
@@ -272,9 +308,14 @@ namespace ix
         if (!headersValid)
         {
             std::string errorMsg("Cannot parse http headers");
-            return std::make_shared<HttpResponse>(code, description, HttpErrorCode::HeaderParsingError,
-                                                  headers, payload, errorMsg,
-                                                  uploadSize, downloadSize);
+            return std::make_shared<HttpResponse>(code,
+                                                  description,
+                                                  HttpErrorCode::HeaderParsingError,
+                                                  headers,
+                                                  payload,
+                                                  errorMsg,
+                                                  uploadSize,
+                                                  downloadSize);
         }
 
         // Redirect ?
@@ -283,30 +324,45 @@ namespace ix
             if (headers.find("Location") == headers.end())
             {
                 std::string errorMsg("Missing location header for redirect");
-                return std::make_shared<HttpResponse>(code, description, HttpErrorCode::MissingLocation,
-                                                      headers, payload, errorMsg,
-                                                      uploadSize, downloadSize);
+                return std::make_shared<HttpResponse>(code,
+                                                      description,
+                                                      HttpErrorCode::MissingLocation,
+                                                      headers,
+                                                      payload,
+                                                      errorMsg,
+                                                      uploadSize,
+                                                      downloadSize);
             }
 
             if (redirects >= args->maxRedirects)
             {
                 std::stringstream ss;
                 ss << "Too many redirects: " << redirects;
-                return std::make_shared<HttpResponse>(code, description, HttpErrorCode::TooManyRedirects,
-                                                      headers, payload, ss.str(),
-                                                      uploadSize, downloadSize);
+                return std::make_shared<HttpResponse>(code,
+                                                      description,
+                                                      HttpErrorCode::TooManyRedirects,
+                                                      headers,
+                                                      payload,
+                                                      ss.str(),
+                                                      uploadSize,
+                                                      downloadSize);
             }
 
             // Recurse
             std::string location = headers["Location"];
-            return request(location, verb, body, args, redirects+1);
+            return request(location, verb, body, args, redirects + 1);
         }
 
         if (verb == "HEAD")
         {
-            return std::make_shared<HttpResponse>(code, description, HttpErrorCode::Ok,
-                                                  headers, payload, std::string(),
-                                                  uploadSize, downloadSize);
+            return std::make_shared<HttpResponse>(code,
+                                                  description,
+                                                  HttpErrorCode::Ok,
+                                                  headers,
+                                                  payload,
+                                                  std::string(),
+                                                  uploadSize,
+                                                  downloadSize);
         }
 
         // Parse response:
@@ -319,15 +375,19 @@ namespace ix
 
             payload.reserve(contentLength);
 
-            auto chunkResult = _socket->readBytes(contentLength,
-                                                  args->onProgressCallback,
-                                                  isCancellationRequested);
+            auto chunkResult = _socket->readBytes(
+                contentLength, args->onProgressCallback, isCancellationRequested);
             if (!chunkResult.first)
             {
                 errorMsg = "Cannot read chunk";
-                return std::make_shared<HttpResponse>(code, description, HttpErrorCode::ChunkReadError,
-                                                      headers, payload, errorMsg,
-                                                      uploadSize, downloadSize);
+                return std::make_shared<HttpResponse>(code,
+                                                      description,
+                                                      HttpErrorCode::ChunkReadError,
+                                                      headers,
+                                                      payload,
+                                                      errorMsg,
+                                                      uploadSize,
+                                                      downloadSize);
             }
             payload += chunkResult.second;
         }
@@ -343,9 +403,14 @@ namespace ix
 
                 if (!lineResult.first)
                 {
-                    return std::make_shared<HttpResponse>(code, description, HttpErrorCode::ChunkReadError,
-                                                          headers, payload, errorMsg,
-                                                          uploadSize, downloadSize);
+                    return std::make_shared<HttpResponse>(code,
+                                                          description,
+                                                          HttpErrorCode::ChunkReadError,
+                                                          headers,
+                                                          payload,
+                                                          errorMsg,
+                                                          uploadSize,
+                                                          downloadSize);
                 }
 
                 uint64_t chunkSize;
@@ -356,23 +421,26 @@ namespace ix
                 if (args->verbose)
                 {
                     std::stringstream oss;
-                    oss << "Reading " << chunkSize << " bytes"
-                        << std::endl;
+                    oss << "Reading " << chunkSize << " bytes" << std::endl;
                     log(oss.str(), args);
                 }
 
                 payload.reserve(payload.size() + (size_t) chunkSize);
 
                 // Read a chunk
-                auto chunkResult = _socket->readBytes((size_t) chunkSize,
-                                                      args->onProgressCallback,
-                                                      isCancellationRequested);
+                auto chunkResult = _socket->readBytes(
+                    (size_t) chunkSize, args->onProgressCallback, isCancellationRequested);
                 if (!chunkResult.first)
                 {
                     errorMsg = "Cannot read chunk";
-                    return std::make_shared<HttpResponse>(code, description, HttpErrorCode::ChunkReadError,
-                                                          headers, payload, errorMsg,
-                                                          uploadSize, downloadSize);
+                    return std::make_shared<HttpResponse>(code,
+                                                          description,
+                                                          HttpErrorCode::ChunkReadError,
+                                                          headers,
+                                                          payload,
+                                                          errorMsg,
+                                                          uploadSize,
+                                                          downloadSize);
                 }
                 payload += chunkResult.second;
 
@@ -381,9 +449,14 @@ namespace ix
 
                 if (!lineResult.first)
                 {
-                    return std::make_shared<HttpResponse>(code, description, HttpErrorCode::ChunkReadError,
-                                                          headers, payload, errorMsg,
-                                                          uploadSize, downloadSize);
+                    return std::make_shared<HttpResponse>(code,
+                                                          description,
+                                                          HttpErrorCode::ChunkReadError,
+                                                          headers,
+                                                          payload,
+                                                          errorMsg,
+                                                          uploadSize,
+                                                          downloadSize);
                 }
 
                 if (chunkSize == 0) break;
@@ -396,9 +469,14 @@ namespace ix
         else
         {
             std::string errorMsg("Cannot read http body");
-            return std::make_shared<HttpResponse>(code, description, HttpErrorCode::CannotReadBody,
-                                                  headers, payload, errorMsg,
-                                                  uploadSize, downloadSize);
+            return std::make_shared<HttpResponse>(code,
+                                                  description,
+                                                  HttpErrorCode::CannotReadBody,
+                                                  headers,
+                                                  payload,
+                                                  errorMsg,
+                                                  uploadSize,
+                                                  downloadSize);
         }
 
         downloadSize = payload.size();
@@ -410,32 +488,39 @@ namespace ix
             if (!gzipInflate(payload, decompressedPayload))
             {
                 std::string errorMsg("Error decompressing payload");
-                return std::make_shared<HttpResponse>(code, description, HttpErrorCode::Gzip,
-                                                      headers, payload, errorMsg,
-                                                      uploadSize, downloadSize);
+                return std::make_shared<HttpResponse>(code,
+                                                      description,
+                                                      HttpErrorCode::Gzip,
+                                                      headers,
+                                                      payload,
+                                                      errorMsg,
+                                                      uploadSize,
+                                                      downloadSize);
             }
             payload = decompressedPayload;
         }
 
-        return std::make_shared<HttpResponse>(code, description, HttpErrorCode::Ok,
-                                              headers, payload, std::string(),
-                                              uploadSize, downloadSize);
+        return std::make_shared<HttpResponse>(code,
+                                              description,
+                                              HttpErrorCode::Ok,
+                                              headers,
+                                              payload,
+                                              std::string(),
+                                              uploadSize,
+                                              downloadSize);
     }
 
-    HttpResponsePtr HttpClient::get(const std::string& url,
-                                    HttpRequestArgsPtr args)
+    HttpResponsePtr HttpClient::get(const std::string& url, HttpRequestArgsPtr args)
     {
         return request(url, kGet, std::string(), args);
     }
 
-    HttpResponsePtr HttpClient::head(const std::string& url,
-                                     HttpRequestArgsPtr args)
+    HttpResponsePtr HttpClient::head(const std::string& url, HttpRequestArgsPtr args)
     {
         return request(url, kHead, std::string(), args);
     }
 
-    HttpResponsePtr HttpClient::del(const std::string& url,
-                                    HttpRequestArgsPtr args)
+    HttpResponsePtr HttpClient::del(const std::string& url, HttpRequestArgsPtr args)
     {
         return request(url, kDel, std::string(), args);
     }
@@ -474,8 +559,7 @@ namespace ix
         escaped.fill('0');
         escaped << std::hex;
 
-        for (std::string::const_iterator i = value.begin(), n = value.end();
-             i != n; ++i)
+        for (std::string::const_iterator i = value.begin(), n = value.end(); i != n; ++i)
         {
             std::string::value_type c = (*i);
 
@@ -503,21 +587,17 @@ namespace ix
 
         for (auto&& it : httpParameters)
         {
-            ss << urlEncode(it.first)
-               << "="
-               << urlEncode(it.second);
+            ss << urlEncode(it.first) << "=" << urlEncode(it.second);
 
-            if (i++ < (count-1))
+            if (i++ < (count - 1))
             {
-               ss << "&";
+                ss << "&";
             }
         }
         return ss.str();
     }
 
-    bool HttpClient::gzipInflate(
-        const std::string& in,
-        std::string& out)
+    bool HttpClient::gzipInflate(const std::string& in, std::string& out)
     {
         z_stream inflateState;
         std::memset(&inflateState, 0, sizeof(inflateState));
@@ -528,13 +608,13 @@ namespace ix
         inflateState.avail_in = 0;
         inflateState.next_in = Z_NULL;
 
-        if (inflateInit2(&inflateState, 16+MAX_WBITS) != Z_OK)
+        if (inflateInit2(&inflateState, 16 + MAX_WBITS) != Z_OK)
         {
             return false;
         }
 
         inflateState.avail_in = (uInt) in.size();
-        inflateState.next_in = (unsigned char *)(const_cast<char *>(in.data()));
+        inflateState.next_in = (unsigned char*) (const_cast<char*>(in.data()));
 
         const int kBufferSize = 1 << 14;
 
@@ -554,22 +634,19 @@ namespace ix
                 return false;
             }
 
-            out.append(
-                reinterpret_cast<char *>(compressBuffer.get()),
-                kBufferSize - inflateState.avail_out
-            );
+            out.append(reinterpret_cast<char*>(compressBuffer.get()),
+                       kBufferSize - inflateState.avail_out);
         } while (inflateState.avail_out == 0);
 
         inflateEnd(&inflateState);
         return true;
     }
 
-    void HttpClient::log(const std::string& msg,
-                         HttpRequestArgsPtr args)
+    void HttpClient::log(const std::string& msg, HttpRequestArgsPtr args)
     {
         if (args->logger)
         {
             args->logger(msg);
         }
     }
-}
+} // namespace ix

ixwebsocket/IXHttpClient.h

@@ -8,6 +8,7 @@
 
 #include "IXHttp.h"
 #include "IXSocket.h"
+#include "IXSocketTLSOptions.h"
 #include "IXWebSocketHttpHeaders.h"
 #include <algorithm>
 #include <atomic>
@@ -58,6 +59,9 @@ namespace ix
         bool performRequest(HttpRequestArgsPtr request,
                             const OnResponseCallback& onResponseCallback);
 
+        // TLS
+        void setTLSOptions(const SocketTLSOptions& tlsOptions);
+
         std::string serializeHttpParameters(const HttpParameters& httpParameters);
 
         std::string urlEncode(const std::string& value);
@@ -86,5 +90,7 @@ namespace ix
 
         std::shared_ptr<Socket> _socket;
         std::mutex _mutex; // to protect accessing the _socket (only one socket per client)
+
+        SocketTLSOptions _tlsOptions;
     };
 } // namespace ix

ixwebsocket/IXHttpServer.cpp

@@ -5,13 +5,13 @@
  */
 
 #include "IXHttpServer.h"
-#include "IXSocketConnect.h"
-#include "IXSocketFactory.h"
-#include "IXNetSystem.h"
 
+#include "IXNetSystem.h"
+#include "IXSocketConnect.h"
+#include "IXUserAgent.h"
+#include <fstream>
 #include <iostream>
 #include <sstream>
-#include <fstream>
 #include <vector>
 
 namespace
@@ -28,7 +28,7 @@ namespace
         file.seekg(0, file.beg);
 
         memblock.resize((size_t) size);
-        file.read((char*)&memblock.front(), static_cast<std::streamsize>(size));
+        file.read((char*) &memblock.front(), static_cast<std::streamsize>(size));
 
         return std::make_pair(true, memblock);
     }
@@ -39,15 +39,13 @@ namespace
         auto vec = res.second;
         return std::make_pair(res.first, std::string(vec.begin(), vec.end()));
     }
-}
+} // namespace
 
 namespace ix
 {
-    HttpServer::HttpServer(int port,
-                           const std::string& host,
-                           int backlog,
-                           size_t maxConnections) : SocketServer(port, host, backlog, maxConnections),
-        _connectedClientsCount(0)
+    HttpServer::HttpServer(int port, const std::string& host, int backlog, size_t maxConnections)
+        : SocketServer(port, host, backlog, maxConnections)
+        , _connectedClientsCount(0)
     {
         setDefaultConnectionCallback();
     }
@@ -71,18 +69,11 @@ namespace ix
         _onConnectionCallback = callback;
     }
 
-    void HttpServer::handleConnection(
-        int fd,
-        std::shared_ptr<ConnectionState> connectionState)
+    void HttpServer::handleConnection(std::shared_ptr<Socket> socket,
+                                      std::shared_ptr<ConnectionState> connectionState)
     {
         _connectedClientsCount++;
 
-        std::string errorMsg;
-        auto socket = createSocket(fd, errorMsg);
-
-        // Set the socket to non blocking mode + other tweaks
-        SocketConnect::configure(fd);
-
         auto ret = Http::parseRequest(socket);
         // FIXME: handle errors in parseRequest
 
@@ -95,7 +86,6 @@ namespace ix
             }
         }
         connectionState->setTerminated();
-        Socket::closeSocket(fd);
 
         _connectedClientsCount--;
     }
@@ -109,39 +99,33 @@ namespace ix
     {
         setOnConnectionCallback(
             [this](HttpRequestPtr request,
-                   std::shared_ptr<ConnectionState> /*connectionState*/) -> HttpResponsePtr
-            {
+                   std::shared_ptr<ConnectionState> /*connectionState*/) -> HttpResponsePtr {
                 std::string uri(request->uri);
                 if (uri.empty() || uri == "/")
                 {
                     uri = "/index.html";
                 }
 
+                WebSocketHttpHeaders headers;
+                headers["Server"] = userAgent();
+
                 std::string path("." + uri);
                 auto res = readAsString(path);
                 bool found = res.first;
                 if (!found)
                 {
-                    return std::make_shared<HttpResponse>(404, "Not Found",
-                                                          HttpErrorCode::Ok,
-                                                          WebSocketHttpHeaders(),
-                                                          std::string());
+                    return std::make_shared<HttpResponse>(
+                        404, "Not Found", HttpErrorCode::Ok, WebSocketHttpHeaders(), std::string());
                 }
 
                 std::string content = res.second;
 
                 // Log request
                 std::stringstream ss;
-                ss << request->method
-                   << " "
-                   << request->headers["User-Agent"]
-                   << " "
-                   << request->uri
-                   << " "
-                   << content.size();
+                ss << request->method << " " << request->headers["User-Agent"] << " "
+                   << request->uri << " " << content.size();
                 logInfo(ss.str());
 
-                WebSocketHttpHeaders headers;
                 // FIXME: check extensions to set the content type
                 // headers["Content-Type"] = "application/octet-stream";
                 headers["Accept-Ranges"] = "none";
@@ -151,11 +135,39 @@ namespace ix
                     headers[it.first] = it.second;
                 }
 
-                return std::make_shared<HttpResponse>(200, "OK",
-                                                      HttpErrorCode::Ok,
-                                                      headers,
-                                                      content);
-            }
-        );
+                return std::make_shared<HttpResponse>(
+                    200, "OK", HttpErrorCode::Ok, headers, content);
+            });
     }
-}
+
+    void HttpServer::makeRedirectServer(const std::string& redirectUrl)
+    {
+        //
+        // See https://developer.mozilla.org/en-US/docs/Web/HTTP/Redirections
+        //
+        setOnConnectionCallback(
+            [this,
+             redirectUrl](HttpRequestPtr request,
+                          std::shared_ptr<ConnectionState> /*connectionState*/) -> HttpResponsePtr {
+                WebSocketHttpHeaders headers;
+                headers["Server"] = userAgent();
+
+                // Log request
+                std::stringstream ss;
+                ss << request->method << " " << request->headers["User-Agent"] << " "
+                   << request->uri;
+                logInfo(ss.str());
+
+                if (request->method == "POST")
+                {
+                    return std::make_shared<HttpResponse>(
+                        200, "OK", HttpErrorCode::Ok, headers, std::string());
+                }
+
+                headers["Location"] = redirectUrl;
+
+                return std::make_shared<HttpResponse>(
+                    301, "OK", HttpErrorCode::Ok, headers, std::string());
+            });
+    }
+} // namespace ix

ixwebsocket/IXHttpServer.h

@@ -34,13 +34,15 @@ namespace ix
 
         void setOnConnectionCallback(const OnConnectionCallback& callback);
 
+        void makeRedirectServer(const std::string& redirectUrl);
+
     private:
         // Member variables
         OnConnectionCallback _onConnectionCallback;
         std::atomic<int> _connectedClientsCount;
 
         // Methods
-        virtual void handleConnection(int fd,
+        virtual void handleConnection(std::shared_ptr<Socket>,
                                       std::shared_ptr<ConnectionState> connectionState) final;
         virtual size_t getConnectedClientsCount() final;
 

ixwebsocket/IXNetSystem.cpp

@@ -42,7 +42,7 @@ namespace ix
     //
     // So we make it a select wrapper
     //
-    int poll(struct pollfd *fds, nfds_t nfds, int timeout)
+    int poll(struct pollfd* fds, nfds_t nfds, int timeout)
     {
 #ifdef _WIN32
         int maxfd = 0;
@@ -53,7 +53,7 @@ namespace ix
 
         for (nfds_t i = 0; i < nfds; ++i)
         {
-            struct pollfd *fd = &fds[i];
+            struct pollfd* fd = &fds[i];
 
             if (fd->fd > maxfd)
             {
@@ -77,8 +77,7 @@ namespace ix
         tv.tv_sec = timeout / 1000;
         tv.tv_usec = (timeout % 1000) * 1000;
 
-        int ret = select(maxfd + 1, &readfds, &writefds, &errorfds,
-                         timeout != -1 ? &tv : NULL);
+        int ret = select(maxfd + 1, &readfds, &writefds, &errorfds, timeout != -1 ? &tv : NULL);
 
         if (ret < 0)
         {
@@ -87,7 +86,7 @@ namespace ix
 
         for (nfds_t i = 0; i < nfds; ++i)
         {
-            struct pollfd *fd = &fds[i];
+            struct pollfd* fd = &fds[i];
             fd->revents = 0;
 
             if (FD_ISSET(fd->fd, &readfds))

ixwebsocket/IXNetSystem.h

@@ -20,6 +20,8 @@ typedef unsigned long int nfds_t;
 #include <arpa/inet.h>
 #include <errno.h>
 #include <netdb.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
 #include <netinet/tcp.h>
 #include <poll.h>
 #include <sys/select.h>

ixwebsocket/IXSelectInterrupt.cpp

@@ -42,5 +42,4 @@ namespace ix
     {
         return -1;
     }
-}
-
+} // namespace ix

ixwebsocket/IXSelectInterruptEventFd.cpp

@@ -26,14 +26,13 @@
 
 #include "IXSelectInterruptEventFd.h"
 
-#include <sys/eventfd.h>
-
-#include <unistd.h> // for write
-#include <string.h> // for strerror
-#include <fcntl.h>
-#include <errno.h>
 #include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
 #include <sstream>
+#include <string.h> // for strerror
+#include <sys/eventfd.h>
+#include <unistd.h> // for write
 
 namespace ix
 {
@@ -113,4 +112,4 @@ namespace ix
     {
         return _eventfd;
     }
-}
+} // namespace ix

ixwebsocket/IXSelectInterruptFactory.cpp

@@ -7,9 +7,9 @@
 #include "IXSelectInterruptFactory.h"
 
 #if defined(__linux__) || defined(__APPLE__)
-# include <ixwebsocket/IXSelectInterruptPipe.h>
+#include <ixwebsocket/IXSelectInterruptPipe.h>
 #else
-# include <ixwebsocket/IXSelectInterrupt.h>
+#include <ixwebsocket/IXSelectInterrupt.h>
 #endif
 
 namespace ix
@@ -22,4 +22,4 @@ namespace ix
         return std::make_shared<SelectInterrupt>();
 #endif
     }
-}
+} // namespace ix

ixwebsocket/IXSelectInterruptPipe.cpp

@@ -10,12 +10,12 @@
 
 #include "IXSelectInterruptPipe.h"
 
-#include <unistd.h> // for write
-#include <string.h> // for strerror
-#include <fcntl.h>
-#include <errno.h>
 #include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
 #include <sstream>
+#include <string.h> // for strerror
+#include <unistd.h> // for write
 
 namespace ix
 {
@@ -143,4 +143,4 @@ namespace ix
 
         return _fildes[kPipeReadIndex];
     }
-}
+} // namespace ix

ixwebsocket/IXSocket.cpp

@@ -5,21 +5,20 @@
  */
 
 #include "IXSocket.h"
-#include "IXSocketConnect.h"
+
 #include "IXNetSystem.h"
 #include "IXSelectInterrupt.h"
 #include "IXSelectInterruptFactory.h"
-
+#include "IXSocketConnect.h"
+#include <algorithm>
+#include <assert.h>
+#include <fcntl.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
-#include <stdint.h>
-#include <fcntl.h>
 #include <sys/types.h>
 
-#include <algorithm>
-
 #ifdef min
 #undef min
 #endif
@@ -32,9 +31,9 @@ namespace ix
     const uint64_t Socket::kCloseRequest = 2;
     constexpr size_t Socket::kChunkSize;
 
-    Socket::Socket(int fd) :
-        _sockfd(fd),
-        _selectInterrupt(createSelectInterrupt())
+    Socket::Socket(int fd)
+        : _sockfd(fd)
+        , _selectInterrupt(createSelectInterrupt())
     {
         ;
     }
@@ -50,13 +49,13 @@ namespace ix
                                 std::shared_ptr<SelectInterrupt> selectInterrupt)
     {
         //
-        // We used to use ::select to poll but on Android 9 we get large fds out of ::connect
-        // which crash in FD_SET as they are larger than FD_SETSIZE.
-        // Switching to ::poll does fix that.
+        // We used to use ::select to poll but on Android 9 we get large fds out of
+        // ::connect which crash in FD_SET as they are larger than FD_SETSIZE. Switching
+        // to ::poll does fix that.
         //
-        // However poll isn't as portable as select and has bugs on Windows, so we should write a
-        // shim to fallback to select on those platforms.
-        // See https://github.com/mpv-player/mpv/pull/5203/files for such a select wrapper.
+        // However poll isn't as portable as select and has bugs on Windows, so we
+        // should write a shim to fallback to select on those platforms. See
+        // https://github.com/mpv-player/mpv/pull/5203/files for such a select wrapper.
         //
         nfds_t nfds = 1;
         struct pollfd fds[2];
@@ -123,8 +122,7 @@ namespace ix
 
             // getsockopt() puts the errno value for connect into optval so 0
             // means no-error.
-            if (getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &optval, &optlen) == -1 ||
-                optval != 0)
+            if (getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &optval, &optlen) == -1 || optval != 0)
             {
                 pollResult = PollResultType::Error;
 
@@ -166,6 +164,16 @@ namespace ix
         return _selectInterrupt->notify(wakeUpCode);
     }
 
+    bool Socket::accept(std::string& errMsg)
+    {
+        if (_sockfd == -1)
+        {
+            errMsg = "Socket is uninitialized";
+            return false;
+        }
+        return true;
+    }
+
     bool Socket::connect(const std::string& host,
                          int port,
                          std::string& errMsg,
@@ -201,7 +209,7 @@ namespace ix
 
     ssize_t Socket::send(const std::string& buffer)
     {
-        return send((char*)&buffer[0], buffer.size());
+        return send((char*) &buffer[0], buffer.size());
     }
 
     ssize_t Socket::recv(void* buffer, size_t length)
@@ -263,7 +271,7 @@ namespace ix
         {
             if (isCancellationRequested && isCancellationRequested()) return false;
 
-            ssize_t ret = send((char*)&str[offset], len);
+            ssize_t ret = send((char*) &str[offset], len);
 
             // We wrote some bytes, as needed, all good.
             if (ret > 0)
@@ -292,8 +300,7 @@ namespace ix
         }
     }
 
-    bool Socket::readByte(void* buffer,
-                          const CancellationRequest& isCancellationRequested)
+    bool Socket::readByte(void* buffer, const CancellationRequest& isCancellationRequested)
     {
         while (true)
         {
@@ -332,7 +339,7 @@ namespace ix
         std::string line;
         line.reserve(64);
 
-        for (int i = 0; i < 2 || (line[i-2] != '\r' && line[i-1] != '\n'); ++i)
+        for (int i = 0; i < 2 || (line[i - 2] != '\r' && line[i - 1] != '\n'); ++i)
         {
             if (!readByte(&c, isCancellationRequested))
             {
@@ -365,18 +372,15 @@ namespace ix
             }
 
             size_t size = std::min(kChunkSize, length - output.size());
-            ssize_t ret = recv((char*)&_readBuffer[0], size);
+            ssize_t ret = recv((char*) &_readBuffer[0], size);
 
-            if (ret <= 0 && !Socket::isWaitNeeded())
+            if (ret > 0)
             {
-                // Error
-                return std::make_pair(false, std::string());
+                output.insert(output.end(), _readBuffer.begin(), _readBuffer.begin() + ret);
             }
-            else
+            else if (ret <= 0 && !Socket::isWaitNeeded())
             {
-                output.insert(output.end(),
-                              _readBuffer.begin(),
-                              _readBuffer.begin() + ret);
+                return std::make_pair(false, std::string());
             }
 
             if (onProgressCallback) onProgressCallback((int) output.size(), (int) length);
@@ -389,7 +393,6 @@ namespace ix
             }
         }
 
-        return std::make_pair(true, std::string(output.begin(),
-                                                output.end()));
+        return std::make_pair(true, std::string(output.begin(), output.end()));
     }
-}
+} // namespace ix

ixwebsocket/IXSocket.h

@@ -64,6 +64,8 @@ namespace ix
         PollResultType isReadyToRead(int timeoutMs);
 
         // Virtual methods
+        virtual bool accept(std::string& errMsg);
+
         virtual bool connect(const std::string& url,
                              int port,
                              std::string& errMsg,

ixwebsocket/IXSocketAppleSSL.cpp

@@ -6,11 +6,13 @@
  *  Adapted from Satori SDK Apple SSL code.
  */
 #include "IXSocketAppleSSL.h"
-#include "IXSocketConnect.h"
 
+#include "IXSocketConnect.h"
+#include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <netinet/tcp.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -18,131 +20,125 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <stdint.h>
-
-#include <errno.h>
 #define socketerrno errno
 
 #include <Security/SecureTransport.h>
 
-namespace {
-
-OSStatus read_from_socket(SSLConnectionRef connection, void *data, size_t *len)
+namespace
 {
-    int fd = (int) (long) connection;
-    if (fd < 0)
-        return errSSLInternal;
-
-    assert(data != nullptr);
-    assert(len != nullptr);
-
-    size_t requested_sz = *len;
-
-    ssize_t status = read(fd, data, requested_sz);
-
-    if (status > 0)
+    OSStatus read_from_socket(SSLConnectionRef connection, void* data, size_t* len)
     {
-        *len = (size_t) status;
-        if (requested_sz > *len)
-            return errSSLWouldBlock;
-        else
-            return noErr;
-    }
-    else if (0 == status)
-    {
-        *len = 0;
-        return errSSLClosedGraceful;
-    }
-    else
-    {
-        *len = 0;
-        switch (errno) {
-            case ENOENT:
-                return errSSLClosedGraceful;
+        int fd = (int) (long) connection;
+        if (fd < 0) return errSSLInternal;
 
-            case EAGAIN:
+        assert(data != nullptr);
+        assert(len != nullptr);
+
+        size_t requested_sz = *len;
+
+        ssize_t status = read(fd, data, requested_sz);
+
+        if (status > 0)
+        {
+            *len = (size_t) status;
+            if (requested_sz > *len)
                 return errSSLWouldBlock;
-
-            case ECONNRESET:
-                return errSSLClosedAbort;
-
-            default:
-                return errSecIO;
+            else
+                return noErr;
         }
-    }
-}
-
-OSStatus write_to_socket(SSLConnectionRef connection, const void *data, size_t *len)
-{
-    int fd = (int) (long) connection;
-    if (fd < 0)
-        return errSSLInternal;
-
-    assert(data != nullptr);
-    assert(len != nullptr);
-
-    size_t to_write_sz = *len;
-    ssize_t status = write(fd, data, to_write_sz);
-
-    if (status > 0)
-    {
-        *len = (size_t) status;
-        if (to_write_sz > *len)
-            return errSSLWouldBlock;
-        else
-            return noErr;
-    }
-    else if (0 == status)
-    {
-        *len = 0;
-        return errSSLClosedGraceful;
-    }
-    else
-    {
-        *len = 0;
-        if (EAGAIN == errno)
+        else if (0 == status)
         {
-            return errSSLWouldBlock;
+            *len = 0;
+            return errSSLClosedGraceful;
         }
         else
         {
-            return errSecIO;
-        }
-    }
-}
-
-std::string getSSLErrorDescription(OSStatus status)
-{
-    std::string errMsg("Unknown SSL error.");
-
-    CFErrorRef error = CFErrorCreate(kCFAllocatorDefault, kCFErrorDomainOSStatus, status, NULL);
-    if (error)
-    {
-        CFStringRef message = CFErrorCopyDescription(error);
-        if (message)
-        {
-            char localBuffer[128];
-            Boolean success;
-            success = CFStringGetCString(message, localBuffer, 128,
-                                         CFStringGetSystemEncoding());
-            if (success)
+            *len = 0;
+            switch (errno)
             {
-                errMsg = localBuffer;
+                case ENOENT: return errSSLClosedGraceful;
+
+                case EAGAIN: return errSSLWouldBlock;
+
+                case ECONNRESET: return errSSLClosedAbort;
+
+                default: return errSecIO;
             }
-            CFRelease(message);
         }
-        CFRelease(error);
     }
 
-    return errMsg;
-}
+    OSStatus write_to_socket(SSLConnectionRef connection, const void* data, size_t* len)
+    {
+        int fd = (int) (long) connection;
+        if (fd < 0) return errSSLInternal;
+
+        assert(data != nullptr);
+        assert(len != nullptr);
+
+        size_t to_write_sz = *len;
+        ssize_t status = write(fd, data, to_write_sz);
+
+        if (status > 0)
+        {
+            *len = (size_t) status;
+            if (to_write_sz > *len)
+                return errSSLWouldBlock;
+            else
+                return noErr;
+        }
+        else if (0 == status)
+        {
+            *len = 0;
+            return errSSLClosedGraceful;
+        }
+        else
+        {
+            *len = 0;
+            if (EAGAIN == errno)
+            {
+                return errSSLWouldBlock;
+            }
+            else
+            {
+                return errSecIO;
+            }
+        }
+    }
+
+    std::string getSSLErrorDescription(OSStatus status)
+    {
+        std::string errMsg("Unknown SSL error.");
+
+        CFErrorRef error = CFErrorCreate(kCFAllocatorDefault, kCFErrorDomainOSStatus, status, NULL);
+        if (error)
+        {
+            CFStringRef message = CFErrorCopyDescription(error);
+            if (message)
+            {
+                char localBuffer[128];
+                Boolean success;
+                success =
+                    CFStringGetCString(message, localBuffer, 128, CFStringGetSystemEncoding());
+                if (success)
+                {
+                    errMsg = localBuffer;
+                }
+                CFRelease(message);
+            }
+            CFRelease(error);
+        }
+
+        return errMsg;
+    }
 
 } // anonymous namespace
 
 namespace ix
 {
-    SocketAppleSSL::SocketAppleSSL(int fd) : Socket(fd),
-        _sslContext(nullptr)
+    SocketAppleSSL::SocketAppleSSL(const SocketTLSOptions& tlsOptions, int fd)
+        : Socket(fd)
+        , _sslContext(nullptr)
+        , _tlsOptions(tlsOptions)
     {
         ;
     }
@@ -168,14 +164,14 @@ namespace ix
             _sslContext = SSLCreateContext(kCFAllocatorDefault, kSSLClientSide, kSSLStreamType);
 
             SSLSetIOFuncs(_sslContext, read_from_socket, write_to_socket);
-            SSLSetConnection(_sslContext, (SSLConnectionRef) (long) _sockfd);
+            SSLSetConnection(_sslContext, (SSLConnectionRef)(long) _sockfd);
             SSLSetProtocolVersionMin(_sslContext, kTLSProtocol12);
             SSLSetPeerDomainName(_sslContext, host.c_str(), host.size());
 
-            do {
+            do
+            {
                 status = SSLHandshake(_sslContext);
-            } while (errSSLWouldBlock == status ||
-                     errSSLServerAuthCompleted == status);
+            } while (errSSLWouldBlock == status || errSSLServerAuthCompleted == status);
         }
 
         if (noErr != status)
@@ -205,7 +201,8 @@ namespace ix
     {
         ssize_t ret = 0;
         OSStatus status;
-        do {
+        do
+        {
             size_t processed = 0;
             std::lock_guard<std::mutex> lock(_mutex);
             status = SSLWrite(_sslContext, buf, nbyte, &processed);
@@ -214,14 +211,13 @@ namespace ix
             nbyte -= processed;
         } while (nbyte > 0 && errSSLWouldBlock == status);
 
-        if (ret == 0 && errSSLClosedAbort != status)
-            ret = -1;
+        if (ret == 0 && errSSLClosedAbort != status) ret = -1;
         return ret;
     }
 
     ssize_t SocketAppleSSL::send(const std::string& buffer)
     {
-        return send((char*)&buffer[0], buffer.size());
+        return send((char*) &buffer[0], buffer.size());
     }
 
     // No wait support
@@ -234,13 +230,11 @@ namespace ix
             std::lock_guard<std::mutex> lock(_mutex);
             status = SSLRead(_sslContext, buf, nbyte, &processed);
 
-            if (processed > 0)
-                return (ssize_t) processed;
+            if (processed > 0) return (ssize_t) processed;
 
             // The connection was reset, inform the caller that this
             // Socket should close
-            if (status == errSSLClosedGraceful ||
-                status == errSSLClosedNoNotify ||
+            if (status == errSSLClosedGraceful || status == errSSLClosedNoNotify ||
                 status == errSSLClosedAbort)
             {
                 errno = ECONNRESET;
@@ -256,4 +250,4 @@ namespace ix
         return -1;
     }
 
-}
+} // namespace ix

ixwebsocket/IXSocketAppleSSL.h

@@ -8,6 +8,7 @@
 
 #include "IXCancellationRequest.h"
 #include "IXSocket.h"
+#include "IXSocketTLSOptions.h"
 #include <Security/SecureTransport.h>
 #include <Security/Security.h>
 #include <mutex>
@@ -17,7 +18,7 @@ namespace ix
     class SocketAppleSSL final : public Socket
     {
     public:
-        SocketAppleSSL(int fd = -1);
+        SocketAppleSSL(const SocketTLSOptions& tlsOptions, int fd = -1);
         ~SocketAppleSSL();
 
         virtual bool connect(const std::string& host,
@@ -33,6 +34,8 @@ namespace ix
     private:
         SSLContextRef _sslContext;
         mutable std::mutex _mutex; // AppleSSL routines are not thread-safe
+
+        SocketTLSOptions _tlsOptions;
     };
 
 } // namespace ix

ixwebsocket/IXSocketConnect.cpp

@@ -5,36 +5,35 @@
  */
 
 #include "IXSocketConnect.h"
+
 #include "IXDNSLookup.h"
 #include "IXNetSystem.h"
 #include "IXSocket.h"
-
-#include <string.h>
 #include <fcntl.h>
+#include <string.h>
 #include <sys/types.h>
 
 // Android needs extra headers for TCP_NODELAY and IPPROTO_TCP
 #ifdef ANDROID
-# include <linux/in.h>
-# include <linux/tcp.h>
+#include <linux/in.h>
+#include <linux/tcp.h>
 #endif
 
 namespace ix
 {
     //
     // This function can be cancelled every 50 ms
-    // This is important so that we don't block the main UI thread when shutting down a connection which is
-    // already trying to reconnect, and can be blocked waiting for ::connect to respond.
+    // This is important so that we don't block the main UI thread when shutting down a
+    // connection which is already trying to reconnect, and can be blocked waiting for
+    // ::connect to respond.
     //
-    int SocketConnect::connectToAddress(const struct addrinfo *address,
+    int SocketConnect::connectToAddress(const struct addrinfo* address,
                                         std::string& errMsg,
                                         const CancellationRequest& isCancellationRequested)
     {
         errMsg = "no error";
 
-        int fd = socket(address->ai_family,
-                        address->ai_socktype,
-                        address->ai_protocol);
+        int fd = socket(address->ai_family, address->ai_socktype, address->ai_protocol);
         if (fd < 0)
         {
             errMsg = "Cannot create a socket";
@@ -74,8 +73,7 @@ namespace ix
             else if (pollResult == PollResultType::Error)
             {
                 Socket::closeSocket(fd);
-                errMsg = std::string("Connect error: ") +
-                            strerror(Socket::getErrno());
+                errMsg = std::string("Connect error: ") + strerror(Socket::getErrno());
                 return -1;
             }
             else if (pollResult == PollResultType::ReadyForWrite)
@@ -85,8 +83,7 @@ namespace ix
             else
             {
                 Socket::closeSocket(fd);
-                errMsg = std::string("Connect error: ") +
-                            strerror(Socket::getErrno());
+                errMsg = std::string("Connect error: ") + strerror(Socket::getErrno());
                 return -1;
             }
         }
@@ -105,7 +102,7 @@ namespace ix
         // First do DNS resolution
         //
         auto dnsLookup = std::make_shared<DNSLookup>(hostname, port);
-        struct addrinfo *res = dnsLookup->resolve(errMsg, isCancellationRequested);
+        struct addrinfo* res = dnsLookup->resolve(errMsg, isCancellationRequested);
         if (res == nullptr)
         {
             return -1;
@@ -114,7 +111,7 @@ namespace ix
         int sockfd = -1;
 
         // iterate through the records to find a working peer
-        struct addrinfo *address;
+        struct addrinfo* address;
         for (address = res; address != nullptr; address = address->ai_next)
         {
             //
@@ -149,8 +146,7 @@ namespace ix
         // 3. (apple) prevent SIGPIPE from being emitted when the remote end disconnect
 #ifdef SO_NOSIGPIPE
         int value = 1;
-        setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE,
-                   (void *)&value, sizeof(value));
+        setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, (void*) &value, sizeof(value));
 #endif
     }
-}
+} // namespace ix

ixwebsocket/IXSocketFactory.cpp

@@ -8,15 +8,15 @@
 
 #ifdef IXWEBSOCKET_USE_TLS
 
-# ifdef IXWEBSOCKET_USE_MBED_TLS
-#  include <ixwebsocket/IXSocketMbedTLS.h>
-# elif __APPLE__
-#  include <ixwebsocket/IXSocketAppleSSL.h>
-# elif defined(_WIN32)
-#  include <ixwebsocket/IXSocketSChannel.h>
-# elif defined(IXWEBSOCKET_USE_OPEN_SSL)
-#  include <ixwebsocket/IXSocketOpenSSL.h>
-# endif
+#ifdef IXWEBSOCKET_USE_MBED_TLS
+#include <ixwebsocket/IXSocketMbedTLS.h>
+#elif defined(_WIN32)
+#include <ixwebsocket/IXSocketSChannel.h>
+#elif defined(IXWEBSOCKET_USE_OPEN_SSL)
+#include <ixwebsocket/IXSocketOpenSSL.h>
+#elif __APPLE__
+#include <ixwebsocket/IXSocketAppleSSL.h>
+#endif
 
 #else
 
@@ -27,27 +27,29 @@
 namespace ix
 {
     std::shared_ptr<Socket> createSocket(bool tls,
-                                         std::string& errorMsg)
+                                         int fd,
+                                         std::string& errorMsg,
+                                         const SocketTLSOptions& tlsOptions)
     {
         errorMsg.clear();
         std::shared_ptr<Socket> socket;
 
         if (!tls)
         {
-            socket = std::make_shared<Socket>();
+            socket = std::make_shared<Socket>(fd);
         }
         else
         {
 #ifdef IXWEBSOCKET_USE_TLS
-# if defined(IXWEBSOCKET_USE_MBED_TLS)
-            socket = std::make_shared<SocketMbedTLS>();
-# elif defined(__APPLE__)
-            socket = std::make_shared<SocketAppleSSL>();
-# elif defined(_WIN32)
-            socket = std::make_shared<SocketSChannel>();
-# else
-            socket = std::make_shared<SocketOpenSSL>();
-# endif
+#if defined(IXWEBSOCKET_USE_MBED_TLS)
+            socket = std::make_shared<SocketMbedTLS>(tlsOptions, fd);
+#elif defined(IXWEBSOCKET_USE_OPEN_SSL)
+            socket = std::make_shared<SocketOpenSSL>(tlsOptions, fd);
+#elif defined(_WIN32)
+            socket = std::make_shared<SocketSChannel>(tlsOptions, fd);
+#elif defined(__APPLE__)
+            socket = std::make_shared<SocketAppleSSL>(tlsOptions, fd);
+#endif
 #else
             errorMsg = "TLS support is not enabled on this platform.";
             return nullptr;
@@ -61,18 +63,4 @@ namespace ix
 
         return socket;
     }
-
-    std::shared_ptr<Socket> createSocket(int fd,
-                                         std::string& errorMsg)
-    {
-        errorMsg.clear();
-
-        std::shared_ptr<Socket> socket = std::make_shared<Socket>(fd);
-        if (!socket->init(errorMsg))
-        {
-            socket.reset();
-        }
-
-        return socket;
-    }
-}
+} // namespace ix

ixwebsocket/IXSocketFactory.h

@@ -7,13 +7,15 @@
 
 #pragma once
 
+#include "IXSocketTLSOptions.h"
 #include <memory>
 #include <string>
 
 namespace ix
 {
     class Socket;
-    std::shared_ptr<Socket> createSocket(bool tls, std::string& errorMsg);
-
-    std::shared_ptr<Socket> createSocket(int fd, std::string& errorMsg);
+    std::shared_ptr<Socket> createSocket(bool tls,
+                                         int fd,
+                                         std::string& errorMsg,
+                                         const SocketTLSOptions& tlsOptions);
 } // namespace ix

ixwebsocket/IXSocketMbedTLS.cpp

@@ -9,34 +9,48 @@
  */
 
 #include "IXSocketMbedTLS.h"
-#include "IXSocketConnect.h"
+
 #include "IXNetSystem.h"
 #include "IXSocket.h"
-
+#include "IXSocketConnect.h"
 #include <string.h>
 
 namespace ix
 {
-    SocketMbedTLS::~SocketMbedTLS()
+    SocketMbedTLS::SocketMbedTLS(const SocketTLSOptions& tlsOptions, int fd)
+        : Socket(fd)
+        , _tlsOptions(tlsOptions)
     {
-        close();
+        initMBedTLS();
     }
 
-    bool SocketMbedTLS::init(const std::string& host, std::string& errMsg)
+    SocketMbedTLS::~SocketMbedTLS()
+    {
+        SocketMbedTLS::close();
+    }
+
+    void SocketMbedTLS::initMBedTLS()
     {
         std::lock_guard<std::mutex> lock(_mutex);
 
         mbedtls_ssl_init(&_ssl);
         mbedtls_ssl_config_init(&_conf);
         mbedtls_ctr_drbg_init(&_ctr_drbg);
-
-        const char *pers = "IXSocketMbedTLS";
-
         mbedtls_entropy_init(&_entropy);
+        mbedtls_x509_crt_init(&_cacert);
+    }
+
+    bool SocketMbedTLS::init(const std::string& host, std::string& errMsg)
+    {
+        initMBedTLS();
+        std::lock_guard<std::mutex> lock(_mutex);
+
+        const char* pers = "IXSocketMbedTLS";
+
         if (mbedtls_ctr_drbg_seed(&_ctr_drbg,
                                   mbedtls_entropy_func,
                                   &_entropy,
-                                  (const unsigned char *) pers,
+                                  (const unsigned char*) pers,
                                   strlen(pers)) != 0)
         {
             errMsg = "Setting entropy seed failed";
@@ -46,7 +60,7 @@ namespace ix
         if (mbedtls_ssl_config_defaults(&_conf,
                                         MBEDTLS_SSL_IS_CLIENT,
                                         MBEDTLS_SSL_TRANSPORT_STREAM,
-                                        MBEDTLS_SSL_PRESET_DEFAULT ) != 0)
+                                        MBEDTLS_SSL_PRESET_DEFAULT) != 0)
         {
             errMsg = "Setting config default failed";
             return false;
@@ -54,8 +68,27 @@ namespace ix
 
         mbedtls_ssl_conf_rng(&_conf, mbedtls_ctr_drbg_random, &_ctr_drbg);
 
-        // FIXME: cert verification is disabled
-        mbedtls_ssl_conf_authmode(&_conf, MBEDTLS_SSL_VERIFY_NONE);
+        if (_tlsOptions.isPeerVerifyDisabled())
+        {
+            mbedtls_ssl_conf_authmode(&_conf, MBEDTLS_SSL_VERIFY_NONE);
+        }
+        else
+        {
+            mbedtls_ssl_conf_ca_chain(&_conf, &_cacert, NULL);
+
+            // FIXME: should we call mbedtls_ssl_conf_verify ?
+
+            if (_tlsOptions.isUsingSystemDefaults())
+            {
+                ; // FIXME
+            }
+            else if (mbedtls_x509_crt_parse_file(&_cacert, _tlsOptions.caFile.c_str()) < 0)
+            {
+                errMsg = "Cannot parse CA file '" + _tlsOptions.caFile + "'";
+                return false;
+            }
+            mbedtls_ssl_conf_authmode(&_conf, MBEDTLS_SSL_VERIFY_REQUIRED);
+        }
 
         if (mbedtls_ssl_setup(&_ssl, &_conf) != 0)
         {
@@ -83,7 +116,8 @@ namespace ix
             if (_sockfd == -1) return false;
         }
 
-        if (!init(host, errMsg))
+        bool initialized = init(host, errMsg);
+        if (!initialized)
         {
             close();
             return false;
@@ -96,8 +130,7 @@ namespace ix
         {
             std::lock_guard<std::mutex> lock(_mutex);
             res = mbedtls_ssl_handshake(&_ssl);
-        }
-        while (res == MBEDTLS_ERR_SSL_WANT_READ || res == MBEDTLS_ERR_SSL_WANT_WRITE);
+        } while (res == MBEDTLS_ERR_SSL_WANT_READ || res == MBEDTLS_ERR_SSL_WANT_WRITE);
 
         if (res != 0)
         {
@@ -122,6 +155,7 @@ namespace ix
         mbedtls_ssl_config_free(&_conf);
         mbedtls_ctr_drbg_free(&_ctr_drbg);
         mbedtls_entropy_free(&_entropy);
+        mbedtls_x509_crt_free(&_cacert);
 
         Socket::close();
     }
@@ -136,13 +170,18 @@ namespace ix
 
             ssize_t res = mbedtls_ssl_write(&_ssl, (unsigned char*) buf, nbyte);
 
-            if (res > 0) {
+            if (res > 0)
+            {
                 nbyte -= res;
                 sent += res;
-            } else if (res == MBEDTLS_ERR_SSL_WANT_READ || res == MBEDTLS_ERR_SSL_WANT_WRITE) {
+            }
+            else if (res == MBEDTLS_ERR_SSL_WANT_READ || res == MBEDTLS_ERR_SSL_WANT_WRITE)
+            {
                 errno = EWOULDBLOCK;
                 return -1;
-            } else {
+            }
+            else
+            {
                 return -1;
             }
         }
@@ -151,7 +190,7 @@ namespace ix
 
     ssize_t SocketMbedTLS::send(const std::string& buffer)
     {
-        return send((char*)&buffer[0], buffer.size());
+        return send((char*) &buffer[0], buffer.size());
     }
 
     ssize_t SocketMbedTLS::recv(void* buf, size_t nbyte)
@@ -175,4 +214,4 @@ namespace ix
         }
     }
 
-}
+} // namespace ix

ixwebsocket/IXSocketMbedTLS.h

@@ -7,12 +7,15 @@
 #pragma once
 
 #include "IXSocket.h"
+#include "IXSocketTLSOptions.h"
 #include <mbedtls/ctr_drbg.h>
 #include <mbedtls/debug.h>
 #include <mbedtls/entropy.h>
 #include <mbedtls/error.h>
 #include <mbedtls/net.h>
 #include <mbedtls/platform.h>
+#include <mbedtls/x509.h>
+#include <mbedtls/x509_crt.h>
 #include <mutex>
 
 namespace ix
@@ -20,7 +23,7 @@ namespace ix
     class SocketMbedTLS final : public Socket
     {
     public:
-        SocketMbedTLS() = default;
+        SocketMbedTLS(const SocketTLSOptions& tlsOptions, int fd = -1);
         ~SocketMbedTLS();
 
         virtual bool connect(const std::string& host,
@@ -38,10 +41,13 @@ namespace ix
         mbedtls_ssl_config _conf;
         mbedtls_entropy_context _entropy;
         mbedtls_ctr_drbg_context _ctr_drbg;
+        mbedtls_x509_crt _cacert;
 
         std::mutex _mutex;
+        SocketTLSOptions _tlsOptions;
 
         bool init(const std::string& host, std::string& errMsg);
+        void initMBedTLS();
     };
 
 } // namespace ix

ixwebsocket/IXSocketOpenSSL.cpp

@@ -1,30 +1,38 @@
 /*
  *  IXSocketOpenSSL.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2017-2018 Machine Zone, Inc. All rights reserved.
+ *  Author: Benjamin Sergeant, Matt DeBoer
+ *  Copyright (c) 2017-2019 Machine Zone, Inc. All rights reserved.
  *
  *  Adapted from Satori SDK OpenSSL code.
  */
 
 #include "IXSocketOpenSSL.h"
+
 #include "IXSocketConnect.h"
-
 #include <cassert>
-
-#include <openssl/x509v3.h>
-
-#include <fnmatch.h>
 #include <errno.h>
+#include <fnmatch.h>
+#include <openssl/x509v3.h>
 #define socketerrno errno
 
 namespace ix
 {
+    const std::string kDefaultCiphers =
+        "ECDHE-ECDSA-AES128-GCM-SHA256 ECDHE-ECDSA-AES256-GCM-SHA384 ECDHE-ECDSA-AES128-SHA "
+        "ECDHE-ECDSA-AES256-SHA ECDHE-ECDSA-AES128-SHA256 ECDHE-ECDSA-AES256-SHA384 "
+        "ECDHE-RSA-AES128-GCM-SHA256 ECDHE-RSA-AES256-GCM-SHA384 ECDHE-RSA-AES128-SHA "
+        "ECDHE-RSA-AES256-SHA ECDHE-RSA-AES128-SHA256 ECDHE-RSA-AES256-SHA384 "
+        "DHE-RSA-AES128-GCM-SHA256 DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES128-SHA "
+        "DHE-RSA-AES256-SHA DHE-RSA-AES128-SHA256 DHE-RSA-AES256-SHA256 AES128-SHA";
+
     std::atomic<bool> SocketOpenSSL::_openSSLInitializationSuccessful(false);
     std::once_flag SocketOpenSSL::_openSSLInitFlag;
 
-    SocketOpenSSL::SocketOpenSSL(int fd) : Socket(fd),
-        _ssl_connection(nullptr),
-        _ssl_context(nullptr)
+    SocketOpenSSL::SocketOpenSSL(const SocketTLSOptions& tlsOptions, int fd)
+        : Socket(fd)
+        , _ssl_connection(nullptr)
+        , _ssl_context(nullptr)
+        , _tlsOptions(tlsOptions)
     {
         std::call_once(_openSSLInitFlag, &SocketOpenSSL::openSSLInitialize, this);
     }
@@ -114,15 +122,11 @@ namespace ix
         SSL_CTX* ctx = SSL_CTX_new(_ssl_method);
         if (ctx)
         {
-            // To skip verification, pass in SSL_VERIFY_NONE
-            SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER,
-                               [](int preverify, X509_STORE_CTX*) -> int
-                               {
-                                   return preverify;
-                               });
+            SSL_CTX_set_mode(ctx,
+                             SSL_MODE_ENABLE_PARTIAL_WRITE | SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
 
-            SSL_CTX_set_verify_depth(ctx, 4);
-            SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
+            SSL_CTX_set_options(
+                ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_CIPHER_SERVER_PREFERENCE);
         }
         return ctx;
     }
@@ -130,16 +134,16 @@ namespace ix
     /**
      * Check whether a hostname matches a pattern
      */
-    bool SocketOpenSSL::checkHost(const std::string& host, const char *pattern)
+    bool SocketOpenSSL::checkHost(const std::string& host, const char* pattern)
     {
         return fnmatch(pattern, host.c_str(), 0) != FNM_NOMATCH;
     }
 
-    bool SocketOpenSSL::openSSLCheckServerCert(SSL *ssl,
+    bool SocketOpenSSL::openSSLCheckServerCert(SSL* ssl,
                                                const std::string& hostname,
                                                std::string& errMsg)
     {
-        X509 *server_cert = SSL_get_peer_certificate(ssl);
+        X509* server_cert = SSL_get_peer_certificate(ssl);
         if (server_cert == nullptr)
         {
             errMsg = "OpenSSL failed - peer didn't present a X509 certificate.";
@@ -149,18 +153,17 @@ namespace ix
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
         // Check server name
         bool hostname_verifies_ok = false;
-        STACK_OF(GENERAL_NAME) *san_names =
-            (STACK_OF(GENERAL_NAME)*) X509_get_ext_d2i((X509 *)server_cert,
-                                                       NID_subject_alt_name, NULL, NULL);
+        STACK_OF(GENERAL_NAME)* san_names = (STACK_OF(GENERAL_NAME)*) X509_get_ext_d2i(
+            (X509*) server_cert, NID_subject_alt_name, NULL, NULL);
         if (san_names)
         {
-            for (int i=0; i<sk_GENERAL_NAME_num(san_names); i++)
+            for (int i = 0; i < sk_GENERAL_NAME_num(san_names); i++)
             {
-                const GENERAL_NAME *sk_name = sk_GENERAL_NAME_value(san_names, i);
+                const GENERAL_NAME* sk_name = sk_GENERAL_NAME_value(san_names, i);
                 if (sk_name->type == GEN_DNS)
                 {
-                    char *name = (char *)ASN1_STRING_data(sk_name->d.dNSName);
-                    if ((size_t)ASN1_STRING_length(sk_name->d.dNSName) == strlen(name) &&
+                    char* name = (char*) ASN1_STRING_data(sk_name->d.dNSName);
+                    if ((size_t) ASN1_STRING_length(sk_name->d.dNSName) == strlen(name) &&
                         checkHost(hostname, name))
                     {
                         hostname_verifies_ok = true;
@@ -173,20 +176,20 @@ namespace ix
 
         if (!hostname_verifies_ok)
         {
-            int cn_pos = X509_NAME_get_index_by_NID(X509_get_subject_name((X509 *)server_cert),
-                                                    NID_commonName, -1);
+            int cn_pos = X509_NAME_get_index_by_NID(
+                X509_get_subject_name((X509*) server_cert), NID_commonName, -1);
             if (cn_pos)
             {
-                X509_NAME_ENTRY *cn_entry = X509_NAME_get_entry(
-                    X509_get_subject_name((X509 *)server_cert), cn_pos);
+                X509_NAME_ENTRY* cn_entry =
+                    X509_NAME_get_entry(X509_get_subject_name((X509*) server_cert), cn_pos);
 
                 if (cn_entry)
                 {
-                    ASN1_STRING *cn_asn1 = X509_NAME_ENTRY_get_data(cn_entry);
-                    char *cn = (char *)ASN1_STRING_data(cn_asn1);
+                    ASN1_STRING* cn_asn1 = X509_NAME_ENTRY_get_data(cn_entry);
+                    char* cn = (char*) ASN1_STRING_data(cn_asn1);
 
-                    if ((size_t)ASN1_STRING_length(cn_asn1) == strlen(cn) &&
-                       checkHost(hostname, cn))
+                    if ((size_t) ASN1_STRING_length(cn_asn1) == strlen(cn) &&
+                        checkHost(hostname, cn))
                     {
                         hostname_verifies_ok = true;
                     }
@@ -205,7 +208,7 @@ namespace ix
         return true;
     }
 
-    bool SocketOpenSSL::openSSLHandshake(const std::string& host, std::string& errMsg)
+    bool SocketOpenSSL::openSSLClientHandshake(const std::string& host, std::string& errMsg)
     {
         while (true)
         {
@@ -240,6 +243,274 @@ namespace ix
         }
     }
 
+    bool SocketOpenSSL::openSSLServerHandshake(std::string& errMsg)
+    {
+        while (true)
+        {
+            if (_ssl_connection == nullptr || _ssl_context == nullptr)
+            {
+                return false;
+            }
+
+            ERR_clear_error();
+            int accept_result = SSL_accept(_ssl_connection);
+            if (accept_result == 1)
+            {
+                return true;
+            }
+            int reason = SSL_get_error(_ssl_connection, accept_result);
+
+            bool rc = false;
+            if (reason == SSL_ERROR_WANT_READ || reason == SSL_ERROR_WANT_WRITE)
+            {
+                rc = true;
+            }
+            else
+            {
+                errMsg = getSSLError(accept_result);
+                rc = false;
+            }
+
+            if (!rc)
+            {
+                return false;
+            }
+        }
+    }
+
+    bool SocketOpenSSL::handleTLSOptions(std::string& errMsg)
+    {
+        ERR_clear_error();
+        if (_tlsOptions.hasCertAndKey())
+        {
+            if (SSL_CTX_use_certificate_chain_file(_ssl_context, _tlsOptions.certFile.c_str()) != 1)
+            {
+                auto sslErr = ERR_get_error();
+                errMsg = "OpenSSL failed - SSL_CTX_use_certificate_chain_file(\"" +
+                         _tlsOptions.certFile + "\") failed: ";
+                errMsg += ERR_error_string(sslErr, nullptr);
+            }
+            else if (SSL_CTX_use_PrivateKey_file(
+                         _ssl_context, _tlsOptions.keyFile.c_str(), SSL_FILETYPE_PEM) != 1)
+            {
+                auto sslErr = ERR_get_error();
+                errMsg = "OpenSSL failed - SSL_CTX_use_PrivateKey_file(\"" + _tlsOptions.keyFile +
+                         "\") failed: ";
+                errMsg += ERR_error_string(sslErr, nullptr);
+            }
+            else if (!SSL_CTX_check_private_key(_ssl_context))
+            {
+                auto sslErr = ERR_get_error();
+                errMsg = "OpenSSL failed - cert/key mismatch(\"" + _tlsOptions.certFile + ", " +
+                         _tlsOptions.keyFile + "\")";
+                errMsg += ERR_error_string(sslErr, nullptr);
+            }
+        }
+
+        ERR_clear_error();
+        if (!_tlsOptions.isPeerVerifyDisabled())
+        {
+            if (_tlsOptions.isUsingSystemDefaults())
+            {
+                if (SSL_CTX_set_default_verify_paths(_ssl_context) == 0)
+                {
+                    auto sslErr = ERR_get_error();
+                    errMsg = "OpenSSL failed - SSL_CTX_default_verify_paths loading failed: ";
+                    errMsg += ERR_error_string(sslErr, nullptr);
+                    return false;
+                }
+            }
+            else if (SSL_CTX_load_verify_locations(
+                         _ssl_context, _tlsOptions.caFile.c_str(), NULL) != 1)
+            {
+                auto sslErr = ERR_get_error();
+                errMsg = "OpenSSL failed - SSL_CTX_load_verify_locations(\"" + _tlsOptions.caFile +
+                         "\") failed: ";
+                errMsg += ERR_error_string(sslErr, nullptr);
+                return false;
+            }
+
+            SSL_CTX_set_verify(_ssl_context,
+                               SSL_VERIFY_PEER,
+                               [](int preverify, X509_STORE_CTX*) -> int { return preverify; });
+            SSL_CTX_set_verify_depth(_ssl_context, 4);
+        }
+        else
+        {
+            SSL_CTX_set_verify(_ssl_context, SSL_VERIFY_NONE, nullptr);
+        }
+
+        if (_tlsOptions.isUsingDefaultCiphers())
+        {
+            if (SSL_CTX_set_cipher_list(_ssl_context, kDefaultCiphers.c_str()) != 1)
+            {
+                auto sslErr = ERR_get_error();
+                errMsg = "OpenSSL failed - SSL_CTX_set_cipher_list(\"" + kDefaultCiphers +
+                         "\") failed: ";
+                errMsg += ERR_error_string(sslErr, nullptr);
+                return false;
+            }
+        }
+        else if (SSL_CTX_set_cipher_list(_ssl_context, _tlsOptions.ciphers.c_str()) != 1)
+        {
+            auto sslErr = ERR_get_error();
+            errMsg = "OpenSSL failed - SSL_CTX_set_cipher_list(\"" + _tlsOptions.ciphers +
+                     "\") failed: ";
+            errMsg += ERR_error_string(sslErr, nullptr);
+            return false;
+        }
+
+        return true;
+    }
+
+    bool SocketOpenSSL::accept(std::string& errMsg)
+    {
+        bool handshakeSuccessful = false;
+        {
+            std::lock_guard<std::mutex> lock(_mutex);
+
+            if (!_openSSLInitializationSuccessful)
+            {
+                errMsg = "OPENSSL_init_ssl failure";
+                return false;
+            }
+
+            if (_sockfd == -1)
+            {
+                return false;
+            }
+
+            {
+                const SSL_METHOD* method = SSLv23_server_method();
+                if (method == nullptr)
+                {
+                    errMsg = "SSLv23_server_method failure";
+                    _ssl_context = nullptr;
+                }
+                else
+                {
+                    _ssl_method = method;
+
+                    _ssl_context = SSL_CTX_new(_ssl_method);
+                    if (_ssl_context)
+                    {
+                        SSL_CTX_set_mode(_ssl_context, SSL_MODE_ENABLE_PARTIAL_WRITE);
+                        SSL_CTX_set_mode(_ssl_context, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
+                        SSL_CTX_set_options(_ssl_context,
+                                            SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
+                    }
+                }
+            }
+
+            if (_ssl_context == nullptr)
+            {
+                return false;
+            }
+
+            ERR_clear_error();
+            if (_tlsOptions.hasCertAndKey())
+            {
+                if (SSL_CTX_use_certificate_chain_file(_ssl_context,
+                                                       _tlsOptions.certFile.c_str()) != 1)
+                {
+                    auto sslErr = ERR_get_error();
+                    errMsg = "OpenSSL failed - SSL_CTX_use_certificate_chain_file(\"" +
+                             _tlsOptions.certFile + "\") failed: ";
+                    errMsg += ERR_error_string(sslErr, nullptr);
+                }
+                else if (SSL_CTX_use_PrivateKey_file(
+                             _ssl_context, _tlsOptions.keyFile.c_str(), SSL_FILETYPE_PEM) != 1)
+                {
+                    auto sslErr = ERR_get_error();
+                    errMsg = "OpenSSL failed - SSL_CTX_use_PrivateKey_file(\"" +
+                             _tlsOptions.keyFile + "\") failed: ";
+                    errMsg += ERR_error_string(sslErr, nullptr);
+                }
+            }
+
+
+            ERR_clear_error();
+            if (!_tlsOptions.isPeerVerifyDisabled())
+            {
+                if (_tlsOptions.isUsingSystemDefaults())
+                {
+                    if (SSL_CTX_set_default_verify_paths(_ssl_context) == 0)
+                    {
+                        auto sslErr = ERR_get_error();
+                        errMsg = "OpenSSL failed - SSL_CTX_default_verify_paths loading failed: ";
+                        errMsg += ERR_error_string(sslErr, nullptr);
+                    }
+                }
+                else
+                {
+                    const char* root_ca_file = _tlsOptions.caFile.c_str();
+                    STACK_OF(X509_NAME) * rootCAs;
+                    rootCAs = SSL_load_client_CA_file(root_ca_file);
+                    if (rootCAs == NULL)
+                    {
+                        auto sslErr = ERR_get_error();
+                        errMsg = "OpenSSL failed - SSL_load_client_CA_file('" + _tlsOptions.caFile +
+                                 "') failed: ";
+                        errMsg += ERR_error_string(sslErr, nullptr);
+                    }
+                    else
+                    {
+                        SSL_CTX_set_client_CA_list(_ssl_context, rootCAs);
+                        if (SSL_CTX_load_verify_locations(_ssl_context, root_ca_file, nullptr) != 1)
+                        {
+                            auto sslErr = ERR_get_error();
+                            errMsg = "OpenSSL failed - SSL_CTX_load_verify_locations(\"" +
+                                     _tlsOptions.caFile + "\") failed: ";
+                            errMsg += ERR_error_string(sslErr, nullptr);
+                        }
+                    }
+                }
+
+                SSL_CTX_set_verify(
+                    _ssl_context, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, nullptr);
+                SSL_CTX_set_verify_depth(_ssl_context, 4);
+            }
+            else
+            {
+                SSL_CTX_set_verify(_ssl_context, SSL_VERIFY_NONE, nullptr);
+            }
+            if (_tlsOptions.isUsingDefaultCiphers())
+            {
+                if (SSL_CTX_set_cipher_list(_ssl_context, kDefaultCiphers.c_str()) != 1)
+                {
+                    return false;
+                }
+            }
+            else if (SSL_CTX_set_cipher_list(_ssl_context, _tlsOptions.ciphers.c_str()) != 1)
+            {
+                return false;
+            }
+
+            _ssl_connection = SSL_new(_ssl_context);
+            if (_ssl_connection == nullptr)
+            {
+                errMsg = "OpenSSL failed to connect";
+                SSL_CTX_free(_ssl_context);
+                _ssl_context = nullptr;
+                return false;
+            }
+
+            SSL_set_ecdh_auto(_ssl_connection, 1);
+
+            SSL_set_fd(_ssl_connection, _sockfd);
+
+            handshakeSuccessful = openSSLServerHandshake(errMsg);
+        }
+
+        if (!handshakeSuccessful)
+        {
+            close();
+            return false;
+        }
+
+        return true;
+    }
+
     bool SocketOpenSSL::connect(const std::string& host,
                                 int port,
                                 std::string& errMsg,
@@ -264,13 +535,9 @@ namespace ix
                 return false;
             }
 
-            ERR_clear_error();
-            int cert_load_result = SSL_CTX_set_default_verify_paths(_ssl_context);
-            if (cert_load_result == 0)
+            if (!handleTLSOptions(errMsg))
             {
-                unsigned long ssl_err = ERR_get_error();
-                errMsg = "OpenSSL failed - SSL_CTX_default_verify_paths loading failed: ";
-                errMsg += ERR_error_string(ssl_err, nullptr);
+                return false;
             }
 
             _ssl_connection = SSL_new(_ssl_context);
@@ -289,13 +556,12 @@ namespace ix
 #if OPENSSL_VERSION_NUMBER >= 0x10002000L
             // Support for server name verification
             // (The docs say that this should work from 1.0.2, and is the default from
-            // 1.1.0, but it does not. To be on the safe side, the manual test below is
-            // enabled for all versions prior to 1.1.0.)
-            X509_VERIFY_PARAM *param = SSL_get0_param(_ssl_connection);
+            // 1.1.0, but it does not. To be on the safe side, the manual test
+            // below is enabled for all versions prior to 1.1.0.)
+            X509_VERIFY_PARAM* param = SSL_get0_param(_ssl_connection);
             X509_VERIFY_PARAM_set1_host(param, host.c_str(), 0);
 #endif
-
-            handshakeSuccessful = openSSLHandshake(host, errMsg);
+            handshakeSuccessful = openSSLClientHandshake(host, errMsg);
         }
 
         if (!handshakeSuccessful)
@@ -342,13 +608,18 @@ namespace ix
             ssize_t write_result = SSL_write(_ssl_connection, buf + sent, (int) nbyte);
             int reason = SSL_get_error(_ssl_connection, (int) write_result);
 
-            if (reason == SSL_ERROR_NONE) {
+            if (reason == SSL_ERROR_NONE)
+            {
                 nbyte -= write_result;
                 sent += write_result;
-            } else if (reason == SSL_ERROR_WANT_READ || reason == SSL_ERROR_WANT_WRITE) {
+            }
+            else if (reason == SSL_ERROR_WANT_READ || reason == SSL_ERROR_WANT_WRITE)
+            {
                 errno = EWOULDBLOCK;
                 return -1;
-            } else {
+            }
+            else
+            {
                 return -1;
             }
         }
@@ -357,7 +628,7 @@ namespace ix
 
     ssize_t SocketOpenSSL::send(const std::string& buffer)
     {
-        return send((char*)&buffer[0], buffer.size());
+        return send((char*) &buffer[0], buffer.size());
     }
 
     ssize_t SocketOpenSSL::recv(void* buf, size_t nbyte)
@@ -389,4 +660,4 @@ namespace ix
         }
     }
 
-}
+} // namespace ix

ixwebsocket/IXSocketOpenSSL.h

@@ -1,13 +1,14 @@
 /*
  *  IXSocketOpenSSL.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2017-2018 Machine Zone, Inc. All rights reserved.
+ *  Author: Benjamin Sergeant, Matt DeBoer
+ *  Copyright (c) 2017-2019 Machine Zone, Inc. All rights reserved.
  */
 
 #pragma once
 
 #include "IXCancellationRequest.h"
 #include "IXSocket.h"
+#include "IXSocketTLSOptions.h"
 #include <mutex>
 #include <openssl/bio.h>
 #include <openssl/conf.h>
@@ -20,9 +21,11 @@ namespace ix
     class SocketOpenSSL final : public Socket
     {
     public:
-        SocketOpenSSL(int fd = -1);
+        SocketOpenSSL(const SocketTLSOptions& tlsOptions, int fd = -1);
         ~SocketOpenSSL();
 
+        virtual bool accept(std::string& errMsg) final;
+
         virtual bool connect(const std::string& host,
                              int port,
                              std::string& errMsg,
@@ -37,13 +40,17 @@ namespace ix
         void openSSLInitialize();
         std::string getSSLError(int ret);
         SSL_CTX* openSSLCreateContext(std::string& errMsg);
-        bool openSSLHandshake(const std::string& hostname, std::string& errMsg);
+        bool openSSLClientHandshake(const std::string& hostname, std::string& errMsg);
         bool openSSLCheckServerCert(SSL* ssl, const std::string& hostname, std::string& errMsg);
         bool checkHost(const std::string& host, const char* pattern);
+        bool handleTLSOptions(std::string& errMsg);
+        bool openSSLServerHandshake(std::string& errMsg);
 
         SSL* _ssl_connection;
         SSL_CTX* _ssl_context;
         const SSL_METHOD* _ssl_method;
+        SocketTLSOptions _tlsOptions;
+
         mutable std::mutex _mutex; // OpenSSL routines are not thread-safe
 
         static std::once_flag _openSSLInitFlag;

ixwebsocket/IXSocketSChannel.cpp

@@ -13,12 +13,12 @@
 #include "IXSocketSChannel.h"
 
 #ifdef _WIN32
-# include <basetsd.h>
-# include <WinSock2.h>
-# include <ws2def.h>
-# include <WS2tcpip.h>
-# include <schannel.h>
-# include <io.h>
+#include <WS2tcpip.h>
+#include <WinSock2.h>
+#include <basetsd.h>
+#include <io.h>
+#include <schannel.h>
+#include <ws2def.h>
 
 #define WIN32_LEAN_AND_MEAN
 
@@ -26,14 +26,15 @@
 #define UNICODE
 #endif
 
-#include <windows.h>
-#include <winsock2.h>
 #include <mstcpip.h>
-#include <ws2tcpip.h>
-#include <rpc.h>
 #include <ntdsapi.h>
+#include <rpc.h>
 #include <stdio.h>
 #include <tchar.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+
+#include <windows.h>
 
 #define RECV_DATA_BUF_SIZE 256
 
@@ -50,12 +51,8 @@
 // has already been initialized
 
 
-
-
-
-
 #else
-# error("This file should only be built on Windows")
+#error("This file should only be built on Windows")
 #endif
 
 namespace ix
@@ -67,12 +64,9 @@ namespace ix
 
     SocketSChannel::~SocketSChannel()
     {
-
     }
 
-    bool SocketSChannel::connect(const std::string& host,
-                                 int port,
-                                 std::string& errMsg)
+    bool SocketSChannel::connect(const std::string& host, int port, std::string& errMsg)
     {
         return Socket::connect(host, port, errMsg, nullptr);
     }
@@ -103,4 +97,4 @@ namespace ix
         return Socket::recv(buf, nbyte);
     }
 
-}
+} // namespace ix

ixwebsocket/IXSocketServer.cpp

@@ -5,14 +5,15 @@
  */
 
 #include "IXSocketServer.h"
+
+#include "IXNetSystem.h"
 #include "IXSocket.h"
 #include "IXSocketConnect.h"
-#include "IXNetSystem.h"
-
+#include "IXSocketFactory.h"
+#include <assert.h>
 #include <iostream>
 #include <sstream>
 #include <string.h>
-#include <assert.h>
 
 namespace ix
 {
@@ -24,17 +25,16 @@ namespace ix
     SocketServer::SocketServer(int port,
                                const std::string& host,
                                int backlog,
-                               size_t maxConnections) :
-        _port(port),
-        _host(host),
-        _backlog(backlog),
-        _maxConnections(maxConnections),
-        _serverFd(-1),
-        _stop(false),
-        _stopGc(false),
-        _connectionStateFactory(&ConnectionState::createConnectionState)
+                               size_t maxConnections)
+        : _port(port)
+        , _host(host)
+        , _backlog(backlog)
+        , _maxConnections(maxConnections)
+        , _serverFd(-1)
+        , _stop(false)
+        , _stopGc(false)
+        , _connectionStateFactory(&ConnectionState::createConnectionState)
     {
-
     }
 
     SocketServer::~SocketServer()
@@ -62,21 +62,18 @@ namespace ix
         if ((_serverFd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
         {
             std::stringstream ss;
-            ss << "SocketServer::listen() error creating socket): "
-               << strerror(Socket::getErrno());
+            ss << "SocketServer::listen() error creating socket): " << strerror(Socket::getErrno());
 
             return std::make_pair(false, ss.str());
         }
 
         // Make that socket reusable. (allow restarting this server at will)
         int enable = 1;
-        if (setsockopt(_serverFd, SOL_SOCKET, SO_REUSEADDR,
-                       (char*) &enable, sizeof(enable)) < 0)
+        if (setsockopt(_serverFd, SOL_SOCKET, SO_REUSEADDR, (char*) &enable, sizeof(enable)) < 0)
         {
             std::stringstream ss;
             ss << "SocketServer::listen() error calling setsockopt(SO_REUSEADDR) "
-               << "at address " << _host << ":" << _port
-               << " : " << strerror(Socket::getErrno());
+               << "at address " << _host << ":" << _port << " : " << strerror(Socket::getErrno());
 
             Socket::closeSocket(_serverFd);
             return std::make_pair(false, ss.str());
@@ -84,7 +81,7 @@ namespace ix
 
         // Bind the socket to the server address.
         server.sin_family = AF_INET;
-        server.sin_port   = htons(_port);
+        server.sin_port = htons(_port);
 
         // Using INADDR_ANY trigger a pop-up box as binding to any address is detected
         // by the osx firewall. We need to codesign the binary with a self-signed cert
@@ -95,12 +92,11 @@ namespace ix
         //
         server.sin_addr.s_addr = inet_addr(_host.c_str());
 
-        if (bind(_serverFd, (struct sockaddr *)&server, sizeof(server)) < 0)
+        if (bind(_serverFd, (struct sockaddr*) &server, sizeof(server)) < 0)
         {
             std::stringstream ss;
             ss << "SocketServer::listen() error calling bind "
-               << "at address " << _host << ":" << _port
-               << " : " << strerror(Socket::getErrno());
+               << "at address " << _host << ":" << _port << " : " << strerror(Socket::getErrno());
 
             Socket::closeSocket(_serverFd);
             return std::make_pair(false, ss.str());
@@ -113,8 +109,7 @@ namespace ix
         {
             std::stringstream ss;
             ss << "SocketServer::listen() error calling listen "
-               << "at address " << _host << ":" << _port
-               << " : " << strerror(Socket::getErrno());
+               << "at address " << _host << ":" << _port << " : " << strerror(Socket::getErrno());
 
             Socket::closeSocket(_serverFd);
             return std::make_pair(false, ss.str());
@@ -125,6 +120,8 @@ namespace ix
 
     void SocketServer::start()
     {
+        _stop = false;
+
         if (!_thread.joinable())
         {
             _thread = std::thread(&SocketServer::run, this);
@@ -186,7 +183,7 @@ namespace ix
     {
         std::lock_guard<std::mutex> lock(_connectionsThreadsMutex);
         auto it = _connectionsThreads.begin();
-        auto itEnd  = _connectionsThreads.end();
+        auto itEnd = _connectionsThreads.end();
 
         while (it != itEnd)
         {
@@ -221,8 +218,7 @@ namespace ix
             if (pollResult == PollResultType::Error)
             {
                 std::stringstream ss;
-                ss << "SocketServer::run() error in select: "
-                   << strerror(Socket::getErrno());
+                ss << "SocketServer::run() error in select: " << strerror(Socket::getErrno());
                 logError(ss.str());
                 continue;
             }
@@ -238,15 +234,15 @@ namespace ix
             socklen_t addressLen = sizeof(client);
             memset(&client, 0, sizeof(client));
 
-            if ((clientFd = accept(_serverFd, (struct sockaddr *)&client, &addressLen)) < 0)
+            if ((clientFd = accept(_serverFd, (struct sockaddr*) &client, &addressLen)) < 0)
             {
                 if (!Socket::isWaitNeeded())
                 {
                     // FIXME: that error should be propagated
                     int err = Socket::getErrno();
                     std::stringstream ss;
-                    ss << "SocketServer::run() error accepting connection: "
-                       << err << ", " << strerror(err);
+                    ss << "SocketServer::run() error accepting connection: " << err << ", "
+                       << strerror(err);
                     logError(ss.str());
                 }
                 continue;
@@ -255,8 +251,7 @@ namespace ix
             if (getConnectedClientsCount() >= _maxConnections)
             {
                 std::stringstream ss;
-                ss << "SocketServer::run() reached max connections = "
-                   << _maxConnections << ". "
+                ss << "SocketServer::run() reached max connections = " << _maxConnections << ". "
                    << "Not accepting connection";
                 logError(ss.str());
 
@@ -273,14 +268,33 @@ namespace ix
 
             if (_stop) return;
 
+            // create socket
+            std::string errorMsg;
+            bool tls = _socketTLSOptions.tls;
+            auto socket = createSocket(tls, clientFd, errorMsg, _socketTLSOptions);
+
+            if (socket == nullptr)
+            {
+                logError("SocketServer::run() cannot create socket: " + errorMsg);
+                Socket::closeSocket(clientFd);
+                continue;
+            }
+
+            // Set the socket to non blocking mode + other tweaks
+            SocketConnect::configure(clientFd);
+
+            if (!socket->accept(errorMsg))
+            {
+                logError("SocketServer::run() tls accept failed: " + errorMsg);
+                Socket::closeSocket(clientFd);
+                continue;
+            }
+
             // Launch the handleConnection work asynchronously in its own thread.
             std::lock_guard<std::mutex> lock(_connectionsThreadsMutex);
             _connectionsThreads.push_back(std::make_pair(
-                    connectionState,
-                    std::thread(&SocketServer::handleConnection,
-                                this,
-                                clientFd,
-                                connectionState)));
+                connectionState,
+                std::thread(&SocketServer::handleConnection, this, socket, connectionState)));
         }
     }
 
@@ -308,5 +322,9 @@ namespace ix
             std::this_thread::sleep_for(std::chrono::milliseconds(10));
         }
     }
-}
 
+    void SocketServer::setTLSOptions(const SocketTLSOptions& socketTLSOptions)
+    {
+        _socketTLSOptions = socketTLSOptions;
+    }
+} // namespace ix

ixwebsocket/IXSocketServer.h

@@ -7,6 +7,7 @@
 #pragma once
 
 #include "IXConnectionState.h"
+#include "IXSocketTLSOptions.h"
 #include <atomic>
 #include <condition_variable>
 #include <functional>
@@ -20,6 +21,8 @@
 
 namespace ix
 {
+    class Socket;
+
     class SocketServer
     {
     public:
@@ -51,6 +54,8 @@ namespace ix
         std::pair<bool, std::string> listen();
         void wait();
 
+        void setTLSOptions(const SocketTLSOptions& socketTLSOptions);
+
     protected:
         // Logging
         void logError(const std::string& str);
@@ -68,10 +73,11 @@ namespace ix
         // socket for accepting connections
         int _serverFd;
 
+        std::atomic<bool> _stop;
+
         std::mutex _logMutex;
 
         // background thread to wait for incoming connections
-        std::atomic<bool> _stop;
         std::thread _thread;
         void run();
 
@@ -92,11 +98,14 @@ namespace ix
         // the factory to create ConnectionState objects
         ConnectionStateFactory _connectionStateFactory;
 
-        virtual void handleConnection(int fd, std::shared_ptr<ConnectionState> connectionState) = 0;
+        virtual void handleConnection(std::shared_ptr<Socket>,
+                                      std::shared_ptr<ConnectionState> connectionState) = 0;
         virtual size_t getConnectedClientsCount() = 0;
 
         // Returns true if all connection threads are joined
         void closeTerminatedThreads();
         size_t getConnectionsThreadsCount();
+
+        SocketTLSOptions _socketTLSOptions;
     };
 } // namespace ix

ixwebsocket/IXSocketTLSOptions.cpp

@@ -0,0 +1,74 @@
+/*
+ *  IXSocketTLSOptions.h
+ *  Author: Matt DeBoer
+ *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
+ */
+
+#include "IXSocketTLSOptions.h"
+
+#include <assert.h>
+#include <fstream>
+
+namespace ix
+{
+    const char* kTLSCAFileUseSystemDefaults = "SYSTEM";
+    const char* kTLSCAFileDisableVerify = "NONE";
+    const char* kTLSCiphersUseDefault = "DEFAULT";
+
+    bool SocketTLSOptions::isValid() const
+    {
+        if (!_validated)
+        {
+            if (!certFile.empty() && !std::ifstream(certFile))
+            {
+                _errMsg = "certFile not found: " + certFile;
+                return false;
+            }
+            if (!keyFile.empty() && !std::ifstream(keyFile))
+            {
+                _errMsg = "keyFile not found: " + keyFile;
+                return false;
+            }
+            if (!caFile.empty() && caFile != kTLSCAFileDisableVerify &&
+                caFile != kTLSCAFileUseSystemDefaults && !std::ifstream(caFile))
+            {
+                _errMsg = "caFile not found: " + caFile;
+                return false;
+            }
+
+            if (certFile.empty() != keyFile.empty())
+            {
+                _errMsg = "certFile and keyFile must be both present, or both absent";
+                return false;
+            }
+
+            _validated = true;
+        }
+        return true;
+    }
+
+    bool SocketTLSOptions::hasCertAndKey() const
+    {
+        return !certFile.empty() && !keyFile.empty();
+    }
+
+    bool SocketTLSOptions::isUsingSystemDefaults() const
+    {
+        return caFile == kTLSCAFileUseSystemDefaults;
+    }
+
+    bool SocketTLSOptions::isPeerVerifyDisabled() const
+    {
+        return caFile == kTLSCAFileDisableVerify;
+    }
+
+    bool SocketTLSOptions::isUsingDefaultCiphers() const
+    {
+        return ciphers.empty() || ciphers == kTLSCiphersUseDefault;
+    }
+
+    const std::string& SocketTLSOptions::getErrorMsg() const
+    {
+        return _errMsg;
+    }
+} // namespace ix

ixwebsocket/IXSocketTLSOptions.h

@@ -0,0 +1,50 @@
+/*
+ *  IXSocketTLSOptions.h
+ *  Author: Matt DeBoer
+ *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
+ */
+
+#pragma once
+
+#include <string>
+
+namespace ix
+{
+    struct SocketTLSOptions
+    {
+    public:
+        // check validity of the object
+        bool isValid() const;
+
+        // the certificate presented to peers
+        std::string certFile;
+
+        // the key used for signing/encryption
+        std::string keyFile;
+
+        // the ca certificate (or certificate bundle) file containing
+        // certificates to be trusted by peers; use 'SYSTEM' to
+        // leverage the system defaults, use 'NONE' to disable peer verification
+        std::string caFile = "SYSTEM";
+
+        // list of ciphers (rsa, etc...)
+        std::string ciphers = "DEFAULT";
+
+        // whether tls is enabled, used for server code
+        bool tls = false;
+
+        bool hasCertAndKey() const;
+
+        bool isUsingSystemDefaults() const;
+
+        bool isPeerVerifyDisabled() const;
+
+        bool isUsingDefaultCiphers() const;
+
+        const std::string& getErrorMsg() const;
+
+    private:
+        mutable std::string _errMsg;
+        mutable bool _validated;
+    };
+} // namespace ix

ixwebsocket/IXUrlParser.cpp

@@ -5,6 +5,7 @@
  */
 
 #include "IXUrlParser.h"
+
 #include "LUrlParser.h"
 
 namespace ix
@@ -24,9 +25,9 @@ namespace ix
         }
 
         protocol = res.m_Scheme;
-        host     = res.m_Host;
-        path     = res.m_Path;
-        query    = res.m_Query;
+        host = res.m_Host;
+        path = res.m_Path;
+        query = res.m_Query;
 
         if (!res.GetPort(&port))
         {
@@ -64,4 +65,4 @@ namespace ix
         return true;
     }
 
-}
+} // namespace ix

ixwebsocket/IXUserAgent.cpp

@@ -5,48 +5,50 @@
  */
 
 #include "IXUserAgent.h"
-#include "IXWebSocketVersion.h"
 
+#include "IXWebSocketVersion.h"
 #include <sstream>
 #include <zlib.h>
 
 // Platform name
 #if defined(_WIN32)
-    #define PLATFORM_NAME "windows" // Windows
+#define PLATFORM_NAME "windows" // Windows
 #elif defined(_WIN64)
-    #define PLATFORM_NAME "windows" // Windows
+#define PLATFORM_NAME "windows" // Windows
 #elif defined(__CYGWIN__) && !defined(_WIN32)
-    #define PLATFORM_NAME "windows" // Windows (Cygwin POSIX under Microsoft Window)
+#define PLATFORM_NAME "windows" // Windows (Cygwin POSIX under Microsoft Window)
 #elif defined(__ANDROID__)
-    #define PLATFORM_NAME "android" // Android (implies Linux, so it must come first)
+#define PLATFORM_NAME "android" // Android (implies Linux, so it must come first)
 #elif defined(__linux__)
-    #define PLATFORM_NAME "linux" // Debian, Ubuntu, Gentoo, Fedora, openSUSE, RedHat, Centos and other
+#define PLATFORM_NAME "linux" // Debian, Ubuntu, Gentoo, Fedora, openSUSE, RedHat, Centos and other
 #elif defined(__unix__) || !defined(__APPLE__) && defined(__MACH__)
-    #include <sys/param.h>
-    #if defined(BSD)
-        #define PLATFORM_NAME "bsd" // FreeBSD, NetBSD, OpenBSD, DragonFly BSD
-    #endif
+#include <sys/param.h>
+#if defined(BSD)
+#define PLATFORM_NAME "bsd" // FreeBSD, NetBSD, OpenBSD, DragonFly BSD
+#endif
 #elif defined(__hpux)
-    #define PLATFORM_NAME "hp-ux" // HP-UX
+#define PLATFORM_NAME "hp-ux" // HP-UX
 #elif defined(_AIX)
-    #define PLATFORM_NAME "aix" // IBM AIX
+#define PLATFORM_NAME "aix"                   // IBM AIX
 #elif defined(__APPLE__) && defined(__MACH__) // Apple OSX and iOS (Darwin)
-    #include <TargetConditionals.h>
-    #if TARGET_IPHONE_SIMULATOR == 1
-        #define PLATFORM_NAME "ios" // Apple iOS
-    #elif TARGET_OS_IPHONE == 1
-        #define PLATFORM_NAME "ios" // Apple iOS
-    #elif TARGET_OS_MAC == 1
-        #define PLATFORM_NAME "macos" // Apple OSX
-    #endif
+#include <TargetConditionals.h>
+#if TARGET_IPHONE_SIMULATOR == 1
+#define PLATFORM_NAME "ios" // Apple iOS
+#elif TARGET_OS_IPHONE == 1
+#define PLATFORM_NAME "ios" // Apple iOS
+#elif TARGET_OS_MAC == 1
+#define PLATFORM_NAME "macos" // Apple OSX
+#endif
 #elif defined(__sun) && defined(__SVR4)
-    #define PLATFORM_NAME "solaris" // Oracle Solaris, Open Indiana
+#define PLATFORM_NAME "solaris" // Oracle Solaris, Open Indiana
 #else
-    #define PLATFORM_NAME "unknown platform"
+#define PLATFORM_NAME "unknown platform"
 #endif
 
 // SSL
-#if defined(IXWEBSOCKET_USE_OPEN_SSL)
+#ifdef IXWEBSOCKET_USE_MBED_TLS
+#include <mbedtls/version.h>
+#elif defined(IXWEBSOCKET_USE_OPEN_SSL)
 #include <openssl/opensslv.h>
 #endif
 
@@ -65,11 +67,11 @@ namespace ix
         // TLS
 #ifdef IXWEBSOCKET_USE_TLS
 #ifdef IXWEBSOCKET_USE_MBED_TLS
-        ss << " ssl/mbedtls";
-#elif __APPLE__
-        ss << " ssl/DarwinSSL";
+        ss << " ssl/mbedtls " << MBEDTLS_VERSION_STRING;
 #elif defined(IXWEBSOCKET_USE_OPEN_SSL)
         ss << " ssl/OpenSSL " << OPENSSL_VERSION_TEXT;
+#elif __APPLE__
+        ss << " ssl/DarwinSSL";
 #endif
 #else
         ss << " nossl";
@@ -80,4 +82,4 @@ namespace ix
 
         return ss.str();
     }
-}
+} // namespace ix

ixwebsocket/IXUtf8Validator.h

@@ -24,7 +24,7 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
-*/
+ */
 
 /*
  *  IXUtf8Validator.h
@@ -48,20 +48,31 @@ namespace ix
 
     /// Lookup table for the UTF8 decode state machine
     static uint8_t const utf8d[] = {
-      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 00..1f
-      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 20..3f
-      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 40..5f
-      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 60..7f
-      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, // 80..9f
-      7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, // a0..bf
-      8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, // c0..df
-      0xa,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x4,0x3,0x3, // e0..ef
-      0xb,0x6,0x6,0x6,0x5,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8, // f0..ff
-      0x0,0x1,0x2,0x3,0x5,0x8,0x7,0x1,0x1,0x1,0x4,0x6,0x1,0x1,0x1,0x1, // s0..s0
-      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,0,1,0,1,1,1,1,1,1, // s1..s2
-      1,2,1,1,1,1,1,2,1,2,1,1,1,1,1,1,1,1,1,1,1,1,1,2,1,1,1,1,1,1,1,1, // s3..s4
-      1,2,1,1,1,1,1,1,1,2,1,1,1,1,1,1,1,1,1,1,1,1,1,3,1,3,1,1,1,1,1,1, // s5..s6
-      1,3,1,1,1,1,1,3,1,3,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // s7..s8
+        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 00..1f
+        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 20..3f
+        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 40..5f
+        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 60..7f
+        1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
+        9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9, // 80..9f
+        7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,
+        7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7, // a0..bf
+        8,   8,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,
+        2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   // c0..df
+        0xa, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x4, 0x3, 0x3, // e0..ef
+        0xb, 0x6, 0x6, 0x6, 0x5, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, // f0..ff
+        0x0, 0x1, 0x2, 0x3, 0x5, 0x8, 0x7, 0x1, 0x1, 0x1, 0x4, 0x6, 0x1, 0x1, 0x1, 0x1, // s0..s0
+        1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
+        1,   0,   1,   1,   1,   1,   1,   0,   1,   0,   1,   1,   1,   1,   1,   1, // s1..s2
+        1,   2,   1,   1,   1,   1,   1,   2,   1,   2,   1,   1,   1,   1,   1,   1,
+        1,   1,   1,   1,   1,   1,   1,   2,   1,   1,   1,   1,   1,   1,   1,   1, // s3..s4
+        1,   2,   1,   1,   1,   1,   1,   1,   1,   2,   1,   1,   1,   1,   1,   1,
+        1,   1,   1,   1,   1,   1,   1,   3,   1,   3,   1,   1,   1,   1,   1,   1, // s5..s6
+        1,   3,   1,   1,   1,   1,   1,   3,   1,   3,   1,   1,   1,   1,   1,   1,
+        1,   3,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1, // s7..s8
     };
 
     /// Decode the next byte of a UTF8 sequence
@@ -71,16 +82,14 @@ namespace ix
      * @param [in] byte The byte to input
      * @return The ending state of the decode operation
      */
-    inline uint32_t decodeNextByte(uint32_t * state, uint32_t * codep, uint8_t byte)
+    inline uint32_t decodeNextByte(uint32_t* state, uint32_t* codep, uint8_t byte)
     {
-      uint32_t type = utf8d[byte];
+        uint32_t type = utf8d[byte];
 
-      *codep = (*state != utf8_accept) ?
-        (byte & 0x3fu) | (*codep << 6) :
-        (0xff >> type) & (byte);
+        *codep = (*state != utf8_accept) ? (byte & 0x3fu) | (*codep << 6) : (0xff >> type) & (byte);
 
-      *state = utf8d[256 + *state*16 + type];
-      return *state;
+        *state = utf8d[256 + *state * 16 + type];
+        return *state;
     }
 
     /// Provides streaming UTF8 validation functionality
@@ -88,7 +97,11 @@ namespace ix
     {
     public:
         /// Construct and initialize the validator
-        Utf8Validator() : m_state(utf8_accept),m_codepoint(0) {}
+        Utf8Validator()
+            : m_state(utf8_accept)
+            , m_codepoint(0)
+        {
+        }
 
         /// Advance the state of the validator with the next input byte
         /**
@@ -97,7 +110,7 @@ namespace ix
          */
         bool consume(uint8_t byte)
         {
-            if (decodeNextByte(&m_state,&m_codepoint,byte) == utf8_reject)
+            if (decodeNextByte(&m_state, &m_codepoint, byte) == utf8_reject)
             {
                 return false;
             }
@@ -110,16 +123,13 @@ namespace ix
          * @param end Input iterator to the end of the input range
          * @return Whether or not decoding the bytes resulted in a validation error.
          */
-        template <typename iterator_type>
+        template<typename iterator_type>
         bool decode(iterator_type begin, iterator_type end)
         {
             for (iterator_type it = begin; it != end; ++it)
             {
-                unsigned int result = decodeNextByte(
-                    &m_state,
-                    &m_codepoint,
-                    static_cast<uint8_t>(*it)
-                );
+                unsigned int result =
+                    decodeNextByte(&m_state, &m_codepoint, static_cast<uint8_t>(*it));
 
                 if (result == utf8_reject)
                 {
@@ -144,9 +154,10 @@ namespace ix
             m_state = utf8_accept;
             m_codepoint = 0;
         }
+
     private:
-        uint32_t    m_state;
-        uint32_t    m_codepoint;
+        uint32_t m_state;
+        uint32_t m_codepoint;
     };
 
     /// Validate a UTF8 string
@@ -154,10 +165,10 @@ namespace ix
      * convenience function that creates a Validator, validates a complete string
      * and returns the result.
      */
-    inline bool validateUtf8(std::string const & s)
+    inline bool validateUtf8(std::string const& s)
     {
         Utf8Validator v;
-        if (!v.decode(s.begin(),s.end()))
+        if (!v.decode(s.begin(), s.end()))
         {
             return false;
         }

ixwebsocket/IXWebSocket.cpp

@@ -5,13 +5,13 @@
  */
 
 #include "IXWebSocket.h"
-#include "IXSetThreadName.h"
-#include "IXWebSocketHandshake.h"
-#include "IXExponentialBackoff.h"
-#include "IXUtf8Validator.h"
 
-#include <cmath>
+#include "IXExponentialBackoff.h"
+#include "IXSetThreadName.h"
+#include "IXUtf8Validator.h"
+#include "IXWebSocketHandshake.h"
 #include <cassert>
+#include <cmath>
 
 
 namespace ix
@@ -23,26 +23,26 @@ namespace ix
     const bool WebSocket::kDefaultEnablePong(true);
     const uint32_t WebSocket::kDefaultMaxWaitBetweenReconnectionRetries(10 * 1000); // 10s
 
-    WebSocket::WebSocket() :
-        _onMessageCallback(OnMessageCallback()),
-        _stop(false),
-        _automaticReconnection(true),
-        _maxWaitBetweenReconnectionRetries(kDefaultMaxWaitBetweenReconnectionRetries),
-        _handshakeTimeoutSecs(kDefaultHandShakeTimeoutSecs),
-        _enablePong(kDefaultEnablePong),
-        _pingIntervalSecs(kDefaultPingIntervalSecs),
-        _pingTimeoutSecs(kDefaultPingTimeoutSecs)
+    WebSocket::WebSocket()
+        : _onMessageCallback(OnMessageCallback())
+        , _stop(false)
+        , _automaticReconnection(true)
+        , _maxWaitBetweenReconnectionRetries(kDefaultMaxWaitBetweenReconnectionRetries)
+        , _handshakeTimeoutSecs(kDefaultHandShakeTimeoutSecs)
+        , _enablePong(kDefaultEnablePong)
+        , _pingIntervalSecs(kDefaultPingIntervalSecs)
+        , _pingTimeoutSecs(kDefaultPingTimeoutSecs)
     {
         _ws.setOnCloseCallback(
-            [this](uint16_t code, const std::string& reason, size_t wireSize, bool remote)
-            {
+            [this](uint16_t code, const std::string& reason, size_t wireSize, bool remote) {
                 _onMessageCallback(
-                    std::make_shared<WebSocketMessage>(
-                        WebSocketMessageType::Close, "", wireSize,
-                        WebSocketErrorInfo(), WebSocketOpenInfo(),
-                        WebSocketCloseInfo(code, reason, remote)));
-            }
-        );
+                    std::make_shared<WebSocketMessage>(WebSocketMessageType::Close,
+                                                       "",
+                                                       wireSize,
+                                                       WebSocketErrorInfo(),
+                                                       WebSocketOpenInfo(),
+                                                       WebSocketCloseInfo(code, reason, remote)));
+            });
     }
 
     WebSocket::~WebSocket()
@@ -67,12 +67,19 @@ namespace ix
         return _url;
     }
 
-    void WebSocket::setPerMessageDeflateOptions(const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions)
+    void WebSocket::setPerMessageDeflateOptions(
+        const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions)
     {
         std::lock_guard<std::mutex> lock(_configMutex);
         _perMessageDeflateOptions = perMessageDeflateOptions;
     }
 
+    void WebSocket::setTLSOptions(const SocketTLSOptions& socketTLSOptions)
+    {
+        std::lock_guard<std::mutex> lock(_configMutex);
+        _socketTLSOptions = socketTLSOptions;
+    }
+
     const WebSocketPerMessageDeflateOptions& WebSocket::getPerMessageDeflateOptions() const
     {
         std::lock_guard<std::mutex> lock(_configMutex);
@@ -153,8 +160,7 @@ namespace ix
         _thread = std::thread(&WebSocket::run, this);
     }
 
-    void WebSocket::stop(uint16_t code,
-                         const std::string& reason)
+    void WebSocket::stop(uint16_t code, const std::string& reason)
     {
         close(code, reason);
 
@@ -173,48 +179,65 @@ namespace ix
         {
             std::lock_guard<std::mutex> lock(_configMutex);
             _ws.configure(_perMessageDeflateOptions,
+                          _socketTLSOptions,
                           _enablePong,
                           _pingIntervalSecs,
                           _pingTimeoutSecs);
         }
 
-        WebSocketInitResult status = _ws.connectToUrl(_url, _extraHeaders, timeoutSecs);
+        WebSocketHttpHeaders headers(_extraHeaders);
+        std::string subProtocolsHeader;
+        auto subProtocols = getSubProtocols();
+        if (!subProtocols.empty())
+        {
+            for (auto subProtocol : subProtocols)
+            {
+                subProtocolsHeader += ",";
+                subProtocolsHeader += subProtocol;
+            }
+            headers["Sec-WebSocket-Protocol"] = subProtocolsHeader;
+        }
+
+        WebSocketInitResult status = _ws.connectToUrl(_url, headers, timeoutSecs);
         if (!status.success)
         {
             return status;
         }
 
-        _onMessageCallback(
-            std::make_shared<WebSocketMessage>(
-                WebSocketMessageType::Open, "", 0,
-                WebSocketErrorInfo(),
-                WebSocketOpenInfo(status.uri, status.headers),
-                WebSocketCloseInfo()));
+        _onMessageCallback(std::make_shared<WebSocketMessage>(
+            WebSocketMessageType::Open,
+            "",
+            0,
+            WebSocketErrorInfo(),
+            WebSocketOpenInfo(status.uri, status.headers, status.protocol),
+            WebSocketCloseInfo()));
         return status;
     }
 
-    WebSocketInitResult WebSocket::connectToSocket(int fd, int timeoutSecs)
+    WebSocketInitResult WebSocket::connectToSocket(std::shared_ptr<Socket> socket, int timeoutSecs)
     {
         {
             std::lock_guard<std::mutex> lock(_configMutex);
             _ws.configure(_perMessageDeflateOptions,
+                          _socketTLSOptions,
                           _enablePong,
                           _pingIntervalSecs,
                           _pingTimeoutSecs);
         }
 
-        WebSocketInitResult status = _ws.connectToSocket(fd, timeoutSecs);
+        WebSocketInitResult status = _ws.connectToSocket(socket, timeoutSecs);
         if (!status.success)
         {
             return status;
         }
 
         _onMessageCallback(
-                std::make_shared<WebSocketMessage>(
-                    WebSocketMessageType::Open, "", 0,
-                    WebSocketErrorInfo(),
-                    WebSocketOpenInfo(status.uri, status.headers),
-                    WebSocketCloseInfo()));
+            std::make_shared<WebSocketMessage>(WebSocketMessageType::Open,
+                                               "",
+                                               0,
+                                               WebSocketErrorInfo(),
+                                               WebSocketOpenInfo(status.uri, status.headers),
+                                               WebSocketCloseInfo()));
         return status;
     }
 
@@ -228,8 +251,7 @@ namespace ix
         return getReadyState() == ReadyState::Closing;
     }
 
-    void WebSocket::close(uint16_t code,
-                          const std::string& reason)
+    void WebSocket::close(uint16_t code, const std::string& reason)
     {
         _ws.close(code, reason);
     }
@@ -273,20 +295,22 @@ namespace ix
 
                 if (_automaticReconnection)
                 {
-                    duration = millis(calculateRetryWaitMilliseconds(retries++, _maxWaitBetweenReconnectionRetries));
+                    duration = millis(calculateRetryWaitMilliseconds(
+                        retries++, _maxWaitBetweenReconnectionRetries));
 
                     connectErr.wait_time = duration.count();
                     connectErr.retries = retries;
                 }
 
-                connectErr.reason      = status.errorStr;
+                connectErr.reason = status.errorStr;
                 connectErr.http_status = status.http_status;
 
-                _onMessageCallback(
-                     std::make_shared<WebSocketMessage>(
-                        WebSocketMessageType::Error, "", 0,
-                        connectErr, WebSocketOpenInfo(),
-                        WebSocketCloseInfo()));
+                _onMessageCallback(std::make_shared<WebSocketMessage>(WebSocketMessageType::Error,
+                                                                      "",
+                                                                      0,
+                                                                      connectErr,
+                                                                      WebSocketOpenInfo(),
+                                                                      WebSocketCloseInfo()));
             }
         }
     }
@@ -322,8 +346,7 @@ namespace ix
                 [this](const std::string& msg,
                        size_t wireSize,
                        bool decompressionError,
-                       WebSocketTransport::MessageKind messageKind)
-                {
+                       WebSocketTransport::MessageKind messageKind) {
                     WebSocketMessageType webSocketMessageType;
                     switch (messageKind)
                     {
@@ -331,22 +354,26 @@ namespace ix
                         case WebSocketTransport::MessageKind::MSG_BINARY:
                         {
                             webSocketMessageType = WebSocketMessageType::Message;
-                        } break;
+                        }
+                        break;
 
                         case WebSocketTransport::MessageKind::PING:
                         {
                             webSocketMessageType = WebSocketMessageType::Ping;
-                        } break;
+                        }
+                        break;
 
                         case WebSocketTransport::MessageKind::PONG:
                         {
                             webSocketMessageType = WebSocketMessageType::Pong;
-                        } break;
+                        }
+                        break;
 
                         case WebSocketTransport::MessageKind::FRAGMENT:
                         {
                             webSocketMessageType = WebSocketMessageType::Fragment;
-                        } break;
+                        }
+                        break;
                     }
 
                     WebSocketErrorInfo webSocketErrorInfo;
@@ -354,11 +381,13 @@ namespace ix
 
                     bool binary = messageKind == WebSocketTransport::MessageKind::MSG_BINARY;
 
-                    _onMessageCallback(
-                         std::make_shared<WebSocketMessage>(
-                            webSocketMessageType, msg, wireSize,
-                            webSocketErrorInfo, WebSocketOpenInfo(),
-                            WebSocketCloseInfo(), binary));
+                    _onMessageCallback(std::make_shared<WebSocketMessage>(webSocketMessageType,
+                                                                          msg,
+                                                                          wireSize,
+                                                                          webSocketErrorInfo,
+                                                                          WebSocketOpenInfo(),
+                                                                          WebSocketCloseInfo(),
+                                                                          binary));
 
                     WebSocket::invokeTrafficTrackerCallback(msg.size(), true);
                 });
@@ -445,17 +474,20 @@ namespace ix
             case SendMessageKind::Text:
             {
                 webSocketSendInfo = _ws.sendText(text, onProgressCallback);
-            } break;
+            }
+            break;
 
             case SendMessageKind::Binary:
             {
                 webSocketSendInfo = _ws.sendBinary(text, onProgressCallback);
-            } break;
+            }
+            break;
 
             case SendMessageKind::Ping:
             {
                 webSocketSendInfo = _ws.sendPing(text);
-            } break;
+            }
+            break;
         }
 
         WebSocket::invokeTrafficTrackerCallback(webSocketSendInfo.wireSize, false);
@@ -467,10 +499,10 @@ namespace ix
     {
         switch (_ws.getReadyState())
         {
-            case ix::WebSocketTransport::ReadyState::OPEN      : return ReadyState::Open;
+            case ix::WebSocketTransport::ReadyState::OPEN: return ReadyState::Open;
             case ix::WebSocketTransport::ReadyState::CONNECTING: return ReadyState::Connecting;
-            case ix::WebSocketTransport::ReadyState::CLOSING   : return ReadyState::Closing;
-            case ix::WebSocketTransport::ReadyState::CLOSED    : return ReadyState::Closed;
+            case ix::WebSocketTransport::ReadyState::CLOSING: return ReadyState::Closing;
+            case ix::WebSocketTransport::ReadyState::CLOSED: return ReadyState::Closed;
             default: return ReadyState::Closed;
         }
     }
@@ -479,10 +511,10 @@ namespace ix
     {
         switch (readyState)
         {
-            case ReadyState::Open      : return "OPEN";
+            case ReadyState::Open: return "OPEN";
             case ReadyState::Connecting: return "CONNECTING";
-            case ReadyState::Closing   : return "CLOSING";
-            case ReadyState::Closed    : return "CLOSED";
+            case ReadyState::Closing: return "CLOSING";
+            case ReadyState::Closed: return "CLOSED";
             default: return "UNKNOWN";
         }
     }
@@ -506,4 +538,16 @@ namespace ix
     {
         return _ws.bufferedAmount();
     }
-}
+
+    void WebSocket::addSubProtocol(const std::string& subProtocol)
+    {
+        std::lock_guard<std::mutex> lock(_configMutex);
+        _subProtocols.push_back(subProtocol);
+    }
+
+    const std::vector<std::string>& WebSocket::getSubProtocols()
+    {
+        std::lock_guard<std::mutex> lock(_configMutex);
+        return _subProtocols;
+    }
+} // namespace ix

ixwebsocket/IXWebSocket.h

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "IXProgressCallback.h"
+#include "IXSocketTLSOptions.h"
 #include "IXWebSocketCloseConstants.h"
 #include "IXWebSocketErrorInfo.h"
 #include "IXWebSocketHttpHeaders.h"
@@ -49,12 +50,14 @@ namespace ix
         void setExtraHeaders(const WebSocketHttpHeaders& headers);
         void setPerMessageDeflateOptions(
             const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions);
+        void setTLSOptions(const SocketTLSOptions& socketTLSOptions);
         void setHeartBeatPeriod(int heartBeatPeriodSecs);
         void setPingInterval(int pingIntervalSecs); // alias of setHeartBeatPeriod
         void setPingTimeout(int pingTimeoutSecs);
         void enablePong();
         void disablePong();
         void disablePerMessageDeflate();
+        void addSubProtocol(const std::string& subProtocol);
 
         // Run asynchronously, by calling start and stop.
         void start();
@@ -99,6 +102,7 @@ namespace ix
         bool isAutomaticReconnectionEnabled() const;
         void setMaxWaitBetweenReconnectionRetries(uint32_t maxWaitBetweenReconnectionRetries);
         uint32_t getMaxWaitBetweenReconnectionRetries() const;
+        const std::vector<std::string>& getSubProtocols();
 
     private:
         WebSocketSendInfo sendMessage(const std::string& text,
@@ -111,7 +115,7 @@ namespace ix
         static void invokeTrafficTrackerCallback(size_t size, bool incoming);
 
         // Server
-        WebSocketInitResult connectToSocket(int fd, int timeoutSecs);
+        WebSocketInitResult connectToSocket(std::shared_ptr<Socket>, int timeoutSecs);
 
         WebSocketTransport _ws;
 
@@ -119,6 +123,9 @@ namespace ix
         WebSocketHttpHeaders _extraHeaders;
 
         WebSocketPerMessageDeflateOptions _perMessageDeflateOptions;
+
+        SocketTLSOptions _socketTLSOptions;
+
         mutable std::mutex _configMutex; // protect all config variables access
 
         OnMessageCallback _onMessageCallback;
@@ -146,6 +153,9 @@ namespace ix
         static const int kDefaultPingIntervalSecs;
         static const int kDefaultPingTimeoutSecs;
 
+        // Subprotocols
+        std::vector<std::string> _subProtocols;
+
         friend class WebSocketServer;
     };
 } // namespace ix

ixwebsocket/IXWebSocketCloseConstants.cpp

@@ -22,10 +22,15 @@ namespace ix
     const std::string WebSocketCloseConstants::kProtocolErrorMessage("Protocol error");
     const std::string WebSocketCloseConstants::kNoStatusCodeErrorMessage("No status code");
     const std::string WebSocketCloseConstants::kProtocolErrorReservedBitUsed("Reserved bit used");
-    const std::string WebSocketCloseConstants::kProtocolErrorPingPayloadOversized("Ping reason control frame with payload length > 125 octets");
-    const std::string WebSocketCloseConstants::kProtocolErrorCodeControlMessageFragmented("Control message fragmented");
-    const std::string WebSocketCloseConstants::kProtocolErrorCodeDataOpcodeOutOfSequence("Fragmentation: data message out of sequence");
-    const std::string WebSocketCloseConstants::kProtocolErrorCodeContinuationOpCodeOutOfSequence("Fragmentation: continuation opcode out of sequence");
-    const std::string WebSocketCloseConstants::kInvalidFramePayloadDataMessage("Invalid frame payload data");
+    const std::string WebSocketCloseConstants::kProtocolErrorPingPayloadOversized(
+        "Ping reason control frame with payload length > 125 octets");
+    const std::string WebSocketCloseConstants::kProtocolErrorCodeControlMessageFragmented(
+        "Control message fragmented");
+    const std::string WebSocketCloseConstants::kProtocolErrorCodeDataOpcodeOutOfSequence(
+        "Fragmentation: data message out of sequence");
+    const std::string WebSocketCloseConstants::kProtocolErrorCodeContinuationOpCodeOutOfSequence(
+        "Fragmentation: continuation opcode out of sequence");
+    const std::string WebSocketCloseConstants::kInvalidFramePayloadDataMessage(
+        "Invalid frame payload data");
     const std::string WebSocketCloseConstants::kInvalidCloseCodeMessage("Invalid close code");
-}
+} // namespace ix

ixwebsocket/IXWebSocketHandshake.cpp

@@ -5,50 +5,45 @@
  */
 
 #include "IXWebSocketHandshake.h"
+
+#include "IXHttp.h"
 #include "IXSocketConnect.h"
 #include "IXUrlParser.h"
-#include "IXHttp.h"
 #include "IXUserAgent.h"
-
 #include "libwshandshake.hpp"
-
-#include <sstream>
-#include <random>
 #include <algorithm>
+#include <random>
+#include <sstream>
 
 
 namespace ix
 {
-    WebSocketHandshake::WebSocketHandshake(std::atomic<bool>& requestInitCancellation,
-                                           std::shared_ptr<Socket> socket,
-                                           WebSocketPerMessageDeflate& perMessageDeflate,
-                                           WebSocketPerMessageDeflateOptions& perMessageDeflateOptions,
-                                           std::atomic<bool>& enablePerMessageDeflate) :
-        _requestInitCancellation(requestInitCancellation),
-        _socket(socket),
-        _perMessageDeflate(perMessageDeflate),
-        _perMessageDeflateOptions(perMessageDeflateOptions),
-        _enablePerMessageDeflate(enablePerMessageDeflate)
+    WebSocketHandshake::WebSocketHandshake(
+        std::atomic<bool>& requestInitCancellation,
+        std::shared_ptr<Socket> socket,
+        WebSocketPerMessageDeflate& perMessageDeflate,
+        WebSocketPerMessageDeflateOptions& perMessageDeflateOptions,
+        std::atomic<bool>& enablePerMessageDeflate)
+        : _requestInitCancellation(requestInitCancellation)
+        , _socket(socket)
+        , _perMessageDeflate(perMessageDeflate)
+        , _perMessageDeflateOptions(perMessageDeflateOptions)
+        , _enablePerMessageDeflate(enablePerMessageDeflate)
     {
-
     }
 
     bool WebSocketHandshake::insensitiveStringCompare(const std::string& a, const std::string& b)
     {
-        return std::equal(a.begin(), a.end(),
-                          b.begin(), b.end(),
-                          [](char a, char b)
-                          {
-                              return tolower(a) == tolower(b);
-                          });
+        return std::equal(a.begin(), a.end(), b.begin(), b.end(), [](char a, char b) {
+            return tolower(a) == tolower(b);
+        });
     }
 
     std::string WebSocketHandshake::genRandomString(const int len)
     {
-        std::string alphanum =
-            "0123456789"
-            "ABCDEFGH"
-            "abcdefgh";
+        std::string alphanum = "0123456789"
+                               "ABCDEFGH"
+                               "abcdefgh";
 
         std::random_device r;
         std::default_random_engine e1(r());
@@ -74,6 +69,7 @@ namespace ix
         ss << " ";
         ss << reason;
         ss << "\r\n";
+        ss << "Server: " << userAgent() << "\r\n";
 
         // Socket write can only be cancelled through a timeout here, not manually.
         static std::atomic<bool> requestInitCancellation(false);
@@ -88,12 +84,13 @@ namespace ix
         return WebSocketInitResult(false, code, reason);
     }
 
-    WebSocketInitResult WebSocketHandshake::clientHandshake(const std::string& url,
-                                                            const WebSocketHttpHeaders& extraHeaders,
-                                                            const std::string& host,
-                                                            const std::string& path,
-                                                            int port,
-                                                            int timeoutSecs)
+    WebSocketInitResult WebSocketHandshake::clientHandshake(
+        const std::string& url,
+        const WebSocketHttpHeaders& extraHeaders,
+        const std::string& host,
+        const std::string& path,
+        int port,
+        int timeoutSecs)
     {
         _requestInitCancellation = false;
 
@@ -105,9 +102,7 @@ namespace ix
         if (!success)
         {
             std::stringstream ss;
-            ss << "Unable to connect to " << host
-               << " on port " << port
-               << ", error: " << errMsg;
+            ss << "Unable to connect to " << host << " on port " << port << ", error: " << errMsg;
             return WebSocketInitResult(false, 0, ss.str());
         }
 
@@ -123,7 +118,7 @@ namespace ix
 
         std::stringstream ss;
         ss << "GET " << path << " HTTP/1.1\r\n";
-        ss << "Host: "<< host << ":" << port << "\r\n";
+        ss << "Host: " << host << ":" << port << "\r\n";
         ss << "Upgrade: websocket\r\n";
         ss << "Connection: Upgrade\r\n";
         ss << "Sec-WebSocket-Version: 13\r\n";
@@ -149,7 +144,8 @@ namespace ix
 
         if (!_socket->writeBytes(ss.str(), isCancellationRequested))
         {
-            return WebSocketInitResult(false, 0, std::string("Failed sending GET request to ") + url);
+            return WebSocketInitResult(
+                false, 0, std::string("Failed sending GET request to ") + url);
         }
 
         // Read HTTP status line
@@ -159,8 +155,8 @@ namespace ix
 
         if (!lineValid)
         {
-            return WebSocketInitResult(false, 0,
-                                       std::string("Failed reading HTTP status line from ") + url);
+            return WebSocketInitResult(
+                false, 0, std::string("Failed reading HTTP status line from ") + url);
         }
 
         // Validate status
@@ -173,8 +169,7 @@ namespace ix
         {
             std::stringstream ss;
             ss << "Expecting HTTP/1.1, got " << httpVersion << ". "
-               << "Rejecting connection to " << host << ":" << port
-               << ", status: " << status
+               << "Rejecting connection to " << host << ":" << port << ", status: " << status
                << ", HTTP Status line: " << line;
             return WebSocketInitResult(false, status, ss.str());
         }
@@ -183,8 +178,7 @@ namespace ix
         if (status != 101)
         {
             std::stringstream ss;
-            ss << "Got bad status connecting to " << host << ":" << port
-               << ", status: " << status
+            ss << "Got bad status connecting to " << host << ":" << port << ", status: " << status
                << ", HTTP Status line: " << line;
             return WebSocketInitResult(false, status, ss.str());
         }
@@ -245,18 +239,13 @@ namespace ix
         return WebSocketInitResult(true, status, "", headers, path);
     }
 
-    WebSocketInitResult WebSocketHandshake::serverHandshake(int fd, int timeoutSecs)
+    WebSocketInitResult WebSocketHandshake::serverHandshake(int timeoutSecs)
     {
         _requestInitCancellation = false;
 
-        // Set the socket to non blocking mode + other tweaks
-        SocketConnect::configure(fd);
-
         auto isCancellationRequested =
             makeCancellationRequestWithTimeout(timeoutSecs, _requestInitCancellation);
 
-        std::string remote = std::string("remote fd ") + std::to_string(fd);
-
         // Read first line
         auto lineResult = _socket->readLine(isCancellationRequested);
         auto lineValid = lineResult.first;
@@ -269,8 +258,8 @@ namespace ix
 
         // Validate request line (GET /foo HTTP/1.1\r\n)
         auto requestLine = Http::parseRequestLine(line);
-        auto method      = std::get<0>(requestLine);
-        auto uri         = std::get<1>(requestLine);
+        auto method = std::get<0>(requestLine);
+        auto uri = std::get<1>(requestLine);
         auto httpVersion = std::get<2>(requestLine);
 
         if (method != "GET")
@@ -280,7 +269,8 @@ namespace ix
 
         if (httpVersion != "HTTP/1.1")
         {
-            return sendErrorResponse(400, "Invalid HTTP version, need HTTP/1.1, got: " + httpVersion);
+            return sendErrorResponse(400,
+                                     "Invalid HTTP version, need HTTP/1.1, got: " + httpVersion);
         }
 
         // Retrieve and validate HTTP headers
@@ -305,8 +295,10 @@ namespace ix
 
         if (!insensitiveStringCompare(headers["upgrade"], "WebSocket"))
         {
-            return sendErrorResponse(400, "Invalid Upgrade header, "
-                                          "need WebSocket, got " + headers["upgrade"]);
+            return sendErrorResponse(400,
+                                     "Invalid Upgrade header, "
+                                     "need WebSocket, got " +
+                                         headers["upgrade"]);
         }
 
         if (headers.find("sec-websocket-version") == headers.end())
@@ -322,8 +314,10 @@ namespace ix
 
             if (version != 13)
             {
-                return sendErrorResponse(400, "Invalid Sec-WebSocket-Version, "
-                                              "need 13, got " + ss.str());
+                return sendErrorResponse(400,
+                                         "Invalid Sec-WebSocket-Version, "
+                                         "need 13, got " +
+                                             ss.str());
             }
         }
 
@@ -349,7 +343,7 @@ namespace ix
             if (!_perMessageDeflate.init(webSocketPerMessageDeflateOptions))
             {
                 return WebSocketInitResult(
-                    false, 0,"Failed to initialize per message deflate engine");
+                    false, 0, "Failed to initialize per message deflate engine");
             }
             ss << webSocketPerMessageDeflateOptions.generateHeader();
         }
@@ -358,9 +352,10 @@ namespace ix
 
         if (!_socket->writeBytes(ss.str(), isCancellationRequested))
         {
-            return WebSocketInitResult(false, 0, std::string("Failed sending response to ") + remote);
+            return WebSocketInitResult(
+                false, 0, std::string("Failed sending response to remote end"));
         }
 
         return WebSocketInitResult(true, 200, "", headers, uri);
     }
-}
+} // namespace ix

ixwebsocket/IXWebSocketHandshake.h

@@ -9,6 +9,7 @@
 #include "IXCancellationRequest.h"
 #include "IXSocket.h"
 #include "IXWebSocketHttpHeaders.h"
+#include "IXWebSocketInitResult.h"
 #include "IXWebSocketPerMessageDeflate.h"
 #include "IXWebSocketPerMessageDeflateOptions.h"
 #include <atomic>
@@ -18,28 +19,6 @@
 
 namespace ix
 {
-    struct WebSocketInitResult
-    {
-        bool success;
-        int http_status;
-        std::string errorStr;
-        WebSocketHttpHeaders headers;
-        std::string uri;
-
-        WebSocketInitResult(bool s = false,
-                            int status = 0,
-                            const std::string& e = std::string(),
-                            WebSocketHttpHeaders h = WebSocketHttpHeaders(),
-                            const std::string& u = std::string())
-        {
-            success = s;
-            http_status = status;
-            errorStr = e;
-            headers = h;
-            uri = u;
-        }
-    };
-
     class WebSocketHandshake
     {
     public:
@@ -49,15 +28,14 @@ namespace ix
                            WebSocketPerMessageDeflateOptions& perMessageDeflateOptions,
                            std::atomic<bool>& enablePerMessageDeflate);
 
-        WebSocketInitResult clientHandshake(
-            const std::string& url,
-            const WebSocketHttpHeaders& extraHeaders,
-            const std::string& host,
-            const std::string& path,
-            int port,
-            int timeoutSecs);
+        WebSocketInitResult clientHandshake(const std::string& url,
+                                            const WebSocketHttpHeaders& extraHeaders,
+                                            const std::string& host,
+                                            const std::string& path,
+                                            int port,
+                                            int timeoutSecs);
 
-        WebSocketInitResult serverHandshake(int fd, int timeoutSecs);
+        WebSocketInitResult serverHandshake(int timeoutSecs);
 
     private:
         std::string genRandomString(const int len);

ixwebsocket/IXWebSocketHttpHeaders.cpp

@@ -5,13 +5,15 @@
  */
 
 #include "IXWebSocketHttpHeaders.h"
+
 #include "IXSocket.h"
 #include <algorithm>
 #include <locale>
 
 namespace ix
 {
-    bool CaseInsensitiveLess::NocaseCompare::operator()(const unsigned char & c1, const unsigned char & c2) const
+    bool CaseInsensitiveLess::NocaseCompare::operator()(const unsigned char& c1,
+                                                        const unsigned char& c2) const
     {
 #ifdef _WIN32
         return std::tolower(c1, std::locale()) < std::tolower(c2, std::locale());
@@ -20,17 +22,17 @@ namespace ix
 #endif
     }
 
-    bool CaseInsensitiveLess::operator()(const std::string & s1, const std::string & s2) const
+    bool CaseInsensitiveLess::operator()(const std::string& s1, const std::string& s2) const
     {
-        return std::lexicographical_compare
-                (s1.begin(), s1.end(),   // source range
-                 s2.begin(), s2.end(),   // dest range
-                 NocaseCompare());       // comparison
+        return std::lexicographical_compare(s1.begin(),
+                                            s1.end(), // source range
+                                            s2.begin(),
+                                            s2.end(),         // dest range
+                                            NocaseCompare()); // comparison
     }
 
     std::pair<bool, WebSocketHttpHeaders> parseHttpHeaders(
-        std::shared_ptr<Socket> socket,
-        const CancellationRequest& isCancellationRequested)
+        std::shared_ptr<Socket> socket, const CancellationRequest& isCancellationRequested)
     {
         WebSocketHttpHeaders headers;
 
@@ -41,11 +43,9 @@ namespace ix
         {
             int colon = 0;
 
-            for (i = 0;
-                 i < 2 || (i < 1023 && line[i-2] != '\r' && line[i-1] != '\n');
-                 ++i)
+            for (i = 0; i < 2 || (i < 1023 && line[i - 2] != '\r' && line[i - 1] != '\n'); ++i)
             {
-                if (!socket->readByte(line+i, isCancellationRequested))
+                if (!socket->readByte(line + i, isCancellationRequested))
                 {
                     return std::make_pair(false, headers);
                 }
@@ -79,4 +79,4 @@ namespace ix
 
         return std::make_pair(true, headers);
     }
-}
+} // namespace ix

ixwebsocket/IXWebSocketInitResult.h

@@ -0,0 +1,36 @@
+/*
+ *  IXWebSocketInitResult.h
+ *  Author: Benjamin Sergeant
+ *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
+ */
+
+#pragma once
+
+#include "IXWebSocketHttpHeaders.h"
+
+namespace ix
+{
+    struct WebSocketInitResult
+    {
+        bool success;
+        int http_status;
+        std::string errorStr;
+        WebSocketHttpHeaders headers;
+        std::string uri;
+        std::string protocol;
+
+        WebSocketInitResult(bool s = false,
+                            int status = 0,
+                            const std::string& e = std::string(),
+                            WebSocketHttpHeaders h = WebSocketHttpHeaders(),
+                            const std::string& u = std::string())
+        {
+            success = s;
+            http_status = status;
+            errorStr = e;
+            headers = h;
+            uri = u;
+            protocol = h["Sec-WebSocket-Protocol"];
+        }
+    };
+} // namespace ix

ixwebsocket/IXWebSocketMessageQueue.cpp

@@ -8,7 +8,6 @@
 
 namespace ix
 {
-
     WebSocketMessageQueue::WebSocketMessageQueue(WebSocket* websocket)
     {
         bindWebsocket(websocket);
@@ -24,7 +23,7 @@ namespace ix
         bindWebsocket(nullptr);
     }
 
-    void WebSocketMessageQueue::bindWebsocket(WebSocket * websocket)
+    void WebSocketMessageQueue::bindWebsocket(WebSocket* websocket)
     {
         if (_websocket == websocket) return;
 
@@ -40,8 +39,7 @@ namespace ix
         // bind new
         if (_websocket)
         {
-            _websocket->setOnMessageCallback([this](const WebSocketMessagePtr& msg)
-            {
+            _websocket->setOnMessageCallback([this](const WebSocketMessagePtr& msg) {
                 std::lock_guard<std::mutex> lock(_messagesMutex);
                 _messages.emplace_back(std::move(msg));
             });
@@ -74,8 +72,7 @@ namespace ix
 
     void WebSocketMessageQueue::poll(int count)
     {
-        if (!_onMessageUserCallback)
-            return;
+        if (!_onMessageUserCallback) return;
 
         WebSocketMessagePtr message;
 
@@ -86,4 +83,4 @@ namespace ix
         }
     }
 
-}
+} // namespace ix

ixwebsocket/IXWebSocketOpenInfo.h

@@ -12,11 +12,14 @@ namespace ix
     {
         std::string uri;
         WebSocketHttpHeaders headers;
+        std::string protocol;
 
         WebSocketOpenInfo(const std::string& u = std::string(),
-                          const WebSocketHttpHeaders& h = WebSocketHttpHeaders())
+                          const WebSocketHttpHeaders& h = WebSocketHttpHeaders(),
+                          const std::string& p = std::string())
             : uri(u)
             , headers(h)
+            , protocol(p)
         {
             ;
         }

ixwebsocket/IXWebSocketPerMessageDeflate.cpp

@@ -41,19 +41,21 @@
  *  - Added more documentation.
  *
  *  Per message Deflate RFC: https://tools.ietf.org/html/rfc7692
- *  Chrome websocket -> https://github.com/chromium/chromium/tree/2ca8c5037021c9d2ecc00b787d58a31ed8fc8bcb/net/websockets
+ *  Chrome websocket ->
+ * https://github.com/chromium/chromium/tree/2ca8c5037021c9d2ecc00b787d58a31ed8fc8bcb/net/websockets
  *
  */
 
 #include "IXWebSocketPerMessageDeflate.h"
-#include "IXWebSocketPerMessageDeflateOptions.h"
+
 #include "IXWebSocketPerMessageDeflateCodec.h"
+#include "IXWebSocketPerMessageDeflateOptions.h"
 
 namespace ix
 {
-    WebSocketPerMessageDeflate::WebSocketPerMessageDeflate() :
-        _compressor(std::make_unique<WebSocketPerMessageDeflateCompressor>()),
-        _decompressor(std::make_unique<WebSocketPerMessageDeflateDecompressor>())
+    WebSocketPerMessageDeflate::WebSocketPerMessageDeflate()
+        : _compressor(std::make_unique<WebSocketPerMessageDeflateCompressor>())
+        , _decompressor(std::make_unique<WebSocketPerMessageDeflateDecompressor>())
     {
         ;
     }
@@ -63,10 +65,10 @@ namespace ix
         ;
     }
 
-    bool WebSocketPerMessageDeflate::init(const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions)
+    bool WebSocketPerMessageDeflate::init(
+        const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions)
     {
-        bool clientNoContextTakeover =
-            perMessageDeflateOptions.getClientNoContextTakeover();
+        bool clientNoContextTakeover = perMessageDeflateOptions.getClientNoContextTakeover();
 
         uint8_t deflateBits = perMessageDeflateOptions.getClientMaxWindowBits();
         uint8_t inflateBits = perMessageDeflateOptions.getServerMaxWindowBits();
@@ -75,16 +77,14 @@ namespace ix
                _decompressor->init(inflateBits, clientNoContextTakeover);
     }
 
-    bool WebSocketPerMessageDeflate::compress(const std::string& in,
-                                              std::string& out)
+    bool WebSocketPerMessageDeflate::compress(const std::string& in, std::string& out)
     {
         return _compressor->compress(in, out);
     }
 
-    bool WebSocketPerMessageDeflate::decompress(const std::string& in,
-                                                std::string &out)
+    bool WebSocketPerMessageDeflate::decompress(const std::string& in, std::string& out)
     {
         return _decompressor->decompress(in, out);
     }
 
-}
+} // namespace ix

ixwebsocket/IXWebSocketPerMessageDeflateCodec.cpp

@@ -5,8 +5,8 @@
  */
 
 #include "IXWebSocketPerMessageDeflateCodec.h"
-#include "IXWebSocketPerMessageDeflateOptions.h"
 
+#include "IXWebSocketPerMessageDeflateOptions.h"
 #include <cassert>
 #include <string.h>
 
@@ -18,7 +18,7 @@ namespace
     const std::string kEmptyUncompressedBlock = std::string("\x00\x00\xff\xff", 4);
 
     const int kBufferSize = 1 << 14;
-}
+} // namespace
 
 namespace ix
 {
@@ -26,7 +26,7 @@ namespace ix
     // Compressor
     //
     WebSocketPerMessageDeflateCompressor::WebSocketPerMessageDeflateCompressor()
-      : _compressBufferSize(kBufferSize)
+        : _compressBufferSize(kBufferSize)
     {
         memset(&_deflateState, 0, sizeof(_deflateState));
 
@@ -43,22 +43,18 @@ namespace ix
     bool WebSocketPerMessageDeflateCompressor::init(uint8_t deflateBits,
                                                     bool clientNoContextTakeOver)
     {
-        int ret = deflateInit2(
-            &_deflateState,
-            Z_DEFAULT_COMPRESSION,
-            Z_DEFLATED,
-            -1*deflateBits,
-            4, // memory level 1-9
-            Z_DEFAULT_STRATEGY
-        );
+        int ret = deflateInit2(&_deflateState,
+                               Z_DEFAULT_COMPRESSION,
+                               Z_DEFLATED,
+                               -1 * deflateBits,
+                               4, // memory level 1-9
+                               Z_DEFAULT_STRATEGY);
 
         if (ret != Z_OK) return false;
 
         _compressBuffer = std::make_unique<unsigned char[]>(_compressBufferSize);
 
-        _flush = (clientNoContextTakeOver)
-                 ? Z_FULL_FLUSH
-                 : Z_SYNC_FLUSH;
+        _flush = (clientNoContextTakeOver) ? Z_FULL_FLUSH : Z_SYNC_FLUSH;
 
         return true;
     }
@@ -70,8 +66,7 @@ namespace ix
         return std::equal(ending.rbegin(), ending.rend(), value.rbegin());
     }
 
-    bool WebSocketPerMessageDeflateCompressor::compress(const std::string& in,
-                                                        std::string& out)
+    bool WebSocketPerMessageDeflateCompressor::compress(const std::string& in, std::string& out)
     {
         //
         // 7.2.1.  Compression
@@ -95,7 +90,7 @@ namespace ix
         if (in.empty())
         {
             uint8_t buf[6] = {0x02, 0x00, 0x00, 0x00, 0xff, 0xff};
-            out.append((char *)(buf), 6);
+            out.append((char*) (buf), 6);
             return true;
         }
 
@@ -112,7 +107,7 @@ namespace ix
 
             output = _compressBufferSize - _deflateState.avail_out;
 
-            out.append((char *)(_compressBuffer.get()),output);
+            out.append((char*) (_compressBuffer.get()), output);
         } while (_deflateState.avail_out == 0);
 
         if (endsWith(out, kEmptyUncompressedBlock))
@@ -127,7 +122,7 @@ namespace ix
     // Decompressor
     //
     WebSocketPerMessageDeflateDecompressor::WebSocketPerMessageDeflateDecompressor()
-      : _compressBufferSize(kBufferSize)
+        : _compressBufferSize(kBufferSize)
     {
         memset(&_inflateState, 0, sizeof(_inflateState));
 
@@ -146,24 +141,18 @@ namespace ix
     bool WebSocketPerMessageDeflateDecompressor::init(uint8_t inflateBits,
                                                       bool clientNoContextTakeOver)
     {
-        int ret = inflateInit2(
-            &_inflateState,
-            -1*inflateBits
-        );
+        int ret = inflateInit2(&_inflateState, -1 * inflateBits);
 
         if (ret != Z_OK) return false;
 
         _compressBuffer = std::make_unique<unsigned char[]>(_compressBufferSize);
 
-        _flush = (clientNoContextTakeOver)
-                 ? Z_FULL_FLUSH
-                 : Z_SYNC_FLUSH;
+        _flush = (clientNoContextTakeOver) ? Z_FULL_FLUSH : Z_SYNC_FLUSH;
 
         return true;
     }
 
-    bool WebSocketPerMessageDeflateDecompressor::decompress(const std::string& in,
-                                                            std::string& out)
+    bool WebSocketPerMessageDeflateDecompressor::decompress(const std::string& in, std::string& out)
     {
         //
         // 7.2.2.  Decompression
@@ -179,7 +168,7 @@ namespace ix
         inFixed += kEmptyUncompressedBlock;
 
         _inflateState.avail_in = (uInt) inFixed.size();
-        _inflateState.next_in = (unsigned char *)(const_cast<char *>(inFixed.data()));
+        _inflateState.next_in = (unsigned char*) (const_cast<char*>(inFixed.data()));
 
         do
         {
@@ -193,13 +182,10 @@ namespace ix
                 return false; // zlib error
             }
 
-            out.append(
-                reinterpret_cast<char *>(_compressBuffer.get()),
-                _compressBufferSize - _inflateState.avail_out
-            );
+            out.append(reinterpret_cast<char*>(_compressBuffer.get()),
+                       _compressBufferSize - _inflateState.avail_out);
         } while (_inflateState.avail_out == 0);
 
         return true;
     }
-}
-
+} // namespace ix

ixwebsocket/IXWebSocketPerMessageDeflateOptions.cpp

@@ -6,9 +6,9 @@
 
 #include "IXWebSocketPerMessageDeflateOptions.h"
 
-#include <sstream>
 #include <algorithm>
 #include <cctype>
+#include <sstream>
 
 namespace ix
 {
@@ -48,7 +48,8 @@ namespace ix
     //
     // Server response could look like that:
     //
-    // Sec-WebSocket-Extensions: permessage-deflate; client_no_context_takeover; server_no_context_takeover
+    // Sec-WebSocket-Extensions: permessage-deflate; client_no_context_takeover;
+    // server_no_context_takeover
     //
     WebSocketPerMessageDeflateOptions::WebSocketPerMessageDeflateOptions(std::string extension)
     {
@@ -92,8 +93,7 @@ namespace ix
                 // Sanitize values to be in the proper range [8, 15] in
                 // case a server would give us bogus values
                 _serverMaxWindowBits =
-                    std::min(maxServerMaxWindowBits,
-                        std::max(x, minServerMaxWindowBits));
+                    std::min(maxServerMaxWindowBits, std::max(x, minServerMaxWindowBits));
             }
 
             if (startsWith(token, "client_max_window_bits="))
@@ -107,8 +107,7 @@ namespace ix
                 // Sanitize values to be in the proper range [8, 15] in
                 // case a server would give us bogus values
                 _clientMaxWindowBits =
-                    std::min(maxClientMaxWindowBits,
-                        std::max(x, minClientMaxWindowBits));
+                    std::min(maxClientMaxWindowBits, std::max(x, minClientMaxWindowBits));
 
                 sanitizeClientMaxWindowBits();
             }
@@ -175,11 +174,10 @@ namespace ix
     std::string WebSocketPerMessageDeflateOptions::removeSpaces(const std::string& str)
     {
         std::string out(str);
-        out.erase(std::remove_if(out.begin(),
-                                 out.end(),
-                                 [](unsigned char x){ return std::isspace(x); }),
-                  out.end());
+        out.erase(
+            std::remove_if(out.begin(), out.end(), [](unsigned char x) { return std::isspace(x); }),
+            out.end());
 
         return out;
     }
-}
+} // namespace ix

ixwebsocket/IXWebSocketServer.cpp

@@ -5,13 +5,13 @@
  */
 
 #include "IXWebSocketServer.h"
-#include "IXWebSocketTransport.h"
-#include "IXWebSocket.h"
-#include "IXSocketConnect.h"
-#include "IXNetSystem.h"
 
-#include <sstream>
+#include "IXNetSystem.h"
+#include "IXSocketConnect.h"
+#include "IXWebSocket.h"
+#include "IXWebSocketTransport.h"
 #include <future>
+#include <sstream>
 #include <string.h>
 
 namespace ix
@@ -23,11 +23,11 @@ namespace ix
                                      const std::string& host,
                                      int backlog,
                                      size_t maxConnections,
-                                     int handshakeTimeoutSecs) : SocketServer(port, host, backlog, maxConnections),
-        _handshakeTimeoutSecs(handshakeTimeoutSecs),
-        _enablePong(kDefaultEnablePong)
+                                     int handshakeTimeoutSecs)
+        : SocketServer(port, host, backlog, maxConnections)
+        , _handshakeTimeoutSecs(handshakeTimeoutSecs)
+        , _enablePong(kDefaultEnablePong)
     {
-
     }
 
     WebSocketServer::~WebSocketServer()
@@ -63,9 +63,8 @@ namespace ix
         _onConnectionCallback = callback;
     }
 
-    void WebSocketServer::handleConnection(
-        int fd,
-        std::shared_ptr<ConnectionState> connectionState)
+    void WebSocketServer::handleConnection(std::shared_ptr<Socket> socket,
+                                           std::shared_ptr<ConnectionState> connectionState)
     {
         auto webSocket = std::make_shared<WebSocket>();
         _onConnectionCallback(webSocket, connectionState);
@@ -83,7 +82,7 @@ namespace ix
             _clients.insert(webSocket);
         }
 
-        auto status = webSocket->connectToSocket(fd, _handshakeTimeoutSecs);
+        auto status = webSocket->connectToSocket(socket, _handshakeTimeoutSecs);
         if (status.success)
         {
             // Process incoming messages and execute callbacks
@@ -93,10 +92,8 @@ namespace ix
         else
         {
             std::stringstream ss;
-            ss << "WebSocketServer::handleConnection() HTTP status: "
-               << status.http_status
-               << " error: "
-               << status.errorStr;
+            ss << "WebSocketServer::handleConnection() HTTP status: " << status.http_status
+               << " error: " << status.errorStr;
             logError(ss.str());
         }
 
@@ -111,8 +108,6 @@ namespace ix
 
         logInfo("WebSocketServer::handleConnection() done");
         connectionState->setTerminated();
-
-        Socket::closeSocket(fd);
     }
 
     std::set<std::shared_ptr<WebSocket>> WebSocketServer::getClients()
@@ -126,4 +121,4 @@ namespace ix
         std::lock_guard<std::mutex> lock(_clientsMutex);
         return _clients.size();
     }
-}
+} // namespace ix

ixwebsocket/IXWebSocketServer.h

@@ -55,7 +55,7 @@ namespace ix
         const static bool kDefaultEnablePong;
 
         // Methods
-        virtual void handleConnection(int fd,
+        virtual void handleConnection(std::shared_ptr<Socket> socket,
                                       std::shared_ptr<ConnectionState> connectionState) final;
         virtual size_t getConnectedClientsCount() final;
     };

ixwebsocket/IXWebSocketTransport.cpp

@@ -33,22 +33,22 @@
 //
 
 #include "IXWebSocketTransport.h"
+
+#include "IXSocketFactory.h"
+#include "IXSocketTLSOptions.h"
+#include "IXUrlParser.h"
+#include "IXUtf8Validator.h"
 #include "IXWebSocketHandshake.h"
 #include "IXWebSocketHttpHeaders.h"
-#include "IXUrlParser.h"
-#include "IXSocketFactory.h"
-#include "IXUtf8Validator.h"
-
-#include <string.h>
-#include <stdlib.h>
-
-#include <cstdlib>
-#include <vector>
-#include <string>
-#include <cstdarg>
-#include <sstream>
 #include <chrono>
+#include <cstdarg>
+#include <cstdlib>
+#include <sstream>
+#include <stdlib.h>
+#include <string.h>
+#include <string>
 #include <thread>
+#include <vector>
 
 
 namespace
@@ -64,7 +64,7 @@ namespace
 
         return a;
     }
-}
+} // namespace
 
 namespace ix
 {
@@ -75,24 +75,24 @@ namespace ix
     const int WebSocketTransport::kClosingMaximumWaitingDelayInMs(300);
     constexpr size_t WebSocketTransport::kChunkSize;
 
-    WebSocketTransport::WebSocketTransport() :
-        _useMask(true),
-        _compressedMessage(false),
-        _readyState(ReadyState::CLOSED),
-        _closeCode(WebSocketCloseConstants::kInternalErrorCode),
-        _closeReason(WebSocketCloseConstants::kInternalErrorMessage),
-        _closeWireSize(0),
-        _closeRemote(false),
-        _enablePerMessageDeflate(false),
-        _requestInitCancellation(false),
-        _closingTimePoint(std::chrono::steady_clock::now()),
-        _enablePong(kDefaultEnablePong),
-        _pingIntervalSecs(kDefaultPingIntervalSecs),
-        _pingTimeoutSecs(kDefaultPingTimeoutSecs),
-        _pingIntervalOrTimeoutGCDSecs(-1),
-        _nextGCDTimePoint(std::chrono::steady_clock::now()),
-        _lastSendPingTimePoint(std::chrono::steady_clock::now()),
-        _lastReceivePongTimePoint(std::chrono::steady_clock::now())
+    WebSocketTransport::WebSocketTransport()
+        : _useMask(true)
+        , _compressedMessage(false)
+        , _readyState(ReadyState::CLOSED)
+        , _closeCode(WebSocketCloseConstants::kInternalErrorCode)
+        , _closeReason(WebSocketCloseConstants::kInternalErrorMessage)
+        , _closeWireSize(0)
+        , _closeRemote(false)
+        , _enablePerMessageDeflate(false)
+        , _requestInitCancellation(false)
+        , _closingTimePoint(std::chrono::steady_clock::now())
+        , _enablePong(kDefaultEnablePong)
+        , _pingIntervalSecs(kDefaultPingIntervalSecs)
+        , _pingTimeoutSecs(kDefaultPingTimeoutSecs)
+        , _pingIntervalOrTimeoutGCDSecs(-1)
+        , _nextGCDTimePoint(std::chrono::steady_clock::now())
+        , _lastSendPingTimePoint(std::chrono::steady_clock::now())
+        , _lastReceivePongTimePoint(std::chrono::steady_clock::now())
     {
         _readbuf.resize(kChunkSize);
     }
@@ -102,21 +102,24 @@ namespace ix
         ;
     }
 
-    void WebSocketTransport::configure(const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions,
-                                       bool enablePong,
-                                       int pingIntervalSecs,
-                                       int pingTimeoutSecs)
+    void WebSocketTransport::configure(
+        const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions,
+        const SocketTLSOptions& socketTLSOptions,
+        bool enablePong,
+        int pingIntervalSecs,
+        int pingTimeoutSecs)
     {
         _perMessageDeflateOptions = perMessageDeflateOptions;
         _enablePerMessageDeflate = _perMessageDeflateOptions.enabled();
+        _socketTLSOptions = socketTLSOptions;
         _enablePong = enablePong;
         _pingIntervalSecs = pingIntervalSecs;
         _pingTimeoutSecs = pingTimeoutSecs;
 
         if (pingIntervalSecs > 0 && pingTimeoutSecs > 0)
         {
-            _pingIntervalOrTimeoutGCDSecs = greatestCommonDivisor(pingIntervalSecs,
-                                                                  pingTimeoutSecs);
+            _pingIntervalOrTimeoutGCDSecs =
+                greatestCommonDivisor(pingIntervalSecs, pingTimeoutSecs);
         }
         else if (_pingTimeoutSecs > 0)
         {
@@ -129,10 +132,9 @@ namespace ix
     }
 
     // Client
-    WebSocketInitResult WebSocketTransport::connectToUrl(
-        const std::string& url,
-        const WebSocketHttpHeaders& headers,
-        int timeoutSecs)
+    WebSocketInitResult WebSocketTransport::connectToUrl(const std::string& url,
+                                                         const WebSocketHttpHeaders& headers,
+                                                         int timeoutSecs)
     {
         std::lock_guard<std::mutex> lock(_socketMutex);
 
@@ -141,13 +143,12 @@ namespace ix
 
         if (!UrlParser::parse(url, protocol, host, path, query, port))
         {
-            return WebSocketInitResult(false, 0,
-                                       std::string("Could not parse URL ") + url);
+            return WebSocketInitResult(false, 0, std::string("Could not parse URL ") + url);
         }
 
         std::string errorMsg;
         bool tls = protocol == "wss";
-        _socket = createSocket(tls, errorMsg);
+        _socket = createSocket(tls, -1, errorMsg, _socketTLSOptions);
 
         if (!_socket)
         {
@@ -160,8 +161,8 @@ namespace ix
                                               _perMessageDeflateOptions,
                                               _enablePerMessageDeflate);
 
-        auto result = webSocketHandshake.clientHandshake(url, headers, host, path,
-                                                         port, timeoutSecs);
+        auto result =
+            webSocketHandshake.clientHandshake(url, headers, host, path, port, timeoutSecs);
         if (result.success)
         {
             setReadyState(ReadyState::OPEN);
@@ -170,20 +171,15 @@ namespace ix
     }
 
     // Server
-    WebSocketInitResult WebSocketTransport::connectToSocket(int fd, int timeoutSecs)
+    WebSocketInitResult WebSocketTransport::connectToSocket(std::shared_ptr<Socket> socket,
+                                                            int timeoutSecs)
     {
         std::lock_guard<std::mutex> lock(_socketMutex);
 
         // Server should not mask the data it sends to the client
         _useMask = false;
 
-        std::string errorMsg;
-        _socket = createSocket(fd, errorMsg);
-
-        if (!_socket)
-        {
-            return WebSocketInitResult(false, 0, errorMsg);
-        }
+        _socket = socket;
 
         WebSocketHandshake webSocketHandshake(_requestInitCancellation,
                                               _socket,
@@ -191,7 +187,7 @@ namespace ix
                                               _perMessageDeflateOptions,
                                               _enablePerMessageDeflate);
 
-        auto result = webSocketHandshake.serverHandshake(fd, timeoutSecs);
+        auto result = webSocketHandshake.serverHandshake(timeoutSecs);
         if (result.success)
         {
             setReadyState(ReadyState::OPEN);
@@ -244,15 +240,15 @@ namespace ix
 
         if (_pingIntervalOrTimeoutGCDSecs > 0)
         {
-            _nextGCDTimePoint = std::chrono::steady_clock::now() + std::chrono::seconds(_pingIntervalOrTimeoutGCDSecs);
+            _nextGCDTimePoint = std::chrono::steady_clock::now() +
+                                std::chrono::seconds(_pingIntervalOrTimeoutGCDSecs);
         }
     }
 
     // Only consider send PING time points for that computation.
     bool WebSocketTransport::pingIntervalExceeded()
     {
-        if (_pingIntervalSecs <= 0)
-            return false;
+        if (_pingIntervalSecs <= 0) return false;
 
         std::lock_guard<std::mutex> lock(_lastSendPingTimePointMutex);
         auto now = std::chrono::steady_clock::now();
@@ -261,8 +257,7 @@ namespace ix
 
     bool WebSocketTransport::pingTimeoutExceeded()
     {
-        if (_pingTimeoutSecs <= 0)
-            return false;
+        if (_pingTimeoutSecs <= 0) return false;
 
         std::lock_guard<std::mutex> lock(_lastReceivePongTimePointMutex);
         auto now = std::chrono::steady_clock::now();
@@ -299,7 +294,8 @@ namespace ix
 
         // No timeout if state is not OPEN, otherwise computed
         // pingIntervalOrTimeoutGCD (equals to -1 if no ping and no ping timeout are set)
-        int lastingTimeoutDelayInMs = (_readyState != ReadyState::OPEN) ? 0 : _pingIntervalOrTimeoutGCDSecs;
+        int lastingTimeoutDelayInMs =
+            (_readyState != ReadyState::OPEN) ? 0 : _pingIntervalOrTimeoutGCDSecs;
 
         if (_pingIntervalOrTimeoutGCDSecs > 0)
         {
@@ -314,7 +310,10 @@ namespace ix
             }
             else
             {
-                lastingTimeoutDelayInMs = (int)std::chrono::duration_cast<std::chrono::milliseconds>(_nextGCDTimePoint - now).count();
+                lastingTimeoutDelayInMs =
+                    (int) std::chrono::duration_cast<std::chrono::milliseconds>(_nextGCDTimePoint -
+                                                                                now)
+                        .count();
             }
         }
 
@@ -362,7 +361,7 @@ namespace ix
         {
             while (true)
             {
-                ssize_t ret = _socket->recv((char*)&_readbuf[0], _readbuf.size());
+                ssize_t ret = _socket->recv((char*) &_readbuf[0], _readbuf.size());
 
                 if (ret < 0 && Socket::isWaitNeeded())
                 {
@@ -370,8 +369,9 @@ namespace ix
                 }
                 else if (ret <= 0)
                 {
-                    // if there are received data pending to be processed, then delay the abnormal closure
-                    // to after dispatch (other close code/reason could be read from the buffer)
+                    // if there are received data pending to be processed, then delay the abnormal
+                    // closure to after dispatch (other close code/reason could be read from the
+                    // buffer)
 
                     closeSocket();
 
@@ -379,9 +379,7 @@ namespace ix
                 }
                 else
                 {
-                    _rxbuf.insert(_rxbuf.end(),
-                                  _readbuf.begin(),
-                                  _readbuf.begin() + ret);
+                    _rxbuf.insert(_rxbuf.end(), _readbuf.begin(), _readbuf.begin() + ret);
                 }
             }
         }
@@ -426,7 +424,7 @@ namespace ix
         {
             for (size_t i = 0; i != (size_t) message_size; ++i)
             {
-                *(_txbuf.end() - (size_t) message_size + i) ^= masking_key[i&0x3];
+                *(_txbuf.end() - (size_t) message_size + i) ^= masking_key[i & 0x3];
             }
         }
     }
@@ -437,7 +435,7 @@ namespace ix
         {
             for (size_t j = 0; j != ws.N; ++j)
             {
-                _rxbuf[j+ws.header_size] ^= ws.masking_key[j&0x3];
+                _rxbuf[j + ws.header_size] ^= ws.masking_key[j & 0x3];
             }
         }
     }
@@ -470,16 +468,17 @@ namespace ix
         while (true)
         {
             wsheader_type ws;
-            if (_rxbuf.size() < 2) break; /* Need at least 2 */
-            const uint8_t * data = (uint8_t *) &_rxbuf[0]; // peek, but don't consume
+            if (_rxbuf.size() < 2) break;                /* Need at least 2 */
+            const uint8_t* data = (uint8_t*) &_rxbuf[0]; // peek, but don't consume
             ws.fin = (data[0] & 0x80) == 0x80;
             ws.rsv1 = (data[0] & 0x40) == 0x40;
             ws.rsv2 = (data[0] & 0x20) == 0x20;
             ws.rsv3 = (data[0] & 0x10) == 0x10;
-            ws.opcode = (wsheader_type::opcode_type) (data[0] & 0x0f);
+            ws.opcode = (wsheader_type::opcode_type)(data[0] & 0x0f);
             ws.mask = (data[1] & 0x80) == 0x80;
             ws.N0 = (data[1] & 0x7f);
-            ws.header_size = 2 + (ws.N0 == 126? 2 : 0) + (ws.N0 == 127? 8 : 0) + (ws.mask? 4 : 0);
+            ws.header_size =
+                2 + (ws.N0 == 126 ? 2 : 0) + (ws.N0 == 127 ? 8 : 0) + (ws.mask ? 4 : 0);
             if (_rxbuf.size() < ws.header_size) break; /* Need: ws.header_size - _rxbuf.size() */
 
             if ((ws.rsv1 && !_enablePerMessageDeflate) || ws.rsv2 || ws.rsv3)
@@ -530,10 +529,10 @@ namespace ix
 
             if (ws.mask)
             {
-                ws.masking_key[0] = ((uint8_t) data[i+0]) << 0;
-                ws.masking_key[1] = ((uint8_t) data[i+1]) << 0;
-                ws.masking_key[2] = ((uint8_t) data[i+2]) << 0;
-                ws.masking_key[3] = ((uint8_t) data[i+3]) << 0;
+                ws.masking_key[0] = ((uint8_t) data[i + 0]) << 0;
+                ws.masking_key[1] = ((uint8_t) data[i + 1]) << 0;
+                ws.masking_key[2] = ((uint8_t) data[i + 2]) << 0;
+                ws.masking_key[3] = ((uint8_t) data[i + 3]) << 0;
             }
             else
             {
@@ -543,16 +542,21 @@ namespace ix
                 ws.masking_key[3] = 0;
             }
 
-            if (_rxbuf.size() < ws.header_size+ws.N)
+            // Prevent integer overflow in the next conditional
+            const uint64_t maxFrameSize(1 << 63);
+            if (ws.N > maxFrameSize)
+            {
+                return;
+            }
+
+            if (_rxbuf.size() < ws.header_size + ws.N)
             {
                 return; /* Need: ws.header_size+ws.N - _rxbuf.size() */
             }
 
-            if (!ws.fin && (
-                   ws.opcode == wsheader_type::PING
-                || ws.opcode == wsheader_type::PONG
-                || ws.opcode == wsheader_type::CLOSE
-            )){
+            if (!ws.fin && (ws.opcode == wsheader_type::PING || ws.opcode == wsheader_type::PONG ||
+                            ws.opcode == wsheader_type::CLOSE))
+            {
                 // Control messages should not be fragmented
                 close(WebSocketCloseConstants::kProtocolErrorCode,
                       WebSocketCloseConstants::kProtocolErrorCodeControlMessageFragmented);
@@ -560,22 +564,19 @@ namespace ix
             }
 
             unmaskReceiveBuffer(ws);
-            std::string frameData(_rxbuf.begin()+ws.header_size,
-                                  _rxbuf.begin()+ws.header_size+(size_t) ws.N);
+            std::string frameData(_rxbuf.begin() + ws.header_size,
+                                  _rxbuf.begin() + ws.header_size + (size_t) ws.N);
 
             // We got a whole message, now do something with it:
-            if (
-                   ws.opcode == wsheader_type::TEXT_FRAME
-                || ws.opcode == wsheader_type::BINARY_FRAME
-                || ws.opcode == wsheader_type::CONTINUATION
-            ) {
-
+            if (ws.opcode == wsheader_type::TEXT_FRAME ||
+                ws.opcode == wsheader_type::BINARY_FRAME ||
+                ws.opcode == wsheader_type::CONTINUATION)
+            {
                 if (ws.opcode != wsheader_type::CONTINUATION)
                 {
-                    _fragmentedMessageKind =
-                        (ws.opcode == wsheader_type::TEXT_FRAME)
-                        ? MessageKind::MSG_TEXT
-                        : MessageKind::MSG_BINARY;
+                    _fragmentedMessageKind = (ws.opcode == wsheader_type::TEXT_FRAME)
+                                                 ? MessageKind::MSG_TEXT
+                                                 : MessageKind::MSG_BINARY;
 
                     _compressedMessage = _enablePerMessageDeflate && ws.rsv1;
 
@@ -589,8 +590,9 @@ namespace ix
                 else if (_chunks.empty())
                 {
                     // Continuation message need to follow a non-fin TEXT or BINARY message
-                    close(WebSocketCloseConstants::kProtocolErrorCode,
-                          WebSocketCloseConstants::kProtocolErrorCodeContinuationOpCodeOutOfSequence);
+                    close(
+                        WebSocketCloseConstants::kProtocolErrorCode,
+                        WebSocketCloseConstants::kProtocolErrorCodeContinuationOpCodeOutOfSequence);
                 }
 
                 //
@@ -598,10 +600,8 @@ namespace ix
                 //
                 if (ws.fin && _chunks.empty())
                 {
-                    emitMessage(_fragmentedMessageKind,
-                                frameData,
-                                _compressedMessage,
-                                onMessageCallback);
+                    emitMessage(
+                        _fragmentedMessageKind, frameData, _compressedMessage, onMessageCallback);
 
                     _compressedMessage = false;
                 }
@@ -618,8 +618,10 @@ namespace ix
 
                     if (ws.fin)
                     {
-                        emitMessage(_fragmentedMessageKind, getMergedChunks(),
-                                    _compressedMessage, onMessageCallback);
+                        emitMessage(_fragmentedMessageKind,
+                                    getMergedChunks(),
+                                    _compressedMessage,
+                                    onMessageCallback);
 
                         _chunks.clear();
                         _compressedMessage = false;
@@ -665,8 +667,8 @@ namespace ix
                 if (ws.N >= 2)
                 {
                     // Extract the close code first, available as the first 2 bytes
-                    code |= ((uint64_t) _rxbuf[ws.header_size])   << 8;
-                    code |= ((uint64_t) _rxbuf[ws.header_size+1]) << 0;
+                    code |= ((uint64_t) _rxbuf[ws.header_size]) << 8;
+                    code |= ((uint64_t) _rxbuf[ws.header_size + 1]) << 0;
 
                     // Get the reason.
                     if (ws.N > 2)
@@ -687,13 +689,11 @@ namespace ix
                     // Full list of status code and status range is defined in the dedicated
                     // RFC section at https://tools.ietf.org/html/rfc6455#page-45
                     //
-                    if (code < 1000 || code == 1004 || code == 1006 ||
-                        (code > 1013 && code < 3000))
+                    if (code < 1000 || code == 1004 || code == 1006 || (code > 1013 && code < 3000))
                     {
                         // build up an error message containing the bad error code
                         std::stringstream ss;
-                        ss << WebSocketCloseConstants::kInvalidCloseCodeMessage
-                           << ": " << code;
+                        ss << WebSocketCloseConstants::kInvalidCloseCodeMessage << ": " << code;
                         reason = ss.str();
 
                         code = WebSocketCloseConstants::kProtocolErrorCode;
@@ -719,8 +719,8 @@ namespace ix
                 }
                 else
                 {
-                    // we got the CLOSE frame answer from our close, so we can close the connection if
-                    // the code/reason are the same
+                    // we got the CLOSE frame answer from our close, so we can close the connection
+                    // if the code/reason are the same
                     bool identicalReason;
                     {
                         std::lock_guard<std::mutex> lock(_closeDataMutex);
@@ -743,8 +743,7 @@ namespace ix
             }
 
             // Erase the message that has been processed from the input/read buffer
-            _rxbuf.erase(_rxbuf.begin(),
-                         _rxbuf.begin() + ws.header_size + (size_t) ws.N);
+            _rxbuf.erase(_rxbuf.begin(), _rxbuf.begin() + ws.header_size + (size_t) ws.N);
         }
 
         // if an abnormal closure was raised in poll, and nothing else triggered a CLOSED state in
@@ -753,7 +752,8 @@ namespace ix
         {
             _rxbuf.clear();
 
-            // if we previously closed the connection (CLOSING state), then set state to CLOSED (code/reason were set before)
+            // if we previously closed the connection (CLOSING state), then set state to CLOSED
+            // (code/reason were set before)
             if (_readyState == ReadyState::CLOSING)
             {
                 closeSocket();
@@ -764,7 +764,8 @@ namespace ix
             {
                 closeSocketAndSwitchToClosedState(WebSocketCloseConstants::kAbnormalCloseCode,
                                                   WebSocketCloseConstants::kAbnormalCloseMessage,
-                                                  0, false);
+                                                  0,
+                                                  false);
             }
         }
     }
@@ -829,16 +830,14 @@ namespace ix
     {
         auto now = std::chrono::system_clock::now();
         auto seconds =
-            std::chrono::duration_cast<std::chrono::seconds>(
-                now.time_since_epoch()).count();
+            std::chrono::duration_cast<std::chrono::seconds>(now.time_since_epoch()).count();
         return static_cast<unsigned>(seconds);
     }
 
-    WebSocketSendInfo WebSocketTransport::sendData(
-        wsheader_type::opcode_type type,
-        const std::string& message,
-        bool compress,
-        const OnProgressCallback& onProgressCallback)
+    WebSocketSendInfo WebSocketTransport::sendData(wsheader_type::opcode_type type,
+                                                   const std::string& message,
+                                                   bool compress,
+                                                   const OnProgressCallback& onProgressCallback)
     {
         if (_readyState != ReadyState::OPEN && _readyState != ReadyState::CLOSING)
         {
@@ -870,7 +869,10 @@ namespace ix
             message_end = compressedMessage.end();
         }
 
-        _txbuf.reserve(wireSize);
+        {
+            std::lock_guard<std::mutex> lock(_txbufMutex);
+            _txbuf.reserve(wireSize);
+        }
 
         // Common case for most message. No fragmentation required.
         if (wireSize < kChunkSize)
@@ -892,10 +894,10 @@ namespace ix
             std::string::const_iterator begin = message_begin;
             std::string::const_iterator end = message_end;
 
-            for (uint64_t i = 0 ; i < steps; ++i)
+            for (uint64_t i = 0; i < steps; ++i)
             {
                 bool firstStep = i == 0;
-                bool lastStep = (i+1) == steps;
+                bool lastStep = (i + 1) == steps;
                 bool fin = lastStep;
 
                 end = begin + kChunkSize;
@@ -913,7 +915,7 @@ namespace ix
                 // Send message
                 sendFragment(opcodeType, fin, begin, end, compress);
 
-                if (onProgressCallback && !onProgressCallback((int)i, (int) steps))
+                if (onProgressCallback && !onProgressCallback((int) i, (int) steps))
                 {
                     break;
                 }
@@ -943,14 +945,13 @@ namespace ix
         uint8_t masking_key[4] = {};
         masking_key[0] = (x >> 24);
         masking_key[1] = (x >> 16) & 0xff;
-        masking_key[2] = (x >> 8)  & 0xff;
-        masking_key[3] = (x)       & 0xff;
+        masking_key[2] = (x >> 8) & 0xff;
+        masking_key[3] = (x) &0xff;
 
         std::vector<uint8_t> header;
-        header.assign(2 +
-                      (message_size >= 126 ? 2 : 0) +
-                      (message_size >= 65536 ? 6 : 0) +
-                      (_useMask ? 4 : 0), 0);
+        header.assign(2 + (message_size >= 126 ? 2 : 0) + (message_size >= 65536 ? 6 : 0) +
+                          (_useMask ? 4 : 0),
+                      0);
         header[0] = type;
 
         // The fin bit indicate that this is the last fragment. Fin is French for end.
@@ -1001,8 +1002,8 @@ namespace ix
             header[5] = (message_size >> 32) & 0xff;
             header[6] = (message_size >> 24) & 0xff;
             header[7] = (message_size >> 16) & 0xff;
-            header[8] = (message_size >>  8) & 0xff;
-            header[9] = (message_size >>  0) & 0xff;
+            header[8] = (message_size >> 8) & 0xff;
+            header[9] = (message_size >> 0) & 0xff;
 
             if (_useMask)
             {
@@ -1014,8 +1015,7 @@ namespace ix
         }
 
         // _txbuf will keep growing until it can be transmitted over the socket:
-        appendToSendBuffer(header, message_begin, message_end,
-                           message_size, masking_key);
+        appendToSendBuffer(header, message_begin, message_end, message_size, masking_key);
 
         // Now actually send this data
         sendOnSocket();
@@ -1035,28 +1035,26 @@ namespace ix
         return info;
     }
 
-    WebSocketSendInfo WebSocketTransport::sendBinary(
-        const std::string& message,
-        const OnProgressCallback& onProgressCallback)
+    WebSocketSendInfo WebSocketTransport::sendBinary(const std::string& message,
+                                                     const OnProgressCallback& onProgressCallback)
 
     {
-        return sendData(wsheader_type::BINARY_FRAME, message,
-                        _enablePerMessageDeflate, onProgressCallback);
+        return sendData(
+            wsheader_type::BINARY_FRAME, message, _enablePerMessageDeflate, onProgressCallback);
     }
 
-    WebSocketSendInfo WebSocketTransport::sendText(
-        const std::string& message,
-        const OnProgressCallback& onProgressCallback)
+    WebSocketSendInfo WebSocketTransport::sendText(const std::string& message,
+                                                   const OnProgressCallback& onProgressCallback)
 
     {
-        return sendData(wsheader_type::TEXT_FRAME, message,
-                        _enablePerMessageDeflate, onProgressCallback);
+        return sendData(
+            wsheader_type::TEXT_FRAME, message, _enablePerMessageDeflate, onProgressCallback);
     }
 
     ssize_t WebSocketTransport::send()
     {
         std::lock_guard<std::mutex> lock(_socketMutex);
-        return _socket->send((char*)&_txbuf[0], _txbuf.size());
+        return _socket->send((char*) &_txbuf[0], _txbuf.size());
     }
 
     void WebSocketTransport::sendOnSocket()
@@ -1093,7 +1091,7 @@ namespace ix
         {
             // See list of close events here:
             // https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent
-            std::string closure{(char)(code >> 8), (char)(code & 0xff)};
+            std::string closure {(char) (code >> 8), (char) (code & 0xff)};
 
             // copy reason after code
             closure.append(reason);
@@ -1113,8 +1111,10 @@ namespace ix
         _socket->close();
     }
 
-    void WebSocketTransport::closeSocketAndSwitchToClosedState(
-        uint16_t code, const std::string& reason, size_t closeWireSize, bool remote)
+    void WebSocketTransport::closeSocketAndSwitchToClosedState(uint16_t code,
+                                                               const std::string& reason,
+                                                               size_t closeWireSize,
+                                                               bool remote)
     {
         closeSocket();
 
@@ -1130,8 +1130,10 @@ namespace ix
         _requestInitCancellation = false;
     }
 
-    void WebSocketTransport::close(
-        uint16_t code, const std::string& reason, size_t closeWireSize, bool remote)
+    void WebSocketTransport::close(uint16_t code,
+                                   const std::string& reason,
+                                   size_t closeWireSize,
+                                   bool remote)
     {
         _requestInitCancellation = true;
 

ixwebsocket/IXWebSocketTransport.h

@@ -12,6 +12,7 @@
 
 #include "IXCancellationRequest.h"
 #include "IXProgressCallback.h"
+#include "IXSocketTLSOptions.h"
 #include "IXWebSocketCloseConstants.h"
 #include "IXWebSocketHandshake.h"
 #include "IXWebSocketHttpHeaders.h"
@@ -24,7 +25,6 @@
 #include <memory>
 #include <mutex>
 #include <string>
-
 #include <vector>
 
 namespace ix
@@ -72,16 +72,18 @@ namespace ix
         ~WebSocketTransport();
 
         void configure(const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions,
+                       const SocketTLSOptions& socketTLSOptions,
                        bool enablePong,
                        int pingIntervalSecs,
                        int pingTimeoutSecs);
 
-        WebSocketInitResult connectToUrl( // Client
-            const std::string& url,
-            const WebSocketHttpHeaders& headers,
-            int timeoutSecs);
-        WebSocketInitResult connectToSocket(int fd, // Server
-                                            int timeoutSecs);
+        // Client
+        WebSocketInitResult connectToUrl(const std::string& url,
+                                         const WebSocketHttpHeaders& headers,
+                                         int timeoutSecs);
+
+        // Server
+        WebSocketInitResult connectToSocket(std::shared_ptr<Socket> socket, int timeoutSecs);
 
         PollResult poll();
         WebSocketSendInfo sendBinary(const std::string& message,
@@ -181,6 +183,9 @@ namespace ix
         WebSocketPerMessageDeflateOptions _perMessageDeflateOptions;
         std::atomic<bool> _enablePerMessageDeflate;
 
+        // Used to control TLS connection behavior
+        SocketTLSOptions _socketTLSOptions;
+
         // Used to cancel dns lookup + socket connect + http upgrade
         std::atomic<bool> _requestInitCancellation;
 

ixwebsocket/IXWebSocketVersion.h

@@ -6,4 +6,4 @@
 
 #pragma once
 
-#define IX_WEBSOCKET_VERSION "6.2.1"
+#define IX_WEBSOCKET_VERSION "7.1.0"

ixwebsocket/LUrlParser.cpp

@@ -32,232 +32,249 @@
 #include <stdlib.h>
 
 // check if the scheme name is valid
-static bool IsSchemeValid( const std::string& SchemeName )
+static bool IsSchemeValid(const std::string& SchemeName)
 {
-	for ( auto c : SchemeName  )
-	{
-		if ( !isalpha( c ) && c != '+' && c != '-' && c != '.' ) return false;
-	}
+    for (auto c : SchemeName)
+    {
+        if (!isalpha(c) && c != '+' && c != '-' && c != '.') return false;
+    }
 
-	return true;
+    return true;
 }
 
-bool LUrlParser::clParseURL::GetPort( int* OutPort ) const
+bool LUrlParser::clParseURL::GetPort(int* OutPort) const
 {
-	if ( !IsValid() ) { return false; }
+    if (!IsValid())
+    {
+        return false;
+    }
 
-	int Port = atoi( m_Port.c_str() );
+    int Port = atoi(m_Port.c_str());
 
-	if ( Port <= 0 || Port > 65535 ) { return false; }
+    if (Port <= 0 || Port > 65535)
+    {
+        return false;
+    }
 
-	if ( OutPort ) { *OutPort = Port; }
+    if (OutPort)
+    {
+        *OutPort = Port;
+    }
 
-	return true;
+    return true;
 }
 
 // based on RFC 1738 and RFC 3986
-LUrlParser::clParseURL LUrlParser::clParseURL::ParseURL( const std::string& URL )
+LUrlParser::clParseURL LUrlParser::clParseURL::ParseURL(const std::string& URL)
 {
-	LUrlParser::clParseURL Result;
+    LUrlParser::clParseURL Result;
 
-	const char* CurrentString = URL.c_str();
+    const char* CurrentString = URL.c_str();
 
-	/*
-	 *	<scheme>:<scheme-specific-part>
-	 *	<scheme> := [a-z\+\-\.]+
-	 *	For resiliency, programs interpreting URLs should treat upper case letters as equivalent to lower case in scheme names
-	 */
+    /*
+     *	<scheme>:<scheme-specific-part>
+     *	<scheme> := [a-z\+\-\.]+
+     *	For resiliency, programs interpreting URLs should treat upper case letters as equivalent to
+     *lower case in scheme names
+     */
 
-	// try to read scheme
-	{
-		const char* LocalString = strchr( CurrentString, ':' );
+    // try to read scheme
+    {
+        const char* LocalString = strchr(CurrentString, ':');
 
-		if ( !LocalString )
-		{
-			return clParseURL( LUrlParserError_NoUrlCharacter );
-		}
+        if (!LocalString)
+        {
+            return clParseURL(LUrlParserError_NoUrlCharacter);
+        }
 
-		// save the scheme name
-		Result.m_Scheme = std::string( CurrentString, LocalString - CurrentString );
+        // save the scheme name
+        Result.m_Scheme = std::string(CurrentString, LocalString - CurrentString);
 
-		if ( !IsSchemeValid( Result.m_Scheme ) )
-		{
-			return clParseURL( LUrlParserError_InvalidSchemeName );
-		}
+        if (!IsSchemeValid(Result.m_Scheme))
+        {
+            return clParseURL(LUrlParserError_InvalidSchemeName);
+        }
 
-		// scheme should be lowercase
-		std::transform( Result.m_Scheme.begin(), Result.m_Scheme.end(), Result.m_Scheme.begin(), ::tolower );
+        // scheme should be lowercase
+        std::transform(
+            Result.m_Scheme.begin(), Result.m_Scheme.end(), Result.m_Scheme.begin(), ::tolower);
 
-		// skip ':'
-		CurrentString = LocalString+1;
-	}
+        // skip ':'
+        CurrentString = LocalString + 1;
+    }
 
-	/*
-	 *	//<user>:<password>@<host>:<port>/<url-path>
-	 *	any ":", "@" and "/" must be normalized
-	 */
+    /*
+     *	//<user>:<password>@<host>:<port>/<url-path>
+     *	any ":", "@" and "/" must be normalized
+     */
 
-	// skip "//"
-	if ( *CurrentString++ != '/' ) return clParseURL( LUrlParserError_NoDoubleSlash );
-	if ( *CurrentString++ != '/' ) return clParseURL( LUrlParserError_NoDoubleSlash );
+    // skip "//"
+    if (*CurrentString++ != '/') return clParseURL(LUrlParserError_NoDoubleSlash);
+    if (*CurrentString++ != '/') return clParseURL(LUrlParserError_NoDoubleSlash);
 
-	// check if the user name and password are specified
-	bool bHasUserName = false;
+    // check if the user name and password are specified
+    bool bHasUserName = false;
 
-	const char* LocalString = CurrentString;
+    const char* LocalString = CurrentString;
 
-	while ( *LocalString )
-	{
-		if ( *LocalString == '@' )
-		{
-			// user name and password are specified
-			bHasUserName = true;
-			break;
-		}
-		else if ( *LocalString == '/' )
-		{
-			// end of <host>:<port> specification
-			bHasUserName = false;
-			break;
-		}
+    while (*LocalString)
+    {
+        if (*LocalString == '@')
+        {
+            // user name and password are specified
+            bHasUserName = true;
+            break;
+        }
+        else if (*LocalString == '/')
+        {
+            // end of <host>:<port> specification
+            bHasUserName = false;
+            break;
+        }
 
-		LocalString++;
-	}
+        LocalString++;
+    }
 
-	// user name and password
-	LocalString = CurrentString;
+    // user name and password
+    LocalString = CurrentString;
 
-	if ( bHasUserName )
-	{
-		// read user name
-		while ( *LocalString && *LocalString != ':' && *LocalString != '@' ) LocalString++;
+    if (bHasUserName)
+    {
+        // read user name
+        while (*LocalString && *LocalString != ':' && *LocalString != '@')
+            LocalString++;
 
-		Result.m_UserName = std::string( CurrentString, LocalString - CurrentString );
+        Result.m_UserName = std::string(CurrentString, LocalString - CurrentString);
 
-		// proceed with the current pointer
-		CurrentString = LocalString;
+        // proceed with the current pointer
+        CurrentString = LocalString;
 
-		if ( *CurrentString == ':' )
-		{
-			// skip ':'
-			CurrentString++;
+        if (*CurrentString == ':')
+        {
+            // skip ':'
+            CurrentString++;
 
-			// read password
-			LocalString = CurrentString;
+            // read password
+            LocalString = CurrentString;
 
-			while ( *LocalString && *LocalString != '@' ) LocalString++;
+            while (*LocalString && *LocalString != '@')
+                LocalString++;
 
-			Result.m_Password = std::string( CurrentString, LocalString - CurrentString );
+            Result.m_Password = std::string(CurrentString, LocalString - CurrentString);
 
-			CurrentString = LocalString;
-		}
+            CurrentString = LocalString;
+        }
 
-		// skip '@'
-		if ( *CurrentString != '@' )
-		{
-			return clParseURL( LUrlParserError_NoAtSign );
-		}
+        // skip '@'
+        if (*CurrentString != '@')
+        {
+            return clParseURL(LUrlParserError_NoAtSign);
+        }
 
-		CurrentString++;
-	}
+        CurrentString++;
+    }
 
-	bool bHasBracket = ( *CurrentString == '[' );
+    bool bHasBracket = (*CurrentString == '[');
 
-	// go ahead, read the host name
-	LocalString = CurrentString;
+    // go ahead, read the host name
+    LocalString = CurrentString;
 
-	while ( *LocalString )
-	{
-		if ( bHasBracket && *LocalString == ']' )
-		{
-			// end of IPv6 address
-			LocalString++;
-			break;
-		}
-		else if ( !bHasBracket && ( *LocalString == ':' || *LocalString == '/' ) )
-		{
-			// port number is specified
-			break;
-		}
+    while (*LocalString)
+    {
+        if (bHasBracket && *LocalString == ']')
+        {
+            // end of IPv6 address
+            LocalString++;
+            break;
+        }
+        else if (!bHasBracket && (*LocalString == ':' || *LocalString == '/'))
+        {
+            // port number is specified
+            break;
+        }
 
-		LocalString++;
-	}
+        LocalString++;
+    }
 
-	Result.m_Host = std::string( CurrentString, LocalString - CurrentString );
+    Result.m_Host = std::string(CurrentString, LocalString - CurrentString);
 
-	CurrentString = LocalString;
+    CurrentString = LocalString;
 
-	// is port number specified?
-	if ( *CurrentString == ':' )
-	{
-		CurrentString++;
+    // is port number specified?
+    if (*CurrentString == ':')
+    {
+        CurrentString++;
 
-		// read port number
-		LocalString = CurrentString;
+        // read port number
+        LocalString = CurrentString;
 
-		while ( *LocalString && *LocalString != '/' ) LocalString++;
+        while (*LocalString && *LocalString != '/')
+            LocalString++;
 
-		Result.m_Port = std::string( CurrentString, LocalString - CurrentString );
+        Result.m_Port = std::string(CurrentString, LocalString - CurrentString);
 
-		CurrentString = LocalString;
-	}
+        CurrentString = LocalString;
+    }
 
-	// end of string
-	if ( !*CurrentString )
-	{
-		Result.m_ErrorCode = LUrlParserError_Ok;
+    // end of string
+    if (!*CurrentString)
+    {
+        Result.m_ErrorCode = LUrlParserError_Ok;
 
-		return Result;
-	}
+        return Result;
+    }
 
-	// skip '/'
-	if ( *CurrentString != '/' )
-	{
-		return clParseURL( LUrlParserError_NoSlash );
-	}
+    // skip '/'
+    if (*CurrentString != '/')
+    {
+        return clParseURL(LUrlParserError_NoSlash);
+    }
 
-	CurrentString++;
+    CurrentString++;
 
-	// parse the path
-	LocalString = CurrentString;
+    // parse the path
+    LocalString = CurrentString;
 
-	while ( *LocalString && *LocalString != '#' && *LocalString != '?' ) LocalString++;
+    while (*LocalString && *LocalString != '#' && *LocalString != '?')
+        LocalString++;
 
-	Result.m_Path = std::string( CurrentString, LocalString - CurrentString );
+    Result.m_Path = std::string(CurrentString, LocalString - CurrentString);
 
-	CurrentString = LocalString;
+    CurrentString = LocalString;
 
-	// check for query
-	if ( *CurrentString == '?' )
-	{
-		// skip '?'
-		CurrentString++;
+    // check for query
+    if (*CurrentString == '?')
+    {
+        // skip '?'
+        CurrentString++;
 
-		// read query
-		LocalString = CurrentString;
+        // read query
+        LocalString = CurrentString;
 
-		while ( *LocalString && *LocalString != '#' ) LocalString++;
+        while (*LocalString && *LocalString != '#')
+            LocalString++;
 
-		Result.m_Query = std::string( CurrentString, LocalString - CurrentString );
+        Result.m_Query = std::string(CurrentString, LocalString - CurrentString);
 
-		CurrentString = LocalString;
-	}
+        CurrentString = LocalString;
+    }
 
-	// check for fragment
-	if ( *CurrentString == '#' )
-	{
-		// skip '#'
-		CurrentString++;
+    // check for fragment
+    if (*CurrentString == '#')
+    {
+        // skip '#'
+        CurrentString++;
 
-		// read fragment
-		LocalString = CurrentString;
+        // read fragment
+        LocalString = CurrentString;
 
-		while ( *LocalString ) LocalString++;
+        while (*LocalString)
+            LocalString++;
 
-		Result.m_Fragment = std::string( CurrentString, LocalString - CurrentString );
-	}
+        Result.m_Fragment = std::string(CurrentString, LocalString - CurrentString);
+    }
 
-	Result.m_ErrorCode = LUrlParserError_Ok;
+    Result.m_ErrorCode = LUrlParserError_Ok;
 
-	return Result;
+    return Result;
 }

ixwebsocket/LUrlParser.h

@@ -62,7 +62,10 @@ namespace LUrlParser
         }
 
         /// return 'true' if the parsing was successful
-        bool IsValid() const { return m_ErrorCode == LUrlParserError_Ok; }
+        bool IsValid() const
+        {
+            return m_ErrorCode == LUrlParserError_Ok;
+        }
 
         /// helper to convert the port number to int, return 'true' if the port is valid (within the
         /// 0..65535 range)

ixwebsocket/apple/IXSetThreadName_apple.cpp

@@ -17,4 +17,4 @@ namespace ix
         //
         pthread_setname_np(name.substr(0, 63).c_str());
     }
-}
+} // namespace ix

ixwebsocket/freebsd/IXSetThreadName_freebsd.cpp

@@ -0,0 +1,16 @@
+/*
+ *  IXSetThreadName_freebsd.cpp
+ *  Author: Benjamin Sergeant
+ *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
+ */
+#include "../IXSetThreadName.h"
+#include <pthread.h>
+#include <pthread_np.h>
+
+namespace ix
+{
+    void setThreadName(const std::string& name)
+    {
+        pthread_set_name_np(pthread_self(), name.substr(0, 15).c_str());
+    }
+} // namespace ix

ixwebsocket/linux/IXSetThreadName_linux.cpp

@@ -15,7 +15,6 @@ namespace ix
         // See prctl and PR_SET_NAME property in
         // http://man7.org/linux/man-pages/man2/prctl.2.html
         //
-        pthread_setname_np(pthread_self(),
-                           name.substr(0, 15).c_str());
+        pthread_setname_np(pthread_self(), name.substr(0, 15).c_str());
     }
-}
+} // namespace ix

ixwebsocket/windows/IXSetThreadName_windows.cpp

@@ -4,13 +4,14 @@
  *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
  */
 #include "../IXSetThreadName.h"
+
 #include <Windows.h>
 
 namespace ix
 {
     const DWORD MS_VC_EXCEPTION = 0x406D1388;
 
-#pragma pack(push,8)
+#pragma pack(push, 8)
     typedef struct tagTHREADNAME_INFO
     {
         DWORD dwType;     // Must be 0x1000.
@@ -30,7 +31,8 @@ namespace ix
 
         __try
         {
-            RaiseException(MS_VC_EXCEPTION, 0, sizeof(info) / sizeof(ULONG_PTR), (ULONG_PTR*)& info);
+            RaiseException(
+                MS_VC_EXCEPTION, 0, sizeof(info) / sizeof(ULONG_PTR), (ULONG_PTR*) &info);
         }
         __except (EXCEPTION_EXECUTE_HANDLER)
         {
@@ -41,4 +43,4 @@ namespace ix
     {
         SetThreadName(-1, name.c_str());
     }
-}
+} // namespace ix

makefile

@@ -9,10 +9,22 @@ install: brew
 # on osx it is good practice to make /usr/local user writable
 # sudo chown -R `whoami`/staff /usr/local
 brew:
-	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 -DUSE_TEST=1 .. ; make -j install)
+	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 -DUSE_TEST=1 .. ; make -j 4 install)
 
 ws:
-	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 -DUSE_MBED_TLS=1 .. ; make -j)
+	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 .. ; make -j 4)
+
+ws_install:
+	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 .. ; make -j 4 install)
+
+ws_openssl:
+	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 -DUSE_OPEN_SSL=1 .. ; make -j 4)
+
+ws_mbedtls:
+	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 -DUSE_MBED_TLS=1 .. ; make -j 4)
+
+ws_no_ssl:
+	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_WS=1 .. ; make -j 4)
 
 uninstall:
 	xargs rm -fv < build/install_manifest.txt
@@ -20,6 +32,12 @@ uninstall:
 tag:
 	git tag v"`cat DOCKER_VERSION`"
 
+xcode:
+	cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 -DUSE_TEST=1 -GXcode && open ixwebsocket.xcodeproj
+
+xcode_openssl:
+	cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 -DUSE_TEST=1 -DUSE_OPEN_SSL=1 -GXcode && open ixwebsocket.xcodeproj
+
 .PHONY: docker
 
 NAME   := bsergean/ws
@@ -32,6 +50,7 @@ docker_test:
 	docker build -f docker/Dockerfile.debian -t bsergean/ixwebsocket_test:build .
 
 docker:
+	git clean -dfx
 	docker build -t ${IMG} .
 	docker tag ${IMG} ${BUILD}
 
@@ -58,7 +77,19 @@ test_server:
 # env TEST=Websocket_chat make test
 # env TEST=heartbeat make test
 test:
-	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 -DUSE_TEST=1 .. ; make -j)
+	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 -DUSE_TEST=1 .. ; make -j 4)
+	(cd test ; python2.7 run.py -r)
+
+test_openssl:
+	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_OPEN_SSL=1 -DUSE_TEST=1 .. ; make -j 4)
+	(cd test ; python2.7 run.py -r)
+
+test_mbedtls:
+	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_MBED_TLS=1 -DUSE_TEST=1 .. ; make -j 4)
+	(cd test ; python2.7 run.py -r)
+
+test_no_ssl:
+	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TEST=1 .. ; make -j 4)
 	(cd test ; python2.7 run.py -r)
 
 ws_test: ws
@@ -82,7 +113,7 @@ install_cmake_for_linux:
 #  source venv/bin/activate
 #  pip install mkdocs
 doc:
-	./venv/bin/mkdocs build -d ../bsergean.github.io/IXWebSocket/site
+	mkdocs gh-deploy
 
 .PHONY: test
 .PHONY: build

test/CMakeLists.txt

@@ -15,15 +15,12 @@ if (MAC)
   option(USE_TLS "Add TLS support" ON)
 endif()
 
-set (WS ../ws)
-
 include_directories(
   ${PROJECT_SOURCE_DIR}/Catch2/single_include
   ../third_party
   ../third_party/msgpack11
   ../third_party/spdlog/include
   ../ws
-  ../ws/snake
 )
 
 # Shared sources
@@ -34,12 +31,6 @@ set (SOURCES
   ../third_party/msgpack11/msgpack11.cpp
   ../third_party/jsoncpp/jsoncpp.cpp
 
-  ${WS}/snake/IXSnakeServer.cpp
-  ${WS}/snake/IXSnakeProtocol.cpp
-  ${WS}/snake/IXAppConfig.cpp
-
-  ${WS}/IXRedisClient.cpp
-
   IXSocketTest.cpp
   IXSocketConnectTest.cpp
   IXWebSocketServerTest.cpp
@@ -50,16 +41,18 @@ set (SOURCES
   IXHttpServerTest.cpp
   IXUnityBuildsTest.cpp
   IXHttpTest.cpp
+  IXCobraChatTest.cpp
+  IXCobraMetricsPublisherTest.cpp
+  IXDNSLookupTest.cpp
+  IXWebSocketSubProtocolTest.cpp
+  IXSentryClientTest.cpp
 )
 
 # Some unittest don't work on windows yet
 if (UNIX)
   list(APPEND SOURCES
-    IXDNSLookupTest.cpp
     IXWebSocketChatTest.cpp
     IXWebSocketCloseTest.cpp
-    IXCobraChatTest.cpp
-    IXCobraMetricsPublisherTest.cpp
   )
 endif()
 
@@ -83,12 +76,14 @@ if (MAC)
 endif()
 
 if (APPLE AND USE_TLS)
-    target_link_libraries(ixwebsocket_unittest "-framework foundation" "-framework security")
+  target_link_libraries(ixwebsocket_unittest "-framework foundation" "-framework security")
 endif()
 
-target_link_libraries(ixwebsocket_unittest ixcore)
-target_link_libraries(ixwebsocket_unittest ixcrypto)
+target_link_libraries(ixwebsocket_unittest ixsnake)
 target_link_libraries(ixwebsocket_unittest ixcobra)
 target_link_libraries(ixwebsocket_unittest ixwebsocket)
+target_link_libraries(ixwebsocket_unittest ixcrypto)
+target_link_libraries(ixwebsocket_unittest ixcore)
+target_link_libraries(ixwebsocket_unittest ixsentry)
 
 install(TARGETS ixwebsocket_unittest DESTINATION bin)

test/IXCobraChatTest.cpp

@@ -4,14 +4,14 @@
  *  Copyright (c) 2017 Machine Zone. All rights reserved.
  */
 
-#include <iostream>
+#include "IXTest.h"
+#include "catch.hpp"
 #include <chrono>
+#include <iostream>
 #include <ixcobra/IXCobraConnection.h>
 #include <ixcrypto/IXUuid.h>
-#include "IXTest.h"
-#include "IXSnakeServer.h"
-
-#include "catch.hpp"
+#include <ixsnake/IXRedisServer.h>
+#include <ixsnake/IXSnakeServer.h>
 
 using namespace ix;
 
@@ -22,67 +22,64 @@ namespace
 
     void setupTrafficTrackerCallback()
     {
-        ix::CobraConnection::setTrafficTrackerCallback(
-            [](size_t size, bool incoming)
+        ix::CobraConnection::setTrafficTrackerCallback([](size_t size, bool incoming) {
+            if (incoming)
             {
-                if (incoming)
-                {
-                    incomingBytes += size;
-                }
-                else
-                {
-                    outgoingBytes += size;
-                }
+                incomingBytes += size;
             }
-        );
+            else
+            {
+                outgoingBytes += size;
+            }
+        });
     }
 
     class SatoriChat
     {
-        public:
-            SatoriChat(const std::string& user,
-                       const std::string& session,
-                       const std::string& endpoint);
+    public:
+        SatoriChat(const std::string& user,
+                   const std::string& session,
+                   const std::string& endpoint);
 
-            void subscribe(const std::string& channel);
-            void start();
-            void stop();
-            void run();
-            bool isReady() const;
+        void subscribe(const std::string& channel);
+        void start();
+        void stop();
+        void run();
+        bool isReady() const;
 
-            void sendMessage(const std::string& text);
-            size_t getReceivedMessagesCount() const;
+        void sendMessage(const std::string& text);
+        size_t getReceivedMessagesCount() const;
 
-            bool hasPendingMessages() const;
-            Json::Value popMessage();
+        bool hasPendingMessages() const;
+        Json::Value popMessage();
 
-        private:
-            std::string _user;
-            std::string _session;
-            std::string _endpoint;
+    private:
+        std::string _user;
+        std::string _session;
+        std::string _endpoint;
 
-            std::queue<Json::Value> _publish_queue;
-            mutable std::mutex _queue_mutex;
+        std::queue<Json::Value> _publish_queue;
+        mutable std::mutex _queue_mutex;
 
-            std::thread _thread;
-            std::atomic<bool> _stop;
+        std::thread _thread;
+        std::atomic<bool> _stop;
 
-            ix::CobraConnection _conn;
-            std::atomic<bool> _connectedAndSubscribed;
+        ix::CobraConnection _conn;
+        std::atomic<bool> _connectedAndSubscribed;
 
-            std::queue<Json::Value> _receivedQueue;
+        std::queue<Json::Value> _receivedQueue;
 
-            std::mutex _logMutex;
+        std::mutex _logMutex;
     };
 
     SatoriChat::SatoriChat(const std::string& user,
                            const std::string& session,
-                           const std::string& endpoint) :
-        _connectedAndSubscribed(false),
-        _stop(false),
-        _user(user),
-        _session(session),
-        _endpoint(endpoint)
+                           const std::string& endpoint)
+        : _user(user)
+        , _session(session)
+        , _endpoint(endpoint)
+        , _stop(false)
+        , _connectedAndSubscribed(false)
     {
     }
 
@@ -127,35 +124,31 @@ namespace
     void SatoriChat::subscribe(const std::string& channel)
     {
         std::string filter;
-        _conn.subscribe(channel, filter,
-                        [this](const Json::Value& msg)
-                        {
-                            std::cout << msg.toStyledString() << std::endl;
-                            if (!msg.isObject()) return;
-                            if (!msg.isMember("user")) return;
-                            if (!msg.isMember("text")) return;
-                            if (!msg.isMember("session")) return;
+        _conn.subscribe(channel, filter, [this](const Json::Value& msg) {
+            spdlog::info("receive {}", msg.toStyledString());
 
-                            std::string msg_user = msg["user"].asString();
-                            std::string msg_text = msg["text"].asString();
-                            std::string msg_session = msg["session"].asString();
+            if (!msg.isObject()) return;
+            if (!msg.isMember("user")) return;
+            if (!msg.isMember("text")) return;
+            if (!msg.isMember("session")) return;
 
-                            // We are not interested in messages
-                            // from a different session.
-                            if (msg_session != _session) return;
+            std::string msg_user = msg["user"].asString();
+            std::string msg_text = msg["text"].asString();
+            std::string msg_session = msg["session"].asString();
 
-                            // We are not interested in our own messages
-                            if (msg_user == _user) return;
+            // We are not interested in messages
+            // from a different session.
+            if (msg_session != _session) return;
 
-                            _receivedQueue.push(msg);
+            // We are not interested in our own messages
+            if (msg_user == _user) return;
 
-                            std::stringstream ss;
-                            ss << std::endl
-                               << msg_user << " > " << msg_text
-                               << std::endl
-                               << _user << " > ";
-                            log(ss.str());
-                        });
+            _receivedQueue.push(msg);
+
+            std::stringstream ss;
+            ss << std::endl << msg_user << " > " << msg_text << std::endl << _user << " > ";
+            log(ss.str());
+        });
     }
 
     void SatoriChat::sendMessage(const std::string& text)
@@ -175,64 +168,56 @@ namespace
     //
     void SatoriChat::run()
     {
-        snake::AppConfig appConfig = makeSnakeServerConfig(8008);
-
-        // Display config on the terminal for debugging
-        dumpConfig(appConfig);
-
-        snake::SnakeServer snakeServer(appConfig);
-        snakeServer.run();
-
         // "chat" conf
         std::string appkey("FC2F10139A2BAc53BB72D9db967b024f");
         std::string channel = _session;
         std::string role = "_sub";
         std::string secret = "66B1dA3ED5fA074EB5AE84Dd8CE3b5ba";
 
-        _conn.configure(appkey, _endpoint, role, secret,
-                        ix::WebSocketPerMessageDeflateOptions(true));
+        _conn.configure(
+            appkey, _endpoint, role, secret, ix::WebSocketPerMessageDeflateOptions(true));
         _conn.connect();
 
-        _conn.setEventCallback(
-            [this, channel]
-            (ix::CobraConnectionEventType eventType,
-             const std::string& errMsg,
-             const ix::WebSocketHttpHeaders& headers,
-             const std::string& subscriptionId,
-             CobraConnection::MsgId msgId)
+        _conn.setEventCallback([this, channel](ix::CobraConnectionEventType eventType,
+                                               const std::string& errMsg,
+                                               const ix::WebSocketHttpHeaders& headers,
+                                               const std::string& subscriptionId,
+                                               CobraConnection::MsgId msgId) {
+            if (eventType == ix::CobraConnection_EventType_Open)
             {
-                if (eventType == ix::CobraConnection_EventType_Open)
+                log("Subscriber connected: " + _user);
+                for (auto&& it : headers)
                 {
-                    log("Subscriber connected: " + _user);
-                }
-                else if (eventType == ix::CobraConnection_EventType_Authenticated)
-                {
-                    log("Subscriber authenticated: " + _user);
-                    subscribe(channel);
-                }
-                else if (eventType == ix::CobraConnection_EventType_Error)
-                {
-                    log(errMsg + _user);
-                }
-                else if (eventType == ix::CobraConnection_EventType_Closed)
-                {
-                    log("Connection closed: " + _user);
-                }
-                else if (eventType == ix::CobraConnection_EventType_Subscribed)
-                {
-                    log("Subscription ok: " + _user + " subscription_id " + subscriptionId);
-                    _connectedAndSubscribed = true;
-                }
-                else if (eventType == ix::CobraConnection_EventType_UnSubscribed)
-                {
-                    log("Unsubscription ok: " + _user + " subscription_id " + subscriptionId);
-                }
-                else if (eventType == ix::CobraConnection_EventType_Published)
-                {
-                    Logger() << "Subscriber: published message acked: " << msgId;
+                    log("Headers " + it.first + " " + it.second);
                 }
             }
-        );
+            else if (eventType == ix::CobraConnection_EventType_Authenticated)
+            {
+                log("Subscriber authenticated: " + _user);
+                subscribe(channel);
+            }
+            else if (eventType == ix::CobraConnection_EventType_Error)
+            {
+                log(errMsg + _user);
+            }
+            else if (eventType == ix::CobraConnection_EventType_Closed)
+            {
+                log("Connection closed: " + _user);
+            }
+            else if (eventType == ix::CobraConnection_EventType_Subscribed)
+            {
+                log("Subscription ok: " + _user + " subscription_id " + subscriptionId);
+                _connectedAndSubscribed = true;
+            }
+            else if (eventType == ix::CobraConnection_EventType_UnSubscribed)
+            {
+                log("Unsubscription ok: " + _user + " subscription_id " + subscriptionId);
+            }
+            else if (eventType == ix::CobraConnection_EventType_Published)
+            {
+                Logger() << "Subscriber: published message acked: " << msgId;
+            }
+        });
 
         while (!_stop)
         {
@@ -261,19 +246,13 @@ namespace
         ix::msleep(50);
         _conn.disconnect();
 
-        _conn.setEventCallback([]
-                               (ix::CobraConnectionEventType eventType,
-                                const std::string& errMsg,
-                                const ix::WebSocketHttpHeaders& headers,
-                                const std::string& subscriptionId,
-                                CobraConnection::MsgId msgId)
-        {
-            ;
-        });
-
-        snakeServer.stop();
+        _conn.setEventCallback([](ix::CobraConnectionEventType /*eventType*/,
+                                  const std::string& /*errMsg*/,
+                                  const ix::WebSocketHttpHeaders& /*headers*/,
+                                  const std::string& /*subscriptionId*/,
+                                  CobraConnection::MsgId /*msgId*/) { ; });
     }
-}
+} // namespace
 
 TEST_CASE("Cobra_chat", "[cobra_chat]")
 {
@@ -281,6 +260,14 @@ TEST_CASE("Cobra_chat", "[cobra_chat]")
     {
         int port = getFreePort();
         snake::AppConfig appConfig = makeSnakeServerConfig(port);
+
+        // Start a redis server
+        ix::RedisServer redisServer(appConfig.redisPort);
+        auto res = redisServer.listen();
+        REQUIRE(res.first);
+        redisServer.start();
+
+        // Start a snake server
         snake::SnakeServer snakeServer(appConfig);
         snakeServer.run();
 
@@ -310,6 +297,7 @@ TEST_CASE("Cobra_chat", "[cobra_chat]")
             if (timeout <= 0)
             {
                 snakeServer.stop();
+                redisServer.stop();
                 REQUIRE(false); // timeout
             }
         }
@@ -334,6 +322,7 @@ TEST_CASE("Cobra_chat", "[cobra_chat]")
             if (timeout <= 0)
             {
                 snakeServer.stop();
+                redisServer.stop();
                 REQUIRE(false); // timeout
             }
         }
@@ -344,15 +333,16 @@ TEST_CASE("Cobra_chat", "[cobra_chat]")
         chatA.stop();
         chatB.stop();
 
-        // FIXME: improve this and make it exact matches
-        //        we get unreliable result set
         REQUIRE(chatA.getReceivedMessagesCount() == 2);
         REQUIRE(chatB.getReceivedMessagesCount() == 3);
 
-        std::cout << incomingBytes << std::endl;
-        std::cout << "Incoming bytes: " << incomingBytes << std::endl;
-        std::cout << "Outgoing bytes: " << outgoingBytes << std::endl;
+        spdlog::info("Incoming bytes {}", incomingBytes);
+        spdlog::info("Outgoing bytes {}", outgoingBytes);
 
+        spdlog::info("Stopping snake server...");
         snakeServer.stop();
+
+        spdlog::info("Stopping redis server...");
+        redisServer.stop();
     }
 }

test/IXCobraMetricsPublisherTest.cpp

@@ -3,19 +3,36 @@
  *  Copyright (c) 2018 Machine Zone. All rights reserved.
  */
 
-#include <iostream>
-#include <set>
-#include <ixcrypto/IXUuid.h>
-#include <ixcobra/IXCobraMetricsPublisher.h>
 #include "IXTest.h"
-#include "IXSnakeServer.h"
-
 #include "catch.hpp"
+#include <iostream>
+#include <ixcobra/IXCobraMetricsPublisher.h>
+#include <ixcrypto/IXUuid.h>
+#include <ixsnake/IXRedisServer.h>
+#include <ixsnake/IXSnakeServer.h>
+#include <set>
 
 using namespace ix;
 
 namespace
 {
+    std::atomic<size_t> incomingBytes(0);
+    std::atomic<size_t> outgoingBytes(0);
+
+    void setupTrafficTrackerCallback()
+    {
+        ix::CobraConnection::setTrafficTrackerCallback([](size_t size, bool incoming) {
+            if (incoming)
+            {
+                incomingBytes += size;
+            }
+            else
+            {
+                outgoingBytes += size;
+            }
+        });
+    }
+
     //
     // This project / appkey is configure on cobra to not do any batching.
     // This way we can start a subscriber and receive all messages as they come in.
@@ -29,7 +46,7 @@ namespace
 
     std::atomic<bool> gStop;
     std::atomic<bool> gSubscriberConnectedAndSubscribed;
-    std::atomic<int> gUniqueMessageIdsCount;
+    std::atomic<size_t> gUniqueMessageIdsCount;
     std::atomic<int> gMessageCount;
 
     std::set<std::string> gIds;
@@ -45,66 +62,71 @@ namespace
         gMessageCount = 0;
 
         ix::CobraConnection conn;
-        conn.configure(APPKEY, endpoint, SUBSCRIBER_ROLE, SUBSCRIBER_SECRET,
+        conn.configure(APPKEY,
+                       endpoint,
+                       SUBSCRIBER_ROLE,
+                       SUBSCRIBER_SECRET,
                        ix::WebSocketPerMessageDeflateOptions(true));
         conn.connect();
 
-        conn.setEventCallback(
-            [&conn]
-            (ix::CobraConnectionEventType eventType,
-             const std::string& errMsg,
-             const ix::WebSocketHttpHeaders& headers,
-             const std::string& subscriptionId,
-             CobraConnection::MsgId msgId)
+        conn.setEventCallback([&conn](ix::CobraConnectionEventType eventType,
+                                      const std::string& errMsg,
+                                      const ix::WebSocketHttpHeaders& headers,
+                                      const std::string& subscriptionId,
+                                      CobraConnection::MsgId msgId) {
+            if (eventType == ix::CobraConnection_EventType_Open)
             {
-                if (eventType == ix::CobraConnection_EventType_Open)
+                Logger() << "Subscriber connected:";
+                for (auto&& it : headers)
                 {
-                    Logger() << "Subscriber connected:";
-                }
-                else if (eventType == ix::CobraConnection_EventType_Authenticated)
-                {
-                    log("Subscriber authenticated");
-                    std::string filter;
-                    conn.subscribe(CHANNEL, filter,
-                                   [](const Json::Value& msg)
-                                   {
-                                       log(msg.toStyledString());
-
-                                       std::string id = msg["id"].asString();
-                                       {
-                                           std::lock_guard<std::mutex> guard(gProtectIds);
-                                           gIds.insert(id);
-                                       }
-
-                                       gMessageCount++;
-                                   });
-                }
-                else if (eventType == ix::CobraConnection_EventType_Subscribed)
-                {
-                    Logger() << "Subscriber: subscribed to channel " << subscriptionId;
-                    if (subscriptionId == CHANNEL)
-                    {
-                        gSubscriberConnectedAndSubscribed = true;
-                    }
-                    else
-                    {
-                        Logger() << "Subscriber: unexpected channel " << subscriptionId;
-                    }
-                }
-                else if (eventType == ix::CobraConnection_EventType_UnSubscribed)
-                {
-                    Logger() << "Subscriber: ununexpected from channel " << subscriptionId;
-                    if (subscriptionId != CHANNEL)
-                    {
-                        Logger() << "Subscriber: unexpected channel " << subscriptionId;
-                    }
-                }
-                else if (eventType == ix::CobraConnection_EventType_Published)
-                {
-                    Logger() << "Subscriber: published message acked: " << msgId;
+                    log("Headers " + it.first + " " + it.second);
                 }
             }
-        );
+            if (eventType == ix::CobraConnection_EventType_Error)
+            {
+                Logger() << "Subscriber error:" << errMsg;
+            }
+            else if (eventType == ix::CobraConnection_EventType_Authenticated)
+            {
+                log("Subscriber authenticated");
+                std::string filter;
+                conn.subscribe(CHANNEL, filter, [](const Json::Value& msg) {
+                    log(msg.toStyledString());
+
+                    std::string id = msg["id"].asString();
+                    {
+                        std::lock_guard<std::mutex> guard(gProtectIds);
+                        gIds.insert(id);
+                    }
+
+                    gMessageCount++;
+                });
+            }
+            else if (eventType == ix::CobraConnection_EventType_Subscribed)
+            {
+                Logger() << "Subscriber: subscribed to channel " << subscriptionId;
+                if (subscriptionId == CHANNEL)
+                {
+                    gSubscriberConnectedAndSubscribed = true;
+                }
+                else
+                {
+                    Logger() << "Subscriber: unexpected channel " << subscriptionId;
+                }
+            }
+            else if (eventType == ix::CobraConnection_EventType_UnSubscribed)
+            {
+                Logger() << "Subscriber: ununexpected from channel " << subscriptionId;
+                if (subscriptionId != CHANNEL)
+                {
+                    Logger() << "Subscriber: unexpected channel " << subscriptionId;
+                }
+            }
+            else if (eventType == ix::CobraConnection_EventType_Published)
+            {
+                Logger() << "Subscriber: published message acked: " << msgId;
+            }
+        });
 
         while (!gStop)
         {
@@ -117,15 +139,40 @@ namespace
 
         gUniqueMessageIdsCount = gIds.size();
     }
-}
+
+    // publish 100 messages, during roughly 100ms
+    // this is used to test thread safety of CobraMetricsPublisher::push
+    void runAdditionalPublisher(ix::CobraMetricsPublisher* cobraMetricsPublisher)
+    {
+        Json::Value data;
+        data["foo"] = "bar";
+
+        for (int i = 0; i < 100; ++i)
+        {
+            cobraMetricsPublisher->push("sms_metric_F_id", data);
+            ix::msleep(1);
+        }
+    }
+
+} // namespace
 
 TEST_CASE("Cobra_Metrics_Publisher", "[cobra]")
 {
     int port = getFreePort();
     snake::AppConfig appConfig = makeSnakeServerConfig(port);
+
+    // Start a redis server
+    ix::RedisServer redisServer(appConfig.redisPort);
+    auto res = redisServer.listen();
+    REQUIRE(res.first);
+    redisServer.start();
+
+    // Start a snake server
     snake::SnakeServer snakeServer(appConfig);
     snakeServer.run();
 
+    setupTrafficTrackerCallback();
+
     std::stringstream ss;
     ss << "ws://localhost:" << port;
     std::string endpoint = ss.str();
@@ -147,6 +194,8 @@ TEST_CASE("Cobra_Metrics_Publisher", "[cobra]")
         timeout -= 10;
         if (timeout <= 0)
         {
+            snakeServer.stop();
+            redisServer.stop();
             REQUIRE(false); // timeout
         }
     }
@@ -154,8 +203,8 @@ TEST_CASE("Cobra_Metrics_Publisher", "[cobra]")
     ix::CobraMetricsPublisher cobraMetricsPublisher;
 
     bool perMessageDeflate = true;
-    cobraMetricsPublisher.configure(APPKEY, endpoint, CHANNEL,
-                                    PUBLISHER_ROLE, PUBLISHER_SECRET, perMessageDeflate);
+    cobraMetricsPublisher.configure(
+        APPKEY, endpoint, CHANNEL, PUBLISHER_ROLE, PUBLISHER_SECRET, perMessageDeflate);
     cobraMetricsPublisher.setSession(uuid4());
     cobraMetricsPublisher.enable(true); // disabled by default, needs to be enabled to be active
 
@@ -185,7 +234,7 @@ TEST_CASE("Cobra_Metrics_Publisher", "[cobra]")
 
     // (msg #6)
     cobraMetricsPublisher.setRateControl({
-        {"sms_metric_C_id", 1},  // published once per minute (60 seconds) max
+        {"sms_metric_C_id", 1}, // published once per minute (60 seconds) max
     });
     // (msg #7)
     cobraMetricsPublisher.push("sms_metric_C_id", data);
@@ -201,7 +250,7 @@ TEST_CASE("Cobra_Metrics_Publisher", "[cobra]")
     log("Testing suspend/resume now, which will disconnect the cobraMetricsPublisher.");
 
     // Test suspend + resume
-    for (int i = 0 ; i < 3 ; ++i)
+    for (int i = 0; i < 3; ++i)
     {
         cobraMetricsPublisher.suspend();
         ix::msleep(500);
@@ -210,7 +259,7 @@ TEST_CASE("Cobra_Metrics_Publisher", "[cobra]")
         cobraMetricsPublisher.push("sms_metric_D_id", data); // will not be sent this time
 
         cobraMetricsPublisher.resume();
-        ix::msleep(2000); // give cobra 2s to connect
+        ix::msleep(2000);                             // give cobra 2s to connect
         REQUIRE(cobraMetricsPublisher.isConnected()); // Check that we are connected now
 
         cobraMetricsPublisher.push("sms_metric_E_id", data);
@@ -218,6 +267,19 @@ TEST_CASE("Cobra_Metrics_Publisher", "[cobra]")
 
     ix::msleep(500);
 
+    // Test multi-threaded publish
+    std::thread bgPublisher1(&runAdditionalPublisher, &cobraMetricsPublisher);
+    std::thread bgPublisher2(&runAdditionalPublisher, &cobraMetricsPublisher);
+    std::thread bgPublisher3(&runAdditionalPublisher, &cobraMetricsPublisher);
+    std::thread bgPublisher4(&runAdditionalPublisher, &cobraMetricsPublisher);
+    std::thread bgPublisher5(&runAdditionalPublisher, &cobraMetricsPublisher);
+
+    bgPublisher1.join();
+    bgPublisher2.join();
+    bgPublisher3.join();
+    bgPublisher4.join();
+    bgPublisher5.join();
+
     // Now stop the thread
     gStop = true;
     bgThread.join();
@@ -230,8 +292,16 @@ TEST_CASE("Cobra_Metrics_Publisher", "[cobra]")
     CHECK(gIds.count("sms_metric_C_id") == 1);
     CHECK(gIds.count("sms_metric_D_id") == 1);
     CHECK(gIds.count("sms_metric_E_id") == 1);
+    CHECK(gIds.count("sms_metric_F_id") == 1);
     CHECK(gIds.count("sms_set_rate_control_id") == 1);
     CHECK(gIds.count("sms_set_blacklist_id") == 1);
 
+    spdlog::info("Incoming bytes {}", incomingBytes);
+    spdlog::info("Outgoing bytes {}", outgoingBytes);
+
+    spdlog::info("Stopping snake server...");
     snakeServer.stop();
+
+    spdlog::info("Stopping redis server...");
+    redisServer.stop();
 }

test/IXDNSLookupTest.cpp

@@ -4,11 +4,10 @@
  *  Copyright (c) 2018 Machine Zone. All rights reserved.
  */
 
-#include "catch.hpp"
-
 #include "IXTest.h"
-#include <ixwebsocket/IXDNSLookup.h>
+#include "catch.hpp"
 #include <iostream>
+#include <ixwebsocket/IXDNSLookup.h>
 
 using namespace ix;
 
@@ -32,7 +31,11 @@ TEST_CASE("dns", "[net]")
         auto dnsLookup = std::make_shared<DNSLookup>("wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww", 80);
 
         std::string errMsg;
-        struct addrinfo* res = dnsLookup->resolve(errMsg, [] { return false; });
+        struct addrinfo* res = dnsLookup->resolve(errMsg,
+                                                  []
+                                                  {
+                                                      return false;
+                                                  });
         std::cerr << "Error message: " << errMsg << std::endl;
         REQUIRE(res == nullptr);
     }
@@ -43,7 +46,11 @@ TEST_CASE("dns", "[net]")
 
         std::string errMsg;
         // The callback returning true means we are requesting cancellation
-        struct addrinfo* res = dnsLookup->resolve(errMsg, [] { return true; });
+        struct addrinfo* res = dnsLookup->resolve(errMsg,
+                                                  []
+                                                  {
+                                                      return true;
+                                                  });
         std::cerr << "Error message: " << errMsg << std::endl;
         REQUIRE(res == nullptr);
     }

test/IXGetFreePort.cpp

@@ -5,11 +5,11 @@
  */
 
 #include "IXGetFreePort.h"
+
 #include <ixwebsocket/IXNetSystem.h>
 #include <ixwebsocket/IXSocket.h>
-
-#include <string>
 #include <random>
+#include <string>
 
 namespace ix
 {
@@ -30,8 +30,7 @@ namespace ix
         }
 
         int enable = 1;
-        if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR,
-                       (char*) &enable, sizeof(enable)) < 0)
+        if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (char*) &enable, sizeof(enable)) < 0)
         {
             return getAnyFreePortRandom();
         }
@@ -39,10 +38,10 @@ namespace ix
         // Bind to port 0. This is the standard way to get a free port.
         struct sockaddr_in server; // server address information
         server.sin_family = AF_INET;
-        server.sin_port   = htons(0);
+        server.sin_port = htons(0);
         server.sin_addr.s_addr = inet_addr("127.0.0.1");
 
-        if (bind(sockfd, (struct sockaddr *)&server, sizeof(server)) < 0)
+        if (bind(sockfd, (struct sockaddr*) &server, sizeof(server)) < 0)
         {
             Socket::closeSocket(sockfd);
             return getAnyFreePortRandom();
@@ -50,7 +49,7 @@ namespace ix
 
         struct sockaddr_in sa; // server address information
         socklen_t len = sizeof(sa);
-        if (getsockname(sockfd, (struct sockaddr *) &sa, &len) < 0)
+        if (getsockname(sockfd, (struct sockaddr*) &sa, &len) < 0)
         {
             Socket::closeSocket(sockfd);
             return getAnyFreePortRandom();
@@ -67,11 +66,11 @@ namespace ix
         while (true)
         {
 #if defined(__has_feature)
-# if __has_feature(address_sanitizer)
+#if __has_feature(address_sanitizer)
             int port = getAnyFreePortRandom();
-# else
+#else
             int port = getAnyFreePort();
-# endif
+#endif
 #else
             int port = getAnyFreePort();
 #endif