mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-05-24 14:36:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow users without System::View to read servers.json

Browse Source
This commit is contained in:
Isaac Connor
2020-03-02 16:39:12 -05:00
parent 9b77f77ac3
commit daff14df9b
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
web/api/app/Controller/ServersController.php
View File

@@ -17,12 +17,17 @@ class ServersController extends AppController {
public function beforeFilter() {
parent::beforeFilter();
/*
* A user needs the server data to calculate how to view a monitor, and there really isn't anything sensitive in this data.
* So it has been decided for now to just let everyone read it.
global $user;
$canView = (!$user) || ($user['System'] != 'None');
if ( !$canView ) {
throw new UnauthorizedException(__('Insufficient Privileges'));
return;
}
*/
}
/**
@@ -34,7 +39,7 @@ class ServersController extends AppController {
$this->Server->recursive = 0;
$options = '';
$servers = $this->Server->find('all',$options);
$servers = $this->Server->find('all', $options);
$this->set(array(
'servers' => $servers,
'_serialize' => array('servers')
@@ -50,13 +55,13 @@ class ServersController extends AppController {
*/
public function view($id = null) {
$this->Server->recursive = 0;
if (!$this->Server->exists($id)) {
if ( !$this->Server->exists($id) ) {
throw new NotFoundException(__('Invalid server'));
}
$restricted = '';
$options = array('conditions' => array(
array('Server.' . $this->Server->primaryKey => $id),
array('Server.'.$this->Server->primaryKey => $id),
$restricted
)
);