merged

6 files changed, 118 insertions, 3 deletions

diff --git a/sp-with-simplesign b/sp-with-simplesign
index 5ef2fb24..2bd6f6f3 100644
--- a/sp-with-simplesign
+++ b/sp-with-simplesign
@@ -293,3 +293,5 @@ www.wisum.its.umu.se-shibboleth.xml
 www.wisum.umdac.umu.se-shibboleth.xml
 www07test.sub.su.se.xml
 www4.genuinetext.com-shibboleth.xml
+pingpong.uu.se-Shibboleth.SSO-Metadata.xml
+its-pd0328.ad.umu.se-shibboleth.xml
diff --git a/swamid-2.0/idp.kmh.se-idp-shibboleth.xml b/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
index 5bf46b5c..45e39afa 100644
--- a/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
@@ -3,6 +3,21 @@
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope regexp="false">kmh.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Kungliga Musikhögskolan i Stockholm</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Royal College of Music</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Kungliga Musikhögskolan</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Royal College of Music</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.kmh.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.kmh.se/english</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="141" width="313">https://idp.kmh.se/idp/images/logo.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="141" width="313">https://idp.kmh.se/idp/images/logo.jpg</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>kmh.se</mdui:DomainHint>
+        <mdui:IPHint>193.10.62.0/24</mdui:IPHint>
+        <mdui:GeolocationHint>geo:59.34474,18.08126</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo>
@@ -76,8 +91,20 @@ Qz1btpwpzorDI58f7uezMy6zg2+3aLxJ</ds:X509Certificate>
     <OrganizationDisplayName xml:lang="en">Kungliga Musikhögskolan</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.kmh.se</OrganizationURL>
   </Organization>
+  <ContactPerson contactType="administrative">
+    <Company>Royal College of Music</Company>
+    <SurName>KMH IT-avdelningen</SurName>
+    <EmailAddress>swamid@kmh.se</EmailAddress>
+  </ContactPerson>
   <ContactPerson contactType="technical">
-    <Company>Kungliga Musikhögskolan</Company>
+    <Company>Royal College of Music</Company>
+    <SurName>KMH IT-avdelningen</SurName>
     <EmailAddress>swamid@kmh.se</EmailAddress>
   </ContactPerson>
+  <ContactPerson contactType="support">
+    <Company>Royal College of Music</Company>
+    <SurName>KMH IT HelpDesk</SurName>
+    <EmailAddress>helpdesk@kmh.se</EmailAddress>
+    <TelephoneNumber>+46 8 161939</TelephoneNumber>
+  </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/login.idp.eduid.se-idp.xml b/swamid-2.0/login.idp.eduid.se-idp.xml
index 65ef4596..d4772a46 100644
--- a/swamid-2.0/login.idp.eduid.se-idp.xml
+++ b/swamid-2.0/login.idp.eduid.se-idp.xml
@@ -10,6 +10,8 @@
         <mdui:Description xml:lang="en">eduID gives you a common login for your education</mdui:Description>
         <mdui:InformationURL xml:lang="sv">https://www.eduid.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://www.eduid.se</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="146" width="144">https://www.eduid.se/img/logo/logo_144x146.png </mdui:Logo>
+        <mdui:Logo xml:lang="en" height="146" width="144">https://www.eduid.se/img/logo/logo_144x146.png </mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="sv">https://www.eduid.se/privacy.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://www.eduid.se/privacy.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
@@ -83,6 +85,7 @@ iJwxGY2Nu6miPteDdWzv8ziUcLeSLvJaOY1aLwyx6cEvU7a94UkaPjhX
     <ns0:Company>eduID</ns0:Company>
     <ns0:SurName>Valter Nordh</ns0:SurName>
     <ns0:EmailAddress>valter@sunet.se</ns0:EmailAddress>
+    <ns0:TelephoneNumber>+46707884742</ns0:TelephoneNumber>
   </ns0:ContactPerson>
   <ns0:ContactPerson contactType="technical">
     <ns0:Company>eduID</ns0:Company>
