Mirrored_Repos/obs-websocket
1
0
Fork 0
mirror of https://github.com/Palakis/obs-websocket.git synced 2024-08-30 18:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

WebSocketServer: Get config values directly from Config

Browse Source 
We were previously storing config values in the WebSocketServer class
itself, in a weak attempt at modularity. It's better to give up on that
idea and just get it from the Config object itself.
This commit is contained in:
tt2468 2021-12-15 02:06:52 -08:00
parent b490e4409b
commit fab56d71ea
2 changed files with 10 additions and 11 deletions

18
src/websocketserver/WebSocketServer.cpp

@ -112,10 +112,6 @@ void WebSocketServer::Start()
return; return;
} }
_serverPort = conf->ServerPort;
_serverPassword = conf->ServerPassword;
_authenticationRequired = conf->AuthRequired;
_authenticationSalt = Utils::Crypto::GenerateSalt(); _authenticationSalt = Utils::Crypto::GenerateSalt();
_authenticationSecret = Utils::Crypto::GenerateSecret(conf->ServerPassword.toStdString(), _authenticationSalt); _authenticationSecret = Utils::Crypto::GenerateSecret(conf->ServerPassword.toStdString(), _authenticationSalt);
@ -133,7 +129,7 @@ void WebSocketServer::Start()
_server.reset(); _server.reset();
websocketpp::lib::error_code errorCode; websocketpp::lib::error_code errorCode;
_server.listen(websocketpp::lib::asio::ip::tcp::v4(), _serverPort, errorCode); _server.listen(websocketpp::lib::asio::ip::tcp::v4(), conf->ServerPort, errorCode);
if (errorCode) { if (errorCode) {
std::string errorCodeMessage = errorCode.message(); std::string errorCodeMessage = errorCode.message();
@ -145,7 +141,7 @@ void WebSocketServer::Start()
_serverThread = std::thread(&WebSocketServer::ServerRunner, this); _serverThread = std::thread(&WebSocketServer::ServerRunner, this);
blog(LOG_INFO, "[WebSocketServer::Start] Server started successfully on port %d. Possible connect address: %s", _serverPort, Utils::Platform::GetLocalAddress().c_str()); blog(LOG_INFO, "[WebSocketServer::Start] Server started successfully on port %d. Possible connect address: %s", conf->ServerPort.load(), Utils::Platform::GetLocalAddress().c_str());
} }
void WebSocketServer::Stop() void WebSocketServer::Stop()
@ -256,6 +252,12 @@ void WebSocketServer::onOpen(websocketpp::connection_hdl hdl)
{ {
auto conn = _server.get_con_from_hdl(hdl); auto conn = _server.get_con_from_hdl(hdl);
auto conf = GetConfig();
if (!conf) {
blog(LOG_ERROR, "[WebSocketServer::onOpen] Unable to retreive config!");
return;
}
// Build new session // Build new session
std::unique_lock<std::mutex> lock(_sessionMutex); std::unique_lock<std::mutex> lock(_sessionMutex);
SessionPtr session = _sessions[hdl] = std::make_shared<WebSocketSession>(); SessionPtr session = _sessions[hdl] = std::make_shared<WebSocketSession>();
@ -265,7 +267,7 @@ void WebSocketServer::onOpen(websocketpp::connection_hdl hdl)
// Configure session details // Configure session details
session->SetRemoteAddress(conn->get_remote_endpoint()); session->SetRemoteAddress(conn->get_remote_endpoint());
session->SetConnectedAt(QDateTime::currentSecsSinceEpoch()); session->SetConnectedAt(QDateTime::currentSecsSinceEpoch());
session->SetAuthenticationRequired(_authenticationRequired); session->SetAuthenticationRequired(conf->AuthRequired);
std::string selectedSubprotocol = conn->get_subprotocol(); std::string selectedSubprotocol = conn->get_subprotocol();
if (!selectedSubprotocol.empty()) { if (!selectedSubprotocol.empty()) {
if (selectedSubprotocol == "obswebsocket.json") if (selectedSubprotocol == "obswebsocket.json")
@ -278,7 +280,7 @@ void WebSocketServer::onOpen(websocketpp::connection_hdl hdl)
json helloMessageData; json helloMessageData;
helloMessageData["obsWebSocketVersion"] = OBS_WEBSOCKET_VERSION; helloMessageData["obsWebSocketVersion"] = OBS_WEBSOCKET_VERSION;
helloMessageData["rpcVersion"] = OBS_WEBSOCKET_RPC_VERSION; helloMessageData["rpcVersion"] = OBS_WEBSOCKET_RPC_VERSION;
if (_authenticationRequired) { if (conf->AuthRequired) {
session->SetSecret(_authenticationSecret); session->SetSecret(_authenticationSecret);
std::string sessionChallenge = Utils::Crypto::GenerateSalt(); std::string sessionChallenge = Utils::Crypto::GenerateSalt();
session->SetChallenge(sessionChallenge); session->SetChallenge(sessionChallenge);

3
src/websocketserver/WebSocketServer.h

@ -96,9 +96,6 @@ class WebSocketServer : QObject
std::thread _serverThread; std::thread _serverThread;
websocketpp::server<websocketpp::config::asio> _server; websocketpp::server<websocketpp::config::asio> _server;
uint16_t _serverPort;
QString _serverPassword;
bool _authenticationRequired;
std::string _authenticationSecret; std::string _authenticationSecret;
std::string _authenticationSalt; std::string _authenticationSalt;