tidy

2 files changed, 58 insertions, 7 deletions

diff --git a/swamid-2.0/kaltura.saas-idp-test.swamid.se-saml2-proxy_saml2_backend.xml b/swamid-2.0/kaltura.saas-idp-test.swamid.se-saml2-proxy_saml2_backend.xml
index eeec5609..c1966c54 100644
--- a/swamid-2.0/kaltura.saas-idp-test.swamid.se-saml2-proxy_saml2_backend.xml
+++ b/swamid-2.0/kaltura.saas-idp-test.swamid.se-saml2-proxy_saml2_backend.xml
@@ -1,4 +1,30 @@
-<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ns2="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns3="http://www.w3.org/2000/09/xmldsig#" entityID="https://kaltura.saas-idp-test.swamid.se/Saml2/proxy_saml2_backend.xml"><ns0:Extensions><ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5" /><ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160" /><ns1:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224" /><ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384" /><ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512" /><ns1:SigningMethod Algorithm="http,//www.w3.org/2000/09/xmldsig#dsa-sha1" /><ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-md5" /><ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160" /><ns1:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224" /><ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384" /><ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512" /></ns0:Extensions><ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"><ns0:Extensions><ns2:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://saas-idp-test.swamid.se/Saml2/disco" index="1" /></ns0:Extensions><ns0:KeyDescriptor use="signing"><ns3:KeyInfo><ns3:X509Data><ns3:X509Certificate>MIIDFzCCAf+gAwIBAgIJAJ2oYIcVdeCnMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNV
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ns2="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns3="http://www.w3.org/2000/09/xmldsig#" entityID="https://kaltura.saas-idp-test.swamid.se/Saml2/proxy_saml2_backend.xml">
+  <ns0:Extensions>
+    <ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/>
+    <ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/>
+    <ns1:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <ns1:SigningMethod Algorithm="http,//www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"/>
+    <ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"/>
+    <ns1:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"/>
+    <ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+  </ns0:Extensions>
+  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <ns0:Extensions>
+      <ns2:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://saas-idp-test.swamid.se/Saml2/disco" index="1"/>
+    </ns0:Extensions>
+    <ns0:KeyDescriptor use="signing">
+      <ns3:KeyInfo>
+        <ns3:X509Data>
+          <ns3:X509Certificate>MIIDFzCCAf+gAwIBAgIJAJ2oYIcVdeCnMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNV
 BAMMF3NhYXMtaWRwLXRlc3Quc3dhbWlkLnNlMB4XDTE2MDQyMjEwMDIxNVoXDTE2
 MDUyMjEwMDIxNVowIjEgMB4GA1UEAwwXc2Fhcy1pZHAtdGVzdC5zd2FtaWQuc2Uw
 ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYm+GFzsTZbyzhGJ/bnc9C
@@ -15,7 +41,14 @@ MEkvSXepP1XiITRa/fIpPX9/HA3DI51WeAaNI0tu4r9bl2MWnI5oAqLLmAIetTNX
 OOmQimcvHRMfkStDwNXhlsjjvfwkibB2jRag4BJfMuSCn/1BxiQ1lMcpJDPeNPdB
 2cEO5CwnF2RKHNsWaWKN/peL53nk8smz4Yn+QhT2u6RAjslL8YSR7mcqfJCkAWHr
 vwUCgOYar5qF3huByMQmNfVFXoU6UDElCkeX
-</ns3:X509Certificate></ns3:X509Data></ns3:KeyInfo></ns0:KeyDescriptor><ns0:KeyDescriptor use="encryption"><ns3:KeyInfo><ns3:X509Data><ns3:X509Certificate>MIIDFzCCAf+gAwIBAgIJAJ2oYIcVdeCnMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNV
+</ns3:X509Certificate>
+        </ns3:X509Data>
+      </ns3:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:KeyDescriptor use="encryption">
+      <ns3:KeyInfo>
+        <ns3:X509Data>
+          <ns3:X509Certificate>MIIDFzCCAf+gAwIBAgIJAJ2oYIcVdeCnMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNV
 BAMMF3NhYXMtaWRwLXRlc3Quc3dhbWlkLnNlMB4XDTE2MDQyMjEwMDIxNVoXDTE2
 MDUyMjEwMDIxNVowIjEgMB4GA1UEAwwXc2Fhcy1pZHAtdGVzdC5zd2FtaWQuc2Uw
 ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYm+GFzsTZbyzhGJ/bnc9C
