Permalink
Browse files

BUGFIX Sanitise keys and tags before using them with Zend_Cache.

  • Loading branch information...
1 parent 27a51ed commit f7516481b14e9c0150cf9ebe22b618a534efdaeb @simonwelsh simonwelsh committed Dec 22, 2011
Showing with 8 additions and 4 deletions.
  1. +7 −4 model/Aggregate.php
  2. +1 −0 view/SSTemplateParser.php.inc
View
@@ -48,9 +48,12 @@ public static function flushCache($class=null) {
if (!$class || $class == 'DataObject') {
$cache->clean(Zend_Cache::CLEANING_MODE_MATCHING_TAG, array('aggregate'));
- }
- else {
- $cache->clean(Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG, ClassInfo::ancestry($class));
+ } else {
+ $tags = ClassInfo::ancestry($class);
+ foreach($tags as &$tag) {
+ $tag = preg_replace('/[^a-zA-Z0-9_]/', '_', $tag);
+ }
+ $cache->clean(Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG, $tags);
}
}
@@ -108,7 +111,7 @@ public function XML_val($name, $args) {
if (!($result = $cache->load($cachekey))) {
$result = (string)$query->execute()->value(); if (!$result) $result = '0';
- $cache->save($result, null, array('aggregate', $this->type));
+ $cache->save($result, null, array('aggregate', preg_replace('/[^a-zA-Z0-9_]/', '_', $this->type)));
}
return $result;
@@ -490,6 +490,7 @@ class SSTemplateParser extends Parser {
$block = ++$res['subblocks'];
// Build the key for this block from the passed cache key, the block index, and the sha hash of the template itself
$key = "'" . sha1($sub['php']) . (isset($res['key']) && $res['key'] ? "_'.sha1(".$res['key'].")" : "'") . ".'_$block'";
+ $key = preg_replace('/[^a-zA-Z0-9_]/', '_', $key);
// Get any condition
$condition = isset($res['condition']) ? $res['condition'] : '';

0 comments on commit f751648

Please sign in to comment.