summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Mattsson <Bjorn.Mattsson@bth.se>2020-03-25 09:43:54 +0100
committerBjörn Mattsson <Bjorn.Mattsson@bth.se>2020-03-25 09:43:54 +0100
commit654ed7401ecb93bb5ab7433f920b7ef6dfa40f02 (patch)
tree92538f848d9a1a36ed2c92d09dfe38795e2410c0
parent24d825bf4ba87d848cd61025e5ce3ea4e5834a0c (diff)
Resolved SWAMID-2774
-rw-r--r--swamid-2.0/studiumbb.uu.se-studium.xml (renamed from swamid-2.0/studium.uu.se-studium.xml)24
-rw-r--r--swamid-sp-2.0.mxml2
2 files changed, 13 insertions, 13 deletions
diff --git a/swamid-2.0/studium.uu.se-studium.xml b/swamid-2.0/studiumbb.uu.se-studium.xml
index 22cc7119..4d564186 100644
--- a/swamid-2.0/studium.uu.se-studium.xml
+++ b/swamid-2.0/studiumbb.uu.se-studium.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://studium.uu.se/studium">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://studiumbb.uu.se/studium">
<md:Extensions>
<mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
<mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
@@ -13,7 +13,7 @@
</md:Extensions>
<md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
- <idpdisco:DiscoveryResponse xmlns:idpdisco="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://studium.uu.se/auth-saml/saml/login/alias/_122_1?disco=true" index="1"/>
+ <idpdisco:DiscoveryResponse xmlns:idpdisco="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://studiumbb.uu.se/auth-saml/saml/login/ali as/_122_1?disco=true" index="1"/>
<mdui:UIInfo>
<mdui:DisplayName xml:lang="en">Studium</mdui:DisplayName>
<mdui:DisplayName xml:lang="sv">Studium</mdui:DisplayName>
@@ -37,7 +37,7 @@
ufFULWajnc0Y+K+BVaeBIDSv3PpPoHPLrqvMaDwseDwCHGS0S7Bd3Iq6tDGGQKZpl5Wehd1G8ZJz
bbz/BPZWppTeODXigWeBXxeqWqNhYb3eHEycl99rf14O5ejoxMu5L/+lwDUpGmgZCubvGIjRKdtb
UDnsXC8=
- </ds:X509Certificate>
+ </ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
@@ -57,23 +57,23 @@
ufFULWajnc0Y+K+BVaeBIDSv3PpPoHPLrqvMaDwseDwCHGS0S7Bd3Iq6tDGGQKZpl5Wehd1G8ZJz
bbz/BPZWppTeODXigWeBXxeqWqNhYb3eHEycl99rf14O5ejoxMu5L/+lwDUpGmgZCubvGIjRKdtb
UDnsXC8=
- </ds:X509Certificate>
+ </ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://studium.uu.se/auth-saml/saml/SingleLogout/alias/_122_1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://studiumbb.uu.se/auth-saml/saml/SingleLogout/alias/_122_1"/>
<md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress
- </md:NameIDFormat>
+ </md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient
- </md:NameIDFormat>
+ </md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent
- </md:NameIDFormat>
+ </md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified
- </md:NameIDFormat>
+ </md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName
- </md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studium.uu.se/auth-saml/saml/SSO/alias/_122_1" index="0" isDefault="true"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://studium.uu.se/auth-saml/saml/SSO/alias/_122_1" index="1"/>
+ </md:NameIDFormat>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studiumbb.uu.se/auth-saml/saml/SSO/alias/_122_1" index="0" isDefault="true"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://studiumbb.uu.se/auth-saml/saml/SSO/alias/_122_1" index="1"/>
</md:SPSSODescriptor>
<md:ContactPerson contactType="technical">
<md:Company>Uppsala universitet</md:Company>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index fa8b3e78..0221586a 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -447,7 +447,7 @@
<xi:include href="swamid-2.0/administrationsverktyg.umu.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/administrationsverktyg.test.umu.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/nfg.su.se-shibboleth.sso.xml"/>
- <xi:include href="swamid-2.0/studium.uu.se-studium.xml"/>
+ <xi:include href="swamid-2.0/studiumbb.uu.se-studium.xml"/>
<xi:include href="swamid-2.0/valda.uhr.se-shibboleth.xml"/>
<xi:include href="swamid-2.0/sunet.my.salesforce.com.xml"/>
<xi:include href="swamid-2.0/saml.salesforce.com-sunet.xml"/>