@@ -32,4 +65,24 @@ MEkvSXepP1XiITRa/fIpPX9/HA3DI51WeAaNI0tu4r9bl2MWnI5oAqLLmAIetTNX
 OOmQimcvHRMfkStDwNXhlsjjvfwkibB2jRag4BJfMuSCn/1BxiQ1lMcpJDPeNPdB
 2cEO5CwnF2RKHNsWaWKN/peL53nk8smz4Yn+QhT2u6RAjslL8YSR7mcqfJCkAWHr
 vwUCgOYar5qF3huByMQmNfVFXoU6UDElCkeX
-</ns3:X509Certificate></ns3:X509Data></ns3:KeyInfo></ns0:KeyDescriptor><ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saas-idp-test.swamid.se/Saml2/acs/post" index="1" /><ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saas-idp-test.swamid.se/Saml2/acs/redirect" index="2" /></ns0:SPSSODescriptor><ns0:Organization><ns0:OrganizationName xml:lang="en">SUNET Play</ns0:OrganizationName><ns0:OrganizationDisplayName xml:lang="en">SUNET Play</ns0:OrganizationDisplayName><ns0:OrganizationURL xml:lang="en">https://sunet.se</ns0:OrganizationURL></ns0:Organization><ns0:ContactPerson contactType="technical"><ns0:GivenName>Technical</ns0:GivenName><ns0:EmailAddress>noc@sunet.se</ns0:EmailAddress></ns0:ContactPerson><ns0:ContactPerson contactType="support"><ns0:GivenName>Support</ns0:GivenName><ns0:EmailAddress>noc@sunet.se</ns0:EmailAddress></ns0:ContactPerson></ns0:EntityDescriptor>
+</ns3:X509Certificate>
+        </ns3:X509Data>
+      </ns3:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saas-idp-test.swamid.se/Saml2/acs/post" index="1"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saas-idp-test.swamid.se/Saml2/acs/redirect" index="2"/>
+  </ns0:SPSSODescriptor>
+  <ns0:Organization>
+    <ns0:OrganizationName xml:lang="en">SUNET Play</ns0:OrganizationName>
+    <ns0:OrganizationDisplayName xml:lang="en">SUNET Play</ns0:OrganizationDisplayName>
+    <ns0:OrganizationURL xml:lang="en">https://sunet.se</ns0:OrganizationURL>
+  </ns0:Organization>
+  <ns0:ContactPerson contactType="technical">
+    <ns0:GivenName>Technical</ns0:GivenName>
+    <ns0:EmailAddress>noc@sunet.se</ns0:EmailAddress>
+  </ns0:ContactPerson>
+  <ns0:ContactPerson contactType="support">
+    <ns0:GivenName>Support</ns0:GivenName>
+    <ns0:EmailAddress>noc@sunet.se</ns0:EmailAddress>
+  </ns0:ContactPerson>
+</ns0:EntityDescriptor>
diff --git a/swamid-2.0/ladok3edit.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3edit.its.umu.se-gui-sp.xml
index 1b9e4ec0..363c1adb 100644
--- a/swamid-2.0/ladok3edit.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3edit.its.umu.se-gui-sp.xml
@@ -1,5 +1,5 @@
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_e76fedb97243073c5306cc0220ef35c8ef853075" entityID="https://ladok3edit.its.umu.se/gui-sp">
-
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3edit.its.umu.se/gui-sp">
   <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,7 +18,6 @@
     <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://ladok3edit.its.umu.se/Shibboleth.sso/Login"/>
@@ -82,5 +81,4 @@ aYnmCVGoNUbA+6Va0n9luhsqnA1TyI9HPOIbtbvAQ8kvU4ALw31YPGAxvzO1majX
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3edit.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3edit.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>