p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #15493 - csrf_migration_helper.py parsing fix. 

Thanks to 'john' for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15647 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Luke Plant 2011-02-25 09:44:52 +00:00
parent c250b8840b
commit b97b9fb8f8
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
extras/csrf_migration_helper.py Normal file → Executable file
View File

@ -41,10 +41,6 @@
# loaders are out of the picture, because there is no way to ask them to # loaders are out of the picture, because there is no way to ask them to
# return all templates. # return all templates.
# #
# - If you put the {% csrf_token %} tag on the same line as the <form> tag it
# will be detected, otherwise it will be assumed that the form does not have
# the token.
#
# - It's impossible to programmatically determine which forms should and should # - It's impossible to programmatically determine which forms should and should
# not have the token added. The developer must decide when to do this, # not have the token added. The developer must decide when to do this,
# ensuring that the token is only added to internally targetted forms. # ensuring that the token is only added to internally targetted forms.
@ -138,6 +134,7 @@ python csrf_migration_helper.py [--settings=path.to.your.settings] /path/to/pyth
_POST_FORM_RE = \ _POST_FORM_RE = \
re.compile(r'(<form\W[^>]*\bmethod\s*=\s*(\'|"|)POST(\'|"|)\b[^>]*>)', re.IGNORECASE) re.compile(r'(<form\W[^>]*\bmethod\s*=\s*(\'|"|)POST(\'|"|)\b[^>]*>)', re.IGNORECASE)
_FORM_CLOSE_RE = re.compile(r'</form\s*>')
_TOKEN_RE = re.compile('\{% csrf_token') _TOKEN_RE = re.compile('\{% csrf_token')
def get_template_dirs(): def get_template_dirs():
@ -190,12 +187,22 @@ class Template(object):
Get information about any POST forms in the template. Get information about any POST forms in the template.
Returns [(linenumber, csrf_token added)] Returns [(linenumber, csrf_token added)]
""" """
matches = [] forms = {}
form_line = 0
for ln, line in enumerate(self.content.split("\n")): for ln, line in enumerate(self.content.split("\n")):
m = _POST_FORM_RE.search(line) if not form_line and _POST_FORM_RE.search(line):
if m is not None: # record the form with no CSRF token yet
matches.append((ln + 1, _TOKEN_RE.search(line) is not None)) form_line = ln + 1
return matches forms[form_line] = False
if form_line and _TOKEN_RE.search(line):
# found the CSRF token
forms[form_line] = True
form_line = 0
if form_line and _FORM_CLOSE_RE.search(line):
# no token found by form closing tag
form_line = 0
return forms.items()
def includes_template(self, t): def includes_template(self, t):
""" """