135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#1036 redux allow use of /login even when authN is delegated

Browse Source
This commit is contained in:
Oliver Gorwits
2023-06-22 13:19:42 +01:00
parent 3da92a9ab5
commit a7cd5603cb
3 changed files with 104 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/App/Netdisco/Web/Auth/Provider/DBIC.pm
View File

@@ -46,10 +46,11 @@ sub get_user_details {
# each of these settings permits no user in the database
# so create a pseudo user entry instead
if (not $user and not setting('validate_remote_user')
and (setting('trust_remote_user')
or setting('trust_x_remote_user')
or setting('no_auth'))) {
if (not $user and
(setting('no_auth') or
(not setting('validate_remote_user')
and (setting('trust_remote_user') or setting('trust_x_remote_user')) ))) {
$user = $database->resultset($users_table)
->new_result({username => $username});
}
@@ -73,7 +74,7 @@ sub validate_api_token {
$database->resultset($users_table)->find({ $token_column => $token });
};
return $user->username
return $user
if $user and $user->in_storage and $user->token_from
and $user->token_from > (time - setting('api_token_lifetime'));
return undef;