Resolves SWAMID-2821, SWAMID-2822 and SWAMID-2823

4 files changed, 7 insertions, 74 deletions

diff --git a/swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml b/swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml
index c9aa6d00..4d55b9ea 100644
--- a/swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml
@@ -10,6 +10,7 @@
       </saml: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-support">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </attr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/openexam.bmc.uu.se-simplesaml.xml b/swamid-2.0/openexam.bmc.uu.se-simplesaml.xml
index c033f7a3..0f04122f 100644
--- a/swamid-2.0/openexam.bmc.uu.se-simplesaml.xml
+++ b/swamid-2.0/openexam.bmc.uu.se-simplesaml.xml
@@ -19,10 +19,10 @@
         <mdui:DisplayName xml:lang="en">OpenExam - Electronic Exams (CBE)</mdui:DisplayName>
         <mdui:Description xml:lang="sv">OpenExam är en serviceplattform för att genomföra elektroniska tentor.</mdui:Description>
         <mdui:Description xml:lang="en">OpenExam is a service platform for conducting electronic exams.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://openexam.test.uu.se/about-sv</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://openexam.test.uu.se/about-en</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://openexam.test.uu.se/privacy-policy-sv</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://openexam.test.uu.se/privacy-policy-en</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://openexam.bmc.uu.se/about-sv</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://openexam.bmc.uu.se/about-en</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://openexam.bmc.uu.se/privacy-policy-sv</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://openexam.bmc.uu.se/privacy-policy-en</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
