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

Merge branch 'master' of https://github.com/Palakis/obs-websocket

Browse Source
This commit is contained in:
tt2468 2021-07-24 20:48:58 -07:00
commit c402b4232c
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -36,7 +36,7 @@ Here is a list of available web clients: (compatible with tablets and other touc
It is **highly recommended** to protect obs-websocket with a password against unauthorized control. To do this, open the "Websocket server settings" dialog under OBS' "Tools" menu. In the settings dialogs, you can enable or disable authentication and set a password for it.
(Psst. You can use `--websocket_port` and `--websocket_password` on the command line to override the configured values.)
(Psst. You can use `--websocket_port`(value), `--websocket_password`(value), and `--websocket_debug`(flag) on the command line to override the configured values.)
### Possible use cases
@ -52,7 +52,7 @@ The protocol understood by the server is documented in [PROTOCOL.md](docs/genera
Here's a list of available language APIs for obs-websocket :
- (No known apis supporting 5.0.0)
I'd like to know what you're building with or for obs-websocket. If you do something in this fashion, feel free to drop a message in `#project-showoff` in the [discord server!](https://discord.gg/WBaSQ3A)
We'd like to know what you're building with or for obs-websocket. If you do something in this fashion, feel free to drop a message in `#project-showoff` in the [discord server!](https://discord.gg/WBaSQ3A)
### Securing obs-websocket (via TLS/SSL)

14
src/requesthandler/RequestHandler_Config.cpp
View File

@ -79,9 +79,19 @@ RequestResult RequestHandler::GetProfileParameter(const Request& request)
config_t* profile = obs_frontend_get_profile_config();
if (!profile)
blog(LOG_ERROR, "Profile invalid.");
std::string parameterValue = config_get_string(profile, parameterCategory.c_str(), parameterName.c_str());
std::string defaultParameterValue = config_get_default_string(profile, parameterCategory.c_str(), parameterName.c_str());
if (parameterValue.empty())
blog(LOG_INFO, "Parameter value is empty.");
if (defaultParameterValue.empty())
blog(LOG_INFO, "Default parameter value is empty.");
json responseData;
responseData["parameterValue"] = config_get_string(profile, parameterCategory.c_str(), parameterName.c_str());
responseData["defaultParameterValue"] = config_get_default_string(profile, parameterCategory.c_str(), parameterName.c_str());
responseData["parameterValue"] = parameterValue;
responseData["defaultParameterValue"] = defaultParameterValue;
return RequestResult::Success(responseData);
}