Changeset 20516

Timestamp:

Feb 2, 2013, 8:09:52 AM (11 years ago)

Author:

rvelices

Message:

feature 2831: simple way to protect urls of originals

Location:

trunk/include

Files:

• common.inc.php (modified) (1 diff)
• config_default.inc.php (modified) (1 diff)
• derivative.inc.php (modified) (4 diffs)
• functions_html.inc.php (modified) (1 diff)

trunk/include/common.inc.php

@@ -267 +267 @@
 add_event_handler('render_tag_url', 'str2url');
 add_event_handler('blockmanager_register_blocks', 'register_default_menubar_blocks', EVENT_HANDLER_PRIORITY_NEUTRAL-1);
+if ( !empty($conf['original_url_protection']) )
+{
+  add_event_handler('get_element_url', 'get_element_url_protection_handler', EVENT_HANDLER_PRIORITY_NEUTRAL, 2 );
+  add_event_handler('get_src_image_url', 'get_src_image_url_protection_handler', EVENT_HANDLER_PRIORITY_NEUTRAL, 2 );
+}
 trigger_action('init');
 ?>

trunk/include/config_default.inc.php

@@ -778 +778 @@
 //Maximum Ajax requests at once, for thumbnails on-the-fly generation
 $conf['max_requests']=3;
+
+// one of '', 'images', 'all'
+//TODO: Put this in admin and also manage .htaccess in #sites and upload folders
+$conf['original_url_protection'] = '';
 ?>

trunk/include/derivative.inc.php

@@ -20 +20 @@
 // +-----------------------------------------------------------------------+
 
-/*A source image is used to get a derivative image. A source image is either the original file for a jpg or a 
+/*A source image is used to get a derivative image. A source image is either the original file for a jpg or a
 'representative' image of a non image file or a standard icon for the non-image file.*/
 final class SrcImage
@@ -79 +79 @@
           $height = $infos['width'];
         }
-        
+
         $this->size = array($width, $height);
       }
@@ -107 +107 @@
   {
     $url = get_root_url().$this->rel_path;
-    if ($this->flags & self::IS_ORIGINAL)
+    if ( !($this->flags & self::IS_MIMETYPE) )
     {
       $url = trigger_event('get_src_image_url', $url, $this);
@@ -171 +171 @@
   }
 
-  /** 
+  /**
   @return derivative image url
   @param type string of standard derivative param type (e.g. IMG_???) or a DerivativeParams object

trunk/include/functions_html.inc.php

@@ -594 +594 @@
 }
 
+/** optional event handler to protect src image urls */
+function get_src_image_url_protection_handler($url, $src_image)
+{
+  return get_action_url($src_image->id, $src_image->is_original() ? 'e' : 'r', false);
+}
+
+/** optional event handler to protect element urls */
+function get_element_url_protection_handler($url, $infos)
+{
+  global $conf;
+  if ('images'==$conf['original_url_protection'])
+  {// protect only images and not other file types (for example large movies that we don't want to send through our file proxy)
+    $ext = get_extension($infos['path']);
+    if (!in_array($ext, $conf['picture_ext']))
+    {
+      return $url;
+    }
+  }
+  return get_action_url($infos['id'], 'e', false);
+}
+
 ?>