Merge pull request #1235 from fwsGonzo/dev

WebSockets

Author: fwsGonzo

api/net/http/secure_server.hpp

@@ -33,8 +33,13 @@ class Secure_server : public http::Server
       fs::Dirent& ca_cert,
       fs::Dirent& server_key,
       TCP& tcp,
-      Request_handler cb
-    );
+      Request_handler cb);
+
+  Secure_server(
+      fs::Dirent& ca_key,
+      fs::Dirent& ca_cert,
+      fs::Dirent& server_key,
+      TCP& tcp);
 
   Secure_server(
       Botan::Credentials_Manager*   in_credman,
@@ -57,7 +62,6 @@ class Secure_server : public http::Server
       Server::connect(std::unique_ptr<net::tls::Server>(ptr));
     });
     ptr->on_close([ptr] {
-      printf("Secure_HTTP::on_close on %s\n", ptr->to_string().c_str());
       delete ptr;
     });
   }

api/net/http/websocket.hpp

@@ -0,0 +1,106 @@
+// This file is a part of the IncludeOS unikernel - www.includeos.org
+//
+// Copyright 2016 Oslo and Akershus University College of Applied Sciences
+// and Alfred Bratterud
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+#ifndef NET_HTTP_WEBSOCKET_HPP
+#define NET_HTTP_WEBSOCKET_HPP
+
+#include <net/http/server.hpp>
+#include <net/http/client.hpp>
+
+namespace http {
+
+class WebSocket {
+public:
+  typedef std::unique_ptr<WebSocket> WebSocket_ptr;
+  // client connected
+  typedef delegate<void(WebSocket_ptr)> connect_func;
+  // server new client
+  typedef delegate<bool(net::tcp::Socket, std::string)> accept_func;
+  // data read (data, length)
+  typedef delegate<void(const char*, size_t)> read_func;
+  // closed (status code)
+  typedef delegate<void(uint16_t)>    close_func;
+  // error (reason)
+  typedef delegate<void(std::string)> error_func;
+
+  /// Server-side connection
+  WebSocket(http::Request_ptr         request,
+            http::Response_writer_ptr response,
+            accept_func = nullptr);
+  /// Client-side connection
+  static void
+  connect(http::Client& client, 
+          std::string   origin,
+          uri::URI      dest,
+          connect_func  callback);
+
+  enum mode_t {
+    TEXT,
+    BINARY
+  };
+  void write(const char* buffer, size_t len, mode_t = TEXT);
+  void write(net::tcp::buffer_t, size_t len, mode_t = TEXT);
+
+  void write(const std::string& text)
+  {
+    write(text.c_str(), text.size(), TEXT);
+  }
+
+  // close the websocket
+  void close();
+
+  // user callbacks
+  close_func   on_close = nullptr;
+  error_func   on_error = nullptr;
+  read_func    on_read  = nullptr;
+
+  bool is_alive() const noexcept {
+    return this->conn != nullptr;
+  }
+  bool is_client() const noexcept {
+    return this->clientside;
+  }
+  const auto& get_connection() const noexcept {
+    return this->conn;
+  }
+
+  // string description for status codes
+  static const char* status_code(uint16_t code);
+
+  WebSocket(net::Stream_ptr, bool);
+  WebSocket(WebSocket&&);
+  ~WebSocket();
+
+private:
+  net::Stream_ptr conn;
+  bool clientside;
+
+  WebSocket(const WebSocket&) = delete;
+  WebSocket& operator= (const WebSocket&) = delete;
+  WebSocket& operator= (WebSocket&&) = delete;
+  void read_data(net::tcp::buffer_t, size_t);
+  bool write_opcode(uint8_t code, const char*, size_t);
+  void failure(const std::string&);
+  void tcp_closed();
+  void reset();
+};
+using WebSocket_ptr = WebSocket::WebSocket_ptr;
+
+} // http
+
+#endif

src/CMakeLists.txt

@@ -52,7 +52,7 @@ set(OS_OBJECTS
   net/http/header.cpp net/http/header_fields.cpp net/http/message.cpp net/http/request.cpp
   net/http/response.cpp net/http/status_codes.cpp net/http/time.cpp net/http/version.cpp
   net/http/mime_types.cpp net/http/cookie.cpp net/http/secure_server.cpp
-  net/http/client_connection.cpp net/http/client.cpp
+  net/http/client_connection.cpp net/http/client.cpp net/http/websocket.cpp
   net/http/server_connection.cpp net/http/server.cpp net/http/response_writer.cpp
   fs/disk.cpp fs/filesystem.cpp fs/mbr.cpp fs/path.cpp
   fs/fat.cpp fs/fat_async.cpp fs/fat_sync.cpp fs/memdisk.cpp

src/net/http/secure_server.cpp

@@ -59,4 +59,13 @@ namespace http
 
     this->credman.reset(credman);
   }
+
+  Secure_server::Secure_server(
+      fs::Dirent& file_ca_key,
+      fs::Dirent& file_ca_cert,
+      fs::Dirent& file_server_key,
+      TCP& tcp)
+    : Secure_server(file_ca_key, file_ca_cert, file_server_key, tcp, nullptr)
+  {}
+
 }