kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-05-07 16:35:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

adding test case for issue 483, which *also* required fixing the app session schema to handle empty string methods a little bit more gracefully

Browse Source
This commit is contained in:
Aaron Blankstein
2017-07-07 15:26:18 -04:00
parent 1488013b93
commit 32efc99d62
3 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
blockstack_client/rpc.py
View File

@@ -432,28 +432,33 @@ class BlockstackAPIEndpointHandler(SimpleHTTPRequestHandler):
decoded_token = jsontokens.decode_token(token)
legacy = False
decode_err = False
try:
assert isinstance(decoded_token, dict)
assert decoded_token.has_key('payload')
try:
jsonschema.validate(decoded_token['payload'], APP_SESSION_REQUEST_SCHEMA )
except ValidationError as ve2:
decode_err = ve2
log.debug("Authentication request is not current; trying legacy")
jsonschema.validate(decoded_token['payload'], APP_SESSION_REQUEST_SCHEMA_OLD )
legacy = True
except ValidationError as ve:
if BLOCKSTACK_TEST or BLOCKSTACK_DEBUG:
log.exception(ve)
if BLOCKSTACK_TEST:
log.debug("Invalid decoded token: {}".format(decoded_token['payload']))
log.debug("Invalid token")
log.error('Invalid authRequest token, tried legacy and current decode paths.')
if decode_err:
log.error('Current decode error:')
log.exception(decode_err)
log.error('Legacy decode error:')
log.exception(ve)
return self._reply_json({'error': 'Invalid authRequest token: does not match any known request schemas'}, status_code=401)
app_domain = str(decoded_token['payload']['app_domain'])
methods = [str(m) for m in decoded_token['payload']['methods']]
methods = [str(m) for m in decoded_token['payload']['methods'] if len(m) > 0]
blockchain_id = None
app_private_key = None
app_public_key = None