resolves SWAMIDOPS-6307

1 files changed, 49 insertions, 65 deletions

diff --git a/swamid-1.0/idp.hig.se.xml b/swamid-1.0/idp.hig.se.xml
index 818219c5..5155917a 100644
--- a/swamid-1.0/idp.hig.se.xml
+++ b/swamid-1.0/idp.hig.se.xml
@@ -1,8 +1,5 @@
-<EntityDescriptor entityID="https://idp.hig.se/idp/shibboleth"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.hig.se/idp/shibboleth">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
@@ -13,49 +10,44 @@
         <KeyDescriptor>
             <ds:KeyInfo>
                 <ds:X509Data>
-                    <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVAICBvXD19C9Alr+PA2+WCJ8AOE5kMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5oaWcuc2UwHhcNMTAwMjEyMDgxODAxWhcNMzAw
-MjEyMDgxODAxWjAVMRMwEQYDVQQDEwppZHAuaGlnLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAyKcZZgGl30xAfWbTeXr84KoAdib1dX7geELbuBYN
-/G6x6TWZ9zBtwR0IYLAS8BU2MUHtbpg+RIp9OVMp4FzCuTpYCHjn8Mm3OHNRAZf2
-shovHPIREI1ZfINY8hOhm6yWr74cFrhLxQ+wjkoeRni1zBuChBHQzw+mcK/Dax1Q
-nMQ+Hf+VCYWagYUO3vYWadg0KVwhiPx+4ignOYAae42WFWDnzg53gxj+Ix64Nzbp
-y2xOxYIp6AvrHCX977yfKBemmDvcuyzD7VvhcSMeVAb/jEugHFWjbU786odPvDD5
-fBpAcLuB4Oncda7Lwq0jVj+xTMC7D6NAxx1Eh5AS3a5qGQIDAQABo1swWTA4BgNV
+                    <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVAKDMK5kO5prtSxBh3prGd9azJDLHMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC5oaWcuc2UwHhcNMTEwOTE5MTAxMzEzWhcNMzEw
+OTE5MTAxMzEzWjAVMRMwEQYDVQQDEwppZHAuaGlnLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAlS0UltW/Niciy2s+KZOXcxBUBhRIwIltiARUzK8l
+/HHgfhDVadKCF6jFS8kYvWSTPGJbPQVtk14WXapOOlSFiUcDAI7JxN4G7wLJZjPc
+VUBIfedZYwzsTGc3XlHYOn6nBGBYIqG/OPHDA39khu/DiMVBoC4iXX7dnKIyLHXX
+ucuhlB3XpBajgzgkPTjp8kJbI0EeTtHn2JenpogOy8+I8mnEveL0p8WWuXr2Ij63
+/+ePtc49AQgEXMgTusGfhQZNqR016I9P32ycF49t4S0Ur2hkv7gm9qL8RwWFN8jH
+YonG4K5Xc7O4T6Q60e+/PDdyf5Po25O3im+aTPMzkEIqwwIDAQABo1swWTA4BgNV
 HREEMTAvggppZHAuaGlnLnNlhiFodHRwczovL2lkcC5oaWcuc2UvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFEWwGXXE3qHIRmgOo2XHStrjaUU0MA0GCSqGSIb3DQEB
-BQUAA4IBAQAkPDs3NMTHVzte7dYlv6ys1VWYB5Ez9aMjvJPBVh5iwwQzXevm4qZl
-IHoGxvne5R8dkEVM1lcYryFnc7IkSRvuq0utBZcMfU+hHV56IvUNXZsUPJohO3/6
-9SkqakYzPJ3g6voaBaQdoeuvgUXL1fxEuISZkna93UHjJyIIS3T480vP49kXhoT6
-ox75FIwbx/e0e3siAlinjxdy9XbmFm6nx9mIWp4MLqw3UzEIiQG2wKyLxRFr1SnZ
-Cyr54IEx7Zg6UOLaa23i3CX0H2PXTNuik1WN2qPcPo4REEkK7wNP60vYXt7TgJXq
-4irFaazkzqSXLSi1n75Jx2hT7wpSszS5</ds:X509Certificate>
+b2xldGgwHQYDVR0OBBYEFNkNbupRD08lWx3ys8A/KEqKGJtDMA0GCSqGSIb3DQEB
+BQUAA4IBAQBLzzCPKLm+PSGXcyFoM13yGUzhaATV3x1aABalp73Ps22j2BZay5Xq
+exByQFZFJoU279mh6CLTDch679S9WyI0WxQM41jV5mYOv5mllRLEiKMTG3slyyQN
+8P7rBL5OM2DusxFHCCturTlDjnafpybukqOd/YlaRoGeZuhQnzmxx0si07C9pwN4
+SdzIT7rVQJAvwjSNWMoepX0tboWAHFTdbvxEstnlFyi6Vibw5oTy34UxXVP2EmA8
+otLAA/GPqLtaaQ1u9fpDcdN5GjkHR1QyYN/UhhF0iXczvUp4o/D0ELbtdBPA5Rwf
++eeRni4ggtByVTzg9fALQjDJydWcw0Oy
+
+                    </ds:X509Certificate>
                 </ds:X509Data>
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://idp.hig.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hig.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://idp.hig.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hig.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
                                    
         <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
         <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
 
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" 
-                             Location="https://idp.hig.se/idp/profile/Shibboleth/SSO" />
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hig.se/idp/profile/Shibboleth/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://idp.hig.se/idp/profile/SAML2/POST/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hig.se/idp/profile/SAML2/POST/SSO"/>
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://idp.hig.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hig.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://idp.hig.se/idp/profile/SAML2/Redirect/SSO" />
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hig.se/idp/profile/SAML2/Redirect/SSO"/>
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -67,45 +59,37 @@ Cyr54IEx7Zg6UOLaa23i3CX0H2PXTNuik1WN2qPcPo4REEkK7wNP60vYXt7TgJXq
         <KeyDescriptor>
             <ds:KeyInfo>
                 <ds:X509Data>
