Skip to content

Commit ea69cd3

Browse files
author
Elijah Lynn
authored
VACMS-3323: Upgrade simplesamlphp library and Drupal module (#3336)
* Remove old patch "Bypass password requirement for password change if logged in with sso". * Apply new patch for "Don't attempt username sync when user was already matched by username". * composer require simplesamlphp/simplesamlphp:^1.18 drupal/simplesamlphp_auth * Set login_link_show for module, disabled by default. Fixes failure: And I should see "Login with PIV or other Smartcard." in the "#edit-simplesamlphp-auth-login-link" element # Drupal\DrupalExtension\Context\MinkContext::assertElementContainsText during behat test run for the user.feature. * Update top-level, non-vendor simplesamlphp-1.17.2 to 1.18.8. * Add default config templates to /config/. * Add custom /config/{authsources,config}.php back. Skipped the below as they are not options in the new config and I don't think we need them: 'default-wsfed-idp' => 'urn:federation:pingfederate:localhost', 'enable.wsfed-sp' => false, 'enable.authmemcookie' => false, * Add default /metadata/saml20-idp-remote.php template. Left the others out because I don't think they are used. * Add custom config to /metadata/saml20-idp-remote.php. * Use a symlink for simplesamlphp instead of copy whole folder. * Add symlink, remove duplicate IDP, remove unneeded files. * composer require simplesamlphp/simplesamlphp:^1.18 drupal/simplesamlphp_auth
1 parent 0bff4d9 commit ea69cd3

File tree

4,250 files changed

+1962
-501124
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,250 files changed

+1962
-501124
lines changed

composer.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
"drupal/restui": "^1.16",
102102
"drupal/role_delegation": "^1.0@alpha",
103103
"drupal/seckit": "^2.0",
104-
"drupal/simplesamlphp_auth": "^3.0",
104+
"drupal/simplesamlphp_auth": "^3.2",
105105
"drupal/site_alert": "1.x-dev#d3700174bdddeca1f33c6995fde86e436b034270",
106106
"drupal/slack": "^1.2",
107107
"drupal/smart_date": "3.0.4",
@@ -136,7 +136,7 @@
136136
"phpunit/phpunit": "^7",
137137
"provision-ops/yaml-tests": "~1.9",
138138
"querypath/querypath": "^3.0",
139-
"simplesamlphp/simplesamlphp": "^1.17",
139+
"simplesamlphp/simplesamlphp": "^1.18",
140140
"squizlabs/php_codesniffer": "^3.5",
141141
"symfony/config": "^3.4",
142142
"symfony/finder": "^3",
@@ -296,8 +296,7 @@
296296
"PHP 7.2 notice - \"Undefined offset: 1\" in JsonSchemaEncoder": "https://www.drupal.org/files/issues/2019-07-08/3063027-5-undefined-offset.patch"
297297
},
298298
"drupal/simplesamlphp_auth": {
299-
"Don't attempt username sync when user was already matched by username": "https://www.drupal.org/files/issues/2019-08-14/2748731-23.patch",
300-
"Bypass password requirement for password change if logged in with sso.": "https://www.drupal.org/files/issues/2018-05-01/simplesamlphp_auth-change-password-access-2968598-2.patch"
299+
"Don't attempt username sync when user was already matched by username": "https://www.drupal.org/files/issues/2020-07-31/reroll-existing-test-and-logging-fix-2748731-29.patch"
301300
},
302301
"drupal/site_alert": {
303302
"Add drush commands https://www.drupal.org/project/site_alert/issues/3118800": "https://www.drupal.org/files/issues/2020-05-20/site_alert-add_drush_commands-3118800-12.patch",
@@ -334,8 +333,9 @@
334333
"mkdir --parents docroot/profiles",
335334
"cp -r 'hooks/git/.' '.git/hooks/'",
336335
"php -r \"chmod('.git/hooks/pre-commit', 0777);\"",
337-
"cp -r 'simplesamlphp-1.17.2/config/' 'docroot/vendor/simplesamlphp/simplesamlphp/'",
338-
"cp -r 'simplesamlphp-1.17.2/metadata/' 'docroot/vendor/simplesamlphp/simplesamlphp/'",
336+
"ln -snf 'docroot/vendor/simplesamlphp/simplesamlphp/' 'simplesamlphp'",
337+
"ln -snf 'docroot/vendor/simplesamlphp/saml2/' 'saml2'",
338+
"cp -r 'simplesamlphp-config-metadata/config' 'simplesamlphp-config-metadata/metadata' 'docroot/vendor/simplesamlphp/simplesamlphp/'",
339339
"echo 'Removing deleted .git/hooks/commit-msg file, no longer used.'",
340340
"rm -f .git/hooks/commit-msg",
341341
"git update-index --skip-worktree samlsessiondb.sq3",

0 commit comments

Comments
 (0)