diff --git a/swamid-2.0/openexam.test.uu.se-simplesaml.xml b/swamid-2.0/openexam.test.uu.se-simplesaml.xml
deleted file mode 100644
index fcf60db0..00000000
--- a/swamid-2.0/openexam.test.uu.se-simplesaml.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?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://openexam.test.uu.se/simplesaml">
-  <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">
-      <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 xsi:type="xs:string">http://www.swamid.se/category/hei-service</saml:AttributeValue>
-        <saml:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</saml:AttributeValue>
-        <saml:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/sfs-1993-1153</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">OpenExam - Elektroniska tentor (CBE) (TEST)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">OpenExam - Electronic Exams (CBE) (TEST)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">OpenExam är en serviceplattform för att genomföra elektroniska tentor.</mdui:Description>
-        <mdui:Description xml:lang="en">OpenExam is a service platform for conducting electronic exams.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://openexam.test.uu.se/about-sv</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://openexam.test.uu.se/about-en</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://openexam.test.uu.se/privacy-policy-sv</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://openexam.test.uu.se/privacy-policy-en</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDEDCCAfgCCQDoaaEZLIak0jANBgkqhkiG9w0BAQsFADBJMQswCQYDVQQGEwJTRTEcMBoGA1UEChMTVXBwc2FsYSB1bml2ZXJzaXRldDEcMBoGA1UEAxMTb3BlbmV4YW0udGVzdC51dS5zZTAgFw0xODAxMzExODA4NDZaGA8yMDcyMTEwMzE4MDg0NlowSTELMAkGA1UEBhMCU0UxHDAaBgNVBAoTE1VwcHNhbGEgdW5pdmVyc2l0ZXQxHDAaBgNVBAMTE29wZW5leGFtLnRlc3QudXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDsTi5AG7zpjZ2FxR7fi4vPCBMjSwx0FDOSg6Fb6gnDhR+rjxfg3o00/a4dLpdNqhOl9Ex2h7s3qcA/zZFlAiOJdVTyri0ECF6G5ysQnvGlABPfIP9rAiCRvyBveDK99xSzeHVyZmivYaNNBLQZ2vp6mWSa2FkhgCpMSeEr/lDbbI4Fpc2xhH/64zNiRrcq94MMCFGrxAS9CkKQGZG1M5J1coG63dxb4GNE1p3bIk9hIg/9WK/M98vVOSTsInmZOBHWDRvHV0dm6SLtxyQLi+lc6Q3rKsfECXHOA8MppYg/XVrrLqb85pLfL7R68sj+9kdIj1zgQiLkJpEgXaxLbMCtAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAOcw+OYQ/hP2EVS05wEhLxZjt9QNAkC8/g0b4GH9IGzXoCv6beByHgcqe0lBEAhRvr3mUcfarf2mobs49F0FttvcXuEvz+vkeyDphYCeDfzsfzoZ08d2DkFi09zDXXzV+998PbVHpeIhXOoS1bbO2alNRKCLIUGRhXUkRxLRzTEswpZCLKnht+dyjvOQH2SprkuNDepfW+NmONyYSHYYNk0OyC11KILNwG1aKkxg614+pax8xP0Mo/1/fmDDn1i04EmBT2v3L8Mjtii6tN7PwqcQLrbjl7a0gYAKNukvlpj1xbtbmNA2kFvC7LZ7qsVs+O3lQtUAn6bJLfdKDWchRqQ=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDEDCCAfgCCQDoaaEZLIak0jANBgkqhkiG9w0BAQsFADBJMQswCQYDVQQGEwJTRTEcMBoGA1UEChMTVXBwc2FsYSB1bml2ZXJzaXRldDEcMBoGA1UEAxMTb3BlbmV4YW0udGVzdC51dS5zZTAgFw0xODAxMzExODA4NDZaGA8yMDcyMTEwMzE4MDg0NlowSTELMAkGA1UEBhMCU0UxHDAaBgNVBAoTE1VwcHNhbGEgdW5pdmVyc2l0ZXQxHDAaBgNVBAMTE29wZW5leGFtLnRlc3QudXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDsTi5AG7zpjZ2FxR7fi4vPCBMjSwx0FDOSg6Fb6gnDhR+rjxfg3o00/a4dLpdNqhOl9Ex2h7s3qcA/zZFlAiOJdVTyri0ECF6G5ysQnvGlABPfIP9rAiCRvyBveDK99xSzeHVyZmivYaNNBLQZ2vp6mWSa2FkhgCpMSeEr/lDbbI4Fpc2xhH/64zNiRrcq94MMCFGrxAS9CkKQGZG1M5J1coG63dxb4GNE1p3bIk9hIg/9WK/M98vVOSTsInmZOBHWDRvHV0dm6SLtxyQLi+lc6Q3rKsfECXHOA8MppYg/XVrrLqb85pLfL7R68sj+9kdIj1zgQiLkJpEgXaxLbMCtAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAOcw+OYQ/hP2EVS05wEhLxZjt9QNAkC8/g0b4GH9IGzXoCv6beByHgcqe0lBEAhRvr3mUcfarf2mobs49F0FttvcXuEvz+vkeyDphYCeDfzsfzoZ08d2DkFi09zDXXzV+998PbVHpeIhXOoS1bbO2alNRKCLIUGRhXUkRxLRzTEswpZCLKnht+dyjvOQH2SprkuNDepfW+NmONyYSHYYNk0OyC11KILNwG1aKkxg614+pax8xP0Mo/1/fmDDn1i04EmBT2v3L8Mjtii6tN7PwqcQLrbjl7a0gYAKNukvlpj1xbtbmNA2kFvC7LZ7qsVs+O3lQtUAn6bJLfdKDWchRqQ=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openexam.test.uu.se/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://openexam.test.uu.se/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openexam.test.uu.se/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openexam.test.uu.se/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openexam.test.uu.se/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://openexam.test.uu.se/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:EmailAddress>mailto:openexam@bmc.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/weblogin.smhi.se-idp-shibboleth.xml b/swamid-2.0/weblogin.smhi.se-idp-shibboleth.xml
index 2e14e27c..ef84ee52 100644
--- a/swamid-2.0/weblogin.smhi.se-idp-shibboleth.xml
+++ b/swamid-2.0/weblogin.smhi.se-idp-shibboleth.xml
@@ -10,13 +10,10 @@
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
       </saml: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-support">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </attr:EntityAttributes>
-
-
-    </mdattr:EntityAttributes>
   </md:Extensions>
   <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <Extensions>