1 files changed, 109 insertions, 33 deletions
diff --git a/swamid-1.0/idp.hig.se.xml b/swamid-1.0/idp.hig.se.xml
index 65ad4807..b27292ed 100644
--- a/swamid-1.0/idp.hig.se.xml
+++ b/swamid-1.0/idp.hig.se.xml
@@ -1,34 +1,109 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hig.se/identity">
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">hig.se</shibmeta:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEjTCCA3WgAwIBAgILAQAAAAABF3zoubQwDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlvbmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4MDExNTEwMDUwMloXDTExMDExNTEwMDUwMlowPjELMAkGA1UEBhMCU0UxGjAYBgNVBAoTEUhvZ3Nrb2xhbiBpIEdhdmxlMRMwEQYDVQQDEwppZHAuaGlnLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzVJwkvrkl/JSBQKx95eRku9iUK8odClbfPr4AlDANP+b2mWYiUaSxoXu+SJkUO/HDtBDmcghRvGHYyv6YLXANk17bzV7PemQb4zA0plyKaurqY6M1FLx5RNEXDplElriWQsDA0Tyuhoz6t/uZpHETngtHpu7NlxWsyONUxeR7Cf6r2DjqiRBn76kI+8G1HBfTHf0xCGZmPWYewJzH1dnFT4pUaWu6psqhGMmZ5jgb0cDyVOz+sKcDp7MlMfQG/vziUySepAKfKSer7Dr84bVUIsa8C+ikQF582Q33Zuunpm+hJRDntXTA3ZJdmK38muiVaSBa70oL+ri7ZcnIceVWwIDAQABo4IBaTCCAWUwUAYDVR0gBEkwRzBFBgcqhkixPgEAMDowOAYIKwYBBQUHAgEWLGh0dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS9jcHMuY2ZtMA4GA1UdDwEB/wQEAwIFoDAfBgNVHSMEGDAWgBRlZaM91zsRowoHJTfJQkpbdndQ4TAdBgNVHQ4EFgQUc6OwpqVR5fUo66R7/PzCQUtL1mswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5nbG9iYWxzaWduLm5ldC9lZHVjYXRpb25hbC5jcmwwTwYIKwYBBQUHAQEEQzBBMD8GCCsGAQUFBzAChjNodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9lZHVjYXRpb25hbC5jcnQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBUGA1UdEQQOMAyCCmlkcC5oaWcuc2UwDQYJKoZIhvcNAQEFBQADggEBAGYIiDLBZooLBBfMbHTA/aU6Vf2lD8++0uZ/pDsO0fHT52dhLB/zVOxQoJvs7P8z4VOQYM60N4iC18cOrEmt9//8V+4OzLnkrGKrr7xDuc6JBpHkMTUiYozHCPPOCAgmf/OZmCEnWc+ne0dHx+A+ThJy9PEebN2yvjs307dP/GFgWSjXKKGVVLnJ2G9/bYn/gTi51/etdbbC0oXZ7GnV2fEI2IhU18IacIogt0RODek8hnEEfSBBEvS7Yb+g/NPZsdM3NiKs486221H7eF0MllYb+Z68AKqtOv+bJZyXnmYaoyENgNrEyIHrd5rGeACUjq4u31pt2dlMWuPW1O/xbf0=</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/shibboleth-idp/AA"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">hig.se</shibmeta:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEjTCCA3WgAwIBAgILAQAAAAABF3zoubQwDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlvbmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4MDExNTEwMDUwMloXDTExMDExNTEwMDUwMlowPjELMAkGA1UEBhMCU0UxGjAYBgNVBAoTEUhvZ3Nrb2xhbiBpIEdhdmxlMRMwEQYDVQQDEwppZHAuaGlnLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzVJwkvrkl/JSBQKx95eRku9iUK8odClbfPr4AlDANP+b2mWYiUaSxoXu+SJkUO/HDtBDmcghRvGHYyv6YLXANk17bzV7PemQb4zA0plyKaurqY6M1FLx5RNEXDplElriWQsDA0Tyuhoz6t/uZpHETngtHpu7NlxWsyONUxeR7Cf6r2DjqiRBn76kI+8G1HBfTHf0xCGZmPWYewJzH1dnFT4pUaWu6psqhGMmZ5jgb0cDyVOz+sKcDp7MlMfQG/vziUySepAKfKSer7Dr84bVUIsa8C+ikQF582Q33Zuunpm+hJRDntXTA3ZJdmK38muiVaSBa70oL+ri7ZcnIceVWwIDAQABo4IBaTCCAWUwUAYDVR0gBEkwRzBFBgcqhkixPgEAMDowOAYIKwYBBQUHAgEWLGh0dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS9jcHMuY2ZtMA4GA1UdDwEB/wQEAwIFoDAfBgNVHSMEGDAWgBRlZaM91zsRowoHJTfJQkpbdndQ4TAdBgNVHQ4EFgQUc6OwpqVR5fUo66R7/PzCQUtL1mswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5nbG9iYWxzaWduLm5ldC9lZHVjYXRpb25hbC5jcmwwTwYIKwYBBQUHAQEEQzBBMD8GCCsGAQUFBzAChjNodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9lZHVjYXRpb25hbC5jcnQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBUGA1UdEQQOMAyCCmlkcC5oaWcuc2UwDQYJKoZIhvcNAQEFBQADggEBAGYIiDLBZooLBBfMbHTA/aU6Vf2lD8++0uZ/pDsO0fHT52dhLB/zVOxQoJvs7P8z4VOQYM60N4iC18cOrEmt9//8V+4OzLnkrGKrr7xDuc6JBpHkMTUiYozHCPPOCAgmf/OZmCEnWc+ne0dHx+A+ThJy9PEebN2yvjs307dP/GFgWSjXKKGVVLnJ2G9/bYn/gTi51/etdbbC0oXZ7GnV2fEI2IhU18IacIogt0RODek8hnEEfSBBEvS7Yb+g/NPZsdM3NiKs486221H7eF0MllYb+Z68AKqtOv+bJZyXnmYaoyENgNrEyIHrd5rGeACUjq4u31pt2dlMWuPW1O/xbf0=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hig.se/shibboleth-idp/Artifact" index="1" isDefault="true"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hig.se/shibboleth-idp/SSO"/>
-  </IDPSSODescriptor>
+<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">
+
+    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+        <Extensions>
+            <shibmd:Scope regexp="false">hig.se</shibmd:Scope>
+        </Extensions>
+
+        <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
+HREEMTAvggppZHAuaGlnLnNlhiFodHRwczovL2lkcC5oaWcuc2UvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFEWwGXXE3qHIRmgOo2XHStrjaUU0MA0GCSqGSIb3DQEB
+BQUAA4IBAQAkPDs3NMTHVzte7dYlv6ys1VWYB5Ez9aMjvJPBVh5iwwQzXevm4qZl
+IHoGxvne5R8dkEVM1lcYryFnc7IkSRvuq0utBZcMfU+hHV56IvUNXZsUPJohO3/6
+9SkqakYzPJ3g6voaBaQdoeuvgUXL1fxEuISZkna93UHjJyIIS3T480vP49kXhoT6
+ox75FIwbx/e0e3siAlinjxdy9XbmFm6nx9mIWp4MLqw3UzEIiQG2wKyLxRFr1SnZ
+Cyr54IEx7Zg6UOLaa23i3CX0H2PXTNuik1WN2qPcPo4REEkK7wNP60vYXt7TgJXq
+4irFaazkzqSXLSi1n75Jx2hT7wpSszS5
+
+                    </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: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: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-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">
+
+        <Extensions>
+            <shibmd:Scope regexp="false">hig.se</shibmd:Scope>
+        </Extensions>
+
+        <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
+HREEMTAvggppZHAuaGlnLnNlhiFodHRwczovL2lkcC5oaWcuc2UvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFEWwGXXE3qHIRmgOo2XHStrjaUU0MA0GCSqGSIb3DQEB
+BQUAA4IBAQAkPDs3NMTHVzte7dYlv6ys1VWYB5Ez9aMjvJPBVh5iwwQzXevm4qZl
+IHoGxvne5R8dkEVM1lcYryFnc7IkSRvuq0utBZcMfU+hHV56IvUNXZsUPJohO3/6
+9SkqakYzPJ3g6voaBaQdoeuvgUXL1fxEuISZkna93UHjJyIIS3T480vP49kXhoT6
+ox75FIwbx/e0e3siAlinjxdy9XbmFm6nx9mIWp4MLqw3UzEIiQG2wKyLxRFr1SnZ
+Cyr54IEx7Zg6UOLaa23i3CX0H2PXTNuik1WN2qPcPo4REEkK7wNP60vYXt7TgJXq
+4irFaazkzqSXLSi1n75Jx2hT7wpSszS5
+
+                    </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: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>
@@ -36,6 +111,7 @@
   </Organization>
   <ContactPerson contactType="technical">
     <Company>Högskolan i Gävle</Company>
-    <EmailAddress>Patrik.Carlsson@hig.se</EmailAddress>
+    <EmailAddress>anders.lordal@hig.se</EmailAddress>
   </ContactPerson>
-</EntityDescriptor>
+    
+</EntityDescriptor>