self-hosted/mailcow-dockerized
1
0
Fork 0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2025-07-15 01:34:16 +02:00
Code Issues Releases Activity

[Web] dont rtrim generic-oidc urls

Browse Source
This commit is contained in:
FreddleSpl0it
2023-10-20 09:07:04 +02:00
committed by DerLinkman
parent 27ef04baa0
commit ba32f1131e
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2165,9 +2165,9 @@ function identity_provider($_action, $_data = null, $_extra = null) {
$_data['sync_interval'] = $_data['sync_interval'] < 1 ? 1 : $_data['sync_interval']; $_data['sync_interval'] = $_data['sync_interval'] < 1 ? 1 : $_data['sync_interval'];
$required_settings = array('authsource', 'server_url', 'realm', 'client_id', 'client_secret', 'redirect_url', 'version', 'mailpassword_flow', 'periodic_sync', 'import_users', 'sync_interval'); $required_settings = array('authsource', 'server_url', 'realm', 'client_id', 'client_secret', 'redirect_url', 'version', 'mailpassword_flow', 'periodic_sync', 'import_users', 'sync_interval');
} else if ($_data['authsource'] == "generic-oidc") { } else if ($_data['authsource'] == "generic-oidc") {
$_data['authorize_url'] = (!empty($_data['authorize_url'])) ? rtrim($_data['authorize_url'], '/') : null; $_data['authorize_url'] = (!empty($_data['authorize_url'])) ? $_data['authorize_url'] : null;
$_data['token_url'] = (!empty($_data['token_url'])) ? rtrim($_data['token_url'], '/') : null; $_data['token_url'] = (!empty($_data['token_url'])) ? $_data['token_url'] : null;
$_data['userinfo_url'] = (!empty($_data['userinfo_url'])) ? rtrim($_data['userinfo_url'], '/') : null; $_data['userinfo_url'] = (!empty($_data['userinfo_url'])) ? $_data['userinfo_url'] : null;
$required_settings = array('authsource', 'authorize_url', 'token_url', 'client_id', 'client_secret', 'redirect_url', 'userinfo_url'); $required_settings = array('authsource', 'authorize_url', 'token_url', 'client_id', 'client_secret', 'redirect_url', 'userinfo_url');
} }
@ -2184,9 +2184,6 @@ function identity_provider($_action, $_data = null, $_extra = null) {
$pdo->rollback(); $pdo->rollback();
return false; return false;
} }
if ($setting == "server_url" || $setting == "authorize_url" || $setting == "token_url" || $setting == "userinfo_url") {
$_data[$setting] = rtrim($_data[$setting], '/');
}
$stmt->bindParam(':key', $setting); $stmt->bindParam(':key', $setting);
$stmt->bindParam(':value', $_data[$setting]); $stmt->bindParam(':value', $_data[$setting]);