From 6df12a8a067d03389edf66bd4badd8e8af1aa8df Mon Sep 17 00:00:00 2001 From: damikael Date: Sat, 14 Oct 2023 11:48:56 +0200 Subject: [PATCH 1/3] fix: multiple AttributeConsumingServiceIndex, deprecate attributes var --- setup/simplesamlphp/simplesamlphp/modules/saml/lib/Message.php | 1 + 1 file changed, 1 insertion(+) diff --git a/setup/simplesamlphp/simplesamlphp/modules/saml/lib/Message.php b/setup/simplesamlphp/simplesamlphp/modules/saml/lib/Message.php index 39272d9..0d995f4 100644 --- a/setup/simplesamlphp/simplesamlphp/modules/saml/lib/Message.php +++ b/setup/simplesamlphp/simplesamlphp/modules/saml/lib/Message.php @@ -820,6 +820,7 @@ private static function processAssertion( } $req_attributes = $spMetadata->getValue('attributes'); + if($req_attributes==null) $req_attributes = array(); $res_attributes_array = $assertion->getAttributes(); $res_attributes = array(); foreach($res_attributes_array as $a=>$v) { From 71bb1e47bb33044ef23a4c27042c1c22dd5ecedf Mon Sep 17 00:00:00 2001 From: damikael Date: Sat, 14 Oct 2023 11:49:21 +0200 Subject: [PATCH 2/3] fix: do not overwrite proxy-home if already exists --- setup/Setup.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/setup/Setup.php b/setup/Setup.php index 763776e..e3c0dd1 100644 --- a/setup/Setup.php +++ b/setup/Setup.php @@ -1251,6 +1251,13 @@ public static function setup(Event $event) { $template = file_get_contents($config['installDir'] . '/setup/sdk/proxy-login.tpl', true); $customized = str_replace(array_keys($vars), $vars, $template); file_put_contents($config['wwwDir'] . "/proxy-login.php", $customized); + + if (!file_exists($config['wwwDir'] . "/proxy-home.php")) { + $template = file_get_contents($config['installDir'] . '/setup/sdk/proxy-home.tpl', true); + $customized = str_replace(array_keys($vars), $vars, $template); + file_put_contents($config['wwwDir'] . "/proxy-home.php", $customized); + } + if (!file_exists($config['wwwDir'] . "/error.php")) { // add error.tpl only if not exists $template = file_get_contents($config['installDir'] . '/setup/sdk/error.tpl', true); From 24cd0c43d952625e5ebe4a441cab9ca5b8e269f4 Mon Sep 17 00:00:00 2001 From: damikael Date: Sat, 14 Oct 2023 11:52:24 +0200 Subject: [PATCH 3/3] v.3.18.1 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 827931d..714c74d 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "config": { - "version": "3.18.0", + "version": "3.18.1", "allow-plugins": { "simplesamlphp/composer-module-installer": true }