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

2 files changed, 94 insertions, 15 deletions

diff --git a/swamid-2.0/dev.play.smdb.kb.se.xml b/swamid-2.0/dev.play.smdb.kb.se.xml
new file mode 100644
index 00000000..170a2c1d
--- /dev/null
+++ b/swamid-2.0/dev.play.smdb.kb.se.xml
@@ -0,0 +1,47 @@
+<?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://dev.play.smdb.kb.se">
+  <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:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Kungliga biblioteket play</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">National Library of Sweden play</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Detta är KBs play tjänst</mdui:Description>
+        <mdui:Description xml:lang="en">This is the National Library of Sweden's streaming service</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEVzCCAz+gAwIBAgIJAOq+2tlkBMfwMA0GCSqGSIb3DQEBBQUAMHoxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTELMAkGA1UEChMCS0IxCzAJBgNVBAsTAktCMQswCQYDVQQDEwJLQjEcMBoGCSqGSIb3DQEJARYNZGV2ZWxvcEBrYi5zZTAeFw0xNjA2MDkwODEwMDZaFw0yNjA2MDkwODEwMDZaMHoxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTELMAkGA1UEChMCS0IxCzAJBgNVBAsTAktCMQswCQYDVQQDEwJLQjEcMBoGCSqGSIb3DQEJARYNZGV2ZWxvcEBrYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOnv4zK6C1XI303zO7pi4C3318mT+W/G7Qb78uKcolubdNdI7O94bvXZpRYWtbVnEO8tP7mE5trr5OQiYA1zI9sS6pKz4LNzzcs2Q1Sbvw+IJWevwzK7HMX494v/hZkkkFRl5HaWzout0EZe/etApgbd267IdJiTYNmC6IKMR0Sks84i7rZ08FfsRWHp7OCWv+9s4tXN4h0Q2XcYLMqSY80t9Kng0oxqu67ByKGJMi6xBBDjuWSVgNDexPZrFyYNPUX28uY+3gTx5OSvMS002dJWL5yIa/xgjQ0mDm4Lc5GSk2Qrdz/cVlgSkthXpWLMlWg2c/RnTrEEeo8iYGRB7U8CAwEAAaOB3zCB3DAdBgNVHQ4EFgQUZZHmd2PBa2HcGGd3KmEVLs+KEaowgawGA1UdIwSBpDCBoYAUZZHmd2PBa2HcGGd3KmEVLs+KEaqhfqR8MHoxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTELMAkGA1UEChMCS0IxCzAJBgNVBAsTAktCMQswCQYDVQQDEwJLQjEcMBoGCSqGSIb3DQEJARYNZGV2ZWxvcEBrYi5zZYIJAOq+2tlkBMfwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHhOCcoiT8M6aWts+GT5R602ZbfDXHQeBiDz1Fy8ZwQC3551UavmJ+c7NunPrhd6WWVnftRcOK12D5Y6Xu+/cH9ge1Ra0mpOjUCaznMMtTHZto6H1jkAUGIDkdEtuCgHTbsDppVvn2sH7XRZADc9idXgPX+0W+F8nN4GvYCnrC/LeKKUV+6hWDTmU4UiVRRTBiWUGV+qOAF3Rm2tLlJ5zpXG3L1KR4LBq/HzNrs7i/1kL15zDD29ok+Ovy09SHywpopB1QXNjKtL9FNROxv/DjVFyvji+zGXIkNjjqG5WfNvZcmUqg7QthSJbJcDb6mIUiYEEPF7qMgG/Zb3zpbRGEA=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEVzCCAz+gAwIBAgIJAOq+2tlkBMfwMA0GCSqGSIb3DQEBBQUAMHoxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTELMAkGA1UEChMCS0IxCzAJBgNVBAsTAktCMQswCQYDVQQDEwJLQjEcMBoGCSqGSIb3DQEJARYNZGV2ZWxvcEBrYi5zZTAeFw0xNjA2MDkwODEwMDZaFw0yNjA2MDkwODEwMDZaMHoxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTELMAkGA1UEChMCS0IxCzAJBgNVBAsTAktCMQswCQYDVQQDEwJLQjEcMBoGCSqGSIb3DQEJARYNZGV2ZWxvcEBrYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOnv4zK6C1XI303zO7pi4C3318mT+W/G7Qb78uKcolubdNdI7O94bvXZpRYWtbVnEO8tP7mE5trr5OQiYA1zI9sS6pKz4LNzzcs2Q1Sbvw+IJWevwzK7HMX494v/hZkkkFRl5HaWzout0EZe/etApgbd267IdJiTYNmC6IKMR0Sks84i7rZ08FfsRWHp7OCWv+9s4tXN4h0Q2XcYLMqSY80t9Kng0oxqu67ByKGJMi6xBBDjuWSVgNDexPZrFyYNPUX28uY+3gTx5OSvMS002dJWL5yIa/xgjQ0mDm4Lc5GSk2Qrdz/cVlgSkthXpWLMlWg2c/RnTrEEeo8iYGRB7U8CAwEAAaOB3zCB3DAdBgNVHQ4EFgQUZZHmd2PBa2HcGGd3KmEVLs+KEaowgawGA1UdIwSBpDCBoYAUZZHmd2PBa2HcGGd3KmEVLs+KEaqhfqR8MHoxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTELMAkGA1UEChMCS0IxCzAJBgNVBAsTAktCMQswCQYDVQQDEwJLQjEcMBoGCSqGSIb3DQEJARYNZGV2ZWxvcEBrYi5zZYIJAOq+2tlkBMfwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHhOCcoiT8M6aWts+GT5R602ZbfDXHQeBiDz1Fy8ZwQC3551UavmJ+c7NunPrhd6WWVnftRcOK12D5Y6Xu+/cH9ge1Ra0mpOjUCaznMMtTHZto6H1jkAUGIDkdEtuCgHTbsDppVvn2sH7XRZADc9idXgPX+0W+F8nN4GvYCnrC/LeKKUV+6hWDTmU4UiVRRTBiWUGV+qOAF3Rm2tLlJ5zpXG3L1KR4LBq/HzNrs7i/1kL15zDD29ok+Ovy09SHywpopB1QXNjKtL9FNROxv/DjVFyvji+zGXIkNjjqG5WfNvZcmUqg7QthSJbJcDb6mIUiYEEPF7qMgG/Zb3zpbRGEA=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.play.smdb.kb.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://dev.play.smdb.kb.se/user/authenticate" index="0"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SMDB Play (DEV)</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SMDB Play (DEV)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://dev.play.smdb.kb.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Administrator</md:SurName>
+    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/idp.mdh.se-idp-shibboleth.xml b/swamid-2.0/idp.mdh.se-idp-shibboleth.xml
index 44a9f6e9..f831711e 100644
--- a/swamid-2.0/idp.mdh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.mdh.se-idp-shibboleth.xml
@@ -1,18 +1,33 @@
 <?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.
