diff options
| -rw-r--r-- | swamid-2.0/lis.ladok.test.sunet.se-shibboleth.xml (renamed from swamid-2.0/websrv01.testad.umu.se-shibboleth.xml) | 41 | ||||
| -rw-r--r-- | swamid-sp-2.0.mxml | 2 |
2 files changed, 19 insertions, 24 deletions
diff --git a/swamid-2.0/websrv01.testad.umu.se-shibboleth.xml b/swamid-2.0/lis.ladok.test.sunet.se-shibboleth.xml index 12f98cfc..dc6afde3 100644 --- a/swamid-2.0/websrv01.testad.umu.se-shibboleth.xml +++ b/swamid-2.0/lis.ladok.test.sunet.se-shibboleth.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://websrv01.testad.umu.se/shibboleth"> +<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lis.ladok.test.sunet.se/shibboleth"> <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport"> <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/> <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/> @@ -18,18 +18,18 @@ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/> <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/hei-service</samla:AttributeValue> + <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/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol 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://websrv01.testad.umu.se/Shibboleth.sso/DS/Login"/> - <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://websrv01.testad.umu.se/Shibboleth.sso/DS/Login" index="1"/> - <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://websrv01.testad.umu.se/Shibboleth.sso/Loginx"/> - <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://websrv01.testad.umu.se/Shibboleth.sso/UMU"/> + <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://lis.ladok.test.sunet.se/Shibboleth.sso/DS/Login"/> + <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/DS/Login" index="1"/> + <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://lis.ladok.test.sunet.se/Shibboleth.sso/Loginx"/> + <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://lis.ladok.test.sunet.se/Shibboleth.sso/UMU"/> <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> <mdui:DisplayName xml:lang="sv">Testsystem för canvas-lis vid Umeå universitet</mdui:DisplayName> <mdui:DisplayName xml:lang="en">Testsystem for canvas-lis at Umea University</mdui:DisplayName> @@ -69,7 +69,7 @@ nEwOTYTTy3bWuySCHbAcLFoRbAEQmRvlPk/sWU9cCUaLmTxRVkmr1s1UbZJNVPhX rNkzHliVfNgyZqak7Ay9DNyx8hSt/1/CBfgQsPjOLxpyKxGIdME86uCTbe32i9mz 1F4EXgMOYoaMf/hN6D9Jrvxz26240P577lU5lbkmyI/OrV8zIc+XYMC7wune5hNz 0/bNyIzo -</ds:X509Certificate> + </ds:X509Certificate> </ds:X509Data> </ds:KeyInfo> <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/> @@ -82,20 +82,15 @@ rNkzHliVfNgyZqak7Ay9DNyx8hSt/1/CBfgQsPjOLxpyKxGIdME86uCTbe32i9mz <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/> <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/> </md:KeyDescriptor> - <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://websrv01.testad.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/> - <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://websrv01.testad.umu.se/Shibboleth.sso/SLO/Artifact"/> - <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://websrv01.testad.umu.se/Shibboleth.sso/SLO/POST"/> - <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://websrv01.testad.umu.se/Shibboleth.sso/SLO/Redirect"/> - <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://websrv01.testad.umu.se/Shibboleth.sso/SLO/SOAP"/> - <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://websrv01.testad.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/> - <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://websrv01.testad.umu.se/Shibboleth.sso/SAML/POST" index="7"/> - <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://websrv01.testad.umu.se/Shibboleth.sso/SAML2/Artifact" index="8"/> - <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://websrv01.testad.umu.se/Shibboleth.sso/SAML2/ECP" index="9"/> - <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://websrv01.testad.umu.se/Shibboleth.sso/SAML2/POST" index="10"/> + <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/> + <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SLO/Artifact"/> + <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SLO/POST"/> + <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SLO/Redirect"/> + <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SLO/SOAP"/> + <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/> + <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SAML/POST" index="7"/> + <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SAML2/Artifact" index="8"/> + <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SAML2/ECP" index="9"/> + <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lis.ladok.test.sunet.se/Shibboleth.sso/SAML2/POST" index="10"/> </md:SPSSODescriptor> - <md:ContactPerson contactType="administrative"> - <md:GivenName>Tommy</md:GivenName> - <md:SurName>Larsson</md:SurName> - <md:EmailAddress>mailto:tommy.larsson@umu.se</md:EmailAddress> - </md:ContactPerson> </md:EntityDescriptor> diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml index 54172917..850f6753 100644 --- a/swamid-sp-2.0.mxml +++ b/swamid-sp-2.0.mxml @@ -699,11 +699,11 @@ <xi:include href="swamid-2.0/hh.hr.evry.se-shibboleth.xml"/> <xi:include href="swamid-2.0/test-hh.hr.evry.se-shibboleth.xml"/> <xi:include href="swamid-2.0/300-mediaspace.kaltura.nordu.net.xml"/> - <xi:include href="swamid-2.0/websrv01.testad.umu.se-shibboleth.xml"/> <xi:include href="swamid-2.0/confluence.its.uu.se-shibboleth.xml"/> <xi:include href="swamid-2.0/jira.its.uu.se-Shibboleth.sso.xml"/> <xi:include href="swamid-2.0/spadfs.it.gu.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/> <xi:include href="swamid-2.0/test-du.hr.evry.se-shibboleth.xml"/> <xi:include href="swamid-2.0/du.hr.evry.se-shibboleth.xml"/> <xi:include href="swamid-2.0/gerrit.cs.lth.se-shibboleth.xml"/> + <xi:include href="swamid-2.0/lis.ladok.test.sunet.se-shibboleth.xml"/> </md:EntitiesDescriptor> |