Resolves SWAMIDOPS-294

4 files changed, 276 insertions, 0 deletions

diff --git a/swamid-2.0/dev-us.cloudmore.com-shibboleth.xml b/swamid-2.0/dev-us.cloudmore.com-shibboleth.xml
new file mode 100644
index 00000000..36c0a925
--- /dev/null
+++ b/swamid-2.0/dev-us.cloudmore.com-shibboleth.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://dev-us.cloudmore.com/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"/>
+  </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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Cloudmore</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Cloud Brokerage Platform for IT, Business and Public Sector</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://web.cloudmore.com/</mdui:InformationURL>
+        <mdui:Logo height="300" width="300">https://us.cloudmore.com/Files/Uploads/Shibboleth/Cloudmore-green-icon.png</mdui:Logo>
+      </mdui:UIInfo>
+      <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://dev-us.cloudmore.com/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>cmpusfe01.cmp-us.cloudmore.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=cmpusfe01.cmp-us.cloudmore.net</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEITCCAomgAwIBAgIJAKyL/KWR/DdqMA0GCSqGSIb3DQEBCwUAMCkxJzAlBgNV
+BAMTHmNtcHVzZmUwMS5jbXAtdXMuY2xvdWRtb3JlLm5ldDAeFw0xNzA0MDMxMTUy
+MzhaFw0yNzA0MDExMTUyMzhaMCkxJzAlBgNVBAMTHmNtcHVzZmUwMS5jbXAtdXMu
+Y2xvdWRtb3JlLm5ldDCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALLz
+RYrrIiv11E8u5ivDKbk8CiAchunwwbzApbg9Gbf03qv+MlWI/TizbB4U78qmUQQo
+rBbrxhxHCG6zh7jmCGrKI525JC/Ggq8eLh5scsReS+h+3dP4OLITYX255AxBXsnf
+puHztUqgmvJalxTqv3ZSj+sgL1Gg9miffZU9Qp+PJTDnvFqryyF5RdtYsM8hl1Hs
+gTgkqq1CfNwjAX+K3KPuaXeI13wX5O5XgLy3GL6AvNcjzR7OK6WRVMzusFV5GDkv
+HDmW1SKPOiwVpEajJFG9ALqYpRcVHWLFC9PbY35aElJppKwI+lOc9+gKoe72Pfzy
+NWktXwcCOQFrKTC+OkdocKD9qU0Ykb5a6jxSke/OqCDXZIDNMtcwkaNq2EVQHQ5l
+m5FSX+7aHkovpZ1EldKeN7bbAHR4vbAHu/TzItw2FTqxIIJ3Dhro+cDxHvt2PkVe
+lHi6FnRKEWD/eKuBa4HYi6wNyPJL5DuTWSa9b6EIHcEAEObx/cLCcO5JyrYCPwID
+AQABo0wwSjApBgNVHREEIjAggh5jbXB1c2ZlMDEuY21wLXVzLmNsb3VkbW9yZS5u
+ZXQwHQYDVR0OBBYEFCIqTffYDcKPd0MsT7uJPMPSdFXBMA0GCSqGSIb3DQEBCwUA
+A4IBgQA6x3KG35Lo6+WdDiHc6jItmA3NVtwEa7yP65+e58eDsFwkcZKMpriKT1j6
+oAQLCo9gm90iTMB6Bp3w49Ugff1ZWp8XQDkS5XATB8kuefdclzT8e0l7AZY3XHVP
+wAzc9xIx8fPDzX7EaQWdUKag+xhC3KarIM+fxIi2bpTl/dmqMlfZXnqYD7xwn/d5
+YL+WaojEcT+bAjwBENRveVJzE8F2zP9XWoac+Kq5m+bpUk4mbdsiyopM+JyQbv0v
+LbdC4ymC3I3g7UWdnrOVIxvAmpZSvfcrltBcq3YUYbNUqN0JBi3yp+vM3YC/Wy5z
+1u9OtZv4XRHYhc4MWrHdpQQ9XmM2fP2Z3IUDD6wrt/oD0bsyZikfS+vQyeWKxVpR
+mNH2YgIOVvKd7FdBOG/Azmal9DDVIRBVT71v/UOR3iQKLemFIKbYeLAlDE3bruDF
+pyWYJhS1xRUZKLOk/yUKNAXBGehk9HjEibygik5sJkYKQ4lVNXyXq06saSeR/Sf0
+LAkq68U=
+</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://dev-us.cloudmore.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev-us.cloudmore.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev-us.cloudmore.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev-us.cloudmore.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev-us.cloudmore.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev-us.cloudmore.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev-us.cloudmore.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev-us.cloudmore.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev-us.cloudmore.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev-us.cloudmore.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cloudmore AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cloudmore</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cloudmore.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:support@cloudmore.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/staging-us.cloudmore.com-shibboleth.xml b/swamid-2.0/staging-us.cloudmore.com-shibboleth.xml
new file mode 100644
index 00000000..032c0863
--- /dev/null
+++ b/swamid-2.0/staging-us.cloudmore.com-shibboleth.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://staging-us.cloudmore.com/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"/>
+  </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://staging-us.cloudmore.com/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Cloudmore</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Cloud Brokerage Platform for IT, Business and Public Sector</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://web.cloudmore.com/</mdui:InformationURL>
+        <mdui:Logo height="300" width="300">https://us.cloudmore.com/Files/Uploads/Shibboleth/Cloudmore-green-icon.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>cmpusfe01.cmp-us.cloudmore.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=cmpusfe01.cmp-us.cloudmore.net</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEITCCAomgAwIBAgIJAKyL/KWR/DdqMA0GCSqGSIb3DQEBCwUAMCkxJzAlBgNV
+BAMTHmNtcHVzZmUwMS5jbXAtdXMuY2xvdWRtb3JlLm5ldDAeFw0xNzA0MDMxMTUy
+MzhaFw0yNzA0MDExMTUyMzhaMCkxJzAlBgNVBAMTHmNtcHVzZmUwMS5jbXAtdXMu
+Y2xvdWRtb3JlLm5ldDCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALLz
+RYrrIiv11E8u5ivDKbk8CiAchunwwbzApbg9Gbf03qv+MlWI/TizbB4U78qmUQQo
+rBbrxhxHCG6zh7jmCGrKI525JC/Ggq8eLh5scsReS+h+3dP4OLITYX255AxBXsnf
+puHztUqgmvJalxTqv3ZSj+sgL1Gg9miffZU9Qp+PJTDnvFqryyF5RdtYsM8hl1Hs
+gTgkqq1CfNwjAX+K3KPuaXeI13wX5O5XgLy3GL6AvNcjzR7OK6WRVMzusFV5GDkv
+HDmW1SKPOiwVpEajJFG9ALqYpRcVHWLFC9PbY35aElJppKwI+lOc9+gKoe72Pfzy
+NWktXwcCOQFrKTC+OkdocKD9qU0Ykb5a6jxSke/OqCDXZIDNMtcwkaNq2EVQHQ5l
+m5FSX+7aHkovpZ1EldKeN7bbAHR4vbAHu/TzItw2FTqxIIJ3Dhro+cDxHvt2PkVe
+lHi6FnRKEWD/eKuBa4HYi6wNyPJL5DuTWSa9b6EIHcEAEObx/cLCcO5JyrYCPwID
+AQABo0wwSjApBgNVHREEIjAggh5jbXB1c2ZlMDEuY21wLXVzLmNsb3VkbW9yZS5u
+ZXQwHQYDVR0OBBYEFCIqTffYDcKPd0MsT7uJPMPSdFXBMA0GCSqGSIb3DQEBCwUA
+A4IBgQA6x3KG35Lo6+WdDiHc6jItmA3NVtwEa7yP65+e58eDsFwkcZKMpriKT1j6
+oAQLCo9gm90iTMB6Bp3w49Ugff1ZWp8XQDkS5XATB8kuefdclzT8e0l7AZY3XHVP
+wAzc9xIx8fPDzX7EaQWdUKag+xhC3KarIM+fxIi2bpTl/dmqMlfZXnqYD7xwn/d5
+YL+WaojEcT+bAjwBENRveVJzE8F2zP9XWoac+Kq5m+bpUk4mbdsiyopM+JyQbv0v
+LbdC4ymC3I3g7UWdnrOVIxvAmpZSvfcrltBcq3YUYbNUqN0JBi3yp+vM3YC/Wy5z
+1u9OtZv4XRHYhc4MWrHdpQQ9XmM2fP2Z3IUDD6wrt/oD0bsyZikfS+vQyeWKxVpR
+mNH2YgIOVvKd7FdBOG/Azmal9DDVIRBVT71v/UOR3iQKLemFIKbYeLAlDE3bruDF
+pyWYJhS1xRUZKLOk/yUKNAXBGehk9HjEibygik5sJkYKQ4lVNXyXq06saSeR/Sf0
+LAkq68U=
+</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://staging-us.cloudmore.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging-us.cloudmore.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://staging-us.cloudmore.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging-us.cloudmore.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging-us.cloudmore.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging-us.cloudmore.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging-us.cloudmore.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://staging-us.cloudmore.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging-us.cloudmore.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging-us.cloudmore.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cloudmore AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cloudmore</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cloudmore.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:support@cloudmore.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/us.cloudmore.com-shibboleth.xml b/swamid-2.0/us.cloudmore.com-shibboleth.xml
new file mode 100644
index 00000000..6de8789d
--- /dev/null
+++ b/swamid-2.0/us.cloudmore.com-shibboleth.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://us.cloudmore.com/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"/>
+  </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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Cloudmore</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Cloud Brokerage Platform for IT, Business and Public Sector</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://web.cloudmore.com/</mdui:InformationURL>
+        <mdui:Logo height="300" width="300">https://us.cloudmore.com/Files/Uploads/Shibboleth/Cloudmore-green-icon.png</mdui:Logo>
+      </mdui:UIInfo>
+      <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://us.cloudmore.com/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>cmpusfe01.cmp-us.cloudmore.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=cmpusfe01.cmp-us.cloudmore.net</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEITCCAomgAwIBAgIJAKyL/KWR/DdqMA0GCSqGSIb3DQEBCwUAMCkxJzAlBgNV
+BAMTHmNtcHVzZmUwMS5jbXAtdXMuY2xvdWRtb3JlLm5ldDAeFw0xNzA0MDMxMTUy
+MzhaFw0yNzA0MDExMTUyMzhaMCkxJzAlBgNVBAMTHmNtcHVzZmUwMS5jbXAtdXMu
+Y2xvdWRtb3JlLm5ldDCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALLz
+RYrrIiv11E8u5ivDKbk8CiAchunwwbzApbg9Gbf03qv+MlWI/TizbB4U78qmUQQo
+rBbrxhxHCG6zh7jmCGrKI525JC/Ggq8eLh5scsReS+h+3dP4OLITYX255AxBXsnf
+puHztUqgmvJalxTqv3ZSj+sgL1Gg9miffZU9Qp+PJTDnvFqryyF5RdtYsM8hl1Hs
+gTgkqq1CfNwjAX+K3KPuaXeI13wX5O5XgLy3GL6AvNcjzR7OK6WRVMzusFV5GDkv
+HDmW1SKPOiwVpEajJFG9ALqYpRcVHWLFC9PbY35aElJppKwI+lOc9+gKoe72Pfzy
+NWktXwcCOQFrKTC+OkdocKD9qU0Ykb5a6jxSke/OqCDXZIDNMtcwkaNq2EVQHQ5l
+m5FSX+7aHkovpZ1EldKeN7bbAHR4vbAHu/TzItw2FTqxIIJ3Dhro+cDxHvt2PkVe
+lHi6FnRKEWD/eKuBa4HYi6wNyPJL5DuTWSa9b6EIHcEAEObx/cLCcO5JyrYCPwID
+AQABo0wwSjApBgNVHREEIjAggh5jbXB1c2ZlMDEuY21wLXVzLmNsb3VkbW9yZS5u
+ZXQwHQYDVR0OBBYEFCIqTffYDcKPd0MsT7uJPMPSdFXBMA0GCSqGSIb3DQEBCwUA
+A4IBgQA6x3KG35Lo6+WdDiHc6jItmA3NVtwEa7yP65+e58eDsFwkcZKMpriKT1j6
+oAQLCo9gm90iTMB6Bp3w49Ugff1ZWp8XQDkS5XATB8kuefdclzT8e0l7AZY3XHVP
+wAzc9xIx8fPDzX7EaQWdUKag+xhC3KarIM+fxIi2bpTl/dmqMlfZXnqYD7xwn/d5
+YL+WaojEcT+bAjwBENRveVJzE8F2zP9XWoac+Kq5m+bpUk4mbdsiyopM+JyQbv0v
+LbdC4ymC3I3g7UWdnrOVIxvAmpZSvfcrltBcq3YUYbNUqN0JBi3yp+vM3YC/Wy5z
+1u9OtZv4XRHYhc4MWrHdpQQ9XmM2fP2Z3IUDD6wrt/oD0bsyZikfS+vQyeWKxVpR
+mNH2YgIOVvKd7FdBOG/Azmal9DDVIRBVT71v/UOR3iQKLemFIKbYeLAlDE3bruDF
+pyWYJhS1xRUZKLOk/yUKNAXBGehk9HjEibygik5sJkYKQ4lVNXyXq06saSeR/Sf0
+LAkq68U=
+</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://us.cloudmore.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://us.cloudmore.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://us.cloudmore.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://us.cloudmore.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://us.cloudmore.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://us.cloudmore.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://us.cloudmore.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://us.cloudmore.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://us.cloudmore.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://us.cloudmore.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Cloudmore AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Cloudmore</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cloudmore.com/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:support@cloudmore.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-edugain-sp-1.0.mxml b/swamid-edugain-sp-1.0.mxml
index 9a8b087c..215c032e 100644
--- a/swamid-edugain-sp-1.0.mxml
+++ b/swamid-edugain-sp-1.0.mxml
@@ -34,4 +34,7 @@
   <xi:include href="swamid-2.0/dev.cloudmore.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/local.cloudmore.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sp.spraakbanken.gu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/dev-us.cloudmore.com-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/staging-us.cloudmore.com-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/us.cloudmore.com-shibboleth.xml"/>
 </md:EntitiesDescriptor>