From 0dc184e99f0ca607774a68257432a9a981f4d5b7 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 18 Jan 2010 11:10:37 -0800
Subject: Overload url::current() and url::merge() to make the current url XSS
 safe.  Add tests to make sure that it doesn't relapse with future Kohana
 changes.  Fixes ticket #983.

Ref: http://gallery.menalto.com/node/93738
---
 modules/gallery/helpers/MY_url.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/MY_url.php b/modules/gallery/helpers/MY_url.php
index 74284951..8a7909b6 100644
--- a/modules/gallery/helpers/MY_url.php
+++ b/modules/gallery/helpers/MY_url.php
@@ -89,4 +89,18 @@ class url extends url_Core {
   static function abs_current($qs=false) {
     return self::abs_site(url::current($qs));
   }
+
+  /**
+   * Just like url::merge except that it escapes any XSS in the path.
+   */
+  static function merge($params) {
+    return htmlspecialchars(parent::merge($params));
+  }
+
+  /**
+   * Just like url::current except that it escapes any XSS in the path.
+   */
+  static function current($qs=false, $suffix=false) {
+    return htmlspecialchars(parent::current($qs, $suffix));
+  }
 }
-- 
cgit v1.2.3


From 41a392611c0e602d2e14859e5c0d5bf9e61d0073 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 18 Jan 2010 12:08:05 -0800
Subject: Change DENY and ALLOW to "0" and "1" to match the fact that ORM no
 longer typecasts values as of http://dev.kohanaphp.com/issues/2459

---
 modules/gallery/helpers/access.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php
index 8ce7e436..e0a0e979 100644
--- a/modules/gallery/helpers/access.php
+++ b/modules/gallery/helpers/access.php
@@ -66,8 +66,8 @@
  *   the Access_Intent_Model
  */
 class access_Core {
-  const DENY      = false;
-  const ALLOW     = true;
+  const DENY      = "0";
+  const ALLOW     = "1";
   const INHERIT   = null; // access_intent
   const UNKNOWN   = null; // cache (access_cache, items)
 
-- 
cgit v1.2.3


From 284788d964688385f77b18bc063a841d0dbcdcd8 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 18 Jan 2010 12:08:39 -0800
Subject: Switch from stdClass to arrays which works around issues caused in
 http://dev.kohanaphp.com/issues/2459 -- I don't exactly know why, but the
 solutions are equivalent so I'm not going to dig too far.

---
 modules/gallery/helpers/model_cache.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/model_cache.php b/modules/gallery/helpers/model_cache.php
index 302e42d9..88756407 100644
--- a/modules/gallery/helpers/model_cache.php
+++ b/modules/gallery/helpers/model_cache.php
@@ -18,27 +18,25 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class model_cache_Core {
-  private static $cache;
+  private static $cache = array();
 
   static function get($model_name, $id, $field_name="id") {
-    if (TEST_MODE || empty(self::$cache->$model_name->$field_name->$id)) {
+    if (TEST_MODE || empty(self::$cache[$model_name][$field_name][$id])) {
       $model = ORM::factory($model_name)->where($field_name, "=", $id)->find();
       if (!$model->loaded()) {
         throw new Exception("@todo MISSING_MODEL $model_name:$id");
       }
-      self::$cache->$model_name->$field_name->$id = $model;
+      self::$cache[$model_name][$field_name][$id] = $model;
     }
 
-    return self::$cache->$model_name->$field_name->$id;
+    return self::$cache[$model_name][$field_name][$id];
   }
 
   static function clear() {
-    self::$cache = new stdClass();
+    self::$cache = array();
   }
 
   static function set($model) {
-    self::$cache->{$model->object_name}
-      ->{$model->primary_key}
-      ->{$model->{$model->primary_key}} = $model;
+    self::$cache[$model->object_name][$model->primary_key][$model->{$model->primary_key}] = $model;
   }
 }
-- 
cgit v1.2.3