Skip to content

update from db to ndb #2

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
adhintz wants to merge 3 commits into
base: master
Choose a base branch
from
Open

update from db to ndb #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
781ee81
update from db to ndb
adhintz Jul 20, 2015
261fbd2
Merge remote-tracking branch 'upstream/master'
adhintz Jul 20, 2015
c6e84d0
Update README.md
adhintz Jul 20, 2015
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
xsrfutil
========

Simple library for protecting against CSRF on AppEngine
Simple library for protecting against cross-site request forgery (CSRF / XSRF) on Google App Engine.
8 changes: 4 additions & 4 deletions xsrfutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

from google.appengine.api import memcache
from google.appengine.api import users
from google.appengine.ext import db
from google.appengine.ext import ndb

# String used instead of user id when there is no user. Not that it makes sense
# to protect unauthenticated functionality from XSRF.
Expand Down Expand Up @@ -169,9 +169,9 @@ def xsrf_token(path=None):
return generate_token(XsrfSecret.get(), user, path)


class XsrfSecret(db.Model):
class XsrfSecret(ndb.Model):
"""Model for datastore to store the XSRF secret."""
secret = db.StringProperty(required=True)
secret = ndb.StringProperty(required=True)

@staticmethod
def get():
Expand All @@ -183,7 +183,7 @@ def get():
"""
secret = memcache.get('xsrf_secret')
if not secret:
xsrf_secret = XsrfSecret.all().get()
xsrf_secret = XsrfSecret.query().get()
if not xsrf_secret:
# hmm, nothing found? We need to generate a secret for xsrf protection.
secret = binascii.b2a_hex(os.urandom(16))
Expand Down