diff --git a/swamid-2.0/pingpong.uu.se-Shibboleth.SSO-Metadata.xml b/swamid-2.0/pingpong.uu.se-Shibboleth.SSO-Metadata.xml
new file mode 100644
index 00000000..499c42dc
--- /dev/null
+++ b/swamid-2.0/pingpong.uu.se-Shibboleth.SSO-Metadata.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pingpong.uu.se/Shibboleth.sso/Metadata">
+  <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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="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://pingpong.uu.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>torgos.its.uu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=torgos.its.uu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJANup0zdi/BFbMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEHRvcmdvcy5pdHMudXUuc2UwHhcNMTQwNDA4MjA0NjU2WhcNMjQwNDA1MjA0
+NjU2WjAbMRkwFwYDVQQDExB0b3Jnb3MuaXRzLnV1LnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA42cSx3rcm9S2SuVvFjxzWYcADftqZfK2osHKWlI1
+C4240puNDDupFqFYhB2Ep7aVQ9gTb3nHqnJ4EOCD0x23CNIqmgJArZQCwbPqeQt7
+a9WB7WmLy3ZD9o3EsLwVNk3t45AZho4CtXcFGDk3T2tXebtdxck5daxLaHWkw+iI
+f+Pcwif39zURmPClcaU/4tgaEkls424M1iFfcddiPSJcLpG9WYpRD9OHRXIRFmyl
+3EJB3CGeB9nS9b9NASRJ0zx+Wyw1N3vlgtWmgX/S+99yI/jsFs59UxMaq1BAhZaO
+iOQaA7Fd1GYyD8dqr6I4aMr1qejF/MDtO5CiTeEHOVcDMwIDAQABoz4wPDAbBgNV
+HREEFDASghB0b3Jnb3MuaXRzLnV1LnNlMB0GA1UdDgQWBBS7NSVWUndsrWj86krB
+CJCBlQ9UCTANBgkqhkiG9w0BAQUFAAOCAQEAu3zBVsJ7hSre8tT7xf8vmCYf596n
+EqSmqxJIa7XpOL2ZH+5VuMeiJkFcaYUo+jJM+WYQzVDDyWLF+9FKqV7Rr9iSHpAP
+lNfvH1aJJ2R95Jshzlf0sxMUfcYxl+N1cse/SAi5GlgPhaIxq+8KnTY83PJ2A7eE
+r9L7peaKnBeo16OdZb1tBGFiSzvSeP/lKjqGOM54IbVFNr/Gs6YoSy7vbebdjKyk
+6ZTiErt0SReC3yu6vqcyo3GorwKE62v6gpkeXuL/ZFgv/K5sSPj5CfyvjA+kUFmV
+RReWEJxl2w1ULiWkHeJhgBDcMr06CUoUgN2pvx7rJhB/sjePs54Bm5UNFQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pingpong.uu.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pingpong.uu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pingpong.uu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pingpong.uu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pingpong.uu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pingpong.uu.se/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pingpong.uu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pingpong.uu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pingpong.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/signon.hh.se-idp-shibboleth.xml b/swamid-2.0/signon.hh.se-idp-shibboleth.xml
index 6496746f..4380bb49 100644
--- a/swamid-2.0/signon.hh.se-idp-shibboleth.xml
+++ b/swamid-2.0/signon.hh.se-idp-shibboleth.xml
@@ -3,6 +3,25 @@
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope regexp="false">hh.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Högskolan i Halmstad</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Halmstad University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Högskolan i Halmstad</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Halmstad University</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.hh.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.hh.se</mdui:InformationURL>
+        <mdui:Logo height="116" width="350">https://signon.hh.se/hh-logo-en-350x116.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="116" width="350">https://signon.hh.se/hh-logo-sv-350x116.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="116" width="350">https://signon.hh.se/hh-logo-en-350x116.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">http://signon.hh.se/idp_privacy_statement.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://signon.hh.se/idp_privacy_statement_en.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>hh.se</mdui:DomainHint>
+        <mdui:IPHint>194.47.0.0/20</mdui:IPHint>
+        <mdui:IPHint>194.47.0.16/21</mdui:IPHint>
+        <mdui:GeolocationHint>geo:56.6647,12.8779</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo>
@@ -80,8 +99,22 @@ CXwK7XzaaZnKkk8K3Hgodpmh+2CIkt0nGwYXAFyb6RE=
     <OrganizationDisplayName xml:lang="en">Högskolan i Halmstad</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.hh.se</OrganizationURL>
   </Organization>
+  <ContactPerson contactType="administrative">
+    <Company>Halmstad University</Company>
+    <SurName>Magnus Morén</SurName>
+    <EmailAddress>magnus.moren@hh.se</EmailAddress>
+    <TelephoneNumber>+46 35 167383</TelephoneNumber>
+  </ContactPerson>
   <ContactPerson contactType="technical">
-    <Company>Högskolan i Halmstad</Company>
-    <EmailAddress>Magnus.Moren@hh.se</EmailAddress>
+    <Company>Halmstad University</Company>
+    <SurName>Magnus Morén</SurName>
+    <EmailAddress>magnus.moren@hh.se</EmailAddress>
+    <TelephoneNumber>+46 35 167383</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <Company>Halmstad University</Company>
+    <SurName>Helpdesk Högskloan i Halmstad</SurName>
+    <EmailAddress>helpdesk@hh.se</EmailAddress>
+    <TelephoneNumber>+35 167800</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 63d9daee..b9ff8321 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -301,4 +301,5 @@
   <xi:include href="swamid-2.0/its-pd0328.ad.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/careergate.student.uu.se-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml"/>
   <xi:include href="swamid-2.0/gw-astronomy.org-shibboleth-sp.xml"/>
+  <xi:include href="swamid-2.0/pingpong.uu.se-Shibboleth.SSO-Metadata.xml"/>
 </md:EntitiesDescriptor>