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

API on remote server requires RELAY not be none. Log an error. Fix url being ruined by auth credentials

pull/2860/head
Isaac Connor 2020-02-25 17:12:48 -05:00
parent 7787ba1040
commit 8fcd5b37ed
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
web/includes/Event.php
View File

@ -511,11 +511,12 @@ class Event extends ZM_Object {
if ( ZM_OPT_USE_AUTH ) { if ( ZM_OPT_USE_AUTH ) {
if ( ZM_AUTH_RELAY == 'hashed' ) { if ( ZM_AUTH_RELAY == 'hashed' ) {
$url .= '?auth='.generateAuthHash( ZM_AUTH_HASH_IPS ); $url .= '?auth='.generateAuthHash( ZM_AUTH_HASH_IPS );
} elseif ( ZM_AUTH_RELAY == 'plain' ) { } else if ( ZM_AUTH_RELAY == 'plain' ) {
$url = '?user='.$_SESSION['username']; $url .= '?user='.$_SESSION['username'];
$url = '?pass='.$_SESSION['password']; $url .= '?pass='.$_SESSION['password'];
} elseif ( ZM_AUTH_RELAY == 'none' ) { } else {
$url = '?user='.$_SESSION['username']; Error('Multi-Server requires AUTH_RELAY be either HASH or PLAIN');
return;
} }
} }
Logger::Debug("sending command to $url"); Logger::Debug("sending command to $url");
@ -557,12 +558,13 @@ class Event extends ZM_Object {
$url = $Server->UrlToApi() . '/events/'.$this->{'Id'}.'.json'; $url = $Server->UrlToApi() . '/events/'.$this->{'Id'}.'.json';
if ( ZM_OPT_USE_AUTH ) { if ( ZM_OPT_USE_AUTH ) {
if ( ZM_AUTH_RELAY == 'hashed' ) { if ( ZM_AUTH_RELAY == 'hashed' ) {
$url .= '?auth='.generateAuthHash( ZM_AUTH_HASH_IPS ); $url .= '?auth='.generateAuthHash(ZM_AUTH_HASH_IPS);
} elseif ( ZM_AUTH_RELAY == 'plain' ) { } elseif ( ZM_AUTH_RELAY == 'plain' ) {
$url = '?user='.$_SESSION['username']; $url .= '?user='.$_SESSION['username'];
$url = '?pass='.$_SESSION['password']; $url .= '?pass='.$_SESSION['password'];
} elseif ( ZM_AUTH_RELAY == 'none' ) { } else {
$url = '?user='.$_SESSION['username']; Error('Multi-Server requires AUTH_RELAY be either HASH or PLAIN');
return;
} }
} }
Logger::Debug("sending command to $url"); Logger::Debug("sending command to $url");

14
web/includes/Monitor.php
View File

@ -285,11 +285,12 @@ class Monitor extends ZM_Object {
if ( ZM_OPT_USE_AUTH ) { if ( ZM_OPT_USE_AUTH ) {
if ( ZM_AUTH_RELAY == 'hashed' ) { if ( ZM_AUTH_RELAY == 'hashed' ) {
$url .= '?auth='.generateAuthHash(ZM_AUTH_HASH_IPS); $url .= '?auth='.generateAuthHash(ZM_AUTH_HASH_IPS);
} elseif ( ZM_AUTH_RELAY == 'plain' ) { } else if ( ZM_AUTH_RELAY == 'plain' ) {
$url .= '?user='.$_SESSION['username']; $url .= '?user='.$_SESSION['username'];
$url .= '?pass='.$_SESSION['password']; $url .= '?pass='.$_SESSION['password'];
} elseif ( ZM_AUTH_RELAY == 'none' ) { } else {
$url .= '?user='.$_SESSION['username']; Error('Multi-Server requires AUTH_RELAY be either HASH or PLAIN');
return;
} }
} }
Logger::Debug("sending command to $url"); Logger::Debug("sending command to $url");
@ -343,11 +344,12 @@ class Monitor extends ZM_Object {
if ( ZM_OPT_USE_AUTH ) { if ( ZM_OPT_USE_AUTH ) {
if ( ZM_AUTH_RELAY == 'hashed' ) { if ( ZM_AUTH_RELAY == 'hashed' ) {
$url .= '?auth='.generateAuthHash(ZM_AUTH_HASH_IPS); $url .= '?auth='.generateAuthHash(ZM_AUTH_HASH_IPS);
} elseif ( ZM_AUTH_RELAY == 'plain' ) { } else if ( ZM_AUTH_RELAY == 'plain' ) {
$url .= '?user='.$_SESSION['username']; $url .= '?user='.$_SESSION['username'];
$url .= '?pass='.$_SESSION['password']; $url .= '?pass='.$_SESSION['password'];
} elseif ( ZM_AUTH_RELAY == 'none' ) { } else {
$url .= '?user='.$_SESSION['username']; Error('Multi-Server requires AUTH_RELAY be either HASH or PLAIN');
return;
} }
} }
Logger::Debug("sending command to $url"); Logger::Debug("sending command to $url");