Skip to content

Fixing CSRF form base for PY3 compat #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ixmatus wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixing CSRF form base for PY3 compat #18

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd5880b
Making CSRF work properly with python3
ixmatus Mar 16, 2013
9941214
Another fix
ixmatus Mar 16, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions pyramid_deform/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,12 +386,21 @@ def get_summary(self, request):

@colander.deferred
def deferred_csrf_value(node, kw):
return kw['request'].session.get_csrf_token()
if PY3:
return kw['request'].session.get_csrf_token().decode()
else:
return kw['request'].session.get_csrf_token()

@colander.deferred
def deferred_csrf_validator(node, kw):
def csrf_validate(node, value):
if value != kw['request'].session.get_csrf_token():

if PY3:
token = kw['request'].session.get_csrf_token().decode()
else:
token = kw['request'].session.get_csrf_token()

if value != token:
raise colander.Invalid(node,
_('Invalid cross-site scripting token'))
return csrf_validate
Expand Down