From 20926205e5484b288ad913098c9b5889747895e5 Mon Sep 17 00:00:00 2001
From: Fredrik Aslund <fredrik.aslund@umu.se>
Date: Thu, 3 Sep 2015 11:02:28 +0200
Subject: atlas.slu.se added test site for new maps.slu.se

---
 swamid-2.0/atlas.slu.se-shibboleth.xml | 90 ++++++++++++++++++++++++++++++++++
 swamid-2.0/maps.slu.se-shibboleth.xml  |  6 +++
 swamid-2.0/saml.salesforce.com-ndn.xml | 47 +++++++++---------
 swamid-sp-2.0.mxml                     |  1 +
 4 files changed, 121 insertions(+), 23 deletions(-)
 create mode 100644 swamid-2.0/atlas.slu.se-shibboleth.xml

diff --git a/swamid-2.0/atlas.slu.se-shibboleth.xml b/swamid-2.0/atlas.slu.se-shibboleth.xml
new file mode 100644
index 00000000..29d46165
--- /dev/null
+++ b/swamid-2.0/atlas.slu.se-shibboleth.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://atlas.slu.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"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <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/eu-adequate-protection</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.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://atlas.slu.se/Shibboleth.sso/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://atlas.slu.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">maps.slu.se - testsite</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">maps.slu.se - testsite</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">SLU:s tjänst för distribution av geografiska data</mdui:Description>
+        <mdui:Description xml:lang="en">SLU service for distribution of geographical data</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>atlas.slu.se</ds:KeyName>
+        <ds:KeyName>https://atlas.slu.se/shibboleth</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=atlas.slu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDDCCAfSgAwIBAgIJAM4yh57daZITMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+BAMTDGF0bGFzLnNsdS5zZTAeFw0xNTA2MTgxMTQxNTBaFw0yNTA2MTUxMTQxNTBa
+MBcxFTATBgNVBAMTDGF0bGFzLnNsdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAL67FSkIyqmdkoEAz9gxPXKf6eli4gBvwmLuh1C/lrc8s1Jzno81
+z36wrUbX5rBzMteupRLQLwfRwx2nIwhPSfQCvtEfyFNLf2D/Pm7Y6SouqyQxyatG
+sn4do9plqfEpGWU0ZK2nH8pf6NkITzDjqykplT7nfAEe5Wsp/VTl5ExXs80JwK3c
+G9xDMneo1NJoytRtjXQI+OsbhR56ZJKkxkv5P5AE523HSg5SuOOgDAFsRHKJsgeK
+ZiUQam0DfzHG5Zceq8TKOmUMcNub1mg+fdgiqu21I+cNGpVgFTms9pa3OxZG6DAw
+55PDJ4e/Ika7O7KMLsfVTHILo4XHLmvVM+kCAwEAAaNbMFkwOAYDVR0RBDEwL4IM
+YXRsYXMuc2x1LnNlhh9odHRwczovL2F0bGFzLnNsdS5zZS9zaGliYm9sZXRoMB0G
+A1UdDgQWBBR06HlBgkISecFyWLaVPfCjzYwN2DANBgkqhkiG9w0BAQUFAAOCAQEA
+pTMhg1KaJfRt4PkSKvjRaPzDQvLWJxE9hgDb9iGNAXvGvnmKPs7YoziMz7ICbkce
+SKTLWchBHAiAD6N/uJCDmdwDY+VmH48F4vRok/vt2FDCgtogrHXfM4K5PlhGHCl1
+gdccPmA/IMkQpSr76I6cVWjk3FTX4nahR1cq6597+iWjaN2AHwsr3vC4kvjdC8QC
+OFfBlIVvEMXWzo+JRCyZbm+BXa5wVx8qkP2HkhYAm0sI2yw0ZjpzaPi1K+3oK9gU
+tFXrBRl9ylwunnWQP2FsI/pceyGv99G2VmWvtx7wVbg4fM3FwlQswj1rM+EkHVl7
+fERSmom3Oe5HW6bTLnbS6w==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <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://atlas.slu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://atlas.slu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://atlas.slu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://atlas.slu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://atlas.slu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://atlas.slu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://atlas.slu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://atlas.slu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://atlas.slu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://atlas.slu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/maps.slu.se-shibboleth.xml b/swamid-2.0/maps.slu.se-shibboleth.xml
index 20dbbaa9..10419685 100644
--- a/swamid-2.0/maps.slu.se-shibboleth.xml
+++ b/swamid-2.0/maps.slu.se-shibboleth.xml
@@ -13,6 +13,12 @@
     <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://maps.slu.se/Shibboleth.sso/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://maps.slu.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">maps.slu.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">maps.slu.se</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">SLU:s tjänst för distribution av geografiska data</mdui:Description>
