Merge branch 'master' of git.swamid.se:swamid-metadata

2 files changed, 7 insertions, 56 deletions

diff --git a/swamid-2.0/play.test.umu.se.xml b/swamid-2.0/play.test.umu.se.xml
deleted file mode 100644
index 58001de5..00000000
--- a/swamid-2.0/play.test.umu.se.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://play.test.umu.se">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-04-11T15:28:52Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
-        <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">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">UMU Play TEST, Umeå universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">UMU Play TEST, Umeå University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Testmiljö för UMU Play video portal vid Umeå universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Test environment for UMU Play video portal at Umeå University</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIICAjCCAWugAwIBAgIUYEbwpJ4cxcU0AES75Axk1t4u28kwDQYJKoZIhvcNAQEFBQAwLTEZMBcGA1UEAwwQcGxheS50ZXN0LnVtdS5zZTEQMA4GA1UECgwHa2FsdHVyYTAeFw0xODA0MTAwNzEzNTdaFw0xOTA0MTAwNzEzNTdaMC0xGTAXBgNVBAMMEHBsYXkudGVzdC51bXUuc2UxEDAOBgNVBAoMB2thbHR1cmEwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAPM+CTB0LmxgNUqs0ujpz8igBPrHapuDESOW3Y9gBNuTdXOjopZ9TbjUn0qxCOqOxKQCgEIoPfTJGrdNqwy9h3HEN6PIUFjzaW9ish4Uq3rxekJEY73H31CKaaXon/qACmkDuJknU+UJ6S2foek9MClQqOmCbBOGfiZT2k+/ff0LAgMBAAGjHzAdMBsGA1UdEQQUMBKCEHBsYXkudGVzdC51bXUuc2UwDQYJKoZIhvcNAQEFBQADgYEAJ/0PUk5khW30MK/zTXhT7F4D9cMqsVjnUy8/2auuPWV7EcIg3SkJq++5AUxF/AU2/+q4ynKz3HNY9KsF0vAgvgDv82oNA3V3GgMkLC5yRGriz/ab70VucLe1cEplNv5RTmzDmaPyDGk6z5b9PM0DCYS4KZ7dg54iFVRQCKK42pQ=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIICAjCCAWugAwIBAgIUYEbwpJ4cxcU0AES75Axk1t4u28kwDQYJKoZIhvcNAQEFBQAwLTEZMBcGA1UEAwwQcGxheS50ZXN0LnVtdS5zZTEQMA4GA1UECgwHa2FsdHVyYTAeFw0xODA0MTAwNzEzNTdaFw0xOTA0MTAwNzEzNTdaMC0xGTAXBgNVBAMMEHBsYXkudGVzdC51bXUuc2UxEDAOBgNVBAoMB2thbHR1cmEwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAPM+CTB0LmxgNUqs0ujpz8igBPrHapuDESOW3Y9gBNuTdXOjopZ9TbjUn0qxCOqOxKQCgEIoPfTJGrdNqwy9h3HEN6PIUFjzaW9ish4Uq3rxekJEY73H31CKaaXon/qACmkDuJknU+UJ6S2foek9MClQqOmCbBOGfiZT2k+/ff0LAgMBAAGjHzAdMBsGA1UdEQQUMBKCEHBsYXkudGVzdC51bXUuc2UwDQYJKoZIhvcNAQEFBQADgYEAJ/0PUk5khW30MK/zTXhT7F4D9cMqsVjnUy8/2auuPWV7EcIg3SkJq++5AUxF/AU2/+q4ynKz3HNY9KsF0vAgvgDv82oNA3V3GgMkLC5yRGriz/ab70VucLe1cEplNv5RTmzDmaPyDGk6z5b9PM0DCYS4KZ7dg54iFVRQCKK42pQ=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.test.umu.se/user/logout"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.test.umu.se/user/authenticate" index="0"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Umeå universitet (TEST)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Umeå universitet (TEST)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://play.test.umu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/te-id.statenssc.se-adfs-services-trust.xml b/swamid-2.0/te-id.statenssc.se-adfs-services-trust.xml
index 70cbe17f..f38602fd 100644
--- a/swamid-2.0/te-id.statenssc.se-adfs-services-trust.xml
+++ b/swamid-2.0/te-id.statenssc.se-adfs-services-trust.xml
@@ -19,6 +19,8 @@
         <mdui:Description xml:lang="en">Statens Servicecenter levererar tjänster inom löneadministration och ekonomiadministration.</mdui:Description>
         <mdui:PrivacyStatementURL xml:lang="sv">https://www.statenssc.se/omstatensservicecenter/personuppgifter/federeradinloggning</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://www.statenssc.se/omstatensservicecenter/personuppgifter/federeradinloggning</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="en">https://www.statenssc.se/omstatensservicecenter/personuppgifter/federeradinloggning</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://www.statenssc.se/omstatensservicecenter/personuppgifter/federeradinloggning</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="encryption">
@@ -35,14 +37,12 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://te-id.statenssc.se/adfs/ls/"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://te-id.statenssc.se/adfs/ls/"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://te-id.statenssc.se/adfs/ls/" index="0" isDefault="true"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://te-id.statenssc.se/adfs/ls/" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://te-id.statenssc.se/adfs/ls/" index="2"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="sv">Ekonomi- och lönetjänster för anställda på svenska myndigheter (test)</md:ServiceName>
       <md:ServiceName xml:lang="en">Accounting and payroll services for employees at Swedish authorities (test)</md:ServiceName>
@@ -54,9 +54,11 @@
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="sv">Statens Servicecenter</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Ekonomi- och lönetjänster för anställda på svenska myndigheter (test)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Accounting and payroll services for employees at Swedish authorities (test)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.statenssc.se/</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">National Government Service Centre</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Statens Servicecenter</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">National Government Service Centre</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.statenssc.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.statenssc.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>William</md:GivenName>