Resolved conflict

2 files changed, 54 insertions, 0 deletions

diff --git a/swamid-2.0/azure.microweb.se-mw.xml b/swamid-2.0/azure.microweb.se-mw.xml
new file mode 100644
index 00000000..ffd98cd5
--- /dev/null
+++ b/swamid-2.0/azure.microweb.se-mw.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://azure.microweb.se/mw">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">MicroWeb Personalarkiv KI</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">MicroWeb Personalarkiv KI</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Digital archive for emloyee information.</mdui:Description>
+        <mdui:Description xml:lang="sv">Digitalt arkiv för information som rör personalen.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://microweb.se/policy/PrivacyStatementKIen.txt</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFCTCCA3GgAwIBAgIJAJ7VEnwv5PGwMA0GCSqGSIb3DQEBCwUAMIGaMQswCQYDVQQGEwJTRTEPMA0GA1UECAwGT3JlYnJvMQ8wDQYDVQQHDAZPcmVicm8xIjAgBgNVBAoMGU1pY3JvZGF0YSBTa2FuZGluYXZpZW4gQUIxCzAJBgNVBAsMAklUMRgwFgYDVQQDDA9zc28ubWljcm93ZWIuc2UxHjAcBgkqhkiG9w0BCQEWD2l0QG1pY3JvZGF0YS5udTAeFw0yMTAyMTExMzM2NTRaFw0zMTAyMTExMzM2NTRaMIGaMQswCQYDVQQGEwJTRTEPMA0GA1UECAwGT3JlYnJvMQ8wDQYDVQQHDAZPcmVicm8xIjAgBgNVBAoMGU1pY3JvZGF0YSBTa2FuZGluYXZpZW4gQUIxCzAJBgNVBAsMAklUMRgwFgYDVQQDDA9zc28ubWljcm93ZWIuc2UxHjAcBgkqhkiG9w0BCQEWD2l0QG1pY3JvZGF0YS5udTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAOZdPDA9XE+d38WizfmZalFCBZs0FzIxbh+BGzZ+Z3U/eetM4NmnWzH/yaS47SDY43vQcdayP2OuhawKg79Pxae2f9t6EO+U50RoCDgooQhdaW2wUJTkdfufPyduKp6IZPA5/v2JycJjZEVtcrIybbFJwo4Nq7krOYjyvcFa3zd80xXe7YnpYl1VMngaKoUbA1MENAHw3ofPPki/Z+1LwTp4JHkHFcy7esbfoVe6ppRDbOTM2zhQNbuwI1NpGQDevlLYwcPGpqpGrECqSHL2gu10eJ5THpNYKwx8tJdL1aIFqhiX1oTadPpZSwYPKuyJq7IR6t5KmqjUPqBWrLqN4wgTyoguhnqXt8kSTm66xrufncAkKNEGDvggqGWIWkYeGwkVI2krrbykfwykcFTq0yBaTOmwI/EzHv2cux7249HFT2ds6WP5LWoY90xusZJyEyYADKqtC4NgGembwinSGEypeVUoPD08xTWvGHJqatCOOc09KqT7nJKFc/prmojqmwIDAQABo1AwTjAdBgNVHQ4EFgQUIwntujDcxThAgnv3B+W63G+R5acwHwYDVR0jBBgwFoAUIwntujDcxThAgnv3B+W63G+R5acwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAYEA2rtG4i5W9r1UEsKGEMityQ9elqzORrcTpOn3a2JNTEd3rNbCRemdkk5/yMnpgl/xBmjwdr+CAqX5ptgTdQOnW9IGYb4NoUyeA+qGLCcMH+iiVpP0lGVEoO8KwDg+HXgGBfxO26s9Gl7ZT/60BCPWQj1SCH01L05A32nCtMpOrxYEyBfLkLMDpg7k/FPqwqpa1FuG6J0o+gE5a4YSlxOCp8JidVgPTeQMYk+Zx96lGGZ3GO7tk9dx3AGEyJVXgQHQ8uN8HbQZL+bmvraGkk9MXOrSW+Dk5J9nYRqFmkvVw7xAyUlEyiijx7ppWWReq7e6QooPrxLcvLiiF8fD4ullZsRFj3HH1vOv0xPxwdH0vytVbcJREELjYyKjH2bHFdy0Fd0Yo9jDZtDAPUS4G+SEybj/w9WRK6RCvaur6MXREUac96cVkpDQ6yfPo7cTm0q8UVHCZ+N3LM9VSCd4Y+EXOYGeqA5dUA9tONBiX5tYUsNPe+ruiQD+fpKcUy/Budab</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFCTCCA3GgAwIBAgIJAJ7VEnwv5PGwMA0GCSqGSIb3DQEBCwUAMIGaMQswCQYDVQQGEwJTRTEPMA0GA1UECAwGT3JlYnJvMQ8wDQYDVQQHDAZPcmVicm8xIjAgBgNVBAoMGU1pY3JvZGF0YSBTa2FuZGluYXZpZW4gQUIxCzAJBgNVBAsMAklUMRgwFgYDVQQDDA9zc28ubWljcm93ZWIuc2UxHjAcBgkqhkiG9w0BCQEWD2l0QG1pY3JvZGF0YS5udTAeFw0yMTAyMTExMzM2NTRaFw0zMTAyMTExMzM2NTRaMIGaMQswCQYDVQQGEwJTRTEPMA0GA1UECAwGT3JlYnJvMQ8wDQYDVQQHDAZPcmVicm8xIjAgBgNVBAoMGU1pY3JvZGF0YSBTa2FuZGluYXZpZW4gQUIxCzAJBgNVBAsMAklUMRgwFgYDVQQDDA9zc28ubWljcm93ZWIuc2UxHjAcBgkqhkiG9w0BCQEWD2l0QG1pY3JvZGF0YS5udTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAOZdPDA9XE+d38WizfmZalFCBZs0FzIxbh+BGzZ+Z3U/eetM4NmnWzH/yaS47SDY43vQcdayP2OuhawKg79Pxae2f9t6EO+U50RoCDgooQhdaW2wUJTkdfufPyduKp6IZPA5/v2JycJjZEVtcrIybbFJwo4Nq7krOYjyvcFa3zd80xXe7YnpYl1VMngaKoUbA1MENAHw3ofPPki/Z+1LwTp4JHkHFcy7esbfoVe6ppRDbOTM2zhQNbuwI1NpGQDevlLYwcPGpqpGrECqSHL2gu10eJ5THpNYKwx8tJdL1aIFqhiX1oTadPpZSwYPKuyJq7IR6t5KmqjUPqBWrLqN4wgTyoguhnqXt8kSTm66xrufncAkKNEGDvggqGWIWkYeGwkVI2krrbykfwykcFTq0yBaTOmwI/EzHv2cux7249HFT2ds6WP5LWoY90xusZJyEyYADKqtC4NgGembwinSGEypeVUoPD08xTWvGHJqatCOOc09KqT7nJKFc/prmojqmwIDAQABo1AwTjAdBgNVHQ4EFgQUIwntujDcxThAgnv3B+W63G+R5acwHwYDVR0jBBgwFoAUIwntujDcxThAgnv3B+W63G+R5acwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAYEA2rtG4i5W9r1UEsKGEMityQ9elqzORrcTpOn3a2JNTEd3rNbCRemdkk5/yMnpgl/xBmjwdr+CAqX5ptgTdQOnW9IGYb4NoUyeA+qGLCcMH+iiVpP0lGVEoO8KwDg+HXgGBfxO26s9Gl7ZT/60BCPWQj1SCH01L05A32nCtMpOrxYEyBfLkLMDpg7k/FPqwqpa1FuG6J0o+gE5a4YSlxOCp8JidVgPTeQMYk+Zx96lGGZ3GO7tk9dx3AGEyJVXgQHQ8uN8HbQZL+bmvraGkk9MXOrSW+Dk5J9nYRqFmkvVw7xAyUlEyiijx7ppWWReq7e6QooPrxLcvLiiF8fD4ullZsRFj3HH1vOv0xPxwdH0vytVbcJREELjYyKjH2bHFdy0Fd0Yo9jDZtDAPUS4G+SEybj/w9WRK6RCvaur6MXREUac96cVkpDQ6yfPo7cTm0q8UVHCZ+N3LM9VSCd4Y+EXOYGeqA5dUA9tONBiX5tYUsNPe+ruiQD+fpKcUy/Budab</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://azure.microweb.se/module.php/saml/sp/saml2-logout.php/ki-shib"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://azure.microweb.se/module.php/saml/sp/saml2-acs.php/ki-shib" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://azure.microweb.se/module.php/saml/sp/saml1-acs.php/ki-shib" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://azure.microweb.se/module.php/saml/sp/saml2-acs.php/ki-shib" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://azure.microweb.se/module.php/saml/sp/saml1-acs.php/ki-shib/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Microdata Personalarkiv</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Microdata Personalarkiv</md:ServiceName>
+      <md:RequestedAttribute Name="urn:oasis:swami.se:email" FriendlyName="email"/>
+      <md:RequestedAttribute Name="urn:oasis:swami.se:kiid" FriendlyName="kiid" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Thomas</md:GivenName>
+    <md:EmailAddress>mailto:thomas.stoll@microdata.nu</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 5e8f3b2a..22ed4b8e 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -683,4 +683,5 @@
   <xi:include href="swamid-2.0/cohorts.medsci.test.uu.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/cohorts.medsci.uu.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/nyaanvandarstod.uhr.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/azure.microweb.se-mw.xml"/>
 </md:EntitiesDescriptor>