Commit 23c7c779 authored by Cecilia Vela Gurovic's avatar Cecilia Vela Gurovic Committed by Robert Lyon

Bug 1744797: Fixes for ssphp 1.15.0

Stop the error:  [SimpleSAML_Error_UnserializableException]:
[ARRAY]: The option 'Format' is not a valid string value

And allow the js submit form for the redirect of the POST to IdP

behatnotneeded

Change-Id: Id617e51722d55c286e9b5340cdc3f5922f7320bc

Adjusting ssphp to copy the extlib www/resources/ files into sp/resources/

Change-Id: Ie347d43b64638b4b36a198c5904cee6128ea6f7f
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 0405658c)
parent af613d48
......@@ -36,3 +36,4 @@ logfile
node_modules/
htdocs/.externalToolBuilders/
htdocs/auth/saml/extlib/simplesamlphp
htdocs/auth/saml/sp/resources
\ No newline at end of file
......@@ -64,6 +64,8 @@ else
@echo "Pulling SimpleSAMLphp from download ..."
@curl -sSL https://github.com/simplesamlphp/simplesamlphp/releases/download/v1.15.0/simplesamlphp-1.15.0.tar.gz | tar --transform 's/simplesamlphp-[0-9]+\.[0-9]+\.[0-9]+/simplesamlphp/x1' -C htdocs/auth/saml/extlib -xzf - # SimpleSAMLPHP release tarball already has all composer dependencies.
# @php external/composer.phar --working-dir=htdocs/auth/saml/extlib/simplesamlphp update --no-dev
@echo "Copying www/resources/* files to sp/resources/ ..."
@cp -R htdocs/auth/saml/extlib/simplesamlphp/www/resources/ htdocs/auth/saml/sp/
@echo "Deleting unneeded files ..."
# Delete composer.json and .lock files to avoid leaking minor version info
@find htdocs/auth/saml/extlib -type f -name composer.json -delete
......
......@@ -63,8 +63,6 @@ $config = array(
'privatekey_pass' => get_config('sitename'),
'certificate' => $cert,
'NameIDPolicy' => NULL,
'redirect.sign' => TRUE,
'redirect.validate' => TRUE,
),
......
......@@ -24,4 +24,4 @@ Then I should see "You should receive an email shortly with a link you can use t
Scenario: Trying a username or password that doesn't exist (Bug 1460911)
When I fill in "Email address or username" with "nosuchuser"
And I press "Send request"
Then I should see "The email address or username you entered does not match any users for this site"
Then I should see "If you do not receive an email either the details you entered are incorrect or you normally use external authentication to access the site"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment