resolve conflicts and merge

1 files changed, 106 insertions, 0 deletions

diff --git a/swamid-interfederations-2.0/netlogin-dev.strath.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/netlogin-dev.strath.ac.uk-idp-shibboleth.xml
new file mode 100644
index 00000000..3a094172
--- /dev/null
+++ b/swamid-interfederations-2.0/netlogin-dev.strath.ac.uk-idp-shibboleth.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://netlogin-dev.strath.ac.uk/idp/shibboleth">
+  <!--
+		This is a "(Dev IdP)" Shibboleth IdP for the University of Strathclyde.
+	-->
+  <Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-04T11:48:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strath.ac.uk</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDUDCCAjigAwIBAgIVALntfhDpdib1U8g0APCYQ0HzFX4HMA0GCSqGSIb3DQEB
+						BQUAMCQxIjAgBgNVBAMMGW5ldGxvZ2luLWRldi5zdHJhdGguYWMudWswHhcNMTQx
+						MTA3MTQ1MDAzWhcNMzQxMTA3MTQ1MDAzWjAkMSIwIAYDVQQDDBluZXRsb2dpbi1k
+						ZXYuc3RyYXRoLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						n5KFxtDXYrp4ChYev6BWlmqRZWRKiGVKqukVMC9qEkRiDWkwCUU5IgPkKH3IwJfW
+						AO1xGZ+s+kZ2hwjgCVXCYMmlwk5RlRKkcCTTjqHjSZ7ZNKA2hEWOaBJF3F9lFbwk
+						AyvMUi4qn7f+mDybZHr9pbl4phANo8Fs3gnPr+yAp+G6F0EyL3At5SKpnanQ/lRy
+						dTCuXMTukeI1TDtvptr7jV2HjpO4KmEILiCsqDvnjNMT2YEFlgxa8bX+YGXG/8cH
+						6LKIQOtvSsg0D3xZvmazOWo6xg9XMAgKh6J+tE0HUr6Js16g/GxXghxfQA/rXmh+
+						lK0bYueUgkjyXSclGQe9uwIDAQABo3kwdzAdBgNVHQ4EFgQUHCmyxQT1A5E7uqal
+						xfUiaDHwCgowVgYDVR0RBE8wTYIZbmV0bG9naW4tZGV2LnN0cmF0aC5hYy51a4Yw
+						aHR0cHM6Ly9uZXRsb2dpbi1kZXYuc3RyYXRoLmFjLnVrL2lkcC9zaGliYm9sZXRo
+						MA0GCSqGSIb3DQEBBQUAA4IBAQCbAbHeCjRT5CzbWDX9I1VLo3Y0hEjlmiwCvAZX
+						yKPZ5FO5fJVCtI2aqOToFbF2BVOe3/mYV8sC6dsoS38Sarwhzbh6GRRE3FywuPbp
+						UkQGTeAmB7jZ7kXLRS/tgVJbWzChljeVqofhwXjW4PfPugSuslpC+elp9PoTj/BP
+						OrfOIm9jSMG2/HPbaVR9VynfXThx+mYa261FIVQuaha6K+s4Y3vGU3qgyTtnyNYv
+						pOIaOiV5+TEokiP5oOHdbyH5Ax5+w/Tx400X/jebeY6vTW6WTKDlYMnmP/Fbv8d6
+						AZTALOEzlYlDfuws2MF1Tc3K10VtbOMIL90R5JROBwVMKw0j
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <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://netlogin-dev.strath.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://netlogin-dev.strath.ac.uk/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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strath.ac.uk</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDUDCCAjigAwIBAgIVALntfhDpdib1U8g0APCYQ0HzFX4HMA0GCSqGSIb3DQEB
+						BQUAMCQxIjAgBgNVBAMMGW5ldGxvZ2luLWRldi5zdHJhdGguYWMudWswHhcNMTQx
+						MTA3MTQ1MDAzWhcNMzQxMTA3MTQ1MDAzWjAkMSIwIAYDVQQDDBluZXRsb2dpbi1k
+						ZXYuc3RyYXRoLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						n5KFxtDXYrp4ChYev6BWlmqRZWRKiGVKqukVMC9qEkRiDWkwCUU5IgPkKH3IwJfW
+						AO1xGZ+s+kZ2hwjgCVXCYMmlwk5RlRKkcCTTjqHjSZ7ZNKA2hEWOaBJF3F9lFbwk
+						AyvMUi4qn7f+mDybZHr9pbl4phANo8Fs3gnPr+yAp+G6F0EyL3At5SKpnanQ/lRy
+						dTCuXMTukeI1TDtvptr7jV2HjpO4KmEILiCsqDvnjNMT2YEFlgxa8bX+YGXG/8cH
+						6LKIQOtvSsg0D3xZvmazOWo6xg9XMAgKh6J+tE0HUr6Js16g/GxXghxfQA/rXmh+
+						lK0bYueUgkjyXSclGQe9uwIDAQABo3kwdzAdBgNVHQ4EFgQUHCmyxQT1A5E7uqal
+						xfUiaDHwCgowVgYDVR0RBE8wTYIZbmV0bG9naW4tZGV2LnN0cmF0aC5hYy51a4Yw
+						aHR0cHM6Ly9uZXRsb2dpbi1kZXYuc3RyYXRoLmFjLnVrL2lkcC9zaGliYm9sZXRo
+						MA0GCSqGSIb3DQEBBQUAA4IBAQCbAbHeCjRT5CzbWDX9I1VLo3Y0hEjlmiwCvAZX
+						yKPZ5FO5fJVCtI2aqOToFbF2BVOe3/mYV8sC6dsoS38Sarwhzbh6GRRE3FywuPbp
+						UkQGTeAmB7jZ7kXLRS/tgVJbWzChljeVqofhwXjW4PfPugSuslpC+elp9PoTj/BP
+						OrfOIm9jSMG2/HPbaVR9VynfXThx+mYa261FIVQuaha6K+s4Y3vGU3qgyTtnyNYv
+						pOIaOiV5+TEokiP5oOHdbyH5Ax5+w/Tx400X/jebeY6vTW6WTKDlYMnmP/Fbv8d6
+						AZTALOEzlYlDfuws2MF1Tc3K10VtbOMIL90R5JROBwVMKw0j
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://netlogin-dev.strath.ac.uk: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">University of Strathclyde</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">University of Strathclyde (Dev IdP)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.strath.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Support</GivenName>
+    <EmailAddress>mailto:ukfed-support@strath.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Technical</GivenName>
+    <EmailAddress>mailto:ukfed-tech@strath.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>