Resolves SWAMIDOPS-893

author: Paul Scott <paul.scott@kau.se> 2018-08-20 07:18:31 +0000
committer: Paul Scott <paul.scott@kau.se> 2018-08-20 07:18:31 +0000
commit: fe268d1e3b4f7762d0351f257396b9ac64df4936 (patch)
tree: 94ef6ff6fbf49b68dad0c4eb6fcadd0861bfc4bc /swamid-2.0
parent: 52aec96f3462fa432fe4eb64c68f2baae70db45f (diff)
18 files changed, 53 insertions, 402 deletions
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..2f3bcb2a 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..65450cf8 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
@@ -87,9 +87,9 @@ Uc3kqnPScQ==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence-test.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
     <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: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.it.su.se-shibboleth.sso.xml b/swamid-2.0/confluence.it.su.se-shibboleth.sso.xml
index bab3135f..ce0ba945 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,9 @@ 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
index 8449c4f4..5089969e 100644
--- a/swamid-2.0/jira-test.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/jira-test.it.su.se-shibboleth.sso.xml
@@ -71,4 +71,8 @@ SKTYQay0lG3RNe7C3dTRD2RvZznqpkhRVqNqWJHGdfuP4uiVfQ==
     <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: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/jira.it.su.se-shibboleth.sso.xml b/swamid-2.0/jira.it.su.se-shibboleth.sso.xml
index e7527c99..c554cb6a 100644
--- a/swamid-2.0/jira.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/jira.it.su.se-shibboleth.sso.xml
@@ -71,4 +71,8 @@ FdYOem7PdnMNtROBFXZZ+vv1hrOfYBy7FrvBe49J9Yub+jaHWw==
     <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: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-test.su.se-shibboleth.sso.xml b/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml
index ca55784b..479e8731 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..c7729c61 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..1c334a04 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/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..73682747 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..9b9a44f5 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..062863ef 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..d8fb2afb 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>
author	Paul Scott <paul.scott@kau.se>	2018-08-20 07:18:31 +0000
committer	Paul Scott <paul.scott@kau.se>	2018-08-20 07:18:31 +0000
commit	fe268d1e3b4f7762d0351f257396b9ac64df4936 (patch)
tree	94ef6ff6fbf49b68dad0c4eb6fcadd0861bfc4bc /swamid-2.0
parent	52aec96f3462fa432fe4eb64c68f2baae70db45f (diff)