Resolved SWAMID-889

3 files changed, 52 insertions, 0 deletions

diff --git a/swamid-2.0/medlem.konstkaren.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.konstkaren.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
index c7ac3a64..53d2be42 100644
--- a/swamid-2.0/medlem.konstkaren.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/medlem.konstkaren.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://medlem.konstkaren.se/saml/simplesamlwww/module.php/saml/sp/metadata.php/AgeraMedlem">
+  <md: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://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla: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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-2.0/medlem.saks.gu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.saks.gu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
new file mode 100644
index 00000000..d17c8de3
--- /dev/null
+++ b/swamid-2.0/medlem.saks.gu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://medlem.saks.gu.se/saml/simplesamlwww/module.php/saml/sp/metadata.php/AgeraMedlem">
+  <md: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://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla: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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Medlemsportalen</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Member Portal</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Medlemsportalen för SAKS</mdui:Description>
+        <mdui:Description xml:lang="en">Member Portal for SAKS</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDoDCCAogCCQCsCozRqQII5TANBgkqhkiG9w0BAQsFADCBkTELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEaMBgGA1UEAwwRbWVkbGVtLnNha3MuZ3Uuc2UxHzAdBgkqhkiG9w0BCQEWEHdlYmJAbW9udGFuaWEuc2UwHhcNMTgwNzA0MTMzNzUyWhcNMjgwNzAzMTMzNzUyWjCBkTELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEaMBgGA1UEAwwRbWVkbGVtLnNha3MuZ3Uuc2UxHzAdBgkqhkiG9w0BCQEWEHdlYmJAbW9udGFuaWEuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOtpxt8zrxK9uEbSPQyGtuqI+/BUG2gAHKW6oasYKPn0p8II0IPd9S6Kb+Kn1uZ3ajk8HBWxAV6KqIpvpiJbaYO1S+K1JRWfpf9A7hdz8Wb9lTn6CcCXa5lftoyekDt65g0/hf1GenLjJj3C/2A3e2y1McU4O5/ODKCLLuSBLXf1upDPIU+NhcG+HXIr9M6ZeDvWF/FsX4HlNHungp3/1o/i6GH20j8JD+YjE6wG3jGNqBcWsnHYcSegBwq3C1g6N7R5hewpa6EzCpjCPSsKBwNP6Le/1yXywsCOeEYbpYd0YFzugmmnx0vMw/VuCfHQ3UkWp3p3AtfL+wpSEoNuiPAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAKQj9iPSrQXgYjOsQbiMkDQoS/+5OUqEMSsshUIngLWki3R1ywfRt9oaHD7o7INMjQM+izFj26F8vtcQqmwm1HS3zdTlhF5p3kvw84jogaS0LsF/lBjjynEXbQK7FifGwakP3ExcZtE/K84l1FWvv6QaMbNnbdHd5zdxsiT4kTJy1O6wHFYeDLF6GmI8KjKTAP7eLQ7GhGna2fIiNEIV8GhDMhIB3Mi50tR4Se9uK7MduFgFZgsoJ1SEmKji+zM3vFlhmYUjtZoQ10MgOsHWdaYmhlUCBaKmtbMMSnfBL7wBkfjdhPDTk+EWmCNT+EugFF3AF1XCSeAGypuztwlwhXg=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDoDCCAogCCQCsCozRqQII5TANBgkqhkiG9w0BAQsFADCBkTELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEaMBgGA1UEAwwRbWVkbGVtLnNha3MuZ3Uuc2UxHzAdBgkqhkiG9w0BCQEWEHdlYmJAbW9udGFuaWEuc2UwHhcNMTgwNzA0MTMzNzUyWhcNMjgwNzAzMTMzNzUyWjCBkTELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEaMBgGA1UEAwwRbWVkbGVtLnNha3MuZ3Uuc2UxHzAdBgkqhkiG9w0BCQEWEHdlYmJAbW9udGFuaWEuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOtpxt8zrxK9uEbSPQyGtuqI+/BUG2gAHKW6oasYKPn0p8II0IPd9S6Kb+Kn1uZ3ajk8HBWxAV6KqIpvpiJbaYO1S+K1JRWfpf9A7hdz8Wb9lTn6CcCXa5lftoyekDt65g0/hf1GenLjJj3C/2A3e2y1McU4O5/ODKCLLuSBLXf1upDPIU+NhcG+HXIr9M6ZeDvWF/FsX4HlNHungp3/1o/i6GH20j8JD+YjE6wG3jGNqBcWsnHYcSegBwq3C1g6N7R5hewpa6EzCpjCPSsKBwNP6Le/1yXywsCOeEYbpYd0YFzugmmnx0vMw/VuCfHQ3UkWp3p3AtfL+wpSEoNuiPAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAKQj9iPSrQXgYjOsQbiMkDQoS/+5OUqEMSsshUIngLWki3R1ywfRt9oaHD7o7INMjQM+izFj26F8vtcQqmwm1HS3zdTlhF5p3kvw84jogaS0LsF/lBjjynEXbQK7FifGwakP3ExcZtE/K84l1FWvv6QaMbNnbdHd5zdxsiT4kTJy1O6wHFYeDLF6GmI8KjKTAP7eLQ7GhGna2fIiNEIV8GhDMhIB3Mi50tR4Se9uK7MduFgFZgsoJ1SEmKji+zM3vFlhmYUjtZoQ10MgOsHWdaYmhlUCBaKmtbMMSnfBL7wBkfjdhPDTk+EWmCNT+EugFF3AF1XCSeAGypuztwlwhXg=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://medlem.saks.gu.se/saml/simplesamlwww/module.php/saml/sp/saml2-logout.php/AgeraMedlem"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://medlem.saks.gu.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://medlem.saks.gu.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://medlem.saks.gu.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://medlem.saks.gu.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Johan</md:GivenName>
+    <md:SurName>Sölve</md:SurName>
+    <md:EmailAddress>webb@montania.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index ee62bd64..41801914 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -715,4 +715,5 @@
   <xi:include href="swamid-2.0/medlem.consensus.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
   <xi:include href="swamid-2.0/medlem.gotastudentkar.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
   <xi:include href="swamid-2.0/medlem.konstkaren.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
+  <xi:include href="swamid-2.0/medlem.saks.gu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
 </md:EntitiesDescriptor>