From ba32f1131e35ed27b3a609ae579c0fe5dc1d7ca8 Mon Sep 17 00:00:00 2001 From: FreddleSpl0it Date: Fri, 20 Oct 2023 09:07:04 +0200 Subject: [PATCH] [Web] dont rtrim generic-oidc urls --- data/web/inc/functions.inc.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/data/web/inc/functions.inc.php b/data/web/inc/functions.inc.php index 0b55e75e1a..efa34ef2ed 100644 --- a/data/web/inc/functions.inc.php +++ b/data/web/inc/functions.inc.php @@ -2165,9 +2165,9 @@ function identity_provider($_action, $_data = null, $_extra = null) { $_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'); } else if ($_data['authsource'] == "generic-oidc") { - $_data['authorize_url'] = (!empty($_data['authorize_url'])) ? rtrim($_data['authorize_url'], '/') : null; - $_data['token_url'] = (!empty($_data['token_url'])) ? rtrim($_data['token_url'], '/') : null; - $_data['userinfo_url'] = (!empty($_data['userinfo_url'])) ? rtrim($_data['userinfo_url'], '/') : null; + $_data['authorize_url'] = (!empty($_data['authorize_url'])) ? $_data['authorize_url'] : null; + $_data['token_url'] = (!empty($_data['token_url'])) ? $_data['token_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'); } @@ -2184,9 +2184,6 @@ function identity_provider($_action, $_data = null, $_extra = null) { $pdo->rollback(); 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(':value', $_data[$setting]);