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

WebSocketProtocol: Session parameter stuff

Browse Source
This commit is contained in:
tt2468 2021-04-30 10:03:38 -07:00
parent 26bfd3121d
commit 45367a7355
2 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/WebSocketProtocol.cpp
View File

@ -4,10 +4,46 @@
#include "plugin-macros.generated.h" #include "plugin-macros.generated.h"
bool IsSupportedRpcVersion(uint8_t requestedVersion)
{
for (auto version : WebSocketProtocol::SupportedRpcVersions) {
if (requestedVersion = version)
return true;
}
return false;
}
WebSocketProtocol::ProcessResult SetSessionParameters(SessionPtr session, json incomingMessage) WebSocketProtocol::ProcessResult SetSessionParameters(SessionPtr session, json incomingMessage)
{ {
WebSocketProtocol::ProcessResult ret; WebSocketProtocol::ProcessResult ret;
if (incomingMessage.contains("ignoreInvalidMessages")) {
if (!incomingMessage["ignoreInvalidMessages"].is_boolean()) {
ret.closeCode = WebSocketServer::WebSocketCloseCode::InvalidIdentifyParameter;
ret.closeReason = "You specified `ignoreInvalidMessages` but the value is not boolean.";
return ret;
}
session->SetIgnoreInvalidMessages(incomingMessage["ignoreInvalidMessages"]);
}
if (incomingMessage.contains("ignoreNonFatalRequestChecks")) {
if (!incomingMessage["ignoreNonFatalRequestChecks"].is_boolean()) {
ret.closeCode = WebSocketServer::WebSocketCloseCode::InvalidIdentifyParameter;
ret.closeReason = "You specified `ignoreNonFatalRequestChecks` but the value is not boolean.";
return ret;
}
session->SetIgnoreNonFatalRequestChecks(incomingMessage["ignoreNonFatalRequestChecks"]);
}
if (incomingMessage.contains("eventSubscriptions")) {
if (!incomingMessage["eventSubscriptions"].is_number_unsigned()) {
ret.closeCode = WebSocketServer::WebSocketCloseCode::InvalidIdentifyParameter;
ret.closeReason = "You specified `eventSubscriptions` but the value is not an unsigned integer.";
return ret;
}
session->SetEventSubscriptions(incomingMessage["eventSubscriptions"]);
}
return ret; return ret;
} }
@ -77,6 +113,19 @@ WebSocketProtocol::ProcessResult WebSocketProtocol::ProcessMessage(SessionPtr se
} }
} }
if (!incomingMessage.contains("rpcVersion") || !incomingMessage["rpcVersion"].is_number_unsigned()) {
ret.closeCode = WebSocketServer::WebSocketCloseCode::InvalidIdentifyParameter;
ret.closeReason = "Your Identify is missing `rpcVersion` or is not an integer.";
return ret;
}
uint8_t requestedRpcVersion = incomingMessage["rpcVersion"];
if (!IsSupportedRpcVersion(requestedRpcVersion)) {
ret.closeCode = WebSocketServer::WebSocketCloseCode::UnsupportedProtocolVersion;
ret.closeReason = "Your requested RPC version is not supported by this server.";
return ret;
}
session->SetRpcVersion(requestedRpcVersion);
WebSocketProtocol::ProcessResult parameterResult = SetSessionParameters(session, incomingMessage); WebSocketProtocol::ProcessResult parameterResult = SetSessionParameters(session, incomingMessage);
if (ret.closeCode != WebSocketServer::WebSocketCloseCode::DontClose) { if (ret.closeCode != WebSocketServer::WebSocketCloseCode::DontClose) {
return parameterResult; return parameterResult;

4
src/WebSocketProtocol.h
View File

@ -8,6 +8,10 @@
#include "requesthandler/RequestHandler.h" #include "requesthandler/RequestHandler.h"
namespace WebSocketProtocol { namespace WebSocketProtocol {
const std::vector<uint8_t> SupportedRpcVersions(
1
);
struct ProcessResult { struct ProcessResult {
WebSocketServer::WebSocketCloseCode closeCode = WebSocketServer::WebSocketCloseCode::DontClose; WebSocketServer::WebSocketCloseCode closeCode = WebSocketServer::WebSocketCloseCode::DontClose;
std::string closeReason; std::string closeReason;