mirror of
https://github.com/ZoneMinder/zoneminder.git
synced 2026-08-03 08:46:44 -04:00
FramesController::index() computed $mon_options (the caller's per-monitor restriction from unviewableMonitorIds()/viewableMonitorIds()) but never applied it to the find() conditions, so any authenticated user with Events=View could enumerate Frame rows (Id, EventId, MonitorId, TimeStamp, Delta, Score, Type) for monitors they are explicitly denied via GET /api/frames.json. Every sibling controller (EventsController, ZonesController) and every other action in this same controller (view/edit/delete, via eventForFrame()/requireFrameEdit()) already enforce this restriction; index() was the one path left over from before the per-monitor ACL helpers were added. The naive fix of merging Event.MonitorId into $conditions the way EventsController does does not work here: Frame belongsTo Event via EventId, index() sets $this->Frame->recursive = -1, and Frame's own table has no MonitorId column, so the condition can't resolve without a join. Add an explicit inner join to Events (aliased Event) on Event.Id = Frame.EventId whenever the caller has a monitor restriction, and filter on Event.MonitorId, mirroring the explicit-join pattern EventsController already uses for Tags. Verified against the production database via a temporary CLI script exercising the exact query-building logic: unrestricted find() returns all ~110.5M frames (matching the pre-fix behaviour), while restricting to a single monitor returns only that monitor's frames (~2.9M, cross-checked row by row against the owning Event's MonitorId), and restricting to a monitor with no events correctly returns zero. Reported as GHSA-mg2g-jmfc-3w8g. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01HoNiNxwgyaHV29CbiueCUf
185 lines
5.2 KiB
PHP
185 lines
5.2 KiB
PHP
<?php
|
|
App::uses('AppController', 'Controller');
|
|
/**
|
|
* Frames Controller
|
|
*
|
|
* @property Frame $Frame
|
|
*/
|
|
class FramesController extends AppController {
|
|
|
|
/**
|
|
* Components
|
|
*
|
|
* @var array
|
|
*/
|
|
public $components = array('RequestHandler');
|
|
|
|
|
|
public function beforeFilter() {
|
|
parent::beforeFilter();
|
|
global $user;
|
|
# We already tested for auth in appController, so we just need to test for specific permission
|
|
$canView = (!$user) || ($user->Events() != 'None');
|
|
if (!$canView) {
|
|
throw new UnauthorizedException(__('Insufficient Privileges'));
|
|
return;
|
|
}
|
|
}
|
|
|
|
# Frames are addressed by their own Id, so the parent Event's per-monitor ACL
|
|
# has to be resolved explicitly. Without this a user denied a monitor can
|
|
# reach that monitor's frames by guessing frame Ids.
|
|
private function eventForFrame($id) {
|
|
$this->Frame->recursive = -1;
|
|
$frame = $this->Frame->find('first', array(
|
|
'conditions' => array('Frame.' . $this->Frame->primaryKey => $id)
|
|
));
|
|
if (!$frame) {
|
|
throw new NotFoundException(__('Invalid frame'));
|
|
}
|
|
$this->loadModel('Event');
|
|
$this->Event->recursive = -1;
|
|
$event = $this->Event->find('first', array(
|
|
'conditions' => array('Event.Id' => $frame['Frame']['EventId'])
|
|
));
|
|
if (!$event) {
|
|
throw new NotFoundException(__('Invalid event'));
|
|
}
|
|
return new ZM\Event($event['Event']);
|
|
}
|
|
|
|
# Frame mutation is an Event mutation, so require Events=Edit as well as the
|
|
# per-monitor ACL. beforeFilter() only guarantees Events != None.
|
|
private function requireFrameEdit($id) {
|
|
global $user;
|
|
if ($user and ($user->Events() != 'Edit')) {
|
|
throw new UnauthorizedException(__('Insufficient Privileges'));
|
|
}
|
|
if (!$this->eventForFrame($id)->canEdit()) {
|
|
throw new UnauthorizedException(__('Insufficient Privileges'));
|
|
}
|
|
}
|
|
|
|
/**
|
|
* index method
|
|
* @return void
|
|
*/
|
|
public function index() {
|
|
$this->Frame->recursive = -1;
|
|
|
|
global $user;
|
|
$allowedMonitors = ($user and $user->unviewableMonitorIds()) ? $user->viewableMonitorIds() : null;
|
|
|
|
$named_params = $this->request->params['named'];
|
|
if ( $named_params ) {
|
|
$this->FilterComponent = $this->Components->load('Filter');
|
|
$conditions = $this->FilterComponent->buildFilter($named_params);
|
|
} else {
|
|
$conditions = array();
|
|
}
|
|
|
|
$findOptions = array('conditions' => $conditions);
|
|
if ( $allowedMonitors ) {
|
|
// Frame has no MonitorId of its own, and recursive=-1 above means the
|
|
// Event association isn't auto-joined, so the per-monitor ACL has to
|
|
// join through to the owning Event explicitly.
|
|
$findOptions['joins'] = array(array(
|
|
'table' => 'Events',
|
|
'alias' => 'Event',
|
|
'type' => 'inner',
|
|
'conditions' => array('Event.Id = Frame.EventId'),
|
|
));
|
|
$findOptions['conditions'][] = array('Event.MonitorId' => $allowedMonitors);
|
|
}
|
|
|
|
$frames = $this->Frame->find('all', $findOptions);
|
|
$this->set(array(
|
|
'frames' => $frames,
|
|
'_serialize' => array('frames')
|
|
));
|
|
}
|
|
|
|
/**
|
|
* view method
|
|
*
|
|
* @throws NotFoundException
|
|
* @param string $id
|
|
* @return void
|
|
*/
|
|
public function view($id = null) {
|
|
$this->Frame->recursive = -1;
|
|
if (!$this->Frame->exists($id)) {
|
|
throw new NotFoundException(__('Invalid frame'));
|
|
}
|
|
if (!$this->eventForFrame($id)->canView()) {
|
|
throw new UnauthorizedException(__('Insufficient Privileges'));
|
|
}
|
|
$options = array('conditions' => array('Frame.' . $this->Frame->primaryKey => $id));
|
|
$frame = $this->Frame->find('first', $options);
|
|
$this->set(array(
|
|
'frame' => $frame,
|
|
'_serialize' => array('frame')
|
|
));
|
|
}
|
|
|
|
/**
|
|
* add method
|
|
*
|
|
* @return void
|
|
*/
|
|
public function add() {
|
|
if ($this->request->is('post')) {
|
|
$this->Frame->create();
|
|
if ($this->Frame->save($this->request->data)) {
|
|
return $this->flash(__('The frame has been saved.'), array('action' => 'index'));
|
|
}
|
|
}
|
|
$events = $this->Frame->Event->find('list');
|
|
$this->set(compact('events'));
|
|
}
|
|
|
|
/**
|
|
* edit method
|
|
*
|
|
* @throws NotFoundException
|
|
* @param string $id
|
|
* @return void
|
|
*/
|
|
public function edit($id = null) {
|
|
if (!$this->Frame->exists($id)) {
|
|
throw new NotFoundException(__('Invalid frame'));
|
|
}
|
|
$this->requireFrameEdit($id);
|
|
if ($this->request->is(array('post', 'put'))) {
|
|
if ($this->Frame->save($this->request->data)) {
|
|
return $this->flash(__('The frame has been saved.'), array('action' => 'index'));
|
|
}
|
|
} else {
|
|
$options = array('conditions' => array('Frame.' . $this->Frame->primaryKey => $id));
|
|
$this->request->data = $this->Frame->find('first', $options);
|
|
}
|
|
$events = $this->Frame->Event->find('list');
|
|
$this->set(compact('events'));
|
|
}
|
|
|
|
/**
|
|
* delete method
|
|
*
|
|
* @throws NotFoundException
|
|
* @param string $id
|
|
* @return void
|
|
*/
|
|
public function delete($id = null) {
|
|
$this->Frame->id = $id;
|
|
if (!$this->Frame->exists()) {
|
|
throw new NotFoundException(__('Invalid frame'));
|
|
}
|
|
$this->request->allowMethod('post', 'delete');
|
|
$this->requireFrameEdit($id);
|
|
if ($this->Frame->delete()) {
|
|
return $this->flash(__('The frame has been deleted.'), array('action' => 'index'));
|
|
} else {
|
|
return $this->flash(__('The frame could not be deleted. Please, try again.'), array('action' => 'index'));
|
|
}
|
|
}}
|