stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-06-16 15:09:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Security pass over all controller code. Mostly adding CSRF checking

Browse Source 
and verifying user permissions, but there are several above-the-bar
changes:

1) Server add is now only available to admins.  This is a hard
   requirement because we have to limit server access (eg:
   server_add::children) to a user subset and the current permission
   model doesn't include that.  Easiest fix is to restrict to admins.
   Got rid of the server_add permission.

2) We now know check permissions at every level, which means in
   controllers AND in helpers.  This "belt and suspenders" approach will
   give us defense in depth in case we overlook it in one area.

3) We now do CSRF checking in every controller method that changes the
   code, in addition to the Forge auto-check.  Again, defense in depth
   and it makes scanning the code for security much simpler.

4) Moved Simple_Uploader_Controller::convert_filename_to_title to
   item:convert_filename_to_title

5) Fixed a bug in sending notification emails.

6) Fixed the Organize code to verify that you only have access to your
   own tasks.  In general, added permission checks to organize which had
   pretty much no validation code.

I did my best to verify every feature that I touched.
This commit is contained in:
Bharat Mediratta
2009-06-01 22:40:22 -07:00
parent b9af090cbd
commit 43abcd9386
38 changed files with 281 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
modules/server_add/controllers/server_add.php
View File

@@ -21,10 +21,11 @@ class Server_Add_Controller extends Controller {
public function index($id) {
$paths = unserialize(module::get_var("server_add", "authorized_paths"));
$item = ORM::factory("item", $id);
access::required("server_add", $item);
access::required("add", $item);
if (!user::active()->admin) {
access::forbidden();
}
$item = ORM::factory("item", $id);
$view = new View("server_add_tree_dialog.html");
$view->action = url::abs_site("__ARGS__/{$id}__TASK_ID__?csrf=" . access::csrf_token());
$view->parents = $item->parents();
@@ -41,8 +42,11 @@ class Server_Add_Controller extends Controller {
}
public function children() {
$paths = unserialize(module::get_var("server_add", "authorized_paths"));
if (!user::active()->admin) {
access::forbidden();
}
$paths = unserialize(module::get_var("server_add", "authorized_paths"));
$path_valid = false;
$path = $this->input->post("path");
@@ -66,7 +70,12 @@ class Server_Add_Controller extends Controller {
}
function start($id) {
if (!user::active()->admin) {
access::forbidden();
}
access::verify_csrf();
$item = ORM::factory("item", $id);
$paths = unserialize(module::get_var("server_add", "authorized_paths"));
$input_files = $this->input->post("path");
$files = array();
@@ -114,9 +123,15 @@ class Server_Add_Controller extends Controller {
}
function add_photo($task_id) {
if (!user::active()->admin) {
access::forbidden();
}
access::verify_csrf();
$task = task::run($task_id);
if (!$task->loaded || $task->owner_id != user::active()->id) {
access::forbidden();
}
if ($task->done) {
switch ($task->state) {
@@ -146,10 +161,16 @@ class Server_Add_Controller extends Controller {
}
public function finish($id, $task_id) {
if (!user::active()->admin) {
access::forbidden();
}
access::verify_csrf();
$task = ORM::factory("task", $task_id);
if (!$task->loaded || $task->owner_id != user::active()->id) {
access::forbidden();
}
if (!$task->done) {
message::warning(t("Add from server was cancelled prior to completion"));
}
@@ -159,9 +180,14 @@ class Server_Add_Controller extends Controller {
}
public function pause($id, $task_id) {
if (!user::active()->admin) {
access::forbidden();
}
access::verify_csrf();
$task = ORM::factory("task", $task_id);
if (!$task->loaded || $task->owner_id != user::active()->id) {
access::forbidden();
}
message::warning(t("Add from server was cancelled prior to completion"));
batch::stop();