Resolves SWAMID-2204

3 files changed, 60 insertions, 1 deletions

diff --git a/swamid-2.0/idp1.artologik.net-adfs-services-trust.xml b/swamid-2.0/idp1.artologik.net-adfs-services-trust.xml
new file mode 100644
index 00000000..b735ad5a
--- /dev/null
+++ b/swamid-2.0/idp1.artologik.net-adfs-services-trust.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="http://idp1.artologik.net/adfs/services/trust">
+  <Extensions>
+    <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>
+  </Extensions>
+  <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <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>MIIC5jCCAc6gAwIBAgIQfLtyFs6eGJ1HiLyQQOQWqzANBgkqhkiG9w0BAQsFADAvMS0wKwYDVQQDEyRBREZTIEVuY3J5cHRpb24gLSBpZHAxLmFydG9sb2dpay5uZXQwHhcNMTgwOTI2MTgzMDU0WhcNMjMwOTI2MTgzMDU0WjAvMS0wKwYDVQQDEyRBREZTIEVuY3J5cHRpb24gLSBpZHAxLmFydG9sb2dpay5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtknWjEAW0GHN9fYKqCDMiGSTmvXZbQQ7YkYzVYb4IufVGKm48NwDrvQO1yeIyi3lQNsWv6hqQ8Ir2pg/jK+qqU84JzwWAh13Wqr1Y3ST5E/ivTzAsJnugcE9qDO1Andjg3YG0XQm6sOPwHdIgeFbm6+lCtE9b01BF2zRYjAM7OOghBHNLKY920g6x4neY7DBhLwlwSCRAWejRGuoAtb6YjBDy5H1jwW76eww0TX5tBhjYY83bGEozZ/JiM97TjYpjR3vGscml4gA1jw+SClClWaj861ePkGLE76eZyvmfmRq2vzPwdybfzm04D4AX5cbgqwyTm7ebd/hxRFCxkBJfAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAG28EKsRUgx7o2hbIVGnnta9hPxwEnjabdbZHBB2rmK5CWUCflfkR3dfdVXTMKxDL8TmUKsniYXCKYwwmdLDoig67pmQJp/RlG/Pu/AqunWa2B+UJB98ig0yZ4Fq98zqmCNavB86pNEZzASWjbjek7UcYVHDZQEXhoh0DSpJNVtdt/XP9snUBA7cW/e0eEzldE1U3HaAZvo87/YQJLbrj8zJSlPuX8s4X77F+ciDcBc+0gaaoKwkVQ0qakWBVSAlvmtZ52m47SmaVadoBMgIY7rNxz1X4NksaDNnwsyI668eHuMtARxgB5U+T+M7diiEH74WH+8+Zay2yQIT0t2IXqE=</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIC4DCCAcigAwIBAgIQGg78S83wD5hLdA0QeCu3XTANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDEyFBREZTIFNpZ25pbmcgLSBpZHAxLmFydG9sb2dpay5uZXQwHhcNMTgwOTI2MTgzMDU0WhcNMjMwOTI2MTgzMDU0WjAsMSowKAYDVQQDEyFBREZTIFNpZ25pbmcgLSBpZHAxLmFydG9sb2dpay5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDnhBaL67YmepU0JdaJVIZedbjqjzP93H6Fwpsl2OHC62ve54h/Ts8PkIvWNifiEhLC/NZ2RZjSmHKUTMZ2MmNNZm2EDaNZFamqkMeSKnkhKKwAlyierYL0qFJPYGVJ+z3u52KsRMm4V5+2jGMEPcmzn/Y+/h9ptThhA94jejm3f0hFV3s+NyOA3nDsw6PotuHAL0IQWJ0jqFVQQM2uurIG2q8KAqcbMnM+hiRilMEQBI7RnRgfsdT/Ma24KSdEs/Ao6wIGxBN/0pfDh8avdJcd6LXSO/Z9aqAMOX5dap8K8mtP2jg3+8nFITddxzEBVCQeljjuw7nW+qdsyY1D+n6rAgMBAAEwDQYJKoZIhvcNAQELBQADggEBACaY3QjUmbLMnERVOoYzuksfw/3aGoozNhfcpJuf7zWJIm0IghJwXBEYez6yS1xodqeHoB45iWr+UxEQaS1eYTg2kCF+pbztk+BtVi0Yly8STsL1lOsz9Yz1e3Doofva42zvJXh9TRl1u/pFnI2Xp8l3TIWafuj2tgwmmm6rN8RPdPmdCp4iAWOwqfU1xBd8+M+aa6Iql+TjUKLJVsteQbUwLwe5tH6/GxnZ0IJsB90R77EochF8SHgVSUY7e3Vzj2jQy5w8hl9c2PIdiUUOegrizDODKVLxhc9Iv7sjE0OzyUeSVAk0Jd15Fa1dqrStLBTU7qhle5Yx+BufBM5FyyE=</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.artologik.net/adfs/ls/"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.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://idp1.artologik.net/adfs/ls/" index="0" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp1.artologik.net/adfs/ls/" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.artologik.net/adfs/ls/" index="2"/>
+  </SPSSODescriptor>
+  <ContactPerson contactType="support">
+    <SurName>Helpdesk</SurName>
+    <EmailAddress>mailto:helpdesk@artologik.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <SurName>Info</SurName>
+    <EmailAddress>mailto:info@artisan.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <SurName>Hostmaster</SurName>
+    <EmailAddress>mailto:hostmaster@artisan.se</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0/uppsala.instructure.com-saml2.xml b/swamid-2.0/uppsala.instructure.com-saml2.xml
index 0c9467d3..92cdbbbb 100644
--- a/swamid-2.0/uppsala.instructure.com-saml2.xml
+++ b/swamid-2.0/uppsala.instructure.com-saml2.xml
@@ -96,6 +96,6 @@ BN+f6kyYZ9ztdvueX8SUp5T4s40=</dsig:X509Certificate>
   <md:ContactPerson contactType="technical">
     <md:Company>Uppsala universitet</md:Company>
     <md:SurName>Canvas</md:SurName>
-    <md:EmailAddress>servicedesk@uu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 1bdc5f2c..e03c3fed 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -627,4 +627,5 @@
   <xi:include href="swamid-2.0/vfusyd-dev.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/backweb.test.antagning.se-hubble-sp.xml"/>
   <xi:include href="swamid-2.0/anvandare.test.antagning.se-anvandare-sp.xml"/>
+  <xi:include href="swamid-2.0/idp1.artologik.net-adfs-services-trust.xml"/>
 </md:EntitiesDescriptor>