mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code

Fixes #1021: Corrected evaluation of API token expiration time

Browse Source
This commit is contained in:
Jeremy Stretch
2017-03-31 11:13:37 -04:00
parent 3ed3e93b25
commit 1c38f705a7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/users/models.py
View File

@ -39,6 +39,6 @@ class Token(models.Model):
@property
def is_expired(self):
if self.expires is not None and timezone.now() > self.expires:
return True
return False
if self.expires is None or timezone.now() < self.expires:
return False
return True

2
netbox/utilities/api.py
View File

@ -30,7 +30,7 @@ class TokenAuthentication(authentication.TokenAuthentication):
raise exceptions.AuthenticationFailed("Invalid token")
# Enforce the Token's expiration time, if one has been set.
if token.expires and not token.is_expired:
if token.is_expired:
raise exceptions.AuthenticationFailed("Token expired")
if not token.user.is_active: