Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Re-add whitespace around caveat operators

This commit is contained in:
Daniel Wagner-Hall 2015-08-19 14:30:31 +01:00
parent 7f08ebb772
commit 70e265e695
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
synapse/handlers/register.py
View File

@ -278,12 +278,12 @@ class RegistrationHandler(BaseHandler):
location = self.hs.config.server_name, location = self.hs.config.server_name,
identifier = "key", identifier = "key",
key = self.hs.config.macaroon_secret_key) key = self.hs.config.macaroon_secret_key)
macaroon.add_first_party_caveat("gen=1") macaroon.add_first_party_caveat("gen = 1")
macaroon.add_first_party_caveat("user_id=%s" % (user_id,)) macaroon.add_first_party_caveat("user_id = %s" % (user_id,))
macaroon.add_first_party_caveat("type=access") macaroon.add_first_party_caveat("type = access")
now = self.hs.get_clock().time_msec() now = self.hs.get_clock().time_msec()
expiry = now + (60 * 60 * 1000) expiry = now + (60 * 60 * 1000)
macaroon.add_first_party_caveat("time<%d" % (expiry,)) macaroon.add_first_party_caveat("time < %d" % (expiry,))
return macaroon.serialize() return macaroon.serialize()

8
tests/handlers/test_register.py
View File

@ -51,16 +51,16 @@ class RegisterTestCase(unittest.TestCase):
macaroon = pymacaroons.Macaroon.deserialize(token) macaroon = pymacaroons.Macaroon.deserialize(token)
def verify_gen(caveat): def verify_gen(caveat):
return caveat == "gen=1" return caveat == "gen = 1"
def verify_user(caveat): def verify_user(caveat):
return caveat == "user_id=a_user" return caveat == "user_id = a_user"
def verify_type(caveat): def verify_type(caveat):
return caveat == "type=access" return caveat == "type = access"
def verify_expiry(caveat): def verify_expiry(caveat):
return caveat == "time<8600000" return caveat == "time < 8600000"
v = pymacaroons.Verifier() v = pymacaroons.Verifier()
v.satisfy_general(verify_gen) v.satisfy_general(verify_gen)