summaryrefslogtreecommitdiff
path: root/modules/server_add/helpers
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-06-01 22:40:22 -0700
committerBharat Mediratta <bharat@menalto.com>2009-06-01 22:40:22 -0700
commit43abcd93867996e32890fa101ae09255ccc24847 (patch)
tree67ddd78724ff7c7f9a369564cf0e8853e1d74374 /modules/server_add/helpers
parentb9af090cbd9ed7d6470e3852bc35ee0cebeaf9bf (diff)
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.
Diffstat (limited to 'modules/server_add/helpers')
-rw-r--r--modules/server_add/helpers/server_add_installer.php5
-rw-r--r--modules/server_add/helpers/server_add_menu.php4
-rw-r--r--modules/server_add/helpers/server_add_task.php1
3 files changed, 1 insertions, 9 deletions
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");