-
-     This metadata is not dynamic - it will not change as your configuration changes.
--->
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://idp.mdh.se/idp/shibboleth">
+  <Extensions>
+    <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </attr:EntityAttributes>
+  </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <Extensions>
       <shibmd:Scope regexp="false">mdh.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">A Name for the IdP at idp.mdh.se</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Enter a description of your IdP at idp.mdh.se</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">Mälardalens Högskola (ny)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Mälardalen University (new)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Mälardalens högskola.</mdui:Description>
+        <mdui:Description xml:lang="en">The Mälardalen University Identity Provider is used by employees and students at the university.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.mdh.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.mdh.se</mdui:InformationURL>
+        <mdui:Logo height="117" width="216">https://idp.mdh.se/idp/images/logo-sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="117" width="216">https://idp.mdh.se/idp/images/logo-sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="117" width="216">https://idp.mdh.se/idp/images/logo-en.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">mdh vasteras eskilstuna malardalen malardalen+university malardalens+hogskola mälardalens+högskola</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">mdh vasteras eskilstuna malardalen malardalen+university malardalens+hogskola mälardalens+högskola</mdui:Keywords>
       </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:DomainHint>mdh.se</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:59.6186,16.5407</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:59.3716,16.5085</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </Extensions>
     <KeyDescriptor use="signing">
       <ds:KeyInfo>
@@ -91,11 +106,6 @@ gJxaftdRQe7zWKOr0S7Lpm02pTSgD9bTPx1RVDuoyIYO0GGn+CF9ADzfOWR4dtJ9
     </KeyDescriptor>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mdh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mdh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <!--
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mdh.se/idp/profile/SAML2/Redirect/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mdh.se/idp/profile/SAML2/POST/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mdh.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-        -->
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mdh.se/idp/profile/Shibboleth/SSO"/>
@@ -182,7 +192,29 @@ gJxaftdRQe7zWKOr0S7Lpm02pTSgD9bTPx1RVDuoyIYO0GGn+CF9ADzfOWR4dtJ9
       </ds:KeyInfo>
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mdh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mdh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
-    <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
   </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">MDH</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Mälardalens Högskola (ny)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Mälardalen University (new)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.mdh.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <Company>Mälardalen University</Company>
+    <SurName>Peter Falck</SurName>
+    <EmailAddress>mailto:peter.falck@mdh.se</EmailAddress>
+    <TelephoneNumber>+46 21 101499</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <Company>Mälardalen University</Company>
+    <SurName>MDH Drift</SurName>
+    <EmailAddress>mailto:drift.ita@mdh.se</EmailAddress>
+    <TelephoneNumber>+46 21 101499</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <Company>Mälardalen University</Company>
+    <SurName>Helpdesk MDH</SurName>
+    <EmailAddress>mailto:helpdesk@mdh.se</EmailAddress>
+    <TelephoneNumber>+46 16 101550</TelephoneNumber>
+  </ContactPerson>
 </EntityDescriptor>