+        <mdui:Description xml:lang="en">SLU service for distribution of geographical data</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-2.0/saml.salesforce.com-ndn.xml b/swamid-2.0/saml.salesforce.com-ndn.xml
index 5051e53c..41384166 100644
--- a/swamid-2.0/saml.salesforce.com-ndn.xml
+++ b/swamid-2.0/saml.salesforce.com-ndn.xml
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?><md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://saml.salesforce.com/ndn">
-   <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-      <md:KeyDescriptor use="signing">
-         <ds:KeyInfo>
-            <ds:X509Data>
-               <ds:X509Certificate>MIIFYDCCBEigAwIBAgIQQ4KxN7E3aAGP1rpwQm6gZzANBgkqhkiG9w0BAQUFADCBvDELMAk
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://saml.salesforce.com/ndn">
+  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFYDCCBEigAwIBAgIQQ4KxN7E3aAGP1rpwQm6gZzANBgkqhkiG9w0BAQUFADCBvDELMAk
 GA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbi
 BUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2UgYXQgaHR0cHM6Ly93d3cud
 mVyaXNpZ24uY29tL3JwYSAoYykxMDE2MDQGA1UEAxMtVmVyaVNpZ24gQ2xhc3MgMyBJbnRl
@@ -29,13 +30,13 @@ AA4IBAQAEMsL4HAd5uYW3j0SQFX4Opl7p0Vo4o7HKBHCtV4ZjzkSFwvRR9+5zijYqlhe4ou
 uTmGvXvIUSAZ5q0CVDgzbGsrjWnZXllgO6krwPonEg6MdFarA87bAkLCrLZ0HqWeUVlf2nt
 fvR7kjr0trUM/EBxPdcPxeMK70EJqku7GMEPOxkexTr2O0yD/2lZM0il+AUuOboZDl0Syfj
 U0N7YIKNKZq5hcoUP/sCpcReMNj0dAWeVYmADrV7LlOVvndgHKcLrUydS/9obQHen</ds:X509Certificate>
-            </ds:X509Data>
-         </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:KeyDescriptor use="encryption">
-         <ds:KeyInfo>
-            <ds:X509Data>
-               <ds:X509Certificate>MIIEVTCCAz2gAwIBAgIOAU9SUXkjAAAAAD/EWOQwDQYJKoZIhvcNAQELBQAwdTEN
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEVTCCAz2gAwIBAgIOAU9SUXkjAAAAAD/EWOQwDQYJKoZIhvcNAQELBQAwdTEN
 MAsGA1UEAwwEc2FtbDEYMBYGA1UECwwPMDBEMjUwMDAwMDBDemp0MRcwFQYDVQQK
 DA5TYWxlc2ZvcmNlLmNvbTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzELMAkGA1UE
 CAwCQ0ExDDAKBgNVBAYTA1VTQTAeFw0xNTA4MjEyMjExNTVaFw0xNzA4MjExMjAw
@@ -59,14 +60,14 @@ nhJSmNKFhp50k32jCzrIW2+MH0cg9jzyicrTHT76zqltsdUwA4WvBIRvpcjM2oLz
 zcvMMMPDhPxLutsEknKYbjKD+y6m2eMHVEn6csRwfZIv3r70E6/ZMoqv6bIy/VMu
 dPCwrqMPuL1eUiKVqP7OVBBav2+lfoBPjbTckwokk7QgDMvsasrCFB4oHJha2oUy
 D6aIo9S0cqgN</ds:X509Certificate>
-            </ds:X509Data>
-         </ds:KeyInfo>
-      </md:KeyDescriptor>
-      <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sunet--Test.cs80.my.salesforce.com?so=00D25000000Czjt&amp;sc=0LE250000004CBO" index="0" isDefault="true"/>
-      <md:AttributeConsumingService index="0" isDefault="true">
-         <md:ServiceName xml:lang="en">Salesforce.com</md:ServiceName>
-         <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      </md:AttributeConsumingService>
-   </md:SPSSODescriptor>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sunet--Test.cs80.my.salesforce.com?so=00D25000000Czjt&amp;sc=0LE250000004CBO" index="0" isDefault="true"/>
+    <md:AttributeConsumingService index="0" isDefault="true">
+      <md:ServiceName xml:lang="en">Salesforce.com</md:ServiceName>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
 </md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 1a45d2da..34a9b895 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -452,4 +452,5 @@
   <xi:include href="swamid-2.0/www.utb.resultat.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/nyainloggning.hv.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/saml.salesforce.com-ndn.xml"/>
+  <xi:include href="swamid-2.0/atlas.slu.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3