7x31
/
mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Web] fix bug on mailbox login

This commit is contained in:
FreddleSpl0it 2023-05-16 14:50:36 +02:00
parent e5cac098ef
commit 2a02bae53e
No known key found for this signature in database
GPG Key ID: 00E14E7634F4BEC5
3 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -333,26 +333,16 @@ function keycloak_mbox_login_rest($user, $pass, $iam_settings, $is_internal = fa
return 'user'; return 'user';
} }
// try to create mbox on successfull login // check if matching attribute exist
$mbox_template = null; $mapper_key = array_search($user_template, $iam_settings['mappers']);
// check if matching attribute mapping exists if ($mapper_key === false) return false;
foreach ($iam_settings['mappers'] as $index => $mapper){
if (in_array($mapper, $iam_settings['mappers'])) {
$mbox_template = $iam_settings['templates'][$index];
break;
}
}
if (!$mbox_template){
// no matching template found
return false;
}
// create mailbox // create mailbox
$create_res = mailbox('add', 'mailbox_from_template', array( $create_res = mailbox('add', 'mailbox_from_template', array(
'domain' => explode('@', $user)[1], 'domain' => explode('@', $user)[1],
'local_part' => explode('@', $user)[0], 'local_part' => explode('@', $user)[0],
'authsource' => 'keycloak', 'authsource' => 'keycloak',
'template' => $mbox_template 'template' => $iam_settings['mappers'][$mapper_key]
)); ));
if (!$create_res) return false; if (!$create_res) return false;

11
data/web/inc/functions.inc.php
View File

@ -2146,7 +2146,7 @@ function identity_provider($_action, $_data = null, $_extra = null) {
); );
return true; return true;
} }
// get mapped template, if not set return false // get mapped template, if not set return false
// also return false if no mappers were defined // also return false if no mappers were defined
$provider = identity_provider('get'); $provider = identity_provider('get');
@ -2160,9 +2160,10 @@ function identity_provider($_action, $_data = null, $_extra = null) {
); );
return false; return false;
} }
// check if matching attribute exist // check if matching attribute exist
if (array_search($user_template, $provider['mappers']) === false) { $mapper_key = array_search($user_template, $provider['mappers']);
if ($mapper_key === false) {
clear_session(); clear_session();
$_SESSION['return'][] = array( $_SESSION['return'][] = array(
'type' => 'danger', 'type' => 'danger',
@ -2171,13 +2172,13 @@ function identity_provider($_action, $_data = null, $_extra = null) {
); );
return false; return false;
} }
// create mailbox // create mailbox
$create_res = mailbox('add', 'mailbox_from_template', array( $create_res = mailbox('add', 'mailbox_from_template', array(
'domain' => explode('@', $info['email'])[1], 'domain' => explode('@', $info['email'])[1],
'local_part' => explode('@', $info['email'])[0], 'local_part' => explode('@', $info['email'])[0],
'authsource' => identity_provider('get')['authsource'], 'authsource' => identity_provider('get')['authsource'],
'template' => $user_template 'template' => $provider['templates'][$mapper_key]
)); ));
if (!$create_res){ if (!$create_res){
clear_session(); clear_session();

2
data/web/inc/functions.mailbox.inc.php
View File

@ -1315,7 +1315,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
break; break;
} }
} }
return mailbox('add', 'mailbox', $mailbox_attributes, array('iam_create_login' => true)); return mailbox('add', 'mailbox', $mailbox_attributes, array('iam_create_login' => true));
break; break;
case 'resource': case 'resource':