Resolves SWAMID-3082

2 files changed, 48 insertions, 0 deletions

diff --git a/swamid-2.0/nai.uu.se.xml b/swamid-2.0/nai.uu.se.xml
new file mode 100644
index 00000000..d0465c87
--- /dev/null
+++ b/swamid-2.0/nai.uu.se.xml
@@ -0,0 +1,47 @@
+<?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://nai.uu.se">
+  <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>
+  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDQjCCAiqgAwIBAgIGAW1t96IoMA0GCSqGSIb3DQEBCwUAMEAxJjAkBgNVBAMMHWh0dHBzOi8v
+dXNlLW5haS5zaXRldmlzaW9uLnNlMRYwFAYDVQQLDA1zaXRldmlzaW9uLXNwMB4XDTE5MDkyNjE0
+MjY0OFoXDTI5MDkyMzE0MjY0OFowQDEmMCQGA1UEAwwdaHR0cHM6Ly91c2UtbmFpLnNpdGV2aXNp
+b24uc2UxFjAUBgNVBAsMDXNpdGV2aXNpb24tc3AwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDDikuhnFInhUAiZ51W24MjZpvamTddQHZUDf5g/ckkboq1GqeASgdhEq2bFcgrFLprT/U9
+AGkixm44l5DDyhjTeMtbwwk1Nt1X2cOI2RGys88Vly3EuP/bZPJp51MaBoJE//WJnTJlY+BpPlT2
+Lr7MZXCppb2zL+uc/JL9/64qA8zLi4A5ZNjtzN7TYV9mlE0aMactvHi/JsXRPCQ0K5WnxQn+blLw
+0HqwhIKqC7PH6MqaP4mBbSWT0X2FKNk5JQYKDuRr6/rS5BHMGN837JJaZlKfmcYh4nI41Bvuuinr
+oK91mATm6wrlrwYweFhkN0k9HpyDV4iAqLZCrcIo78X7AgMBAAGjQjBAMB0GA1UdDgQWBBSWT6Yh
+bc86oezP8Nv4zA0ezcarnTAfBgNVHSMEGDAWgBSWT6Yhbc86oezP8Nv4zA0ezcarnTANBgkqhkiG
+9w0BAQsFAAOCAQEAW4hF9urYJIIjVliW8OQFHQA0kcDcmLBcwyQCGBV4Jk4dhiE/61Ow2nFzcnZL
+Jmv3cnqYUdfWqfcL3iW05gmsUKKxPkcOtaKmZYvyqbEP2rsO1cdazLVQ0izA7eIViFvB+ZJcIRkR
+i4NlpfSlg1rIc+++5pf/0DgJqOgHLqzPZN67avsVhWeFcuA1Kn/QOvG9V50+2jzo78aiJtYPkIQw
+fr801xaTmp7Gqq8cCx/CMMmRDnxO9KB1bmn5fBMbBPHBmF+3Zd1NVOYGzhKMHm8cHKz9/o48EPVT
+ocEdp31x+MlteKxIGncaBzTpfpdPWs6DZ+cA1/XLCbZgKtQPqohzRQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nai.uu.se/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://nai.uu.se/saml/LogoutServiceHTTPRedirectResponse"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nai.uu.se/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Nordiska Afrikainstitutet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Nordiska Afrikainstitutet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://nai.uu.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Nordiska Afrikainstitutet</md:Company>
+    <md:EmailAddress>mailto:sebastian.danielsson@nai.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 2896c5d7..8a8f2909 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -595,6 +595,7 @@
   <xi:include href="swamid-2.0/appstest.convertus.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/apps.convertus.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/intranet.nai.uu.se.xml"/>
+  <xi:include href="swamid-2.0/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"/>