Merge branch 'master' into feature/websocketnavigation

This merge changes the default websocket port from 8001 to 4862.

modules/server/include/connection.h

@@ -41,7 +41,12 @@ class Topic;
 
 class Connection {
 public:
-    Connection(std::unique_ptr<ghoul::io::Socket> s, std::string address);
+    Connection(
+        std::unique_ptr<ghoul::io::Socket> s,
+        std::string address,
+        bool authorized = false,
+        const std::string& password = ""
+    );
 
     void handleMessage(const std::string& message);
     void sendMessage(const std::string& message);
@@ -62,12 +67,9 @@ private:
     std::thread _thread;
 
     std::string _address;
-    bool _requireAuthorization;
     bool _isAuthorized = false;
     std::map<TopicId, std::string> _messageQueue;
     std::map<TopicId, std::chrono::system_clock::time_point> _sentMessages;
-
-    bool isWhitelisted() const;
 };
 
 } // namespace openspace

modules/server/include/serverinterface.h

@@ -0,0 +1,84 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2018                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_MODULE_SERVER___SERVERINTERFACE___H__
+#define __OPENSPACE_MODULE_SERVER___SERVERINTERFACE___H__
+
+#include <openspace/properties/propertyowner.h>
+#include <openspace/properties/stringproperty.h>
+#include <openspace/properties/stringlistproperty.h>
+#include <openspace/properties/optionproperty.h>
+#include <openspace/properties/scalar/boolproperty.h>
+#include <openspace/properties/scalar/intproperty.h>
+
+namespace ghoul::io { class SocketServer; }
+
+namespace openspace {
+
+class ServerInterface : public properties::PropertyOwner {
+public:
+    static std::unique_ptr<ServerInterface> createFromDictionary(
+        const ghoul::Dictionary& dictionary);
+
+    ServerInterface(const ghoul::Dictionary& dictionary);
+    ~ServerInterface();
+
+    void initialize();
+    void deinitialize();
+    bool isEnabled() const;
+    bool isActive() const;
+    int port() const;
+    std::string password() const;
+    bool clientHasAccessWithoutPassword(const std::string& address) const;
+    bool clientIsBlocked(const std::string& address) const;
+
+    ghoul::io::SocketServer* server();
+
+private:
+    enum class InterfaceType : int {
+        TcpSocket = 0,
+        WebSocket
+    };
+    
+    enum class Access : int {
+        Deny = 0,
+        RequirePassword,
+        Allow
+    };
+
+    properties::OptionProperty _type;
+    properties::IntProperty _port;
+    properties::BoolProperty _enabled;
+    properties::StringListProperty _allowAddresses;
+    properties::StringListProperty _requirePasswordAddresses;
+    properties::StringListProperty _denyAddresses;
+    properties::OptionProperty _defaultAccess;
+    properties::StringProperty _password;
+
+    std::unique_ptr<ghoul::io::SocketServer> _socketServer;
+};
+
+} // namespace openspace
+
+#endif // __OPENSPACE_MODULE_SERVER___SERVERINTERFACE___H__

modules/server/include/topics/authorizationtopic.h

@@ -31,7 +31,7 @@ namespace openspace {
 
 class AuthorizationTopic : public Topic {
 public:
-    AuthorizationTopic() = default;
+    AuthorizationTopic(std::string password);
 
     void handleJson(const nlohmann::json& json) override;
     bool isDone() const override;
@@ -39,6 +39,7 @@ public:
 private:
     bool authorize(const std::string& key);
 
+    std::string _password;
     bool _isAuthenticated = false;
 };