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

server: remove validate handler

Browse Source
This commit is contained in:
Stéphane Lepin 2018-12-31 17:23:20 +01:00
parent ec7f3fa057
commit a8de9ac472
2 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/WSServer.cpp
View File

@ -52,7 +52,6 @@ WSServer::WSServer(QObject* parent)
{
_server.init_asio();
_server.set_validate_handler(bind(&WSServer::validateConnection, this, ::_1));
_server.set_open_handler(bind(&WSServer::onOpen, this, ::_1));
_server.set_close_handler(bind(&WSServer::onClose, this, ::_1));
_server.set_message_handler(bind(&WSServer::onMessage, this, ::_1, ::_2));
@ -101,46 +100,6 @@ void WSServer::broadcast(QString message)
}
}
bool WSServer::validateConnection(connection_hdl hdl)
{
// TODO enforce subprotocol
Config* config = Config::Current();
if (config->AuthRequired) {
auto conn = _server.get_con_from_hdl(hdl);
QString authorization =
QString::fromStdString(conn->get_request_header("Authorization"));
if (!authorization.isNull() && !authorization.isEmpty()) {
const QStringList& parts = authorization.split(" ", QString::SplitBehavior::SkipEmptyParts);
if (parts.length() >= 2) {
const QString& authType = parts.at(0);
const QString& authValue = parts.at(1);
if (authType == "Basic") {
const QStringList& decodedParts =
decodeBase64(authValue).split(":", QString::SplitBehavior::SkipEmptyParts);
if (decodedParts.length() >= 2) {
const QString& username = decodedParts.at(0);
const QString& password = decodedParts.at(1);
// TODO time-constant string comparison
if (password == config->AuthPassword) {
return true;
}
}
}
}
}
conn->set_status(websocketpp::http::status_code::unauthorized);
conn->append_header("WWW-Authenticate", "Basic charset=\"UTF-8\"");
return false;
}
return true;
}
void WSServer::onOpen(connection_hdl hdl)
{
QMutexLocker locker(&_clMutex);

1
src/WSServer.h
View File

@ -49,7 +49,6 @@ public:
static WSServer* Instance;
private:
bool validateConnection(connection_hdl hdl);
void onOpen(connection_hdl hdl);
void onMessage(connection_hdl hdl, server::message_ptr message);
void onClose(connection_hdl hdl);