From bdb732d8c7296188eb1c5257cd3f4630efae6294 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 17 Apr 2019 12:38:44 +0200 Subject: [PATCH] Enable encryption and authentication for default configurations --- libnymea-core/nymeaconfiguration.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/libnymea-core/nymeaconfiguration.cpp b/libnymea-core/nymeaconfiguration.cpp index 8e1a3af7..2746fa29 100644 --- a/libnymea-core/nymeaconfiguration.cpp +++ b/libnymea-core/nymeaconfiguration.cpp @@ -78,14 +78,13 @@ NymeaConfiguration::NymeaConfiguration(QObject *parent) : settings.endGroup(); } if (createDefaults) { - qCWarning(dcApplication) << "No TCP server configuration found. Generating default of 0.0.0.0:2222"; + qCWarning(dcApplication) << "No TCP server configuration found. Generating default of nymeas://0.0.0.0:2222"; ServerConfiguration config; config.id = "default"; config.address = QHostAddress("0.0.0.0"); config.port = 2222; - // TODO enable encryption/authentication by default once the important clients are supporting it - config.sslEnabled = false; - config.authenticationEnabled = false; + config.sslEnabled = true; + config.authenticationEnabled = true; m_tcpServerConfigs[config.id] = config; storeServerConfig("TcpServer", config); } @@ -107,7 +106,7 @@ NymeaConfiguration::NymeaConfiguration(QObject *parent) : settings.endGroup(); } if (createDefaults) { - qCWarning(dcApplication) << "No Web server configuration found. Generating default of 0.0.0.0:3333"; + qCWarning(dcApplication) << "No Web server configuration found. Generating defaults of http://0.0.0.0:80 and https://0.0.0.0:443"; WebServerConfiguration insecureConfig; insecureConfig.id = "insecure"; insecureConfig.address = QHostAddress("0.0.0.0"); @@ -148,14 +147,13 @@ NymeaConfiguration::NymeaConfiguration(QObject *parent) : settings.endGroup(); } if (createDefaults) { - qCWarning(dcApplication) << "No WebSocket server configuration found. Generating default of 0.0.0.0:4444"; + qCWarning(dcApplication) << "No WebSocket server configuration found. Generating default of wss://0.0.0.0:4444"; ServerConfiguration config; config.id = "default"; config.address = QHostAddress("0.0.0.0"); config.port = 4444; - // TODO enable encryption/authentication by default once the important clients are supporting it - config.sslEnabled = false; - config.authenticationEnabled = false; + config.sslEnabled = true; + config.authenticationEnabled = true; m_webSocketServerConfigs[config.id] = config; storeServerConfig("WebSocketServer", config); }