From f70ce52a9078c83485317122c5010fb12ad9a4f1 Mon Sep 17 00:00:00 2001 From: Kirill Roskolii Date: Tue, 8 Oct 2024 15:39:43 +1300 Subject: [PATCH 1/7] Allow required plugins --- composer.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 95b3153..a6d58b6 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,10 @@ }, "config": { "allow-plugins": { - "simplesamlphp/composer-module-installer": true + "simplesamlphp/composer-module-installer": true, + "composer/installers": true, + "dealerdirect/phpcodesniffer-composer-installer": true, + "simplesamlphp/composer-xmlprovider-installer": true } } } From 92f8b6b9a68f67c60e10fa75906b49c46f23d686 Mon Sep 17 00:00:00 2001 From: Kirill Roskolii Date: Tue, 8 Oct 2024 15:47:08 +1300 Subject: [PATCH 2/7] Test on 8.3 --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index e89dadf..3c0445b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,8 @@ jobs: dist: jammy - php: '8.2' dist: jammy + - php: '8.3' + dist: jammy before_script: composer install script: From 465045c051fbf5965f9d4592c41d1ee8ea41cedb Mon Sep 17 00:00:00 2001 From: Kirill Roskolii Date: Mon, 16 Jun 2025 12:03:02 +1200 Subject: [PATCH 3/7] Restore SimpleSAMLphp exception handler (#100) --- CHANGELOG | 9 --------- CHANGELOG.md | 16 ++++++++++++++++ src/DrupalHelper.php | 2 ++ 3 files changed, 18 insertions(+), 9 deletions(-) delete mode 100644 CHANGELOG create mode 100644 CHANGELOG.md diff --git a/CHANGELOG b/CHANGELOG deleted file mode 100644 index 577c9de..0000000 --- a/CHANGELOG +++ /dev/null @@ -1,9 +0,0 @@ -20131210 Steve Moitozo - - Resolved security issue (defect #9 - identified by alanabarrett0). - - Expanded the use of the salted hash to ensure that an attacker cannot change the uid of the authenticated Drupal user by manipulating the value of a cookie. - - Modified files: - drupal_module/drupalauth4ssp/drupalauth4ssp.module - concatenate uid with salt before hashing - lib/Auth/Source/External.php - concatenate uid with salt before hashing and minor adjustments diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..aeea622 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,16 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). + +See the main [README.md](./README.md#branch-and-version-naming) for the details about version naming. + + +## [Unreleased] + +### Fixed +- Restored SimpleSAMLphp exception handler (#29, #35) + + +## [2.10.0-rc.1] diff --git a/src/DrupalHelper.php b/src/DrupalHelper.php index 8488c55..1cfb36b 100644 --- a/src/DrupalHelper.php +++ b/src/DrupalHelper.php @@ -24,6 +24,8 @@ public function bootDrupal(string $drupalRoot) $kernel->boot(); $kernel->loadLegacyIncludes(); chdir($originalDir); + \restore_exception_handler(); + \restore_error_handler(); } /** From 6ad28dda12a6f3b978eaefd7ff8ad1ab77f8d8bd Mon Sep 17 00:00:00 2001 From: Dave Long Date: Mon, 15 Apr 2024 10:42:54 +0100 Subject: [PATCH 4/7] Fix Drupal bootstrap. --- src/DrupalHelper.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/DrupalHelper.php b/src/DrupalHelper.php index 1cfb36b..a6ccb36 100644 --- a/src/DrupalHelper.php +++ b/src/DrupalHelper.php @@ -3,7 +3,9 @@ namespace SimpleSAML\Module\drupalauth; use Drupal\Core\DrupalKernel; +use Drupal\Core\Routing\RouteObjectInterface; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Routing\Route; class DrupalHelper { @@ -13,6 +15,8 @@ class DrupalHelper * Boot Drupal. * * @param string $drupalRoot Path to Drupal root. + * + * @see \Drupal\Core\Test\FunctionalTestSetupTrait::initKernel() */ public function bootDrupal(string $drupalRoot) { @@ -21,8 +25,11 @@ public function bootDrupal(string $drupalRoot) $originalDir = getcwd(); chdir($drupalRoot); $kernel = DrupalKernel::createFromRequest($request, $autoloader, 'prod', true, $drupalRoot); + $kernel->invalidateContainer(); $kernel->boot(); - $kernel->loadLegacyIncludes(); + $request->attributes->set(RouteObjectInterface::ROUTE_OBJECT, new Route('')); + $request->attributes->set(RouteObjectInterface::ROUTE_NAME, ''); + $kernel->preHandle($request); chdir($originalDir); \restore_exception_handler(); \restore_error_handler(); From 3b8ded0954d040556760ba2379d6f40aa50c05b8 Mon Sep 17 00:00:00 2001 From: Dave Long Date: Mon, 15 Apr 2024 12:50:16 +0100 Subject: [PATCH 5/7] Do not invalidate container. --- src/DrupalHelper.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/DrupalHelper.php b/src/DrupalHelper.php index a6ccb36..a704637 100644 --- a/src/DrupalHelper.php +++ b/src/DrupalHelper.php @@ -25,7 +25,6 @@ public function bootDrupal(string $drupalRoot) $originalDir = getcwd(); chdir($drupalRoot); $kernel = DrupalKernel::createFromRequest($request, $autoloader, 'prod', true, $drupalRoot); - $kernel->invalidateContainer(); $kernel->boot(); $request->attributes->set(RouteObjectInterface::ROUTE_OBJECT, new Route('')); $request->attributes->set(RouteObjectInterface::ROUTE_NAME, ''); From 598c20d4ddf7ce40c875a02e79d9d4d6b66bbdcf Mon Sep 17 00:00:00 2001 From: Kirill Roskolii Date: Mon, 16 Jun 2025 12:45:51 +1200 Subject: [PATCH 6/7] Add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aeea622..f3482bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ See the main [README.md](./README.md#branch-and-version-naming) for the details ### Fixed - Restored SimpleSAMLphp exception handler (#29, #35) +- Bootstrap Drupal correctly from inside SimpleSAMLphp (#75, #98) ## [2.10.0-rc.1] From 9ced070ad50e7706f109af0e2a95d144d9c9c9a3 Mon Sep 17 00:00:00 2001 From: Kirill Roskolii Date: Mon, 16 Jun 2025 12:50:53 +1200 Subject: [PATCH 7/7] New version --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3482bd..4b4b33a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ See the main [README.md](./README.md#branch-and-version-naming) for the details ## [Unreleased] + +## [2.10.0] ### Fixed - Restored SimpleSAMLphp exception handler (#29, #35) - Bootstrap Drupal correctly from inside SimpleSAMLphp (#75, #98)