diff options
| author | Milo Casagrande <milo.casagrande@linaro.org> | 2015-01-16 16:51:01 +0100 |
|---|---|---|
| committer | Milo Casagrande <milo.casagrande@linaro.org> | 2015-01-16 16:51:01 +0100 |
| commit | 270a2606a6200808cc7aa40ecd37c4a637b4ae6d (patch) | |
| tree | 0994f05fb583a8d8e44c77d3577e535b4625e4d5 | |
| parent | a4dd1aeb94d199bea1de2b78d2308d90abf7a104 (diff) | |
Fix token handler.
Change-Id: I9264b3334a16f494789dfb6a1f5cf9b0023fb8ee
| -rw-r--r-- | app/handlers/token.py | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/app/handlers/token.py b/app/handlers/token.py index fcb6137..59cc37c 100644 --- a/app/handlers/token.py +++ b/app/handlers/token.py @@ -217,27 +217,33 @@ class TokenHandler(hbase.BaseHandler): if json_get(models.EXPIRES_KEY, None): token.expires_on = json_get(models.EXPIRES_KEY) - if json_get(models.GET_KEY, None): + if str(json_get(models.EXPIRED_KEY, None)) != "None": + token.expired = json_get(models.EXPIRED_KEY) + + if str(json_get(models.GET_KEY, None)) != "None": token.is_get_token = json_get(models.GET_KEY) - if json_get(models.POST_KEY, None): + if str(json_get(models.POST_KEY, None)) != "None": token.is_post_token = json_get(models.POST_KEY) - if json_get(models.DELETE_KEY, None): + if str(json_get(models.DELETE_KEY, None)) != "None": token.is_delete_token = json_get(models.DELETE_KEY) - if json_get(models.SUPERUSER_KEY, None): + if str(json_get(models.SUPERUSER_KEY, None)) != "None": token.is_superuser = json_get(models.SUPERUSER_KEY) - if json_get(models.ADMIN_KEY, None): + if str(json_get(models.ADMIN_KEY, None)) != "None": token.is_admin = json_get(models.ADMIN_KEY) - if json_get(models.IP_RESTRICTED, None): + if str(json_get(models.IP_RESTRICTED, None)) != "None": token.is_ip_restricted = json_get(models.IP_RESTRICTED) - if json_get(models.LAB_KEY, None): + if str(json_get(models.LAB_KEY, None)) != "None": token.is_lab_token = json_get(models.LAB_KEY) + if str(json_get(models.UPLOAD_KEY, None)) != "None": + token.is_upload_token = json_get(models.UPLOAD_KEY) + if token.is_ip_restricted and not json_get(models.IP_ADDRESS_KEY, None): raise Exception("IP restricted but no IP addresses given") elif (json_get(models.IP_ADDRESS_KEY, None) and |