diff options
-rw-r--r-- | swamid-2.0/hbidp.hb.se-idp-shibboleth.xml | 161 | ||||
-rw-r--r-- | swamid-2.0/identity.mdh.se-idp-shibboleth.xml | 15 | ||||
-rw-r--r-- | swamid-2.0/idp.mdh.se-idp-shibboleth.xml | 8 | ||||
-rw-r--r-- | swamid-idp-2.0.mxml | 2 |
4 files changed, 16 insertions, 170 deletions
diff --git a/swamid-2.0/hbidp.hb.se-idp-shibboleth.xml b/swamid-2.0/hbidp.hb.se-idp-shibboleth.xml deleted file mode 100644 index 363b70e2..00000000 --- a/swamid-2.0/hbidp.hb.se-idp-shibboleth.xml +++ /dev/null @@ -1,161 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://hbidp.hb.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: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">hb.se</shibmd:Scope> - <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> - <mdui:DisplayName xml:lang="sv">Högskolan i Borås - Old</mdui:DisplayName> - <mdui:DisplayName xml:lang="en">University of Borås - Old</mdui:DisplayName> - <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Borås.</mdui:Description> - <mdui:Description xml:lang="en">Identity Provider for employees and students at Borås University.</mdui:Description> - <mdui:InformationURL xml:lang="sv">http://www.hb.se/Om-hogskolan/</mdui:InformationURL> - <mdui:InformationURL xml:lang="en">https://www.hb.se/en/About-UB/</mdui:InformationURL> - <mdui:Logo height="90" width="350">https://www.hb.se//PageFiles/41206/HBloggaSwamid.gif</mdui:Logo> - <mdui:Logo xml:lang="sv" height="90" width="350">https://www.hb.se//PageFiles/41206/HBloggaSwamid.gif</mdui:Logo> - <mdui:Keywords xml:lang="sv">hb högskolan+i+borås hogskolan+i+boras textilhogskolan textilhögskolan bibliotekshogskolan bibliotekshögskolan university+of+borås textile+university+of+borås university+of+boras textile+university+of+boras boras+university+of+library+science borås+university+of+library+science</mdui:Keywords> - <mdui:Keywords xml:lang="en">hb högskolan+i+borås hogskolan+i+boras textilhogskolan textilhögskolan bibliotekshogskolan bibliotekshögskolan university+of+borås textile+university+of+borås university+of+boras textile+university+of+boras boras+university+of+library+science borås+university+of+library+science</mdui:Keywords> - </mdui:UIInfo> - <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> - <mdui:DomainHint>hb.se</mdui:DomainHint> - <mdui:IPHint>193.10.168.0/24</mdui:IPHint> - <mdui:IPHint>193.10.169.0/24</mdui:IPHint> - <mdui:IPHint>193.10.170.0/24</mdui:IPHint> - <mdui:IPHint>193.10.171.0/24</mdui:IPHint> - <mdui:IPHint>193.10.172.0/24</mdui:IPHint> - <mdui:IPHint>193.10.173.0/24</mdui:IPHint> - <mdui:IPHint>193.10.174.0/24</mdui:IPHint> - <mdui:IPHint>193.10.175.0/24</mdui:IPHint> - <mdui:IPHint>193.10.245.0/24</mdui:IPHint> - <mdui:IPHint>193.10.246.0/24</mdui:IPHint> - <mdui:IPHint>193.10.247.0/24</mdui:IPHint> - <mdui:IPHint>193.11.64.0/24</mdui:IPHint> - <mdui:IPHint>193.11.65.0/24</mdui:IPHint> - <mdui:IPHint>193.11.66.0/24</mdui:IPHint> - <mdui:IPHint>193.11.67.0/24</mdui:IPHint> - <mdui:IPHint>193.11.68.0/24</mdui:IPHint> - <mdui:IPHint>193.11.69.0/24</mdui:IPHint> - <mdui:IPHint>193.11.70.0/24</mdui:IPHint> - <mdui:IPHint>193.11.71.0/24</mdui:IPHint> - <mdui:IPHint>193.11.72.0/24</mdui:IPHint> - <mdui:IPHint>193.11.73.0/24</mdui:IPHint> - <mdui:GeolocationHint>geo:57.724368,12.939918</mdui:GeolocationHint> - </mdui:DiscoHints> - </Extensions> - <KeyDescriptor> - <ds:KeyInfo> - <ds:X509Data> - <ds:X509Certificate> -MIIEfjCCA2agAwIBAgIQQh0tAUo8tbGvjLhvMULUFjANBgkqhkiG9w0BAQUFADA2 -MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg -U1NMIENBMB4XDTA5MTAwMTAwMDAwMFoXDTEyMDkzMDIzNTk1OVowTjELMAkGA1UE -BhMCU0UxHDAaBgNVBAoME0jDtmdza29sYW4gaSBCb3LDpXMxCzAJBgNVBAsTAklU -MRQwEgYDVQQDEwtoYmlkcC5oYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC -AQoCggEBANmhPsWXpER8PlBGqHtoR1hsTeLWqTRGhaFm9Vuc57qf7xd328jkwZ3C -tyBL65rNHYI/EVrsiA5nNAm/NLuPl5Wh8IOztI26XcHgNhYgqe6Tlpw5kN4pn0ME -+KAMAGKh1PAaKP2E3sHN2k3QdqHU0hesmaFHRAm+9JqcP++Frkdr1WVIcxYniOBa -dorbeA+Mui3WaMsUm/tkYTOOQ3QCHi2VT9U6JOIVyuyIjX6slHhS2LkCSAKn4sKD -DUVaeSyTxWrH12Dx/mMd8BfXV8XkjBbDNzfFizxTzHsdrj8K8y9ggGiv5+g1Mmsf -2ehMfEhN0TNtVLaiw9Br2N7XSLLGuaMCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaA -FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRNDaiYtvTh/NO79ufN3n7k -Zx6CjjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr -BgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNV -HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT -TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu -dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw -Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAmBgNVHREEHzAdggtoYmlkcC5oYi5zZYIO -dm0taGJpZHAuaGIuc2UwDQYJKoZIhvcNAQEFBQADggEBACUT4mjeYXLYfWz4oKhH -ou/S52jlhiVtskXArO7Ntxk0Oy6tpSkRYgyBN4NDuaFfS//69Et4kQWfxpe7tS8X -t2cEEtTRhYhwBpBHCMnixRxcoYyeH60fnHoeCn+w7HmD+ffyRojbtcE86O+7bRTP -J2xZfZxoRzyEYBVfLBEcBSOYTQrlIBtZmZS/w4whSQs5ruf5X9Wj7BrFLjo8nnli -rA6Msf8vaeuR1RNKQFHIx/vX3Aj+s2E4rq+L9O3BDAyfc1vKiNy8LLhlvYUFl9If -NtlzTU8oxWfErMa+Y2BMXWIALruQgeQrFxbO/k4RoPBHRvCul0uUsxak1IFtfT0x -9Ks= - - </ds:X509Certificate> - </ds:X509Data> - </ds:KeyInfo> - </KeyDescriptor> - <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hbidp.hb.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/> - <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hbidp.hb.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/> - <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://hbidp.hb.se/idp/profile/Shibboleth/SSO"/> - <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hbidp.hb.se/idp/profile/SAML2/POST/SSO"/> - <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hbidp.hb.se/idp/profile/SAML2/POST-SimpleSign/SSO"/> - <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hbidp.hb.se/idp/profile/SAML2/Redirect/SSO"/> - </IDPSSODescriptor> - <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"> - <Extensions> - <shibmd:Scope regexp="false">hb.se</shibmd:Scope> - </Extensions> - <KeyDescriptor> - <ds:KeyInfo> - <ds:X509Data> - <ds:X509Certificate> -MIIEfjCCA2agAwIBAgIQQh0tAUo8tbGvjLhvMULUFjANBgkqhkiG9w0BAQUFADA2 -MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg -U1NMIENBMB4XDTA5MTAwMTAwMDAwMFoXDTEyMDkzMDIzNTk1OVowTjELMAkGA1UE -BhMCU0UxHDAaBgNVBAoME0jDtmdza29sYW4gaSBCb3LDpXMxCzAJBgNVBAsTAklU -MRQwEgYDVQQDEwtoYmlkcC5oYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC -AQoCggEBANmhPsWXpER8PlBGqHtoR1hsTeLWqTRGhaFm9Vuc57qf7xd328jkwZ3C -tyBL65rNHYI/EVrsiA5nNAm/NLuPl5Wh8IOztI26XcHgNhYgqe6Tlpw5kN4pn0ME -+KAMAGKh1PAaKP2E3sHN2k3QdqHU0hesmaFHRAm+9JqcP++Frkdr1WVIcxYniOBa -dorbeA+Mui3WaMsUm/tkYTOOQ3QCHi2VT9U6JOIVyuyIjX6slHhS2LkCSAKn4sKD -DUVaeSyTxWrH12Dx/mMd8BfXV8XkjBbDNzfFizxTzHsdrj8K8y9ggGiv5+g1Mmsf -2ehMfEhN0TNtVLaiw9Br2N7XSLLGuaMCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaA -FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRNDaiYtvTh/NO79ufN3n7k -Zx6CjjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr -BgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNV -HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT -TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu -dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw -Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAmBgNVHREEHzAdggtoYmlkcC5oYi5zZYIO -dm0taGJpZHAuaGIuc2UwDQYJKoZIhvcNAQEFBQADggEBACUT4mjeYXLYfWz4oKhH -ou/S52jlhiVtskXArO7Ntxk0Oy6tpSkRYgyBN4NDuaFfS//69Et4kQWfxpe7tS8X -t2cEEtTRhYhwBpBHCMnixRxcoYyeH60fnHoeCn+w7HmD+ffyRojbtcE86O+7bRTP -J2xZfZxoRzyEYBVfLBEcBSOYTQrlIBtZmZS/w4whSQs5ruf5X9Wj7BrFLjo8nnli -rA6Msf8vaeuR1RNKQFHIx/vX3Aj+s2E4rq+L9O3BDAyfc1vKiNy8LLhlvYUFl9If -NtlzTU8oxWfErMa+Y2BMXWIALruQgeQrFxbO/k4RoPBHRvCul0uUsxak1IFtfT0x -9Ks= - - </ds:X509Certificate> - </ds:X509Data> - </ds:KeyInfo> - </KeyDescriptor> - <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hbidp.hb.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/> - <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hbidp.hb.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> - <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat> - <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat> - </AttributeAuthorityDescriptor> - <Organization> - <OrganizationName xml:lang="en">HB</OrganizationName> - <OrganizationDisplayName xml:lang="sv">Högskolan i Borås - Old</OrganizationDisplayName> - <OrganizationDisplayName xml:lang="en">University of Borås - Old</OrganizationDisplayName> - <OrganizationURL xml:lang="en">http://www.hb.se</OrganizationURL> - </Organization> - <ContactPerson contactType="administrative"> - <Company>University of Borås</Company> - <SurName>IT-avdelningen</SurName> - <EmailAddress>mailto:it-avdelningen@hb.se</EmailAddress> - <TelephoneNumber>+46 33 435 4690</TelephoneNumber> - </ContactPerson> - <ContactPerson contactType="technical"> - <Company>University of Borås</Company> - <SurName>Per-Olof Axelsson</SurName> - <EmailAddress>mailto:Per-Olof.Axelsson@hb.se</EmailAddress> - <TelephoneNumber>+46 33 435 4697</TelephoneNumber> - </ContactPerson> - <ContactPerson contactType="support"> - <Company>University of Borås</Company> - <SurName>IT-avdelningen</SurName> - <EmailAddress>mailto:it-avdelningen@hb.se</EmailAddress> - <TelephoneNumber>+46 33 435 4690</TelephoneNumber> - </ContactPerson> -</EntityDescriptor> diff --git a/swamid-2.0/identity.mdh.se-idp-shibboleth.xml b/swamid-2.0/identity.mdh.se-idp-shibboleth.xml index 7a14fceb..1ea81c96 100644 --- a/swamid-2.0/identity.mdh.se-idp-shibboleth.xml +++ b/swamid-2.0/identity.mdh.se-idp-shibboleth.xml @@ -1,11 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://identity.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: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">mdh.se</shibmd:Scope> <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> - <mdui:DisplayName xml:lang="sv">Mälardalens Högskola</mdui:DisplayName> - <mdui:DisplayName xml:lang="en">Mälardalen University</mdui:DisplayName> + <mdui:DisplayName xml:lang="sv">Mälardalens Högskola (gammal)</mdui:DisplayName> + <mdui:DisplayName xml:lang="en">Mälardalen University (old)</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> @@ -94,8 +101,8 @@ P7nZB2+XoE3sf8xqd2a9xO7vy1r17Q7bx8PzwklL9GdFppuRnimioYoF3atEQM6R </AttributeAuthorityDescriptor> <Organization> <OrganizationName xml:lang="en">MDH</OrganizationName> - <OrganizationDisplayName xml:lang="sv">Mälardalens Högskola</OrganizationDisplayName> - <OrganizationDisplayName xml:lang="en">Mälardalen University</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="sv">Mälardalens Högskola (gammal)</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="en">Mälardalen University (old)</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.mdh.se</OrganizationURL> </Organization> <ContactPerson contactType="administrative"> diff --git a/swamid-2.0/idp.mdh.se-idp-shibboleth.xml b/swamid-2.0/idp.mdh.se-idp-shibboleth.xml index 6a4a63df..e7a5a5f3 100644 --- a/swamid-2.0/idp.mdh.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.mdh.se-idp-shibboleth.xml @@ -4,8 +4,8 @@ <Extensions> <shibmd:Scope regexp="false">mdh.se</shibmd:Scope> <mdui:UIInfo> - <mdui:DisplayName xml:lang="sv">Mälardalens Högskola (ny)</mdui:DisplayName> - <mdui:DisplayName xml:lang="en">Mälardalen University (new)</mdui:DisplayName> + <mdui:DisplayName xml:lang="sv">Mälardalens Högskola</mdui:DisplayName> + <mdui:DisplayName xml:lang="en">Mälardalen University</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> @@ -188,8 +188,8 @@ gJxaftdRQe7zWKOr0S7Lpm02pTSgD9bTPx1RVDuoyIYO0GGn+CF9ADzfOWR4dtJ9 </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> + <OrganizationDisplayName xml:lang="sv">Mälardalens Högskola</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="en">Mälardalen University</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.mdh.se</OrganizationURL> </Organization> <ContactPerson contactType="administrative"> diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml index 00b1cbb2..1db8e5c6 100644 --- a/swamid-idp-2.0.mxml +++ b/swamid-idp-2.0.mxml @@ -16,10 +16,10 @@ <xi:include href="swamid-2.0/idp.sics.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp.his.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/login.liu.se-idp-shibboleth.xml"/> - <xi:include href="swamid-2.0/hbidp.hb.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp.antagning.se-aws-idp.xml"/> <xi:include href="swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/fs.test.ad.liu.se-adfs-services-trust.xml"/> <xi:include href="swamid-2.0/adfs.rkh.se-adfs-services-trust.xml"/> <xi:include href="swamid-2.0/idp2.hv.se-idp-shibboleth.xml"/> + <xi:include href="swamid-2.0/identity.mdh.se-idp-shibboleth.xml"/> </md:EntitiesDescriptor> |