trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

providers/oauth2: make exp optional on jwt client_credentials flow 

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
Jens Langhammer 2022-04-10 17:02:25 +02:00
parent f8f8a9bbb9
commit f977bf61eb
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
authentik/core/tasks.py
View File

@ -60,6 +60,8 @@ def clean_temporary_users(self: MonitoredTask):
messages = [] messages = []
deleted_users = 0 deleted_users = 0
for user in User.objects.filter(**{f"attributes__{USER_ATTRIBUTE_GENERATED}": True}): for user in User.objects.filter(**{f"attributes__{USER_ATTRIBUTE_GENERATED}": True}):
if USER_ATTRIBUTE_EXPIRES not in user.attributes:
continue
delta: timedelta = _now - datetime.fromtimestamp( delta: timedelta = _now - datetime.fromtimestamp(
user.attributes.get(USER_ATTRIBUTE_EXPIRES) user.attributes.get(USER_ATTRIBUTE_EXPIRES)
) )

13
authentik/providers/oauth2/views/token.py
View File

@ -280,11 +280,12 @@ class TokenParams:
if not token: if not token:
raise TokenError("invalid_grant") raise TokenError("invalid_grant")
exp = datetime.fromtimestamp(token["exp"]) if "exp" in token:
# Non-timezone aware check since we assume `exp` is in UTC exp = datetime.fromtimestamp(token["exp"])
if datetime.now() >= exp: # Non-timezone aware check since we assume `exp` is in UTC
LOGGER.info("JWT token expired") if datetime.now() >= exp:
raise TokenError("invalid_grant") LOGGER.info("JWT token expired")
raise TokenError("invalid_grant")
app = Application.objects.filter(provider=self.provider).first() app = Application.objects.filter(provider=self.provider).first()
if not app or not app.provider: if not app or not app.provider:
@ -298,7 +299,7 @@ class TokenParams:
defaults={ defaults={
"attributes": { "attributes": {
USER_ATTRIBUTE_GENERATED: True, USER_ATTRIBUTE_GENERATED: True,
USER_ATTRIBUTE_EXPIRES: token["exp"], USER_ATTRIBUTE_EXPIRES: token.get("exp"),
}, },
"last_login": now(), "last_login": now(),
"name": f"Autogenerated user from application {app.name} (client credentials JWT)", "name": f"Autogenerated user from application {app.name} (client credentials JWT)",