SWAMID-74, Identity federation med EduGAIN

2 files changed, 29 insertions, 18 deletions

diff --git a/swamid-2.0/drive-idp-proxy.sunet.se-sp.xml b/swamid-2.0/drive-idp-proxy.sunet.se-sp.xml
index e119f0f6..4337badb 100644
--- a/swamid-2.0/drive-idp-proxy.sunet.se-sp.xml
+++ b/swamid-2.0/drive-idp-proxy.sunet.se-sp.xml
@@ -34,6 +34,14 @@
   <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <ns0:Extensions>
       <ns3:DiscoveryResponse xmlns:ns3="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://drive-idp-proxy.sunet.se/Saml2SP/disco" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Sunet Drive Satosa GW</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Sunet Drive Satosa GW</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Satosa GW för Sunet Drive</mdui:Description>
+        <mdui:Description xml:lang="en">Satosa GW to bridge SAML authentication for Sunet Drive</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.sunet.se/swamid/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.sunet.se/about-sunet/</mdui:InformationURL>
+      </mdui:UIInfo>
     </ns0:Extensions>
     <ns0:KeyDescriptor use="signing">
       <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
@@ -107,23 +115,25 @@ nFazsTrNSZlEGo3j2eQJF+jcoe/dBg/fTJkDpehuCObZ6KOCGBIiYSu6wISlbti9
     </ns0:KeyDescriptor>
     <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat>
     <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drive-idp-proxy.sunet.se/Saml2SP/acs/post" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://drive-idp-proxy.sunet.se/Saml2SP/acs/redirect" index="2"/>
   </ns0:SPSSODescriptor>
-  <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
-    <ns0:OrganizationName xml:lang="en">SUNET Drive</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="en">SUNET Drive</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">https://sunet.se</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <ns0:GivenName>Richard Freitag</ns0:GivenName>
-    <ns0:EmailAddress>mailto:freitag@sunet.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <ns0:GivenName>Jonas Hagström</ns0:GivenName>
-    <ns0:EmailAddress>mailto:jonas@nordu.net</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <ns0:GivenName>Sunet NOC</ns0:GivenName>
-    <ns0:EmailAddress>mailto:noc@sunet.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">SUNET</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">SUNET</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Swedish University Network (SUNET)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish University Network (SUNET)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.sunet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Richard Freitag</md:GivenName>
+    <md:EmailAddress>mailto:freitag@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jonas Hagström</md:GivenName>
+    <md:EmailAddress>mailto:jonas@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sunet NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-edugain-sp-1.0.mxml b/swamid-edugain-sp-1.0.mxml
index 57cb933c..83fa199a 100644
--- a/swamid-edugain-sp-1.0.mxml
+++ b/swamid-edugain-sp-1.0.mxml
@@ -50,4 +50,5 @@
   <xi:include href="swamid-2.0/gitlab.speech.humlab.umu.se.xml"/>
   <xi:include href="swamid-2.0/speech.humlab.umu.se.xml"/>
   <xi:include href="swamid-2.0/gitlab.fysik.su.se-swamidproxy-gitlab.xml"/>
+  <xi:include href="swamid-2.0/drive-idp-proxy.sunet.se-sp.xml"/>
 </md:EntitiesDescriptor>