amorfo77/mailcow-dockerized
1
0
Fork 0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2026-03-14 02:31:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7123 from mailcow/fix/7115

Browse Source 
[Web] Fix LDAP/Keycloak login TypeError - missing JSON decode for attributes
This commit is contained in:
FreddleSpl0it
2026-03-12 07:45:06 +01:00
committed by GitHub
parent 1e0850193a d1feebf164
commit 5f8382ef44
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/web/inc/functions.auth.inc.php
View File

@@ -287,6 +287,8 @@ function user_login($user, $pass, $extra = null){
return false;
}
$row['attributes'] = json_decode($row['attributes'], true);
// check for tfa authenticators
$authenticators = get_tfa($user);
if (isset($authenticators['additional']) && is_array($authenticators['additional']) && count($authenticators['additional']) > 0 && !$is_internal) {
@@ -343,6 +345,8 @@ function user_login($user, $pass, $extra = null){
return false;
}
$row['attributes'] = json_decode($row['attributes'], true);
// check for tfa authenticators
$authenticators = get_tfa($user);
if (isset($authenticators['additional']) && is_array($authenticators['additional']) && count($authenticators['additional']) > 0 && !$is_internal) {