summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--swamid-2.0/login.idp.eduid.se-idp.xml17
-rw-r--r--swamid-2.0/saml-1.sys.kth.se-idp-shibboleth.xml22
-rw-r--r--swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml54
3 files changed, 82 insertions, 11 deletions
diff --git a/swamid-2.0/login.idp.eduid.se-idp.xml b/swamid-2.0/login.idp.eduid.se-idp.xml
index b932e7ad..299125c0 100644
--- a/swamid-2.0/login.idp.eduid.se-idp.xml
+++ b/swamid-2.0/login.idp.eduid.se-idp.xml
@@ -3,6 +3,14 @@
<ns0:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<ns0:Extensions>
<ns1:Scope regexp="false">eduid.se</ns1:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">eduID</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">eduID</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="sv">https://www.eduid.se</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">https://www.eduid.se</mdui:InformationURL>
+ <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>
</ns0:Extensions>
<ns0:KeyDescriptor use="encryption">
<ns2:KeyInfo>
@@ -70,12 +78,13 @@ iJwxGY2Nu6miPteDdWzv8ziUcLeSLvJaOY1aLwyx6cEvU7a94UkaPjhX
<ns0:OrganizationURL xml:lang="en">http://www.eduid.se/</ns0:OrganizationURL>
</ns0:Organization>
<ns0:ContactPerson contactType="technical">
- <ns0:GivenName>eduID</ns0:GivenName>
- <ns0:SurName>developers</ns0:SurName>
- <ns0:EmailAddress>eduid-dev@SEGATE.SUNET.SE</ns0:EmailAddress>
+ <ns0:Company>eduID</ns0:Company>
+ <ns0:SurName>SUNET eduID team</ns0:SurName>
+ <ns0:EmailAddress>eduid-dev@segate.sunet.se</ns0:EmailAddress>
</ns0:ContactPerson>
<ns0:ContactPerson contactType="support">
- <ns0:GivenName>Support</ns0:GivenName>
+ <ns0:Company>eduID</ns0:Company>
+ <ns0:SurName>eduID Support</ns0:SurName>
<ns0:EmailAddress>support@eduid.se</ns0:EmailAddress>
</ns0:ContactPerson>
</ns0:EntityDescriptor>
diff --git a/swamid-2.0/saml-1.sys.kth.se-idp-shibboleth.xml b/swamid-2.0/saml-1.sys.kth.se-idp-shibboleth.xml
index 72694f12..f592bb6e 100644
--- a/swamid-2.0/saml-1.sys.kth.se-idp-shibboleth.xml
+++ b/swamid-2.0/saml-1.sys.kth.se-idp-shibboleth.xml
@@ -4,11 +4,12 @@
<Extensions>
<shibmd:Scope regexp="false">kth.se</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Kungliga Tekniska Högskolan</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Kungliga Tekniska Högskolan (KTH)</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">KTH Royal Institute of Technology</mdui:DisplayName>
- <mdui:Description xml:lang="en">KTH Royal Institute of Technology Identity Provider is used by employees and students at the university.</mdui:Description>
- <mdui:InformationURL xml:lang="sv">https://saml-1.sys.kth.se/om.html</mdui:InformationURL>
- <mdui:InformationURL xml:lang="en">https://saml-1.sys.kth.se/about.html</mdui:InformationURL>
+ <mdui:Description xml:lang="sv">Identity Provider för KTH</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider for KTH</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">https://www.kth.se/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">https://www.kth.se/en</mdui:InformationURL>
<mdui:Logo height="82" width="82">https://saml-1.sys.kth.se/logo-main.png</mdui:Logo>
</mdui:UIInfo>
<mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
@@ -117,14 +118,21 @@ sdhdXg==
<OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.kth.se</OrganizationURL>
</Organization>
+ <ContactPerson contactType="administrative">
+ <Company>KTH Royal Institute of Technology</Company>
+ <SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</SurName>
+ <EmailAddress>ita-infra-saml-contact@kth.se</EmailAddress>
+ <TelephoneNumber>+46 8 790 6000</TelephoneNumber>
+ </ContactPerson>
<ContactPerson contactType="technical">
<Company>KTH Royal Institute of Technology</Company>
- <EmailAddress>it-support@kth.se</EmailAddress>
- <TelephoneNumber>+46 8 790 6600</TelephoneNumber>
+ <SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</SurName>
+ <EmailAddress>ita-infra-saml-contact@kth.se</EmailAddress>
+ <TelephoneNumber>+46 8 790 6000</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>KTH Royal Institute of Technology</Company>
- <SurName>IT-support på KTH</SurName>
+ <SurName>KTH IT-Support</SurName>
<EmailAddress>it-support@kth.se</EmailAddress>
<TelephoneNumber>+46 8 790 6600</TelephoneNumber>
</ContactPerson>
diff --git a/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml b/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
index 6f0fbc9b..6ce5cf83 100644
--- a/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
+++ b/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
@@ -3,6 +3,42 @@
<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">kth.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Kungliga Tekniska högskolan (test)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">KTH Royal Institute of Technology (test)</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identity Provider för KTH</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider for KTH</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">https://www.kth.se/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">https://www.kth.se/en</mdui:InformationURL>
+ <mdui:Logo height="225" width="225">https://saml-2.sys.kth.se/idp/images/logo.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>kth.se</mdui:DomainHint>
+ <mdui:IPHint>130.237.0.0/18</mdui:IPHint>
+ <mdui:IPHint>130.237.64.0/20</mdui:IPHint>
+ <mdui:IPHint>130.237.80.0/22</mdui:IPHint>
+ <mdui:IPHint>130.237.84.0/24</mdui:IPHint>
+ <mdui:IPHint>130.237.202.0/23</mdui:IPHint>
+ <mdui:IPHint>130.237.206.0/24</mdui:IPHint>
+ <mdui:IPHint>130.237.209.0/24</mdui:IPHint>
+ <mdui:IPHint>130.237.210.0/23</mdui:IPHint>
+ <mdui:IPHint>130.237.212.0/22</mdui:IPHint>
+ <mdui:IPHint>130.237.216.0/24</mdui:IPHint>
+ <mdui:IPHint>130.237.218.0/23</mdui:IPHint>
+ <mdui:IPHint>130.237.220.0/22</mdui:IPHint>
+ <mdui:IPHint>130.237.224.0/22</mdui:IPHint>
+ <mdui:IPHint>130.237.228.0/22</mdui:IPHint>
+ <mdui:IPHint>130.237.232.0/21</mdui:IPHint>
+ <mdui:IPHint>130.237.249.0/24</mdui:IPHint>
+ <mdui:IPHint>130.237.250.0/23</mdui:IPHint>
+ <mdui:IPHint>130.237.255.0/24</mdui:IPHint>
+ <mdui:IPHint>130.229.128.0/18</mdui:IPHint>
+ <mdui:IPHint>193.10.37.0/24</mdui:IPHint>
+ <mdui:IPHint>193.10.38.0/24</mdui:IPHint>
+ <mdui:IPHint>193.10.39.0/24</mdui:IPHint>
+ <mdui:IPHint>2001:6b0:1::/48</mdui:IPHint>
+ <mdui:GeolocationHint>geo:59.346123,18.072305</mdui:GeolocationHint>
+ </mdui:DiscoHints>
</Extensions>
<KeyDescriptor>
<ds:KeyInfo>
@@ -79,4 +115,22 @@ x7JUFw==</ds:X509Certificate>
<OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology (test)</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.kth.se</OrganizationURL>
</Organization>
+ <ContactPerson contactType="administrative">
+ <Company>KTH Royal Institute of Technology (test)</Company>
+ <SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</SurName>
+ <EmailAddress>ita-infra-saml-contact@kth.se</EmailAddress>
+ <TelephoneNumber>+46 8 790 6000</TelephoneNumber>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <Company>KTH Royal Institute of Technology (test)</Company>
+ <SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</SurName>
+ <EmailAddress>ita-infra-saml-contact@kth.se</EmailAddress>
+ <TelephoneNumber>+46 8 790 6000</TelephoneNumber>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <Company>KTH Royal Institute of Technology (test)</Company>
+ <SurName>KTH IT-Support</SurName>
+ <EmailAddress>it-support@kth.se</EmailAddress>
+ <TelephoneNumber>+46 8 790 6600</TelephoneNumber>
+ </ContactPerson>
</EntityDescriptor>