ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Uses the master Janus secret as the mountpoint secret, detects and restarts mounts if PIN is stale

pull/3601/head
Jonathan Bennett 2022-09-24 15:47:14 -05:00
parent e91b11d1db
commit 9cb21dce22
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/zm_monitor_janus.cpp
View File

@ -124,7 +124,9 @@ int Monitor::JanusManager::check_janus() {
std::string postData = "{\"janus\" : \"message\", \"transaction\" : \"randomString\", \"body\" : {"; std::string postData = "{\"janus\" : \"message\", \"transaction\" : \"randomString\", \"body\" : {";
postData += "\"request\" : \"info\", \"id\" : "; postData += "\"request\" : \"info\", \"id\" : ";
postData += std::to_string(parent->id); postData += std::to_string(parent->id);
postData += "}}"; postData += ", \"secret\" : \"";
postData += config.janus_secret;
postData += "\"}}";
std::string response; std::string response;
std::string endpoint = janus_endpoint+"/"+janus_session+"/"+janus_handle; std::string endpoint = janus_endpoint+"/"+janus_session+"/"+janus_handle;
@ -157,6 +159,13 @@ int Monitor::JanusManager::check_janus() {
Warning("Mountpoint Missing"); Warning("Mountpoint Missing");
return 0; return 0;
} }
//check for changed PIN
if (response.find(parent->janus_pin) == std::string::npos){
Warning("PIN changed, remounting.");
return remove_from_janus();
}
return 1; return 1;
} }
@ -181,7 +190,7 @@ int Monitor::JanusManager::add_to_janus() {
postData += rtsp_path; postData += rtsp_path;
//secret prevents querying the mount for info, which leaks the camera's secrets. //secret prevents querying the mount for info, which leaks the camera's secrets.
postData += "\", \"secret\" : \""; postData += "\", \"secret\" : \"";
postData += parent->janus_pin; postData += config.janus_secret;
//pin prevents viewing the video. //pin prevents viewing the video.
postData += "\", \"pin\" : \""; postData += "\", \"pin\" : \"";
postData += parent->janus_pin; postData += parent->janus_pin;
@ -245,7 +254,7 @@ int Monitor::JanusManager::remove_from_janus() {
postData += "\"request\" : \"destroy\", \"admin_key\" : \""; postData += "\"request\" : \"destroy\", \"admin_key\" : \"";
postData += config.janus_secret; postData += config.janus_secret;
postData += "\", \"secret\" : \""; postData += "\", \"secret\" : \"";
postData += parent->janus_pin; postData += config.janus_secret;
postData += "\", \"id\" : "; postData += "\", \"id\" : ";
postData += std::to_string(parent->id); postData += std::to_string(parent->id);
postData += "}}"; postData += "}}";