-                    <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVAICBvXD19C9Alr+PA2+WCJ8AOE5kMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5oaWcuc2UwHhcNMTAwMjEyMDgxODAxWhcNMzAw
-MjEyMDgxODAxWjAVMRMwEQYDVQQDEwppZHAuaGlnLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAyKcZZgGl30xAfWbTeXr84KoAdib1dX7geELbuBYN
-/G6x6TWZ9zBtwR0IYLAS8BU2MUHtbpg+RIp9OVMp4FzCuTpYCHjn8Mm3OHNRAZf2
-shovHPIREI1ZfINY8hOhm6yWr74cFrhLxQ+wjkoeRni1zBuChBHQzw+mcK/Dax1Q
-nMQ+Hf+VCYWagYUO3vYWadg0KVwhiPx+4ignOYAae42WFWDnzg53gxj+Ix64Nzbp
-y2xOxYIp6AvrHCX977yfKBemmDvcuyzD7VvhcSMeVAb/jEugHFWjbU786odPvDD5
-fBpAcLuB4Oncda7Lwq0jVj+xTMC7D6NAxx1Eh5AS3a5qGQIDAQABo1swWTA4BgNV
+                    <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVAKDMK5kO5prtSxBh3prGd9azJDLHMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC5oaWcuc2UwHhcNMTEwOTE5MTAxMzEzWhcNMzEw
+OTE5MTAxMzEzWjAVMRMwEQYDVQQDEwppZHAuaGlnLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAlS0UltW/Niciy2s+KZOXcxBUBhRIwIltiARUzK8l
+/HHgfhDVadKCF6jFS8kYvWSTPGJbPQVtk14WXapOOlSFiUcDAI7JxN4G7wLJZjPc
+VUBIfedZYwzsTGc3XlHYOn6nBGBYIqG/OPHDA39khu/DiMVBoC4iXX7dnKIyLHXX
+ucuhlB3XpBajgzgkPTjp8kJbI0EeTtHn2JenpogOy8+I8mnEveL0p8WWuXr2Ij63
+/+ePtc49AQgEXMgTusGfhQZNqR016I9P32ycF49t4S0Ur2hkv7gm9qL8RwWFN8jH
+YonG4K5Xc7O4T6Q60e+/PDdyf5Po25O3im+aTPMzkEIqwwIDAQABo1swWTA4BgNV
 HREEMTAvggppZHAuaGlnLnNlhiFodHRwczovL2lkcC5oaWcuc2UvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFEWwGXXE3qHIRmgOo2XHStrjaUU0MA0GCSqGSIb3DQEB
-BQUAA4IBAQAkPDs3NMTHVzte7dYlv6ys1VWYB5Ez9aMjvJPBVh5iwwQzXevm4qZl
-IHoGxvne5R8dkEVM1lcYryFnc7IkSRvuq0utBZcMfU+hHV56IvUNXZsUPJohO3/6
-9SkqakYzPJ3g6voaBaQdoeuvgUXL1fxEuISZkna93UHjJyIIS3T480vP49kXhoT6
-ox75FIwbx/e0e3siAlinjxdy9XbmFm6nx9mIWp4MLqw3UzEIiQG2wKyLxRFr1SnZ
-Cyr54IEx7Zg6UOLaa23i3CX0H2PXTNuik1WN2qPcPo4REEkK7wNP60vYXt7TgJXq
-4irFaazkzqSXLSi1n75Jx2hT7wpSszS5</ds:X509Certificate>
+b2xldGgwHQYDVR0OBBYEFNkNbupRD08lWx3ys8A/KEqKGJtDMA0GCSqGSIb3DQEB
+BQUAA4IBAQBLzzCPKLm+PSGXcyFoM13yGUzhaATV3x1aABalp73Ps22j2BZay5Xq
+exByQFZFJoU279mh6CLTDch679S9WyI0WxQM41jV5mYOv5mllRLEiKMTG3slyyQN
+8P7rBL5OM2DusxFHCCturTlDjnafpybukqOd/YlaRoGeZuhQnzmxx0si07C9pwN4
+SdzIT7rVQJAvwjSNWMoepX0tboWAHFTdbvxEstnlFyi6Vibw5oTy34UxXVP2EmA8
+otLAA/GPqLtaaQ1u9fpDcdN5GjkHR1QyYN/UhhF0iXczvUp4o/D0ELbtdBPA5Rwf
++eeRni4ggtByVTzg9fALQjDJydWcw0Oy
+
+                    </ds:X509Certificate>
                 </ds:X509Data>
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://idp.hig.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hig.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://idp.hig.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hig.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
         
         <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
         <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
         
     </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">HIG</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Högskolan i Gävle</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hig.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>Högskolan i Gävle</Company>
-    <EmailAddress>anders.lordal@hig.se</EmailAddress>
-  </ContactPerson>
     
-</EntityDescriptor>    
+</EntityDescriptor>