From 321279ccceb267a2807fe48657f276fc82cc0f38 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Thu, 6 Feb 2020 16:48:04 +0000
Subject: Resolves SWAMID-2676

---
 swamid-sp-2.0.mxml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'swamid-sp-2.0.mxml')

diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 2d243358..a09df6f9 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -613,4 +613,5 @@
   <xi:include href="swamid-2.0/intranet.nai.uu.se.xml"/>
   <xi:include href="swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-proxysp-swamid-retendo.xml"/>
   <xi:include href="swamid-2.0/outscan.outpost24.com-opi-xmlapi-action-showspmetadata.xml"/>
+  <xi:include href="swamid-2.0/test.redcap.its.umu.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3


From 68041009152f90e5f8d078fec5400fb9c5c21389 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Fri, 7 Feb 2020 08:00:23 +0000
Subject: Resolves SWAMID-2677

---
 .../adfs.artologik.net-adfs-services-trust.xml     | 61 ++++++++++++++++++++++
 swamid-sp-2.0.mxml                                 |  1 +
 2 files changed, 62 insertions(+)
 create mode 100644 swamid-2.0/adfs.artologik.net-adfs-services-trust.xml

(limited to 'swamid-sp-2.0.mxml')

diff --git a/swamid-2.0/adfs.artologik.net-adfs-services-trust.xml b/swamid-2.0/adfs.artologik.net-adfs-services-trust.xml
new file mode 100644
index 00000000..a15d7398
--- /dev/null
+++ b/swamid-2.0/adfs.artologik.net-adfs-services-trust.xml
@@ -0,0 +1,61 @@
+<?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="http://adfs.artologik.net/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Artologik Survey&amp;Report</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Artologik Survey&amp;Report</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Survey&amp;Report är ett webbaserat och flerspråkigt program som gör det enkelt att skapa professionella enkäter för undersökningar och utvärderingar.</mdui:Description>
+        <mdui:Description xml:lang="en">Survey&amp;Report is a web based and multilingual program which makes it easy to create professional surveys for evaluations.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.artologik.com/documents/artologik/pages/surveyandreport/swamid/sv</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.artologik.com/documents/artologik/pages/surveyandreport/swamid/en</mdui:InformationURL>
+        <mdui:Logo height="64" width="350" xml:lang="sv">https://www.artologik.com/documents/artologik/pages/surveyandreport/swamid/sv/logo.png</mdui:Logo>
+        <mdui:Logo height="64" width="350" xml:lang="en">https://www.artologik.com/documents/artologik/pages/surveyandreport/swamid/en/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="encryption">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIC5jCCAc6gAwIBAgIQFarUx438v7BPvXGMcHQUSDANBgkqhkiG9w0BAQsFADAvMS0wKwYDVQQDEyRBREZTIEVuY3J5cHRpb24gLSBhZGZzLmFydG9sb2dpay5uZXQwHhcNMjAwMTA5MTMwMzIyWhcNMzAwMTA5MTMwMzIyWjAvMS0wKwYDVQQDEyRBREZTIEVuY3J5cHRpb24gLSBhZGZzLmFydG9sb2dpay5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4Hzoa2RMWIF5zAH9H6/TgeonwUoqo4sTU/SE3tTmz+0siwYJHna0rqLoM0iDy7MdkJpjHiNsyktVpDHw5HEY4paTY6Bc4hfhOn/KJsEFXpmNw6K2hLnKYzyU9zMCm6NDNYjuZgaHbhU+zcpJ1zoOJgwbbHksbrzVye+tibKUrpjC1TWXzObai+FquiW6xi/zltEVxwfIx0jiJyGeW68QnZxN/J19azp9adEGSOWNtjoSco3g1nWkzQhBmGjUNi0VhOOO+La8AjVu8j/dQTFEgzZm207ChATzh8aJrPmJL8hecaSrCCwVzopG9MGrichV9ApvEXZwcTHyoTvtUrVaFAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAE+mBfn21OQ+M+JkfYsog5nkFrb5B+prexP4u/DSTFdlGvuLjodHMfjwumlRjp63Qq/Jfu+xaokWRfL7XRmBF3ng2tKuv6Uq+oC+7hTVWMvDxWlXjOWd/TyeT016CkhgylLA0I6iSwQ4PgYwzGXuyXx7K7qEIwj15m7NBrfDU9reZgYkNZYiKAobehP8lyDTcjGDe+zj1iw1R4TRb7zFulsGcpVSRfb5+3G1SPKnn/oF17/6vRYVlU/wogPFn5sX/Z8pegelYcL+8WgJzuNzg6QcKGum4joNRAdRMLuIOfN4w7GToq09HQMEStE/3ZhwyN0Z94yBwRpCcAplVpv4Ff0=</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIC4DCCAcigAwIBAgIQdp67wCZJ/axHjAU2MMsbOTANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDEyFBREZTIFNpZ25pbmcgLSBhZGZzLmFydG9sb2dpay5uZXQwHhcNMjAwMTA5MTMwMzI0WhcNMzAwMTA5MTMwMzI0WjAsMSowKAYDVQQDEyFBREZTIFNpZ25pbmcgLSBhZGZzLmFydG9sb2dpay5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyeL8LiKCcTHN6OaNcbspb4RYzRpSdUb+GTf+M2mND2r/smEqbPfbulvtLZp6vgqeAz+LrbptgMWiog5+mtKkzmqCaoxGtO5Ol7lk3vlXkKq8O+k3Gjw8rZpKEOqICwnA5Y7Hth6w4HVUNBcO/9J3VCRcBxsAA5DPdKKPreN+K9N/n4DOg4QFGoE5TUr6muDl6latpwSOFNoChi9TfSN5DiZwN/QVZM/JVQ7etrNhfeMZsIHOGx3kInMRdUsrZFQn33WB7CwB16/drI9E7OQoWy+WYA4SrUGknBvX8WNq21p/t8D1fc/OHADGywm+S8cyxlXt28/phB7E8qNDoy52pAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAC+RxZ+X/HMWkPZX17GeusL1KuIr+TrZ03nennXlDjnTAFjT75tkufl1Cdagvoq2bFCKaD8sLLQGqn+z3VESwJdiYO26AMIwe02A9nasK4g+aAkJs+XKSJxFMNLq2qZ+q+W9OK7OePBL74Lim4ajDEhDWCOWlXJxvNPN+udJ++OeHw+xixvMuKPscLuTMLCC+idwe/h75Kz9hsveIGF0PhfwTHMrGWxJrTXjDau47CHUnwt2drEYMM8Y8J/1xY+jc0LeF/eXF33XFYhPjM9xEcrCrKB3OLWfz+TAats7ncSsVjepw5JixTlCtZ95CWsRGqZbYfTnwXQ08WD+viWNRV8=</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.artologik.net/adfs/ls/"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.artologik.net/adfs/ls/"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.artologik.net/adfs/ls/" index="0" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.artologik.net/adfs/ls/" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.artologik.net/adfs/ls/" index="2"/>
+  </SPSSODescriptor>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <SurName>Helpdesk</SurName>
+    <EmailAddress>mailto:helpdesk@artologik.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <SurName>Info</SurName>
+    <EmailAddress>mailto:info@artisan.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <SurName>Hostmaster</SurName>
+    <EmailAddress>mailto:hostmaster@artisan.se</EmailAddress>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index a09df6f9..bb7be9f6 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -614,4 +614,5 @@
   <xi:include href="swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-proxysp-swamid-retendo.xml"/>
   <xi:include href="swamid-2.0/outscan.outpost24.com-opi-xmlapi-action-showspmetadata.xml"/>
   <xi:include href="swamid-2.0/test.redcap.its.umu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/adfs.artologik.net-adfs-services-trust.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3