summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérôme Schneider <jschneider@entrouvert.com>2013-11-08 13:30:40 (GMT)
committerJérôme Schneider <jschneider@entrouvert.com>2013-11-08 13:35:12 (GMT)
commit1baac3123d30a63ab6423d2e751802d144145d4f (patch)
tree2c4d102c5e95dd6ce1af689e44d0589b1f44fefa
parentd0c82e8359ec57df5cd896004d08aa6ef3355072 (diff)
downloadspip-saml-1baac3123d30a63ab6423d2e751802d144145d4f.zip
spip-saml-1baac3123d30a63ab6423d2e751802d144145d4f.tar.gz
spip-saml-1baac3123d30a63ab6423d2e751802d144145d4f.tar.bz2
modify metadata and configuration to use artifact
-rw-r--r--inc/simplesamlphp/cert/server.crt16
-rw-r--r--inc/simplesamlphp/cert/server.pem15
-rw-r--r--inc/simplesamlphp/config/authsources.php4
-rw-r--r--inc/simplesamlphp/metadata/saml20-idp-remote.php6
4 files changed, 7 insertions, 34 deletions
diff --git a/inc/simplesamlphp/cert/server.crt b/inc/simplesamlphp/cert/server.crt
deleted file mode 100644
index b4147e5..0000000
--- a/inc/simplesamlphp/cert/server.crt
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICgTCCAeoCCQCbOlrWDdX7FTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMC
-Tk8xGDAWBgNVBAgTD0FuZHJlYXMgU29sYmVyZzEMMAoGA1UEBxMDRm9vMRAwDgYD
-VQQKEwdVTklORVRUMRgwFgYDVQQDEw9mZWlkZS5lcmxhbmcubm8xITAfBgkqhkiG
-9w0BCQEWEmFuZHJlYXNAdW5pbmV0dC5ubzAeFw0wNzA2MTUxMjAxMzVaFw0wNzA4
-MTQxMjAxMzVaMIGEMQswCQYDVQQGEwJOTzEYMBYGA1UECBMPQW5kcmVhcyBTb2xi
-ZXJnMQwwCgYDVQQHEwNGb28xEDAOBgNVBAoTB1VOSU5FVFQxGDAWBgNVBAMTD2Zl
-aWRlLmVybGFuZy5ubzEhMB8GCSqGSIb3DQEJARYSYW5kcmVhc0B1bmluZXR0Lm5v
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDivbhR7P516x/S3BqKxupQe0LO
-NoliupiBOesCO3SHbDrl3+q9IbfnfmE04rNuMcPsIxB161TdDpIesLCn7c8aPHIS
-KOtPlAeTZSnb8QAu7aRjZq3+PbrP5uW3TcfCGPtKTytHOge/OlJbo078dVhXQ14d
-1EDwXJW1rRXuUt4C8QIDAQABMA0GCSqGSIb3DQEBBQUAA4GBACDVfp86HObqY+e8
-BUoWQ9+VMQx1ASDohBjwOsg2WykUqRXF+dLfcUH9dWR63CtZIKFDbStNomPnQz7n
-bK+onygwBspVEbnHuUihZq3ZUdmumQqCw4Uvs/1Uvq3orOo/WJVhTyvLgFVK2Qar
-Q4/67OZfHd7R+POBXhophSMv1ZOo
------END CERTIFICATE-----
diff --git a/inc/simplesamlphp/cert/server.pem b/inc/simplesamlphp/cert/server.pem
deleted file mode 100644
index 673196b..0000000
--- a/inc/simplesamlphp/cert/server.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQDivbhR7P516x/S3BqKxupQe0LONoliupiBOesCO3SHbDrl3+q9
-IbfnfmE04rNuMcPsIxB161TdDpIesLCn7c8aPHISKOtPlAeTZSnb8QAu7aRjZq3+
-PbrP5uW3TcfCGPtKTytHOge/OlJbo078dVhXQ14d1EDwXJW1rRXuUt4C8QIDAQAB
-AoGAD4/Z4LWVWV6D1qMIp1Gzr0ZmdWTE1SPdZ7Ej8glGnCzPdguCPuzbhGXmIg0V
-J5D+02wsqws1zd48JSMXXM8zkYZVwQYIPUsNn5FetQpwxDIMPmhHg+QNBgwOnk8J
-K2sIjjLPL7qY7Itv7LT7Gvm5qSOkZ33RCgXcgz+okEIQMYkCQQDzbTOyDL0c5WQV
-6A2k06T/azdhUdGXF9C0+WkWSfNaovmTgRXh1G+jMlr82Snz4p4/STt7P/XtyWzF
-3pkVgZr3AkEA7nPjXwHlttNEMo6AtxHd47nizK2NUN803ElIUT8P9KSCoERmSXq6
-6PDekGNic4ldpsSvOeYCk8MAYoDBy9kvVwJBAMLgX4xg6lzhv7hR5+pWjTb1rIY6
-rCHbrPfU264+UZXz9v2BT/VUznLF81WMvStD9xAPHpFS6R0OLghSZhdzhI0CQQDL
-8Duvfxzrn4b9QlmduV8wLERoT6rEVxKLsPVz316TGrxJvBZLk/cV0SRZE1cZf4uk
-XSWMfEcJ/0Zt+LdG1CqjAkEAqwLSglJ9Dy3HpgMz4vAAyZWzAxvyA1zW0no9GOLc
-PQnYaNUN/Fy2SYtETXTb0CQ9X1rt8ffkFP7ya+5TC83aMg==
------END RSA PRIVATE KEY-----
diff --git a/inc/simplesamlphp/config/authsources.php b/inc/simplesamlphp/config/authsources.php
index e096648..f420ac8 100644
--- a/inc/simplesamlphp/config/authsources.php
+++ b/inc/simplesamlphp/config/authsources.php
@@ -35,6 +35,10 @@ $config = array(
// Force persistent NameID
'NameIDFormat' => 'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent',
+
+ 'ProtocolBinding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact',
+ 'privatekey' => 'server.pem',
+ 'certificate' => 'server.crt',
),
diff --git a/inc/simplesamlphp/metadata/saml20-idp-remote.php b/inc/simplesamlphp/metadata/saml20-idp-remote.php
index 0402e55..9ae055b 100644
--- a/inc/simplesamlphp/metadata/saml20-idp-remote.php
+++ b/inc/simplesamlphp/metadata/saml20-idp-remote.php
@@ -45,7 +45,7 @@ $metadata['https://mon.meyzieu.fr/idp/saml2/metadata'] = array (
array (
'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:SOAP',
'Location' => 'https://mon.meyzieu.fr/idp/saml2/artifact',
- 'index' => 1,
+ 'index' => 0,
),
),
'keys' =>
@@ -125,7 +125,7 @@ $metadata['https://mon-meyzieu.recette.entrouvert.com/idp/saml2/metadata'] = arr
array (
'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:SOAP',
'Location' => 'https://mon-meyzieu.recette.entrouvert.com/idp/saml2/artifact',
- 'index' => 1,
+ 'index' => 0,
),
),
'keys' =>
@@ -201,7 +201,7 @@ $metadata['http://mon.meyzieu.dev.entrouvert.org/idp/saml2/metadata'] = array (
array (
'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:SOAP',
'Location' => 'http://mon.meyzieu.dev.entrouvert.org/idp/saml2/artifact',
- 'index' => 1,
+ 'index' => 0,
),
),
'keys' =>