test SP:s added for Prisma

SWAMIDOPS-7222

SimpleSign removed for www.alvin-portal.org
SWAMIDOPS-7225

3 files changed, 162 insertions, 1 deletions

diff --git a/swamid-2.0/sd0312.sigma.dev-shibboleth.xml b/swamid-2.0/sd0312.sigma.dev-shibboleth.xml
new file mode 100644
index 00000000..52fc9ba7
--- /dev/null
+++ b/swamid-2.0/sd0312.sigma.dev-shibboleth.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sd0312.sigma.dev/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sd0312.sigma.dev:444/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sd0312.sigma.dev:444/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Prisma - devECM</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Prisma - devECM</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">I Prisma kan du ansöka om forskningsmedel och hantera dina beviljade bidrag.</mdui:Description>
+        <mdui:Description xml:lang="en">Prisma is a joint portal used by several research funders.</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>sd0312.sigma.dev</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sd0312.sigma.dev</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAN4kcCPYjMbSMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEHNkMDMxMi5zaWdtYS5kZXYwHhcNMTQwNTAyMDgyMjQwWhcNMjQwNDI5MDgy
+MjQwWjAbMRkwFwYDVQQDExBzZDAzMTIuc2lnbWEuZGV2MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAtdp0ilqJrsx4H+r8jh9xxtJoqTb0Vpv0AKTBVAq/
+LJuNdO/s89eaHI8seNF4kNaPOCX6TDgJHne1zx7gQ/FTCoy/XvwSjW7Vjqv+VbcB
+YqOljNKW2vHOBqtFT9oxoYYzDxFp+PmaNKVoZlFFssw+A7qOhPur3PyULUQqKV1o
+xVukaunEV9Zz7HBE/Z+UznXZdQLn+pCVKOoKthrBa9/T1QoB9rSpU0rZWiY96KsN
+TpI85+GZlib1MuDbaVUVAihY0Mv1D/E9Rmec/YuSuqU7dX9Y60+SbyYmhQAY8QHL
+Koa8i1OnQzJtgRQEJZu0fYmL/M+tnioxSqC8MGTuURHcCQIDAQABoz4wPDAbBgNV
+HREEFDASghBzZDAzMTIuc2lnbWEuZGV2MB0GA1UdDgQWBBTJpWJM+SCvWgPgyEGn
+LwqhGCAg3TANBgkqhkiG9w0BAQUFAAOCAQEArg+FBf8i++DVRV8NAJMn+85luRyD
+XU+oXOilBiTWXpqerekN158/8NBruD/ZjwEsHZTAmSidEYGoWFKfIGznEnW5nCpY
+DBjheVsAEkN1s3MyOp0wYz4ezv4a4mAe3/fg4KQRxtLnjCpseFTgIEFE6O61J4fV
+AobAGpEyXtQMnu4wE1vYZlyrcEMLtLRJV2+O/2ygd3hTU6GNvpGPkSNZftgfQAl8
+T8a6bUgW2C9Tw3zMP3RLHPnlK6yh5OTyDA0bNYGuGwWyOMEdM94mcV/v0QB0+Oz+
+GNaugsZYVjUyIk0RQTVlYVhGXr9M9/fljVlbWqjBdnXDeAg3RKhMSRPOIA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sd0312.sigma.dev:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sd0312.sigma.dev:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sd0312.sigma.dev:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sd0312.sigma.dev:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sd0312.sigma.dev:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sd0312.sigma.dev:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sd0312.sigma.dev:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sd0312.sigma.dev:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sd0312.sigma.dev:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sd0312.sigma.dev:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/testaprisma.vr.se-shibboleth.xml b/swamid-2.0/testaprisma.vr.se-shibboleth.xml
new file mode 100644
index 00000000..1f731026
--- /dev/null
+++ b/swamid-2.0/testaprisma.vr.se-shibboleth.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://testaprisma.vr.se/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://testaprisma.vr.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://testaprisma.vr.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Prisma - testaprisma.vr.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Prisma - testaprisma.vr.se</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">I Prisma kan du ansöka om forskningsmedel och hantera dina beviljade bidrag.</mdui:Description>
+        <mdui:Description xml:lang="en">Prisma is a joint portal used by several research funders.</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>testaprisma.vr.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=testaprisma.vr.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJALyDb0U/kwgyMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEXRlc3RhcHJpc21hLnZyLnNlMB4XDTE0MDUwMjA4MzYwOFoXDTI0MDQyOTA4
+MzYwOFowHDEaMBgGA1UEAxMRdGVzdGFwcmlzbWEudnIuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC6ojfwiDlOFQMYd/ENAcVUaW3YQ1k1L+JlE81K
+Z8ZZh796aWxwwVisbmZqBek/H6eNWpxLR//D77YEx8TwdmMzDuB9RbNLsbp28uu6
+UssH7qVUIdw5nnpEAywK+NGsLJbVEhrZerp8ydpAu5Qj9Th0WIiLThXiXc/9WH4S
+VeEkHD22LI1FjsgXQjlcVxyvyIDlHgnkzQmrUfwAtyVY67ASFEsy4SkJAeuGzi2I
+vMPrc938LPUANRHtJrECcbBUsmnpZBeU24DBdR5rYLL1BPjYrsWkyrHVciP/zT4j
+N+fvnJC1I8NflYhtdxQx2nJbHiNw1mvFt3jsAs6eeaLpwEbHAgMBAAGjPzA9MBwG
+A1UdEQQVMBOCEXRlc3RhcHJpc21hLnZyLnNlMB0GA1UdDgQWBBRZtyMF+9cE8Bgi
+ypEcHApzkfy4CTANBgkqhkiG9w0BAQUFAAOCAQEAdruGJJ79YxJMkORE7Li8jATg
+s2+bU8dnTEDNls2RBfRYKlYHQg+mjtyYYdZR7qTy0aJibwofgo6ieXdX6Jg5eMU9
+/+93xCFYTPEofWj9pZy5BDx6AvxyhgQ9XjtdsMDphGMRoWTc92BGdNjAAw/Oag75
+H9PjoorE61MIqluiO6Pb/W+bE2mYgeIWsqsutJQfa6Duk9UjnVVYAMspkRyQ9Z0f
+JeN4ASzWWgxCEmOjT+bj6VFvnRwPDOlTi7paqdpasPoxKVSx/S/4bgpH23vNtu9b
+Dy3oscht7rhlGhTsIsDulx5tPZY9ZyOVoZ6d6RQxvIwExf5Tt7QW1w0i0Pb9xA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testaprisma.vr.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testaprisma.vr.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testaprisma.vr.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testaprisma.vr.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testaprisma.vr.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testaprisma.vr.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testaprisma.vr.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testaprisma.vr.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testaprisma.vr.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testaprisma.vr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.alvin-portal.org-shibboleth.xml b/swamid-2.0/www.alvin-portal.org-shibboleth.xml
index c6c370b3..c47fa828 100644
--- a/swamid-2.0/www.alvin-portal.org-shibboleth.xml
+++ b/swamid-2.0/www.alvin-portal.org-shibboleth.xml
@@ -82,7 +82,6 @@ nCC3ytLciA==
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.alvin-portal.org/Shibboleth.sso/NIM/POST"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.alvin-portal.org/Shibboleth.sso/NIM/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.alvin-portal.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.alvin-portal.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.alvin-portal.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.alvin-portal.org/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.alvin-portal.org/Shibboleth.sso/SAML/POST" index="5"/>