mirror/zoneminder
1
0 Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-10-26 08:18:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Isaac Connor committed 2020-02-25 17:15:59 -05:00
1 parent 7787ba1040
commit 8fcd5b37ed
2 files changed
+20 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

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