From e1d4549e9d68d944c194740a569a2c99ecf23847 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Wed, 9 Sep 2015 14:55:49 +0200
Subject: Resolves SWAMIDOPS-7795 Produktion nais-systemet

---
 swamid-2.0/www.nais.uhr.se-shibboleth.xml | 95 +++++++++++++++++++++++++++++++
 swamid-sp-2.0.mxml                        |  1 +
 2 files changed, 96 insertions(+)
 create mode 100644 swamid-2.0/www.nais.uhr.se-shibboleth.xml

diff --git a/swamid-2.0/www.nais.uhr.se-shibboleth.xml b/swamid-2.0/www.nais.uhr.se-shibboleth.xml
new file mode 100644
index 00000000..6fb3e210
--- /dev/null
+++ b/swamid-2.0/www.nais.uhr.se-shibboleth.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.nais.uhr.se/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <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/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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 urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.nais.uhr.se/Shibboleth.sso/DS/ds.swamid.se"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.nais.uhr.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.nais.uhr.se/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">NaisSP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">NaisSP</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">NAIS står för Nationellt Administrations- och Informationssystem för samordnare av särskilt pedagogiskt stöd</mdui:Description>
+        <mdui:Description xml:lang="en">NAIS stands for National Administration- and Information system for coordination of pedagogical aid</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>sto-pola.sto.netlight.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sto-pola.sto.netlight.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDzCCAfegAwIBAgIJAM8E1VkC2/D7MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+BAMTGHN0by1wb2xhLnN0by5uZXRsaWdodC5zZTAeFw0xNDEyMTIxNDM3MzRaFw0y
+NDEyMDkxNDM3MzRaMCMxITAfBgNVBAMTGHN0by1wb2xhLnN0by5uZXRsaWdodC5z
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMe7IeD13RcALx46boeu
+Xqi1RI4czNsDBSt7O5CmYdI9V1SuVMLxX1pg/xqX2E7UquxmgOKDSk37ELzCvllI
+LiajuaTFJB2piIgOuty24TVVdPKu3d9MSONguAinoee3+EQVAAGv1PeqJddVKZR2
+WcWHm8+gaw30f031hPDxdkAmfH6aj9DYpAvR0X++uDBXCTzLSSs4EqBFCxce5pHN
+fWzft0k5M/eSozzu7SiS0GS/HbQoXRVwcW2LHayULlbeLMDfnybhm/nD9bgC1+y0
+QMDYmTnP6QFMKfrlnoSzJwdgexn6WlC1ot+EMWebt0h2LOsyAplAZW+xnX/yf+VV
+RM0CAwEAAaNGMEQwIwYDVR0RBBwwGoIYc3RvLXBvbGEuc3RvLm5ldGxpZ2h0LnNl
+MB0GA1UdDgQWBBSBXAMCdz4oSN4hX5oOoKNTrFXt9TANBgkqhkiG9w0BAQUFAAOC
+AQEAfXL0K8J7WCSSzMN+3mC6dl2sou6zw8QNGfXRo41vB+kBqtLLI1VZZg1cWAf0
+yopwPtwz9KseMSJvoQgcW+UuSXJgTEQmrkD6hJJhcZZpFSqAt9cNfbrXY6m5YDHj
+WBGYLC1USzLHiC1LP73IbiATvEPi8r3jS1Vm/Sg82bkkxbSXMkN3GmxjvKpFZkZH
+Fpgh9wz7R/qlZTrKGWoBsIApiSNJB4BBMc8AaaF6v26IZy2FsFhXQjX7fHG5OpIZ
+ABP8HAePligOwIdfjCyp+kw/tvzVOE6mcGZUibXvNXBSnQoykuV8dPZe4yWzpbzg
+MViWUqDxKicGyuokDNf3hpcc9w==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nais.uhr.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nais.uhr.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nais.uhr.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nais.uhr.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nais.uhr.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nais.uhr.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nais.uhr.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nais.uhr.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nais.uhr.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nais.uhr.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nais.uhr.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.nais.uhr.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nais.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.nais.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 3c0149ca..34dcc8c5 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -457,4 +457,5 @@
   <xi:include href="swamid-2.0/mintentateknat.kvk.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/daisy.dsv.su.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/daisy2.dsv.su.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/www.nais.uhr.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3