added another server to simplify testing

meson.build

@@ -210,6 +210,7 @@ alltests = executable('alltests',
 	'test/webfuse/utils/path.c',
 	'test/webfuse/utils/static_filesystem.c',
 	'test/webfuse/utils/ws_server.cc',
+	'test/webfuse/utils/ws_server2.cc',
 	'test/webfuse/mocks/fake_invokation_context.cc',
 	'test/webfuse/mocks/mock_authenticator.cc',
 	'test/webfuse/mocks/mock_request.cc',

test/webfuse/mocks/mock_invokation_handler.hpp

@@ -0,0 +1,18 @@
+#ifndef WF_MOCK_INVOKATION_HANDLER_HPP
+#define WF_MOCK_INVOKATION_HANDLER_HPP
+
+#include "webfuse/utils/ws_server2.hpp"
+#include <gtest/gtest.h>
+
+namespace webfuse_test
+{
+
+class MockInvokationHander: public IIvokationHandler
+{
+public:
+    MOCK_METHOD2(Invoke, std::string(char const * method, json_t * params));
+};
+
+}
+
+#endif

test/webfuse/tests/adapter/test_client.cc

@@ -5,18 +5,23 @@
 #include "webfuse/adapter/credentials.h"
 #include "webfuse/adapter/credentials.h"
 #include "webfuse/core/protocol_names.h"
-#include "webfuse/utils/ws_server.h"
+#include "webfuse/utils/ws_server2.hpp"
 #include "webfuse/mocks/mock_adapter_client_callback.hpp"
+#include "webfuse/mocks/mock_invokation_handler.hpp"
 #include "webfuse/utils/timeout_watcher.hpp"
 
-using webfuse_test::WsServer;
+using webfuse_test::WsServer2;
+using webfuse_test::MockInvokationHander;
 using webfuse_test::MockAdapterClientCallback;
 using webfuse_test::TimeoutWatcher;
 using testing::_;
 using testing::Invoke;
 using testing::AnyNumber;
+using testing::Return;
+using testing::Throw;
+using testing::StrEq;
 
-#define TIMEOUT (std::chrono::milliseconds(10 * 1000))
+#define TIMEOUT (std::chrono::milliseconds(30 * 1000))
 
 namespace
 {
@@ -123,9 +128,11 @@ TEST(AdapterClient, Connect)
 {
     TimeoutWatcher watcher(TIMEOUT);
 
-    WsServer server(WF_PROTOCOL_NAME_PROVIDER_SERVER);
-    MockAdapterClientCallback callback;
+    MockInvokationHander handler;
+    WsServer2 server(handler, WF_PROTOCOL_NAME_PROVIDER_SERVER);
+    EXPECT_CALL(handler, Invoke(_,_)).Times(0);
 
+    MockAdapterClientCallback callback;
     EXPECT_CALL(callback, Invoke(_, WF_CLIENT_INIT, nullptr)).Times(1);
     EXPECT_CALL(callback, Invoke(_, WF_CLIENT_CREATED, nullptr)).Times(1);
     EXPECT_CALL(callback, Invoke(_, WF_CLIENT_GET_TLS_CONFIG, _)).Times(1);
@@ -159,9 +166,12 @@ TEST(AdapterClient, Authenticate)
 {
     TimeoutWatcher watcher(TIMEOUT);
 
-    WsServer server(WF_PROTOCOL_NAME_PROVIDER_SERVER);
-    MockAdapterClientCallback callback;
+    MockInvokationHander handler;
+    WsServer2 server(handler, WF_PROTOCOL_NAME_PROVIDER_SERVER);
+    EXPECT_CALL(handler, Invoke(StrEq("authenticate"),_)).Times(1)
+        .WillOnce(Return("{}"));
 
+    MockAdapterClientCallback callback;
     EXPECT_CALL(callback, Invoke(_, _, _)).Times(AnyNumber());
     EXPECT_CALL(callback, Invoke(_, WF_CLIENT_AUTHENTICATE_GET_CREDENTIALS, _)).Times(1)
         .WillOnce(Invoke(GetCredentials));
@@ -174,6 +184,53 @@ TEST(AdapterClient, Authenticate)
     wf_client * client = wf_client_create(
         callback.GetCallbackFn(), callback.GetUserData());
 
+
+    wf_client_connect(client, server.GetUrl().c_str());
+    while (!server.IsConnected())
+    {
+        watcher.check();
+        wf_client_service(client);
+    }
+
+    wf_client_authenticate(client);
+    while (!called) {
+        watcher.check();
+        wf_client_service(client);
+    }
+
+    wf_client_disconnect(client);
+    while (server.IsConnected())
+    {
+        watcher.check();
+        wf_client_service(client);
+    }
+
+    wf_client_dispose(client);
+}
+
+TEST(AdapterClient, AuthenticationFailed)
+{
+    TimeoutWatcher watcher(TIMEOUT);
+
+    MockInvokationHander handler;
+    WsServer2 server(handler, WF_PROTOCOL_NAME_PROVIDER_SERVER);
+    EXPECT_CALL(handler, Invoke(StrEq("authenticate"),_)).Times(1)
+        .WillOnce(Throw(std::runtime_error("authentication failed")));
+
+    MockAdapterClientCallback callback;
+    EXPECT_CALL(callback, Invoke(_, _, _)).Times(AnyNumber());
+    EXPECT_CALL(callback, Invoke(_, WF_CLIENT_AUTHENTICATE_GET_CREDENTIALS, _)).Times(1)
+        .WillOnce(Invoke(GetCredentials));
+    bool called = false;
+    EXPECT_CALL(callback, Invoke(_, WF_CLIENT_AUTHENTICATION_FAILED, nullptr)).Times(1)
+        .WillOnce(Invoke([&called] (wf_client *, int, void *) mutable {
+            called = true;
+        }));
+
+    wf_client * client = wf_client_create(
+        callback.GetCallbackFn(), callback.GetUserData());
+
+
     wf_client_connect(client, server.GetUrl().c_str());
     while (!server.IsConnected())
     {
@@ -182,37 +239,6 @@ TEST(AdapterClient, Authenticate)
     }
 
     wf_client_authenticate(client);
-    json_t * request = server.ReceiveMessage();
-    while (nullptr == request)
-    {
-        watcher.check();
-        wf_client_service(client);
-        request = server.ReceiveMessage();
-    }
-    json_t * id = json_object_get(request, "id");
-    ASSERT_TRUE(json_is_integer(id));
-    json_t * method = json_object_get(request, "method");
-    ASSERT_TRUE(json_is_string(method));
-    ASSERT_STREQ("authenticate", json_string_value(method));
-    json_t * params = json_object_get(request, "params");
-    ASSERT_TRUE(json_is_array(params));
-    ASSERT_EQ(2, json_array_size(params));
-    json_t * type = json_array_get(params, 0);
-    ASSERT_TRUE(json_is_string(type));
-    json_t * creds = json_array_get(params, 1);
-    ASSERT_TRUE(json_is_object(creds));
-    json_t * username = json_object_get(creds, "username");
-    ASSERT_TRUE(json_is_string(username));
-    ASSERT_STREQ("Bob", json_string_value(username));
-    json_t * password = json_object_get(creds, "password");
-    ASSERT_TRUE(json_is_string(password));
-    ASSERT_STREQ("secret", json_string_value(password));
-
-    json_t * response = json_object();
-    json_object_set(response, "id", id);
-    json_object_set_new(response, "result", json_object());
-    server.SendMessage(response);
-    json_decref(request);
     while (!called) {
         watcher.check();
         wf_client_service(client);

test/webfuse/utils/ws_server2.cc

@@ -0,0 +1,305 @@
+#include "webfuse/utils/ws_server2.hpp"
+#include "webfuse/core/lws_log.h"
+
+#include <libwebsockets.h>
+#include <thread>
+#include <mutex>
+#include <chrono>
+#include <sstream>
+#include <queue>
+
+namespace
+{
+
+class IServer
+{
+public:
+    virtual ~IServer() = default;
+    virtual void OnConnected(lws * wsi) = 0;
+    virtual void OnConnectionClosed(lws * wsi) = 0;
+    virtual void OnMessageReceived(struct lws * wsi, char const * data, size_t length) = 0;
+    virtual void OnWritable(struct lws * wsi) = 0;
+};
+
+}
+
+extern "C"
+{
+
+static int wf_test_utils_ws_server_callback(
+    struct lws * wsi,
+    enum lws_callback_reasons reason,
+    void * user,
+    void * in,
+    size_t len)
+{
+    int result = 0;
+    struct lws_protocols const * ws_protocol = lws_get_protocol(wsi);
+    auto * server = reinterpret_cast<IServer*>(nullptr != ws_protocol ? ws_protocol->user : nullptr);
+
+    if (nullptr != server)
+    {
+        switch (reason)
+        {
+            case LWS_CALLBACK_ESTABLISHED:
+                server->OnConnected(wsi);
+                break;
+            case LWS_CALLBACK_CLOSED:
+                server->OnConnectionClosed(wsi);
+                break;
+            case LWS_CALLBACK_RECEIVE:
+                {
+                    auto * data = reinterpret_cast<char const *>(in);
+                    server->OnMessageReceived(wsi, data, len);
+                }
+                break;
+            case LWS_CALLBACK_SERVER_WRITEABLE:
+                server->OnWritable(wsi);
+                break;
+            default:
+                break;
+        }
+    }
+
+    return result;
+}
+
+}
+
+
+namespace webfuse_test
+{
+
+class WsServer2::Private : IServer
+{
+    Private(Private const &) = delete;
+    Private & operator=(Private const &) = delete;
+public:
+    Private(IIvokationHandler & handler, std::string const & protocol, int port);
+    ~Private();
+    bool IsConnected();
+    std::string const & GetUrl() const;
+    void OnConnected(lws * wsi) override;
+    void OnConnectionClosed(lws * wsi) override;
+    void OnMessageReceived(struct lws * wsi, char const * data, size_t length) override;
+    void OnWritable(struct lws * wsi) override;
+
+private:
+    void SendMessage(json_t * message);
+    static void Run(Private * self);
+
+    IIvokationHandler & handler_;
+    std::string protocol_;
+    bool is_connected;
+    bool is_shutdown_requested;
+    lws * wsi_;
+    lws_context * ws_context;
+    lws_protocols ws_protocols[2];
+	lws_context_creation_info info;
+    std::string url;
+    std::thread context;
+    std::mutex mutex;
+    std::queue<std::string> writeQueue;
+};
+
+WsServer2::WsServer2(
+    IIvokationHandler& handler,
+    std::string const & protocol,
+    int port)
+: d(new WsServer2::Private(handler, protocol, port))
+{
+
+}
+
+WsServer2::~WsServer2()
+{
+    delete d;
+}
+
+bool WsServer2::IsConnected()
+{
+    return d->IsConnected();
+}
+
+std::string const & WsServer2::GetUrl() const
+{
+    return d->GetUrl();
+}
+
+WsServer2::Private::Private(
+    IIvokationHandler & handler,
+    std::string const & protocol,
+    int port)
+: handler_(handler)
+, protocol_(protocol)
+, is_connected(false)
+, is_shutdown_requested(false)
+, wsi_(nullptr)
+{
+    wf_lwslog_disable();
+    IServer * server = this;
+    memset(ws_protocols, 0, sizeof(struct lws_protocols) * 2 );
+
+    ws_protocols[0].name = protocol_.c_str();
+    ws_protocols[0].callback = &wf_test_utils_ws_server_callback;
+    ws_protocols[0].per_session_data_size = 0;
+    ws_protocols[0].user = reinterpret_cast<void*>(server);
+
+    memset(&info, 0, sizeof(struct lws_context_creation_info));
+    info.port = port;
+    info.mounts = NULL;
+    info.protocols =ws_protocols;
+    info.vhost_name = "localhost";
+    info.ws_ping_pong_interval = 10;
+    info.options = LWS_SERVER_OPTION_HTTP_HEADERS_SECURITY_BEST_PRACTICES_ENFORCE;
+    info.options |= LWS_SERVER_OPTION_EXPLICIT_VHOSTS;
+
+    ws_context = lws_create_context(&info);
+
+    std::ostringstream stream;
+    struct lws_vhost * vhost = lws_create_vhost(ws_context, &info);
+    stream << "ws://localhost:" << lws_get_vhost_port(vhost) << "/";
+    url = stream.str();
+
+    context = std::thread(&Run, this);
+}
+
+WsServer2::Private::~Private()
+{
+    {
+        std::unique_lock<std::mutex> lock(mutex);
+        is_shutdown_requested = true;
+    }
+
+    lws_cancel_service(ws_context);
+    context.join();
+    lws_context_destroy(ws_context);
+}
+
+void WsServer2::Private::Run(Private * self)
+{
+    bool is_running = true;
+    while (is_running)
+    {
+        lws_service(self->ws_context, 0);
+        {
+            std::unique_lock<std::mutex> lock(self->mutex);
+            is_running = !self->is_shutdown_requested;
+        }
+    }
+}
+
+bool WsServer2::Private::IsConnected()
+{
+    std::unique_lock<std::mutex> lock(mutex);
+    return is_connected;
+}
+
+void WsServer2::Private::OnConnected(lws * wsi)
+{
+    std::unique_lock<std::mutex> lock(mutex);
+    is_connected = true;
+    wsi_ = wsi;
+}
+
+void WsServer2::Private::OnConnectionClosed(lws * wsi)
+{
+    std::unique_lock<std::mutex> lock(mutex);
+    if (wsi == wsi_)
+    {
+        is_connected = false;
+        wsi_ = nullptr;
+    }
+}
+
+void WsServer2::Private::OnWritable(struct lws * wsi)
+{
+    bool notify = false;
+
+    {
+        std::unique_lock<std::mutex> lock(mutex);
+
+        if (!writeQueue.empty())
+        {
+            std::string const & message = writeQueue.front();
+
+            unsigned char * data = new unsigned char[LWS_PRE + message.size()];
+            memcpy(&data[LWS_PRE], message.c_str(), message.size());
+            lws_write(wsi, &data[LWS_PRE], message.size(), LWS_WRITE_TEXT);
+            delete[] data;
+
+            writeQueue.pop();
+            notify = !writeQueue.empty();
+        }
+    }
+
+    if (notify)
+    {
+        lws_callback_on_writable(wsi);
+    }
+}
+
+
+void WsServer2::Private::SendMessage(json_t * message)
+{
+    lws * wsi = nullptr;
+
+    {
+        std::unique_lock<std::mutex> lock(mutex);
+
+        if (nullptr != wsi_)
+        {
+            char* message_text = json_dumps(message, JSON_COMPACT);
+            writeQueue.push(message_text);
+            json_decref(message);
+            free(message_text);
+            wsi = wsi_;
+        }
+    }
+
+    if (nullptr != wsi)
+    {
+        lws_callback_on_writable(wsi_);
+    }
+}
+
+void WsServer2::Private::OnMessageReceived(struct lws * wsi, char const * data, size_t length)
+{
+    (void) wsi;
+
+    json_t * request = json_loadb(data, length, JSON_DECODE_ANY, nullptr);
+    json_t * method = json_object_get(request, "method");
+    json_t * params = json_object_get(request, "params");
+    json_t * id = json_object_get(request, "id");
+
+    if (json_is_string(method) && json_is_array(params) && json_is_integer(id))
+    {
+        json_t * response = json_object();
+
+        try 
+        {
+            std::string result_text = handler_.Invoke(json_string_value(method), params);
+            json_t * result = json_loads(result_text.c_str(), JSON_DECODE_ANY, nullptr);
+            json_object_set_new(response, "result", result);
+        }
+        catch (...)
+        {
+            json_t * error = json_object();
+            json_object_set_new(error, "code", json_integer(1));
+            json_object_set_new(response, "error", error);
+        }
+
+        json_object_set(response, "id", id);
+        SendMessage(response);
+    }
+
+    json_decref(request);
+}
+
+std::string const & WsServer2::Private::GetUrl() const
+{
+    return url;
+}
+
+
+}

test/webfuse/utils/ws_server2.hpp

@@ -0,0 +1,36 @@
+#ifndef WF_TEST_UTILS_WS_SERVER2_HPP
+#define WF_TEST_UTILS_WS_SERVER2_HPP
+
+#include <jansson.h>
+#include <string>
+
+namespace webfuse_test
+{
+
+class IIvokationHandler
+{
+public:
+    virtual ~IIvokationHandler() = default;
+    virtual std::string Invoke(char const * method, json_t * params) = 0;
+};
+
+class WsServer2
+{
+    WsServer2(WsServer2 const &) = delete;
+    WsServer2 & operator=(WsServer2 const & ) = delete;
+public:
+    WsServer2(
+        IIvokationHandler& handler,
+        std::string const & protocol,
+        int port = 0);
+    virtual ~WsServer2();
+    bool IsConnected();
+    std::string const & GetUrl() const;
+private:
+    class Private;
+    Private * d;
+};
+
+}
+
+#endif