summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sp-with-simplesign2
-rw-r--r--swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml6
-rw-r--r--swamid-2.0/aktivera-test.su.se-shibboleth.sso.xml4
-rw-r--r--swamid-2.0/aktivera.su.se-shibboleth.sso.xml4
-rw-r--r--swamid-2.0/confluence-test.it.su.se-shibboleth.sso.xml5
-rw-r--r--swamid-2.0/confluence.it.su.se-shibboleth.sso.xml4
-rw-r--r--swamid-2.0/dspace.it.su.se.xml49
-rw-r--r--swamid-2.0/jira-test.it.su.se-shibboleth.sso.xml74
-rw-r--r--swamid-2.0/jira.it.su.se-shibboleth.sso.xml74
-rw-r--r--swamid-2.0/medlem.konstkaren.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml44
-rw-r--r--swamid-2.0/medlem.saks.gu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml44
-rw-r--r--swamid-2.0/mondo-test.su.se-shibboleth.sso.xml4
-rw-r--r--swamid-2.0/mondo.su.se-shibboleth.sso.xml4
-rw-r--r--swamid-2.0/nfg.su.se-shibboleth.sso.xml4
-rw-r--r--swamid-2.0/play.bth.se.xml12
-rw-r--r--swamid-2.0/public.it.secure.su.se-shibboleth.xml47
-rw-r--r--swamid-2.0/sp-test.it.su.se-shibboleth.sso.xml4
-rw-r--r--swamid-2.0/vfu-dev.su.se-shibboleth.sso.xml93
-rw-r--r--swamid-2.0/vfu-gemdev.it.su.se-shibboleth.sso.xml4
-rw-r--r--swamid-2.0/vfu-portfolio-dev.su.se-Shibboleth.sso.xml106
-rw-r--r--swamid-2.0/vfu-portfolio.su.se-shibboleth.sso.xml103
-rw-r--r--swamid-2.0/vfu-test.su.se-shibboleth.sso.xml4
-rw-r--r--swamid-2.0/vfu.su.se-shibboleth.sso.xml4
-rw-r--r--swamid-sp-2.0.mxml9
24 files changed, 144 insertions, 564 deletions
diff --git a/sp-with-simplesign b/sp-with-simplesign
index ecb78a53..f542a1d7 100644
--- a/sp-with-simplesign
+++ b/sp-with-simplesign
@@ -70,8 +70,6 @@ idp.test.antagning.se-aws-idp.xml
its-pd0328.ad.umu.se-shibboleth.xml
its-pd0030.ad.umu.se-shibboleth.xml
its-pd0062.ad.umu.se-shibboleth-sp.xml
-jira-test.it.su.se-shibboleth.sso.xml
-jira.it.su.se-shibboleth.sso.xml
kilw.ki.se-shibboleth.xml
kilwdev.it.ki.se-shibboleth.xml
kilwtest.it.ki.se-shibboleth.xml
diff --git a/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml b/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml
index a85bfd44..48fe0929 100644
--- a/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml
@@ -92,4 +92,10 @@
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.test.umu.se/adfs/ls/"/>
<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.umu.se/adfs/ls/"/>
</IDPSSODescriptor>
+ <ContactPerson contactType="support">
+ <Company>Umeå University</Company>
+ <SurName>ITS datordrift</SurName>
+ <EmailAddress>mailto:datordrift@its.umu.se</EmailAddress>
+ <TelephoneNumber>+46 90 786 6300</TelephoneNumber>
+ </ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/aktivera-test.su.se-shibboleth.sso.xml b/swamid-2.0/aktivera-test.su.se-shibboleth.sso.xml
index d9b23844..d61f2d9b 100644
--- a/swamid-2.0/aktivera-test.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/aktivera-test.su.se-shibboleth.sso.xml
@@ -82,4 +82,8 @@ u/S7d9rEGQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aktivera-test.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aktivera-test.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
</md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>IT-avdelningen</md:SurName>
+ <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/aktivera.su.se-shibboleth.sso.xml b/swamid-2.0/aktivera.su.se-shibboleth.sso.xml
index 9210c6a5..984002b9 100644
--- a/swamid-2.0/aktivera.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/aktivera.su.se-shibboleth.sso.xml
@@ -82,4 +82,8 @@ mqvHC5Aeiw==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aktivera.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aktivera.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
</md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>IT-avdelningen</md:SurName>
+ <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/confluence-test.it.su.se-shibboleth.sso.xml b/swamid-2.0/confluence-test.it.su.se-shibboleth.sso.xml
index b077ef0c..200d4270 100644
--- a/swamid-2.0/confluence-test.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/confluence-test.it.su.se-shibboleth.sso.xml
@@ -88,8 +88,7 @@ Uc3kqnPScQ==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://confluence-test.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
</md:SPSSODescriptor>
<md:ContactPerson contactType="technical">
- <md:GivenName>Christian</md:GivenName>
- <md:SurName>Biamont</md:SurName>
- <md:EmailAddress>christian.biamont@su.se</md:EmailAddress>
+ <md:SurName>IT-avdelningen</md:SurName>
+ <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/confluence.it.su.se-shibboleth.sso.xml b/swamid-2.0/confluence.it.su.se-shibboleth.sso.xml
index bab3135f..8ce9c11b 100644
--- a/swamid-2.0/confluence.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/confluence.it.su.se-shibboleth.sso.xml
@@ -85,4 +85,8 @@ qVpQDZd93P9YLQGNulZ1J4JdseJC6nAeXZY+iAiEBCyhx0+NQnlt+BZt7m76yNYi
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://confluence.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
</md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>IT-avdelningen</md:SurName>
+ <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/dspace.it.su.se.xml b/swamid-2.0/dspace.it.su.se.xml
deleted file mode 100644
index 66d762cd..00000000
--- a/swamid-2.0/dspace.it.su.se.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dspace.it.su.se">
- <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIIEsDCCA5igAwIBAgILAQAAAAABGAfclPAwDQYJKoZIhvcNAQEFBQAwXzELMAkG
-A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
-bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4
-MDIxMTA5Mzg1OVoXDTExMDIxMTA5Mzg1OVowXDELMAkGA1UEBhMCU0UxEjAQBgNV
-BAcTCVN0b2NraG9sbTEfMB0GA1UEChMWU3RvY2tob2xtcyB1bml2ZXJzaXRldDEY
-MBYGA1UEAxMPZHNwYWNlLml0LnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA44wISsGxXeYm5R3WerWQW0USE5xBKKltYPa+H1sL+SVMjl6KMABG
-PgdryRt5I++NXr/gLzyd4CXvkFoVhqEGoPNxLzlVvu0LI/Cmy2024rt/UsFnjl5t
-AoqXDDe4DsVYzT6qAR4lMuUP5LIw8ZwCgEj+3f9/J/1Mf3XHdiAstcJYcuHQlqHD
-i89QtedgEufNPqxSUga7U8nZ2reUz6GO8LnD0+pg7e5JFyJrmjoX9lyNbnjbJyX+
-7PpadkEEVtpgNIiUDwFQ8LKUHCJgwrN87vIEJ8/NR7cFGkf0RZO4qM5RX3GZThgX
-SuNWx8RkUQC3FiTcJ2mCecF73RCLeew/eQIDAQABo4IBbjCCAWowUAYDVR0gBEkw
-RzBFBgcqhkixPgEAMDowOAYIKwYBBQUHAgEWLGh0dHA6Ly93d3cuZ2xvYmFsc2ln
-bi5uZXQvcmVwb3NpdG9yeS9jcHMuY2ZtMA4GA1UdDwEB/wQEAwIFoDAfBgNVHSME
-GDAWgBRlZaM91zsRowoHJTfJQkpbdndQ4TAdBgNVHQ4EFgQUT/xPAfwXKFqS8DEW
-7h93jl4NzX0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5nbG9iYWxzaWdu
-Lm5ldC9lZHVjYXRpb25hbC5jcmwwTwYIKwYBBQUHAQEEQzBBMD8GCCsGAQUFBzAC
-hjNodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9lZHVjYXRpb25h
-bC5jcnQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBoGA1UdEQQTMBGC
-D2RzcGFjZS5pdC5zdS5zZTANBgkqhkiG9w0BAQUFAAOCAQEATd9qOAU/t9HMnCEY
-ufTL2ZIaGGt8LpPFI2poNpQQ6feZc5weJj2Z+pmVwmGX4tn6rgVUrCCgJ+DL65Xo
-8Oxj7DPl5GP+InII7tc0qb8dZX6ifQg6YtVqB5NX4HCehjHyG6pw16gyD4LuI7/G
-xPXYYgJwubkj5wpzhWyySpJvpitL4owINSmkguJo1ANmtVNascTohklWea5Cj+QH
-HSm+FKQEXFadM9rzMgNnR7yACmusHY1N6BOZ+WzdR73OBEEeoSACax5ZxH7hT0L/
-3YUqE4vXpU3HmFyvlLPs1UPSweFukJ3z7cVjOYjcyY/VcOV2NDLzY0Q+FdFmJ8w7
-3nGwlw==</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dspace.it.su.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">SU</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <Company>Stockholm university</Company>
- <GivenName>Jan</GivenName>
- <SurName>Johansson</SurName>
- <EmailAddress>leifj@it.su.se</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-2.0/jira-test.it.su.se-shibboleth.sso.xml b/swamid-2.0/jira-test.it.su.se-shibboleth.sso.xml
deleted file mode 100644
index 8449c4f4..00000000
--- a/swamid-2.0/jira-test.it.su.se-shibboleth.sso.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jira-test.it.su.se/Shibboleth.sso">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://jira-test.it.su.se/Shibboleth.sso/WAYF" index="1"/>
- <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://jira-test.it.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>jira-test-app1</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=jira-test-app1</ds:X509SubjectName>
- <ds:X509Certificate>MIIC8TCCAdmgAwIBAgIJALGCNK9nNxZDMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDmppcmEtdGVzdC1hcHAxMB4XDTEwMDgyNjEyMzI1MloXDTIwMDgyMzEyMzI1
-MlowGTEXMBUGA1UEAxMOamlyYS10ZXN0LWFwcDEwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDO4PWB2RnZzDupQuf0rCArOypgHuDgHZxndiGjGQz80v2N
-3eYm7nPaJC9pTMZX8p6zhYw1CPRn+Gi8u53gRZKT2i7+drIBBHZPc1spTYLM4sUZ
-NlLWpaGfGLkRFfbq518xL6HGRRVmMcZlSAERhht6AqOxbfgoK88dihomUEnX4ANE
-wLbBJPHg/tERZnqjlwLF+Ftbpk9+Gfq9X7A5FSKo7Za+j6Puk1EzzzxqdmN60Jlf
-F9/T9eQh7zw3pJUKemh7/wp4zkNwkp7iyOhq1389QqUDFx74hZOQjFB60lm0z/Vp
-HFgq0nlvHOGE2cpTcq6MmFT3r8RFpTzft00y2QENAgMBAAGjPDA6MBkGA1UdEQQS
-MBCCDmppcmEtdGVzdC1hcHAxMB0GA1UdDgQWBBSL7ZJAZ3DDSKpgRMGXwhP9aNbZ
-7zANBgkqhkiG9w0BAQUFAAOCAQEAJtgLdreha5LTqtjQgQuXu+2l3iT2tHS0oX0I
-ZKcL+r2e3eSBY/r2maj4rI2y727zBQblf+slQBe0mAbBV0EGycgUiibukAQpIAze
-2I2EgrGBuWkFJJPGi71fOwiZFBJpHO2fSHc5wxEhgipRJrC4Es4TjZ2d2VbpAIC/
-zVshHJgtGbOSJmyi3OOih0YSwWX6sGWPNHEb7jKmfadfLreVEG30bVUDtxKy5tZA
-I0v8p/Tq2BIBdK6rTSh/5u2UVR52qJLh8Y7/+HG8DukTaEHWtPmLbuR3NZ2mWgdn
-SKTYQay0lG3RNe7C3dTRD2RvZznqpkhRVqNqWJHGdfuP4uiVfQ==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>jira-test-app1</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=jira-test-app1</ds:X509SubjectName>
- <ds:X509Certificate>MIIC8TCCAdmgAwIBAgIJALGCNK9nNxZDMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDmppcmEtdGVzdC1hcHAxMB4XDTEwMDgyNjEyMzI1MloXDTIwMDgyMzEyMzI1
-MlowGTEXMBUGA1UEAxMOamlyYS10ZXN0LWFwcDEwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDO4PWB2RnZzDupQuf0rCArOypgHuDgHZxndiGjGQz80v2N
-3eYm7nPaJC9pTMZX8p6zhYw1CPRn+Gi8u53gRZKT2i7+drIBBHZPc1spTYLM4sUZ
-NlLWpaGfGLkRFfbq518xL6HGRRVmMcZlSAERhht6AqOxbfgoK88dihomUEnX4ANE
-wLbBJPHg/tERZnqjlwLF+Ftbpk9+Gfq9X7A5FSKo7Za+j6Puk1EzzzxqdmN60Jlf
-F9/T9eQh7zw3pJUKemh7/wp4zkNwkp7iyOhq1389QqUDFx74hZOQjFB60lm0z/Vp
-HFgq0nlvHOGE2cpTcq6MmFT3r8RFpTzft00y2QENAgMBAAGjPDA6MBkGA1UdEQQS
-MBCCDmppcmEtdGVzdC1hcHAxMB0GA1UdDgQWBBSL7ZJAZ3DDSKpgRMGXwhP9aNbZ
-7zANBgkqhkiG9w0BAQUFAAOCAQEAJtgLdreha5LTqtjQgQuXu+2l3iT2tHS0oX0I
-ZKcL+r2e3eSBY/r2maj4rI2y727zBQblf+slQBe0mAbBV0EGycgUiibukAQpIAze
-2I2EgrGBuWkFJJPGi71fOwiZFBJpHO2fSHc5wxEhgipRJrC4Es4TjZ2d2VbpAIC/
-zVshHJgtGbOSJmyi3OOih0YSwWX6sGWPNHEb7jKmfadfLreVEG30bVUDtxKy5tZA
-I0v8p/Tq2BIBdK6rTSh/5u2UVR52qJLh8Y7/+HG8DukTaEHWtPmLbuR3NZ2mWgdn
-SKTYQay0lG3RNe7C3dTRD2RvZznqpkhRVqNqWJHGdfuP4uiVfQ==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jira-test.it.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jira-test.it.su.se/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jira-test.it.su.se/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira-test.it.su.se/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira-test.it.su.se/Shibboleth.sso/SLO/Artifact"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jira-test.it.su.se/Shibboleth.sso/NIM/SOAP"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jira-test.it.su.se/Shibboleth.sso/NIM/Redirect"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira-test.it.su.se/Shibboleth.sso/NIM/POST"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira-test.it.su.se/Shibboleth.sso/NIM/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jira-test.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jira-test.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira-test.it.su.se/Shibboleth.sso/SAML2/POST" index="7"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jira-test.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira-test.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jira-test.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/jira.it.su.se-shibboleth.sso.xml b/swamid-2.0/jira.it.su.se-shibboleth.sso.xml
deleted file mode 100644
index e7527c99..00000000
--- a/swamid-2.0/jira.it.su.se-shibboleth.sso.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jira.it.su.se/Shibboleth.sso">
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
- <md:Extensions>
- <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://jira.it.su.se/Shibboleth.sso/WAYF" index="1"/>
- <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://jira.it.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
- </md:Extensions>
- <md:KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>jira-prod-app1</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=jira-prod-app1</ds:X509SubjectName>
- <ds:X509Certificate>MIIC8TCCAdmgAwIBAgIJAKO40oiNNokAMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDmppcmEtcHJvZC1hcHAxMB4XDTEwMDgyMzEwMDkwOFoXDTIwMDgyMDEwMDkw
-OFowGTEXMBUGA1UEAxMOamlyYS1wcm9kLWFwcDEwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDK1jIyprLcwZSC0tZxTwUerRm0igvgtt0WP5SeETSOtioh
-aBURLewSZ1Z+ea2WLaOIn6tW5jgKykVRcSMeaJ5JkW59KrzJo9+qJgJkd+izp4HF
-w3jSubP1Xo3OADW6Vf4LsH3FTIcFaGfWaAI0hfX2R+N4Llwwnci4l/0Yth65sZPH
-xufMzH7b/JJf1ZGHpVsYiX6VVz0QCZM5n4dLJUxwpdmR1IsyVmuABo9i130MlBjt
-Ot1aXWWf/XlhajMUkeuqFdEfpBqiBOSzV7nkRP7IAnxbzCE8z5hac5OAB+o8ueOu
-GztmeB/n+7lwOiN4MtqdoYlNpJRig42qIlwimtSDAgMBAAGjPDA6MBkGA1UdEQQS
-MBCCDmppcmEtcHJvZC1hcHAxMB0GA1UdDgQWBBQNbTCMshQI1Adr7JFGtx1Q8beG
-sTANBgkqhkiG9w0BAQUFAAOCAQEAN1YvkrZ45WXs56AUGcykmQ2m3YMjueiQP0Zt
-cyUJmJ6OMomhTA6eSoNvqv5h/g1dgVnF25wpsDhgwhJM1zgP6gArad02PfWrWVfx
-r/RrT2wGIYiqAnceTgtSJ7jbqKn2q2KZ6a4TKWiJDfYCPfA/ZLHgHanDCOaV8w12
-/JaEWVZldvm+MMLd9/pc8mr3TskEtunCs88mTT+xESt0alNJHnZX76ZPBQOVvzE9
-TSPz6L4JJM7OYEx92swJuDyjcGUWx6SHiumZtFh6t5FxlpIi2+bnV3iw9QP6M5dd
-FdYOem7PdnMNtROBFXZZ+vv1hrOfYBy7FrvBe49J9Yub+jaHWw==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>jira-prod-app1</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=jira-prod-app1</ds:X509SubjectName>
- <ds:X509Certificate>MIIC8TCCAdmgAwIBAgIJAKO40oiNNokAMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDmppcmEtcHJvZC1hcHAxMB4XDTEwMDgyMzEwMDkwOFoXDTIwMDgyMDEwMDkw
-OFowGTEXMBUGA1UEAxMOamlyYS1wcm9kLWFwcDEwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDK1jIyprLcwZSC0tZxTwUerRm0igvgtt0WP5SeETSOtioh
-aBURLewSZ1Z+ea2WLaOIn6tW5jgKykVRcSMeaJ5JkW59KrzJo9+qJgJkd+izp4HF
-w3jSubP1Xo3OADW6Vf4LsH3FTIcFaGfWaAI0hfX2R+N4Llwwnci4l/0Yth65sZPH
-xufMzH7b/JJf1ZGHpVsYiX6VVz0QCZM5n4dLJUxwpdmR1IsyVmuABo9i130MlBjt
-Ot1aXWWf/XlhajMUkeuqFdEfpBqiBOSzV7nkRP7IAnxbzCE8z5hac5OAB+o8ueOu
-GztmeB/n+7lwOiN4MtqdoYlNpJRig42qIlwimtSDAgMBAAGjPDA6MBkGA1UdEQQS
-MBCCDmppcmEtcHJvZC1hcHAxMB0GA1UdDgQWBBQNbTCMshQI1Adr7JFGtx1Q8beG
-sTANBgkqhkiG9w0BAQUFAAOCAQEAN1YvkrZ45WXs56AUGcykmQ2m3YMjueiQP0Zt
-cyUJmJ6OMomhTA6eSoNvqv5h/g1dgVnF25wpsDhgwhJM1zgP6gArad02PfWrWVfx
-r/RrT2wGIYiqAnceTgtSJ7jbqKn2q2KZ6a4TKWiJDfYCPfA/ZLHgHanDCOaV8w12
-/JaEWVZldvm+MMLd9/pc8mr3TskEtunCs88mTT+xESt0alNJHnZX76ZPBQOVvzE9
-TSPz6L4JJM7OYEx92swJuDyjcGUWx6SHiumZtFh6t5FxlpIi2+bnV3iw9QP6M5dd
-FdYOem7PdnMNtROBFXZZ+vv1hrOfYBy7FrvBe49J9Yub+jaHWw==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jira.it.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jira.it.su.se/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jira.it.su.se/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira.it.su.se/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira.it.su.se/Shibboleth.sso/SLO/Artifact"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jira.it.su.se/Shibboleth.sso/NIM/SOAP"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jira.it.su.se/Shibboleth.sso/NIM/Redirect"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira.it.su.se/Shibboleth.sso/NIM/POST"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira.it.su.se/Shibboleth.sso/NIM/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jira.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jira.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira.it.su.se/Shibboleth.sso/SAML2/POST" index="7"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jira.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jira.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.konstkaren.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.konstkaren.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
new file mode 100644
index 00000000..53d2be42
--- /dev/null
+++ b/swamid-2.0/medlem.konstkaren.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://medlem.konstkaren.se/saml/simplesamlwww/module.php/saml/sp/metadata.php/AgeraMedlem">
+ <md:Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Medlemsportalen</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Member Portal</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Medlemsportalen för Konstkåren</mdui:Description>
+ <mdui:Description xml:lang="en">Member Portal for Konstkåren</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDpjCCAo4CCQCprvbR6zSa9zANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEdMBsGA1UEAwwUbWVkbGVtLmtvbnN0a2FyZW4uc2UxHzAdBgkqhkiG9w0BCQEWEHdlYmJAbW9udGFuaWEuc2UwHhcNMTgwNzA0MTM0MjU5WhcNMjgwNzAzMTM0MjU5WjCBlDELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEdMBsGA1UEAwwUbWVkbGVtLmtvbnN0a2FyZW4uc2UxHzAdBgkqhkiG9w0BCQEWEHdlYmJAbW9udGFuaWEuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtJGPiSgNlQjOYLC6uzAUhFSv8cqHEKUYbgBRLenLDQzTLqqLiGg64qvl78QzcXYtg5hNaBgb23sweO0LF0pgpPi5N1h9d56vJ6B2gy+b1ZT4izPHFTobKh/W77D5+RIm0uZi09tUCfHLckZgSns7WniW5nplPUEA+C4g2vCbClae/8ApZiCdy9OK2//dW4WgAOJDbJ2WE+DJ3Q6qsideMK3JlpXNxDWLotQqPdYgUIj1dQKQBYwON9KMUdCu1GdIGgb9ura2NDwZeC0OHvQpS12N/Iw965PjJ8NO4CxSrUnOSpZ2fafZ1GCoyWLGyL/taleV2DoG4y+1VGiB1nYx1AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAF2ryv1lmbPse5e7SbtQfhP9iY/rzZHxYTB4VffyQSPi42EeEfCfGt4itYZe5NRPm8FnVNC5xd5dWPEL3dJvMalBMO5FnEfwzBIC9UEVUoOwcQtt3OLMhlKE784KLjBWFUCbHDnTR6qUBEWJ78eLwr6Dv2M/pvqH5EtG603vExDnLLIS2PAnWlDG0jDcaJiTRq1wH0pXyaqtj0Fx1S0ePPI0YJV59TqBY95f71L7FfegJNiDuN38KloQaTdWdDKM9h5oJrfCHiOBRLnSVs38g8M1gyMvLFxz2b/FUIJZhiDqmFOh0H3YtSeN/Y24yIz1F0dWRmWFNkgXkLJ7C9hSi6A=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDpjCCAo4CCQCprvbR6zSa9zANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEdMBsGA1UEAwwUbWVkbGVtLmtvbnN0a2FyZW4uc2UxHzAdBgkqhkiG9w0BCQEWEHdlYmJAbW9udGFuaWEuc2UwHhcNMTgwNzA0MTM0MjU5WhcNMjgwNzAzMTM0MjU5WjCBlDELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEdMBsGA1UEAwwUbWVkbGVtLmtvbnN0a2FyZW4uc2UxHzAdBgkqhkiG9w0BCQEWEHdlYmJAbW9udGFuaWEuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtJGPiSgNlQjOYLC6uzAUhFSv8cqHEKUYbgBRLenLDQzTLqqLiGg64qvl78QzcXYtg5hNaBgb23sweO0LF0pgpPi5N1h9d56vJ6B2gy+b1ZT4izPHFTobKh/W77D5+RIm0uZi09tUCfHLckZgSns7WniW5nplPUEA+C4g2vCbClae/8ApZiCdy9OK2//dW4WgAOJDbJ2WE+DJ3Q6qsideMK3JlpXNxDWLotQqPdYgUIj1dQKQBYwON9KMUdCu1GdIGgb9ura2NDwZeC0OHvQpS12N/Iw965PjJ8NO4CxSrUnOSpZ2fafZ1GCoyWLGyL/taleV2DoG4y+1VGiB1nYx1AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAF2ryv1lmbPse5e7SbtQfhP9iY/rzZHxYTB4VffyQSPi42EeEfCfGt4itYZe5NRPm8FnVNC5xd5dWPEL3dJvMalBMO5FnEfwzBIC9UEVUoOwcQtt3OLMhlKE784KLjBWFUCbHDnTR6qUBEWJ78eLwr6Dv2M/pvqH5EtG603vExDnLLIS2PAnWlDG0jDcaJiTRq1wH0pXyaqtj0Fx1S0ePPI0YJV59TqBY95f71L7FfegJNiDuN38KloQaTdWdDKM9h5oJrfCHiOBRLnSVs38g8M1gyMvLFxz2b/FUIJZhiDqmFOh0H3YtSeN/Y24yIz1F0dWRmWFNkgXkLJ7C9hSi6A=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://medlem.konstkaren.se/saml/simplesamlwww/module.php/saml/sp/saml2-logout.php/AgeraMedlem"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://medlem.konstkaren.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="0"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://medlem.konstkaren.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://medlem.konstkaren.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://medlem.konstkaren.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem/artifact" index="3"/>
+ </md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Johan</md:GivenName>
+ <md:SurName>Sölve</md:SurName>
+ <md:EmailAddress>webb@montania.se</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.saks.gu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.saks.gu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
new file mode 100644
index 00000000..d17c8de3
--- /dev/null
+++ b/swamid-2.0/medlem.saks.gu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://medlem.saks.gu.se/saml/simplesamlwww/module.php/saml/sp/metadata.php/AgeraMedlem">
+ <md:Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Medlemsportalen</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Member Portal</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Medlemsportalen för SAKS</mdui:Description>
+ <mdui:Description xml:lang="en">Member Portal for SAKS</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDoDCCAogCCQCsCozRqQII5TANBgkqhkiG9w0BAQsFADCBkTELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEaMBgGA1UEAwwRbWVkbGVtLnNha3MuZ3Uuc2UxHzAdBgkqhkiG9w0BCQEWEHdlYmJAbW9udGFuaWEuc2UwHhcNMTgwNzA0MTMzNzUyWhcNMjgwNzAzMTMzNzUyWjCBkTELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEaMBgGA1UEAwwRbWVkbGVtLnNha3MuZ3Uuc2UxHzAdBgkqhkiG9w0BCQEWEHdlYmJAbW9udGFuaWEuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOtpxt8zrxK9uEbSPQyGtuqI+/BUG2gAHKW6oasYKPn0p8II0IPd9S6Kb+Kn1uZ3ajk8HBWxAV6KqIpvpiJbaYO1S+K1JRWfpf9A7hdz8Wb9lTn6CcCXa5lftoyekDt65g0/hf1GenLjJj3C/2A3e2y1McU4O5/ODKCLLuSBLXf1upDPIU+NhcG+HXIr9M6ZeDvWF/FsX4HlNHungp3/1o/i6GH20j8JD+YjE6wG3jGNqBcWsnHYcSegBwq3C1g6N7R5hewpa6EzCpjCPSsKBwNP6Le/1yXywsCOeEYbpYd0YFzugmmnx0vMw/VuCfHQ3UkWp3p3AtfL+wpSEoNuiPAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAKQj9iPSrQXgYjOsQbiMkDQoS/+5OUqEMSsshUIngLWki3R1ywfRt9oaHD7o7INMjQM+izFj26F8vtcQqmwm1HS3zdTlhF5p3kvw84jogaS0LsF/lBjjynEXbQK7FifGwakP3ExcZtE/K84l1FWvv6QaMbNnbdHd5zdxsiT4kTJy1O6wHFYeDLF6GmI8KjKTAP7eLQ7GhGna2fIiNEIV8GhDMhIB3Mi50tR4Se9uK7MduFgFZgsoJ1SEmKji+zM3vFlhmYUjtZoQ10MgOsHWdaYmhlUCBaKmtbMMSnfBL7wBkfjdhPDTk+EWmCNT+EugFF3AF1XCSeAGypuztwlwhXg=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDoDCCAogCCQCsCozRqQII5TANBgkqhkiG9w0BAQsFADCBkTELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEaMBgGA1UEAwwRbWVkbGVtLnNha3MuZ3Uuc2UxHzAdBgkqhkiG9w0BCQEWEHdlYmJAbW9udGFuaWEuc2UwHhcNMTgwNzA0MTMzNzUyWhcNMjgwNzAzMTMzNzUyWjCBkTELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEaMBgGA1UEAwwRbWVkbGVtLnNha3MuZ3Uuc2UxHzAdBgkqhkiG9w0BCQEWEHdlYmJAbW9udGFuaWEuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOtpxt8zrxK9uEbSPQyGtuqI+/BUG2gAHKW6oasYKPn0p8II0IPd9S6Kb+Kn1uZ3ajk8HBWxAV6KqIpvpiJbaYO1S+K1JRWfpf9A7hdz8Wb9lTn6CcCXa5lftoyekDt65g0/hf1GenLjJj3C/2A3e2y1McU4O5/ODKCLLuSBLXf1upDPIU+NhcG+HXIr9M6ZeDvWF/FsX4HlNHungp3/1o/i6GH20j8JD+YjE6wG3jGNqBcWsnHYcSegBwq3C1g6N7R5hewpa6EzCpjCPSsKBwNP6Le/1yXywsCOeEYbpYd0YFzugmmnx0vMw/VuCfHQ3UkWp3p3AtfL+wpSEoNuiPAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAKQj9iPSrQXgYjOsQbiMkDQoS/+5OUqEMSsshUIngLWki3R1ywfRt9oaHD7o7INMjQM+izFj26F8vtcQqmwm1HS3zdTlhF5p3kvw84jogaS0LsF/lBjjynEXbQK7FifGwakP3ExcZtE/K84l1FWvv6QaMbNnbdHd5zdxsiT4kTJy1O6wHFYeDLF6GmI8KjKTAP7eLQ7GhGna2fIiNEIV8GhDMhIB3Mi50tR4Se9uK7MduFgFZgsoJ1SEmKji+zM3vFlhmYUjtZoQ10MgOsHWdaYmhlUCBaKmtbMMSnfBL7wBkfjdhPDTk+EWmCNT+EugFF3AF1XCSeAGypuztwlwhXg=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://medlem.saks.gu.se/saml/simplesamlwww/module.php/saml/sp/saml2-logout.php/AgeraMedlem"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://medlem.saks.gu.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="0"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://medlem.saks.gu.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://medlem.saks.gu.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://medlem.saks.gu.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem/artifact" index="3"/>
+ </md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Johan</md:GivenName>
+ <md:SurName>Sölve</md:SurName>
+ <md:EmailAddress>webb@montania.se</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml b/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml
index ca55784b..53001f79 100644
--- a/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml
@@ -66,4 +66,8 @@ snJSQ/YlB4ldg4xiZo0aKDvUVZqlhkCcwEKNcNrwiXxMtkx0ekUmiHv5SA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mondo-test.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mondo-test.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
</md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>IT-avdelningen</md:SurName>
+ <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/mondo.su.se-shibboleth.sso.xml b/swamid-2.0/mondo.su.se-shibboleth.sso.xml
index 7f8174bd..6e362e44 100644
--- a/swamid-2.0/mondo.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/mondo.su.se-shibboleth.sso.xml
@@ -85,4 +85,8 @@ z/E5dFvlHgjgE2ON6BQ/LtWQP5FMV/ZXjsRSINnc12T9AQV6Q4P51Q==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mondo.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mondo.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
</md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>IT-avdelningen</md:SurName>
+ <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/nfg.su.se-shibboleth.sso.xml b/swamid-2.0/nfg.su.se-shibboleth.sso.xml
index 7ecf1f18..ccadb552 100644
--- a/swamid-2.0/nfg.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/nfg.su.se-shibboleth.sso.xml
@@ -86,4 +86,8 @@ iEBP9GjIK/5IW3dJF+RPAqpatMcUUNM+lqcpMabxM5o=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nfg.su.se/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nfg.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>IT-avdelningen</md:SurName>
+ <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/play.bth.se.xml b/swamid-2.0/play.bth.se.xml
index 30a7b033..20a1dbe6 100644
--- a/swamid-2.0/play.bth.se.xml
+++ b/swamid-2.0/play.bth.se.xml
@@ -3,8 +3,7 @@
<md:Extensions>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
<samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
</samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
@@ -20,14 +19,14 @@
<md:KeyDescriptor use="signing">
<ds:KeyInfo>
<ds:X509Data>
- <ds:X509Certificate>MIID4TCCAsmgAwIBAgIJANYuxTUyYl49MA0GCSqGSIb3DQEBCwUAMIGGMQswCQYDVQQGEwJTRTERMA8GA1UECAwIQmxla2luZ2UxEzARBgNVBAcMCkthcmxza3JvbmExDDAKBgNVBAoMA0JUSDENMAsGA1UECwwER0lUUzEUMBIGA1UEAwwLcGxheS5idGguc2UxHDAaBgkqhkiG9w0BCQEWDXNvcC5pdEBidGguc2UwHhcNMTYwMjAzMTEyNzA2WhcNMjYwMjAyMTEyNzA2WjCBhjELMAkGA1UEBhMCU0UxETAPBgNVBAgMCEJsZWtpbmdlMRMwEQYDVQQHDApLYXJsc2tyb25hMQwwCgYDVQQKDANCVEgxDTALBgNVBAsMBEdJVFMxFDASBgNVBAMMC3BsYXkuYnRoLnNlMRwwGgYJKoZIhvcNAQkBFg1zb3AuaXRAYnRoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArox0Yil1CwvPy2Ugw27a7H1++U5FCYpl8rMyhkaOdqANQ56R2XoP+M78Xx4Zooj0ftHBgUhx2RwgqxfEs7shZ1NlzOaItPShlu4dCmNdcUBW/sl6dmUANYPPIjONMQiEtsTajmgXP88/9yMm/BlPyvDaY9lGQz4z8FcBQa7aOZ/aYjpAGj7x5bWvJ3174JF4idwBMIuP1bkvNedxn+1Uf3umHYP1XxLeWJGt3Mgx8JC+Ve+3Qz8tuf2a5xeiGgh0U7mMUE0tX7+MXiCPsXauUHC7MU6pB7vKWk79Q3jKdmP0qv9Tty/sICv0QdfRYd1TdMyMD+FYMeVJlJSquBcpbQIDAQABo1AwTjAdBgNVHQ4EFgQUBhWDwptdljrj9Y52d9divoFLF/IwHwYDVR0jBBgwFoAUBhWDwptdljrj9Y52d9divoFLF/IwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAFSjaXmS+aPCZ3vhI5St7WbKW+zYGQudRi/G2cn6bjt4QM1zb9gEDQ+RBQs8FTGFApq2h7Lb67J9ozrIGIxGUf+Jpuc+003oCv6xwHL3tnmVgoZp2m0ZdL8SIYwQA+z7UluY08a+lNHIDDw10EPVJKtR/9k5CpwG8nlkQt7tD+nblo9xPhj00cXokQRKtAM46zWFuPwlgIVpo7r0xuXlHF4UCjyCv8LqWtw+DPzhKA3FZ5AccYTMkvzKHhCusAn010l1kFVYCc7u+p7i0vAD4Z3uoXODpxner69kowOtX/DwQm1hdn1L9aTObRxv6uyDZqUlOiRFXIWt7BXgj3Zzw9Q==</ds:X509Certificate>
+ <ds:X509Certificate>MIICMjCCAZugAwIBAgIUSNmSXuKOmQgtimtnumPU1gAM/PYwDQYJKoZIhvcNAQEFBQAwPTEpMCcGA1UEAwwgMzM3LW1lZGlhc3BhY2Uua2FsdHVyYS5ub3JkdS5uZXQxEDAOBgNVBAoMB2thbHR1cmEwHhcNMTgwNjI1MDkyMTE2WhcNMTkwNjI1MDkyMTE2WjA9MSkwJwYDVQQDDCAzMzctbWVkaWFzcGFjZS5rYWx0dXJhLm5vcmR1Lm5ldDEQMA4GA1UECgwHa2FsdHVyYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAu0jIT398Vd2YsyF9LUzYZy5eJlpo3UIdNeGOWUcLDfC6ixe6Z1DLjYHYpsld3zjAhO1+V9UuRaXAwlBf+DbOZFudtNa7gq7+Xh3zUOVb+9wIU/sw1lgi6bJ2xX7k9axM9yAUmquCYTrsP0l+OLSLh0tvKhs9RwPMkCDu90Id3qUCAwEAAaMvMC0wKwYDVR0RBCQwIoIgMzM3LW1lZGlhc3BhY2Uua2FsdHVyYS5ub3JkdS5uZXQwDQYJKoZIhvcNAQEFBQADgYEAeJ1744GzQ+UeeZZljO2yhEqBZIUXvdAQZXVGYcGEH8VVv6uXFGntgKqA8kqG5/KdlRz8wVuaAwlcnj7QEuEoWMv1V1q5laFqJApu5vguZruEoiRNUEmpGTG9LDE1w/4or4K06GqJCJePJnB5mesLHwi8KgFPXmzGu2O2Vs2x1eY=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
<md:KeyDescriptor use="encryption">
<ds:KeyInfo>
<ds:X509Data>
- <ds:X509Certificate>MIID4TCCAsmgAwIBAgIJANYuxTUyYl49MA0GCSqGSIb3DQEBCwUAMIGGMQswCQYDVQQGEwJTRTERMA8GA1UECAwIQmxla2luZ2UxEzARBgNVBAcMCkthcmxza3JvbmExDDAKBgNVBAoMA0JUSDENMAsGA1UECwwER0lUUzEUMBIGA1UEAwwLcGxheS5idGguc2UxHDAaBgkqhkiG9w0BCQEWDXNvcC5pdEBidGguc2UwHhcNMTYwMjAzMTEyNzA2WhcNMjYwMjAyMTEyNzA2WjCBhjELMAkGA1UEBhMCU0UxETAPBgNVBAgMCEJsZWtpbmdlMRMwEQYDVQQHDApLYXJsc2tyb25hMQwwCgYDVQQKDANCVEgxDTALBgNVBAsMBEdJVFMxFDASBgNVBAMMC3BsYXkuYnRoLnNlMRwwGgYJKoZIhvcNAQkBFg1zb3AuaXRAYnRoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArox0Yil1CwvPy2Ugw27a7H1++U5FCYpl8rMyhkaOdqANQ56R2XoP+M78Xx4Zooj0ftHBgUhx2RwgqxfEs7shZ1NlzOaItPShlu4dCmNdcUBW/sl6dmUANYPPIjONMQiEtsTajmgXP88/9yMm/BlPyvDaY9lGQz4z8FcBQa7aOZ/aYjpAGj7x5bWvJ3174JF4idwBMIuP1bkvNedxn+1Uf3umHYP1XxLeWJGt3Mgx8JC+Ve+3Qz8tuf2a5xeiGgh0U7mMUE0tX7+MXiCPsXauUHC7MU6pB7vKWk79Q3jKdmP0qv9Tty/sICv0QdfRYd1TdMyMD+FYMeVJlJSquBcpbQIDAQABo1AwTjAdBgNVHQ4EFgQUBhWDwptdljrj9Y52d9divoFLF/IwHwYDVR0jBBgwFoAUBhWDwptdljrj9Y52d9divoFLF/IwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAFSjaXmS+aPCZ3vhI5St7WbKW+zYGQudRi/G2cn6bjt4QM1zb9gEDQ+RBQs8FTGFApq2h7Lb67J9ozrIGIxGUf+Jpuc+003oCv6xwHL3tnmVgoZp2m0ZdL8SIYwQA+z7UluY08a+lNHIDDw10EPVJKtR/9k5CpwG8nlkQt7tD+nblo9xPhj00cXokQRKtAM46zWFuPwlgIVpo7r0xuXlHF4UCjyCv8LqWtw+DPzhKA3FZ5AccYTMkvzKHhCusAn010l1kFVYCc7u+p7i0vAD4Z3uoXODpxner69kowOtX/DwQm1hdn1L9aTObRxv6uyDZqUlOiRFXIWt7BXgj3Zzw9Q==</ds:X509Certificate>
+ <ds:X509Certificate>MIICMjCCAZugAwIBAgIUSNmSXuKOmQgtimtnumPU1gAM/PYwDQYJKoZIhvcNAQEFBQAwPTEpMCcGA1UEAwwgMzM3LW1lZGlhc3BhY2Uua2FsdHVyYS5ub3JkdS5uZXQxEDAOBgNVBAoMB2thbHR1cmEwHhcNMTgwNjI1MDkyMTE2WhcNMTkwNjI1MDkyMTE2WjA9MSkwJwYDVQQDDCAzMzctbWVkaWFzcGFjZS5rYWx0dXJhLm5vcmR1Lm5ldDEQMA4GA1UECgwHa2FsdHVyYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAu0jIT398Vd2YsyF9LUzYZy5eJlpo3UIdNeGOWUcLDfC6ixe6Z1DLjYHYpsld3zjAhO1+V9UuRaXAwlBf+DbOZFudtNa7gq7+Xh3zUOVb+9wIU/sw1lgi6bJ2xX7k9axM9yAUmquCYTrsP0l+OLSLh0tvKhs9RwPMkCDu90Id3qUCAwEAAaMvMC0wKwYDVR0RBCQwIoIgMzM3LW1lZGlhc3BhY2Uua2FsdHVyYS5ub3JkdS5uZXQwDQYJKoZIhvcNAQEFBQADgYEAeJ1744GzQ+UeeZZljO2yhEqBZIUXvdAQZXVGYcGEH8VVv6uXFGntgKqA8kqG5/KdlRz8wVuaAwlcnj7QEuEoWMv1V1q5laFqJApu5vguZruEoiRNUEmpGTG9LDE1w/4or4K06GqJCJePJnB5mesLHwi8KgFPXmzGu2O2Vs2x1eY=</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
@@ -41,7 +40,8 @@
<md:OrganizationURL xml:lang="en">https://play.bth.se</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
- <md:SurName>Administrator</md:SurName>
- <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
+ <md:GivenName>NORDUnet</md:GivenName>
+ <md:SurName>SAML Admin</md:SurName>
+ <md:EmailAddress>saml@media.nordu.net</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/public.it.secure.su.se-shibboleth.xml b/swamid-2.0/public.it.secure.su.se-shibboleth.xml
deleted file mode 100644
index f5eb39e0..00000000
--- a/swamid-2.0/public.it.secure.su.se-shibboleth.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://public.it.secure.su.se/shibboleth">
- <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
- <KeyDescriptor use="signing">
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:X509Data>
- <ds:X509Certificate>MIIEezCCA2OgAwIBAgIRAIkN3dNaPPpybQqwD4EtF8cwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0wOTExMTgwMDAwMDBaFw0xMjExMTcyMzU5NTlaME8xCzAJBgNV
-BAYTAlNFMR8wHQYDVQQKExZTdG9ja2hvbG1zIHVuaXZlcnNpdGV0MR8wHQYDVQQD
-ExZwdWJsaWMuaXQuc2VjdXJlLnN1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA1KmDH3snkoJ/V918DPqYEQC33ps0LE/LPd6wm1FVMPm30MfeWJ/1
-jl1pePjl4Bw/yGtPdbWRXLHgSzBJz3VtG7llWdynm7oJU67gkRxySKN/Nt5fsHqV
-9jYflaWHZydlwhKwluUBvj23w6oNZVLrpc0rojzNtw9X1B2o+FyxuZD42cyGuNEi
-/AJP/tWwmnRY6TgLwqhfAHqopoF6VKbu52E6xtRcD/3XolVvbk/Hjpvulxfwvh2z
-+fuqgN+I4yHls0M7iMcqLHllalAk1who/1wW6VZbZ70AyDzEBCstQ6xub0zk8B2x
-Dc9/avEir9dkRStnwOrDQy8j6I3CxsqMmQIDAQABo4IBaTCCAWUwHwYDVR0jBBgw
-FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFIuqOIxBDa2bI/0AGqFa
-PlMUfZJbMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoG
-A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
-U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
-dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
-dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCEGA1UdEQQaMBiCFnB1YmxpYy5pdC5z
-ZWN1cmUuc3Uuc2UwDQYJKoZIhvcNAQEFBQADggEBAANer2ZFt47Izep8mZFjQzzQ
-zmJGSAtETMQ4gvSo9lFFiiijwevbRIfSEn2MH/wDAWaXQ9cPWMh/CklDcco82en1
-o8SmNJVKP6LIX5YQerxBsoX9quejqfEUHB5UboZrVzkte9vvET/0E4ZwZkukJAeY
-m6qFJYEF9/YbtqspBfobpPmYZi/49563GZOJrB6B2ufQZSJvh4MW/ArbaIccxbrS
-ZOyBYB9wSPfBk4E4buU7eZgCBckY2CHo+j54Zpv7nGMDqEeY94e/OF3UVGhvtOy4
-tCsXA4uQ/OvmIcURnN6u+RAoyaxMDMF9uOBLcu5+p0LgXyVdFr50VN8FRZvk5qk=</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://public.it.secure.su.se/shibboleth/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
- </SPSSODescriptor>
- <Organization>
- <OrganizationName xml:lang="en">SU</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <Company>Stockholm university</Company>
- <GivenName>Leif</GivenName>
- <SurName>Johansson</SurName>
- <EmailAddress>leifj@it.su.se</EmailAddress>
- </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-2.0/sp-test.it.su.se-shibboleth.sso.xml b/swamid-2.0/sp-test.it.su.se-shibboleth.sso.xml
index 1889db83..eb05f6db 100644
--- a/swamid-2.0/sp-test.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/sp-test.it.su.se-shibboleth.sso.xml
@@ -74,4 +74,8 @@ ZZ++pFd6COZSWkvz3O0kbDXKOANgr4ZylWIxYz+Fj1y8i5PN5C85ojDAIvzZ93J5
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp-test.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
</md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>IT-avdelningen</md:SurName>
+ <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/vfu-dev.su.se-shibboleth.sso.xml b/swamid-2.0/vfu-dev.su.se-shibboleth.sso.xml
deleted file mode 100644
index cb01011e..00000000
--- a/swamid-2.0/vfu-dev.su.se-shibboleth.sso.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vfu-dev.su.se/Shibboleth.sso">
- <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"/>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
- </samla:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.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://vfu-dev.su.se/Shibboleth.sso/WAYF"/>
- <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://vfu-dev.su.se/Shibboleth.sso/WAYF" index="1"/>
- <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://vfu-dev.su.se/Shibboleth.sso/WAYF/wavelan"/>
- <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://vfu-dev.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
- <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://vfu-dev.su.se/Shibboleth.sso/WAYF/idp.it.su.se"/>
- <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://vfu-dev.su.se/Shibboleth.sso/SWAMID"/>
- <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://vfu-dev.su.se/Shibboleth.sso/SWAMID" index="3"/>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">VFU-Portalen utvecklingsmiljö (ny)</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">VFU-Portalen development environment (new)</mdui:DisplayName>
- <mdui:Description xml:lang="sv">VFU-portalen utvecklingsmiljlö, Stockholms univsersitet</mdui:Description>
- <mdui:Description xml:lang="en">VFU-portalen development environment, Stockholm University</mdui:Description>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>vfu-dev-app02</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=vfu-dev-app02</ds:X509SubjectName>
- <ds:X509Certificate>MIIC7jCCAdagAwIBAgIJAO8u0Q/9dqXwMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDXZmdS1kZXYtYXBwMDIwHhcNMTYwNjEwMTE1ODI2WhcNMjYwNjA4MTE1ODI2
-WjAYMRYwFAYDVQQDEw12ZnUtZGV2LWFwcDAyMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAw4Dnlg/CVVC4dBa9KBWnonpPDuAwY/mIXrirKBuGFj81FrVt
-EV/i5WNWmUr1poEJTIbgzR/SVxw15RQv5MCuZPTsshVeCainbxV1z+LMxCZhdIT+
-KACnywjHfCxXOLe5tCX3RjcS0pU8AE2rLoJSa/sAL+asGcZAJtoszHcaYhmlkAq5
-OA36+rjadY4qseIyRCHGbT+yL+l2VMaM8B+b15EjRLBAwjQNkefc79Y69LL8q176
-ZkRTOSbSt/CPR3afiUqvGd/nKK8qGO2yLT4SdVbQV7GPqVK4Vh+D3eEcFfaghg38
-qmjPTkN6/RBNKDt8dGH4PdtQcApks0JSN3CWnQIDAQABozswOTAYBgNVHREEETAP
-gg12ZnUtZGV2LWFwcDAyMB0GA1UdDgQWBBTHEuqtFuCP1mT2TmhSSfZyD7NJ/jAN
-BgkqhkiG9w0BAQUFAAOCAQEANHaln5e7lSQ4NaAGa5kQLbxVuyr/q1G9BMZajC5g
-j0zbnza3rdnDlE9jNz0H4d2I4rVSiOk8NraXlwQ6IAX2JpRbsX0FaenqXWQPFNNX
-tKwbCHeriq2PCaXn/GIVxdDWvnlfM3UGWoJMVDbMJ54VIpaCL7s57jvrLhYbOTxZ
-2ZEzI1x2r4ID8t59ijlt+bphDyXozortYlvQ0saHvQjv2i4Dg7MIFn4VgFDelwre
-jdo1HNKdA2/vohVkFDf2+WoYHu9ryy+d1mxomiuoTP+oYj2coHNmKGovUNMd9rno
-JvENN2ybRiypi6DmJo2S0r+iQWVkyJo7fXiFCs4nz9bZUA==
-</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://vfu-dev.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vfu-dev.su.se/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vfu-dev.su.se/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vfu-dev.su.se/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu-dev.su.se/Shibboleth.sso/SLO/Artifact"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vfu-dev.su.se/Shibboleth.sso/NIM/SOAP"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vfu-dev.su.se/Shibboleth.sso/NIM/Redirect"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vfu-dev.su.se/Shibboleth.sso/NIM/POST"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu-dev.su.se/Shibboleth.sso/NIM/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vfu-dev.su.se/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vfu-dev.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vfu-dev.su.se/Shibboleth.sso/SAML2/POST" index="7"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu-dev.su.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfu-dev.su.se/Shibboleth.sso/SAML2/ECP" index="9"/>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/vfu-gemdev.it.su.se-shibboleth.sso.xml b/swamid-2.0/vfu-gemdev.it.su.se-shibboleth.sso.xml
index 707ab0e5..67f7b9a8 100644
--- a/swamid-2.0/vfu-gemdev.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/vfu-gemdev.it.su.se-shibboleth.sso.xml
@@ -87,4 +87,8 @@ UaFs0ulwkp2uVhPCL1SV0KFnIWeKpY9rkcacQlpaDxwK5TKUnmw3zA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu-gemdev.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfu-gemdev.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
</md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>IT-avdelningen</md:SurName>
+ <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/vfu-portfolio-dev.su.se-Shibboleth.sso.xml b/swamid-2.0/vfu-portfolio-dev.su.se-Shibboleth.sso.xml
deleted file mode 100644
index 1be06903..00000000
--- a/swamid-2.0/vfu-portfolio-dev.su.se-Shibboleth.sso.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?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://vfu-portfolio-dev.su.se/Shibboleth.sso">
- <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"/>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
- </samla:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.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://vfu-portfolio-dev.su.se/Shibboleth.sso/WAYF"/>
- <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://vfu-portfolio-dev.su.se/Shibboleth.sso/WAYF" index="1"/>
- <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://vfu-portfolio-dev.su.se/Shibboleth.sso/WAYF/wavelan"/>
- <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://vfu-portfolio-dev.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
- <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://vfu-portfolio-dev.su.se/Shibboleth.sso/WAYF/idp.it.su.se"/>
- <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://vfu-portfolio-dev.su.se/Shibboleth.sso/SWAMID"/>
- <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://vfu-portfolio-dev.su.se/Shibboleth.sso/SWAMID" index="3"/>
- <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://vfu-portfolio-dev.su.se/Shibboleth.sso/WAYF/guest-idp.it.su.se"/>
- <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://vfu-portfolio-dev.su.se/Shibboleth.sso/WAYF/skolfederation-trial-ds"/>
- <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://vfu-portfolio-dev.su.se/Shibboleth.sso/WAYF/skolfederation-trial-ds" index="4"/>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="en">VFU-portfolio development environment</mdui:DisplayName>
- <mdui:DisplayName xml:lang="sv">VFU-portfolio utvecklingsmiljlö</mdui:DisplayName>
- <mdui:Description xml:lang="en">VFU-portfolio development environment, Stockholm University</mdui:Description>
- <mdui:Description xml:lang="sv">VFU-portfolio utvecklingsmiljlö, Stockholms univsersitet</mdui:Description>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>vfuportfolio-dev-app01</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=vfuportfolio-dev-app01</ds:X509SubjectName>
- <ds:X509Certificate>MIIDCTCCAfGgAwIBAgIJAIpnqZkjKutaMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFnZmdXBvcnRmb2xpby1kZXYtYXBwMDEwHhcNMTUxMDI4MTEzNDM1WhcNMjUx
-MDI1MTEzNDM1WjAhMR8wHQYDVQQDExZ2ZnVwb3J0Zm9saW8tZGV2LWFwcDAxMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyqtR4ajOqkqjqVBkiwxeHdbz
-Aw48lzKxVsKeGCMhnJJBbx9GLM2B9ZmmrlQEsbU7e7HUl0vVO8UwCoekLu+Wx9UY
-c/P0zsSLVH3xK8iJyQOObaoyMOrjwzKGytuAskojxr6b63GGS1B0z9e2P5tU1+JM
-tN61YtV5D6EgC8j1rRI93G6KCmUIbJelFALwaqCSSvxBfMOAw4jkW9mdOr7QeE28
-Bl/RH+EF4lGA8aS5oALFFme+VBMXtcwA2iSFRg7/g7KF4pUF5qRvvus37T5E+yCm
-QuM98fKvx5B27RTOy6SpKTYEzjNQV0im9x1NOp5qE1Rhf9UkWr+ywinSIk5FLwID
-AQABo0QwQjAhBgNVHREEGjAYghZ2ZnVwb3J0Zm9saW8tZGV2LWFwcDAxMB0GA1Ud
-DgQWBBQ5cBe7i06BVSpUeAChZXD4RvL9GDANBgkqhkiG9w0BAQUFAAOCAQEAK0s9
-x9TH1kkJ4lTzLo9kPzBwAgBURAB3yeHmVvH1jlAL55/Kd3qDAvoKKoaWoT+XR7oK
-bcc/9Mfd+c0zWbRaAqag2f53mfdTMU5z5Y919QTaRagYlQmbf7J5aXu95d7PUiCs
-VnwaC9gspgB3nvRKGjPwi9fpDD8dm2V/H73XJ/gEgGF0r8raIZ/cuu2Z8fJST+YW
-kfn2egpShxYbM7RcP3zi25R77Wwtr0ejZGPOP7hxoKok+iaIu99w62Krz7v6V2ef
-H6Kc4jFZ/hhFnKHQp8NlxDR99dktJ0dJJaVl127OX5bwImTA6PrkLGjfisOPKtyO
-uyXS7c6QGBaTTZ+M4g==
-</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://vfu-portfolio-dev.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/SLO/Artifact"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/NIM/SOAP"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/NIM/Redirect"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/NIM/POST"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/NIM/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/SAML2/POST" index="7"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/SAML2/ECP" index="9"/>
- </md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Sima</md:GivenName>
- <md:SurName>Skymberg</md:SurName>
- <md:EmailAddress>mailto:helpdesk@it.su.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/vfu-portfolio.su.se-shibboleth.sso.xml b/swamid-2.0/vfu-portfolio.su.se-shibboleth.sso.xml
deleted file mode 100644
index 660ebb09..00000000
--- a/swamid-2.0/vfu-portfolio.su.se-shibboleth.sso.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vfu-portfolio.su.se/Shibboleth.sso">
- <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"/>
- <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
- <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
- <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
- </samla:Attribute>
- </mdattr:EntityAttributes>
- </md:Extensions>
- <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.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://vfu-portfolio.su.se/Shibboleth.sso/WAYF"/>
- <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://vfu-portfolio.su.se/Shibboleth.sso/WAYF" index="1"/>
- <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://vfu-portfolio.su.se/Shibboleth.sso/WAYF/wavelan"/>
- <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://vfu-portfolio.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
- <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://vfu-portfolio.su.se/Shibboleth.sso/WAYF/idp.it.su.se"/>
- <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://vfu-portfolio.su.se/Shibboleth.sso/SWAMID"/>
- <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://vfu-portfolio.su.se/Shibboleth.sso/SWAMID" index="3"/>
- <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://vfu-portfolio.su.se/Shibboleth.sso/WAYF/guest-idp.it.su.se"/>
- <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://vfu-portfolio.su.se/Shibboleth.sso/WAYF/eduid.se"/>
- <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://vfu-portfolio.su.se/Shibboleth.sso/WAYF/skolfederation-trial-ds"/>
- <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://vfu-portfolio.su.se/Shibboleth.sso/WAYF/skolfederation-trial-ds" index="4"/>
- <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">VFU-portfolio</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">VFU-portfolio</mdui:DisplayName>
- <mdui:Description xml:lang="sv">VFU-portfolio prod miljlö, Stockholms univsersitet</mdui:Description>
- <mdui:Description xml:lang="en">VFU-portfolio production environment, Stockholm University</mdui:Description>
- </mdui:UIInfo>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>vfuportfolio-prod-app01</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=vfuportfolio-prod-app01</ds:X509SubjectName>
- <ds:X509Certificate>MIIDDDCCAfSgAwIBAgIJAKXvIM36zSAIMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF3ZmdXBvcnRmb2xpby1wcm9kLWFwcDAxMB4XDTE2MDcxNDE0MzY1MFoXDTI2
-MDcxMjE0MzY1MFowIjEgMB4GA1UEAxMXdmZ1cG9ydGZvbGlvLXByb2QtYXBwMDEw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLZqZci0cwswmw4JvDAiUY
-QVXnnDppo+L4lKHmWM5gHg0W5EoKjemDNhftf5iNfePnyHESOVu3KZEp3J4QGruZ
-s4HV8faRPTB6rMhbuKdAN7S82sA7Mcw5hB9QBvqUvcY4Ixvlx8pDQFJUmnLzloQ4
-/NFnCRUS0GWzd6OETka7DgBA504T/b4JFdrJRn3+NgO0PiIzplYLRf75RTrefsL5
-wbqJ0DokEWZvvxsG3OrkaS0Pv8UgEBTUelkMc6GiUb0yX1R0/+5Ch6KGI7PHmtiB
-/Fz39tMvBiJgJ6Jr0UHBxLPC3DoMzF20JajkK8Z9FOSRVokMV74bfedYUTI3J0Aj
-AgMBAAGjRTBDMCIGA1UdEQQbMBmCF3ZmdXBvcnRmb2xpby1wcm9kLWFwcDAxMB0G
-A1UdDgQWBBQ2TIg3V+et+d+vAeEaEzlgkCcVtTANBgkqhkiG9w0BAQUFAAOCAQEA
-HGQvwqzkN4W4uxDxXW/oEtCb9NG40q2TevX0Kd8tBNCQ31jSjWDy6cr7xNVg4blb
-7QLIdMzj8wuS+Tl+UsSOmJQf4soAba134QlKpP1bEqr9Ezxu0WOXSW/O2ghW4fvV
-/PGLjYhLMGUu1lxOU6KVmKTBm9hvAcNj0RNkFpMf1AKs3WYVnE5NfF3YLQS5gS4F
-j6SmJt/KW18bWCRrYtZDQssA1V4rJD1LIveWFC2AK71jtXT9swMTdMt2eeFv3uyu
-radN68cLGo7nwh/2fV/WYcNxfLoCmYJyB6w2orbvdRy0Tl+g600udpo6ru+Fa/S1
-evI4v5y4DQozvVi492RnnA==
-</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://vfu-portfolio.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vfu-portfolio.su.se/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vfu-portfolio.su.se/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vfu-portfolio.su.se/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu-portfolio.su.se/Shibboleth.sso/SLO/Artifact"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vfu-portfolio.su.se/Shibboleth.sso/NIM/SOAP"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vfu-portfolio.su.se/Shibboleth.sso/NIM/Redirect"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vfu-portfolio.su.se/Shibboleth.sso/NIM/POST"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu-portfolio.su.se/Shibboleth.sso/NIM/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vfu-portfolio.su.se/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vfu-portfolio.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vfu-portfolio.su.se/Shibboleth.sso/SAML2/POST" index="7"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu-portfolio.su.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfu-portfolio.su.se/Shibboleth.sso/SAML2/ECP" index="9"/>
- </md:SPSSODescriptor>
- <md:ContactPerson contactType="technical">
- <md:GivenName>Sima</md:GivenName>
- <md:SurName>Skymberg</md:SurName>
- <md:EmailAddress>mailto:helpdesk@it.su.se</md:EmailAddress>
- </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/vfu-test.su.se-shibboleth.sso.xml b/swamid-2.0/vfu-test.su.se-shibboleth.sso.xml
index 823c2fb0..e48cd859 100644
--- a/swamid-2.0/vfu-test.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/vfu-test.su.se-shibboleth.sso.xml
@@ -97,4 +97,8 @@ XOl0tx98AnNRgDTOuRoPtUa7Bg8w4puwklhK+gg+X01kZA==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu-test.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfu-test.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
</md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>IT-avdelningen</md:SurName>
+ <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/vfu.su.se-shibboleth.sso.xml b/swamid-2.0/vfu.su.se-shibboleth.sso.xml
index cc5f05c7..3e282bf7 100644
--- a/swamid-2.0/vfu.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/vfu.su.se-shibboleth.sso.xml
@@ -68,4 +68,8 @@ ZbIlfQJbU+IsF+PBKYkQ9oGeHIBu0E6lRYjrmIFz1n176w==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfu.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
</md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>IT-avdelningen</md:SurName>
+ <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 7b8c2bf7..41801914 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -57,7 +57,6 @@
<xi:include href="swamid-2.0/se.timeedit.net-umu-student-sp.xml"/>
<xi:include href="swamid-2.0/scalear-saml.herokuapp.com.xml"/>
<xi:include href="swamid-2.0/sp.swamid.se-shibboleth.xml"/>
- <xi:include href="swamid-2.0/public.it.secure.su.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/shib1.oru.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/sp-nya.bth.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/accountcheckout.lnu.se.xml"/>
@@ -80,7 +79,6 @@
<xi:include href="swamid-2.0/ensky.lhs.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/www.wisum.umdac.umu.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/beta.augustus.se.xml"/>
- <xi:include href="swamid-2.0/dspace.it.su.se.xml"/>
<xi:include href="swamid-2.0/www.sub.su.se.xml"/>
<xi:include href="swamid-2.0/samsok.libris.kb.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/shibboleth.ebscohost.com.xml"/>
@@ -125,10 +123,8 @@
<xi:include href="swamid-2.0/unitcf.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/crowd.nordu.net-shibboleth.xml"/>
<xi:include href="swamid-2.0/confluence.it.su.se-shibboleth.sso.xml"/>
- <xi:include href="swamid-2.0/jira.it.su.se-shibboleth.sso.xml"/>
<xi:include href="swamid-2.0/confluence-test.it.su.se-shibboleth.sso.xml"/>
<xi:include href="swamid-2.0/mailfilter.sunet.se-shibboleth.xml"/>
- <xi:include href="swamid-2.0/jira-test.it.su.se-shibboleth.sso.xml"/>
<xi:include href="swamid-2.0/connect.uninett.no-shibboleth.xml"/>
<xi:include href="swamid-2.0/dev.lobber.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/ws3.bmc.uu.se-shibboleth.xml"/>
@@ -353,7 +349,6 @@
<xi:include href="swamid-2.0/ludwig.lub.lu.se-sp.xml"/>
<xi:include href="swamid-2.0/vartuppdrag.se.xml"/>
<xi:include href="swamid-2.0/account.hs.se-shibboleth.xml"/>
- <xi:include href="swamid-2.0/vfu-portfolio-dev.su.se-Shibboleth.sso.xml"/>
<xi:include href="swamid-2.0/play.education.lu.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/dev.play.bth.se.xml"/>
<xi:include href="swamid-2.0/play.bth.se.xml"/>
@@ -397,7 +392,6 @@
<xi:include href="swamid-2.0/swamid.grandid.com-simplesaml-module.php-saml-sp-metadata.php-retendosp.xml"/>
<xi:include href="swamid-2.0/luvittest1.education.lu.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/luvittest2.ced.lu.se-shibboleth.xml"/>
- <xi:include href="swamid-2.0/vfu-dev.su.se-shibboleth.sso.xml"/>
<xi:include href="swamid-2.0/zeus.slu.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/play.mdh.se.xml"/>
<xi:include href="swamid-2.0/test.play.mdh.se.xml"/>
@@ -417,7 +411,6 @@
<xi:include href="swamid-2.0/play.hv.se.xml"/>
<xi:include href="swamid-2.0/moodlealfa.omv.lu.se-shibboleth.sso-login.xml"/>
<xi:include href="swamid-2.0/studeranuutv.its.umu.se-shibboleth.xml"/>
- <xi:include href="swamid-2.0/vfu-portfolio.su.se-shibboleth.sso.xml"/>
<xi:include href="swamid-2.0/moodle.med.lu.se-shibboleth.sso-login.xml"/>
<xi:include href="swamid-2.0/play.hb.se.xml"/>
<xi:include href="swamid-2.0/student.mit-integration.ladok.se-student-sp.xml"/>
@@ -721,4 +714,6 @@
<xi:include href="swamid-2.0/medlem.stuff.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
<xi:include href="swamid-2.0/medlem.consensus.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
<xi:include href="swamid-2.0/medlem.gotastudentkar.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
+ <xi:include href="swamid-2.0/medlem.konstkaren.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
+ <xi:include href="swamid-2.0/medlem.saks.gu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
</md:EntitiesDescriptor>