From 43abcd93867996e32890fa101ae09255ccc24847 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Mon, 1 Jun 2009 22:40:22 -0700 Subject: Security pass over all controller code. Mostly adding CSRF checking 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. --- modules/server_add/helpers/server_add_installer.php | 5 ----- modules/server_add/helpers/server_add_menu.php | 4 +--- modules/server_add/helpers/server_add_task.php | 1 - 3 files changed, 1 insertion(+), 9 deletions(-) (limited to 'modules/server_add/helpers') diff --git a/modules/server_add/helpers/server_add_installer.php b/modules/server_add/helpers/server_add_installer.php index b592b448..f8773a2e 100644 --- a/modules/server_add/helpers/server_add_installer.php +++ b/modules/server_add/helpers/server_add_installer.php @@ -22,7 +22,6 @@ class server_add_installer { $db = Database::instance(); $version = module::get_version("server_add"); if ($version == 0) { - access::register_permission("server_add", t("Add files from server")); module::set_version("server_add", 1); } server_add::check_config(); @@ -31,8 +30,4 @@ class server_add_installer { static function deactivate() { site_status::clear("server_add_configuration"); } - - static function uninstall() { - access::delete_permission("server_add"); - } } diff --git a/modules/server_add/helpers/server_add_menu.php b/modules/server_add/helpers/server_add_menu.php index 04c94493..7269d952 100644 --- a/modules/server_add/helpers/server_add_menu.php +++ b/modules/server_add/helpers/server_add_menu.php @@ -28,11 +28,9 @@ class server_add_menu_Core { static function site($menu, $theme) { $item = $theme->item(); - $paths = unserialize(module::get_var("server_add", "authorized_paths")); - if ($item && access::can("edit", $item) && access::can("server_add", $item) && - $item->is_album() && !empty($paths)) { + if (user::active()->admin && $item->is_album() && !empty($paths)) { $options_menu = $menu->get("options_menu") ->append(Menu::factory("dialog") ->id("server_add") diff --git a/modules/server_add/helpers/server_add_task.php b/modules/server_add/helpers/server_add_task.php index c5a7f067..98575915 100644 --- a/modules/server_add/helpers/server_add_task.php +++ b/modules/server_add/helpers/server_add_task.php @@ -31,7 +31,6 @@ class server_add_task_Core { if (!empty($context["files"][$path])) { $file = $context["files"][$path][$context["position"]]; $parent = ORM::factory("item", $file["parent_id"]); - access::required("server_add", $parent); access::required("add", $parent); if (!$parent->is_album()) { throw new Exception("@todo BAD_ALBUM"); -- cgit v1.2.3 From e834c4ca2434ff687461e39ee02926f449f49287 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Tue, 2 Jun 2009 15:46:05 -0700 Subject: Have server_add turn the "Add Photo" menu option into a dropdown and make "Add from Server" a 2nd option there. This requires adding the Menu::remove() API function. --- modules/gallery/libraries/Menu.php | 13 +++++++++- modules/server_add/helpers/server_add_menu.php | 34 ++++++++++++++++++++++---- 2 files changed, 41 insertions(+), 6 deletions(-) (limited to 'modules/server_add/helpers') diff --git a/modules/gallery/libraries/Menu.php b/modules/gallery/libraries/Menu.php index d19d8b1e..83bd1616 100644 --- a/modules/gallery/libraries/Menu.php +++ b/modules/gallery/libraries/Menu.php @@ -170,11 +170,22 @@ class Menu_Core extends Menu_Element { return $this; } + /** + * Remove an element from the menu + */ + public function remove($target_id) { + unset($this->elements[$target_id]); + } + /** * Retrieve a Menu_Element by id */ public function get($id) { - return $this->elements[$id]; + if (array_key_exists($id, $this->elements)) { + return $this->elements[$id]; + } + + return null; } public function __toString() { diff --git a/modules/server_add/helpers/server_add_menu.php b/modules/server_add/helpers/server_add_menu.php index 7269d952..a97a6cee 100644 --- a/modules/server_add/helpers/server_add_menu.php +++ b/modules/server_add/helpers/server_add_menu.php @@ -31,11 +31,35 @@ class server_add_menu_Core { $paths = unserialize(module::get_var("server_add", "authorized_paths")); if (user::active()->admin && $item->is_album() && !empty($paths)) { - $options_menu = $menu->get("options_menu") - ->append(Menu::factory("dialog") - ->id("server_add") - ->label(t("Add from server")) - ->url(url::site("server_add/index/$item->id"))); + // This is a little tricky. Normally there's an "Add Photo" menu option, but we want to + // turn that into a dropdown if there are two different ways to add things. Do that in a + // portable way for now. If we find ourselves duplicating this pattern, we should make an + // API method for this. + $server_add = Menu::factory("dialog") + ->id("server_add") + ->label(t("Add from server")) + ->url(url::site("server_add/index/$item->id")); + $options_menu = $menu->get("options_menu"); + $add_item = $options_menu->get("add_item"); + $add_menu = $options_menu->get("add_menu"); + + if ($add_item && !$add_menu) { + // Assuming that $add_menu is unset, create add_menu and add our item + $options_menu->add_after( + "add_item", + Menu::factory("submenu") + ->id("add_menu") + ->label(t("Add")) + ->append($add_item) + ->append($server_add)); + $options_menu->remove("add_item"); + } else if ($add_menu) { + // Append to the existing sub-menu + $add_menu->append($server_add); + } else { + // Else just add it in at the end of Options + $options_menu->append($server_add); + } } } } -- cgit v1.2.3 From dde5fb96ee9db5a67b286ea4ac4f35190453a6ef Mon Sep 17 00:00:00 2001 From: jhilden Date: Tue, 2 Jun 2009 19:31:11 -0400 Subject: made "Add photos" its own site menu item * open for suggestions on the submenu item labels * @bharat: not sure about the add photos menu item id in the dropdown case --- modules/gallery/helpers/gallery_menu.php | 13 ++++++++----- modules/server_add/helpers/server_add_menu.php | 25 ++++++++++++++----------- 2 files changed, 22 insertions(+), 16 deletions(-) (limited to 'modules/server_add/helpers') diff --git a/modules/gallery/helpers/gallery_menu.php b/modules/gallery/helpers/gallery_menu.php index 09c2d91a..d28e71c9 100644 --- a/modules/gallery/helpers/gallery_menu.php +++ b/modules/gallery/helpers/gallery_menu.php @@ -30,7 +30,14 @@ class gallery_menu_Core { $can_edit = $item && access::can("edit", $item) || $is_admin; $can_add = $item && (access::can("add", $item) || $is_admin); - + + if ($can_add) { + $menu->append(Menu::factory("dialog") + ->id("add_photos_item") + ->label(t("Add photos")) + ->url(url::site("simple_uploader/app/$item->id"))); + } + if ($item && $can_edit || $can_add) { $menu->append($options_menu = Menu::factory("submenu") ->id("options_menu") @@ -48,10 +55,6 @@ class gallery_menu_Core { if ($item->is_album()) { if ($can_add) { $options_menu - ->append(Menu::factory("dialog") - ->id("add_item") - ->label(t("Add a photo")) - ->url(url::site("simple_uploader/app/$item->id"))) ->append(Menu::factory("dialog") ->id("add_album") ->label(t("Add an album")) diff --git a/modules/server_add/helpers/server_add_menu.php b/modules/server_add/helpers/server_add_menu.php index a97a6cee..f02223f7 100644 --- a/modules/server_add/helpers/server_add_menu.php +++ b/modules/server_add/helpers/server_add_menu.php @@ -40,22 +40,25 @@ class server_add_menu_Core { ->label(t("Add from server")) ->url(url::site("server_add/index/$item->id")); $options_menu = $menu->get("options_menu"); - $add_item = $options_menu->get("add_item"); - $add_menu = $options_menu->get("add_menu"); + $add_photos_item = $menu->get("add_photos_item"); + $add_photos_menu = $menu->get("add_photos_menu"); - if ($add_item && !$add_menu) { + if ($add_photos_item && !$add_photos_menu) { // Assuming that $add_menu is unset, create add_menu and add our item - $options_menu->add_after( - "add_item", + $menu->add_after( + "home", Menu::factory("submenu") - ->id("add_menu") - ->label(t("Add")) - ->append($add_item) + ->id("add_photos_menu") + ->label(t("Add Photos")) + ->append(Menu::factory("dialog") + ->id("add_photos_submenu_item") + ->label(t("via Simple Uploader")) + ->url(url::site("simple_uploader/app/$item->id"))) ->append($server_add)); - $options_menu->remove("add_item"); - } else if ($add_menu) { + $menu->remove("add_photos_item"); + } else if ($add_photos_menu) { // Append to the existing sub-menu - $add_menu->append($server_add); + $add_photos_menu->append($server_add); } else { // Else just add it in at the end of Options $options_menu->append($server_add); -- cgit v1.2.3