Commit c9771f0b authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.0.X] Fixed #11270 -- Modified cache template tag to prevent the creation of... 

[1.0.X] Fixed #11270 -- Modified cache template tag to prevent the creation of very long cache keys. Thanks to 235 for the report and patch.

Merge of r11068 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11070 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent bb0538d4

django/templatetags/cache.py

+3 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ from django.template import resolve_variable 
from django.core.cache import cache

from django.utils.encoding import force_unicode

from django.utils.http import urlquote

from django.utils.hashcompat import md5_constructor



register = Library()
@@ -23,7 +24,8 @@ class CacheNode(Node): 
        except (ValueError, TypeError):

            raise TemplateSyntaxError('"cache" tag got a non-integer timeout value: %r' % expire_time)

        # Build a unicode key for this fragment and all vary-on's.

        cache_key = u':'.join([self.fragment_name] + [urlquote(resolve_variable(var, context)) for var in self.vary_on])

        args = md5_constructor(u':'.join([urlquote(resolve_variable(var, context)) for var in self.vary_on]))

        cache_key = 'template.cache.%s.%s' % (self.fragment_name, args.hexdigest())

        value = cache.get(cache_key)

        if value is None:

            value = self.nodelist.render(context)

tests/regressiontests/templates/tests.py

+3 −0
Original line number Diff line number Diff line
@@ -987,6 +987,9 @@ class Templates(unittest.TestCase): 
            # Regression test for #7460.

            'cache16': ('{% load cache %}{% cache 1 foo bar %}{% endcache %}', {'foo': 'foo', 'bar': 'with spaces'}, ''),



            # Regression test for #11270.

            'cache17': ('{% load cache %}{% cache 10 long_cache_key poem %}Some Content{% endcache %}', {'poem': 'Oh freddled gruntbuggly/Thy micturations are to me/As plurdled gabbleblotchits/On a lurgid bee/That mordiously hath bitled out/Its earted jurtles/Into a rancid festering/Or else I shall rend thee in the gobberwarts with my blurglecruncheon/See if I dont.'}, 'Some Content'),



            ### AUTOESCAPE TAG ##############################################

            'autoescape-tag01': ("{% autoescape off %}hello{% endautoescape %}", {}, "hello"),

            'autoescape-tag02': ("{% autoescape off %}{{ first }}{% endautoescape %}", {"first": "<b>hello</b>"}, "<b>hello</b>"),