From ec523fd855684dde5f197903216b219141382c5f Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Tue, 5 Jun 2018 15:27:22 +0200
Subject: Resolves SWAMIDOPS-737

---
 swamid-2.0/indico.test.uu.se-shibboleth.xml | 120 ++++++++++++++++++++++++++++
 swamid-sp-2.0.mxml                          |   1 +
 2 files changed, 121 insertions(+)
 create mode 100644 swamid-2.0/indico.test.uu.se-shibboleth.xml

diff --git a/swamid-2.0/indico.test.uu.se-shibboleth.xml b/swamid-2.0/indico.test.uu.se-shibboleth.xml
new file mode 100644
index 00000000..c196de44
--- /dev/null
+++ b/swamid-2.0/indico.test.uu.se-shibboleth.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://indico.test.uu.se/shibboleth">
+  <md:Extensions>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" 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.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification">
+        <saml:AttributeValue>https://refeds.org/sirtfi</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 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://indico.test.uu.se/Shibboleth.sso/Login"/>
+      <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://indico.test.uu.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Indico TEST</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Indico TEST</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Indico är ett evenemangshanteringssystem för möten, konferenser och föreläsningar.</mdui:Description>
+        <mdui:Description xml:lang="en">Indico is an event management system for meetings, conferences and lectures.</mdui:Description>
+        <mdui:Logo xml:lang="en" height="52" width="196">https://indico.test.uu.se/images/logo_indico.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="52" width="196">https://indico.test.uu.se/images/logo_indico.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://indico.test.uu.se/about</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://indico.test.uu.se/static/custom/privacy-policy-en</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://indico.test.uu.se/static/custom/privacy-policy-sv</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>uuc-web031-t.its.uu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=uuc-web031-t.its.uu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDGTCCAgGgAwIBAgIJAKmas4P9C3JXMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNV
+BAMMFz11dWMtd2ViMDMxLXQuaXRzLnV1LnNlMCAXDTE4MDUzMTE0MDI0OVoYDzIw
+NjgwNTE4MTQwMjQ5WjAiMSAwHgYDVQQDDBc9dXVjLXdlYjAzMS10Lml0cy51dS5z
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMAeFrmGgAfLo+1vYbj2
+QfFTfWNPMYdcmTi0AL4Won4sobNBoFZ566tlP8uJ9StRWjoXwJjsPr3ojQk16SQ6
+Am8006g4qEFOwM4oTzRHCPrWILtu6TJ5X1VIX/mw7KArOKjpGpWUtMzScWzt6sI8
+OlZJac3ZDa2VFAExxdSbNWGm+Lts94YoZ9+oCOaTdD9+JVFe/YKof4xd025WOEzd
+tPWVwDLAZm6bQytDCxafopnqNSwfWOgrYSyl6TpXKrjPMt6sy2n2OTpC357jf1py
+rSsAsEEW2wJlIpBICCLtpK5JedguOVMuoxqC63JfnKenWR7Vq6oz/WFhTcy3jhZ9
+fOsCAwEAAaNQME4wHQYDVR0OBBYEFNpK6GpcCaTD+WhRfMTFnItjQhX9MB8GA1Ud
+IwQYMBaAFNpK6GpcCaTD+WhRfMTFnItjQhX9MAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADggEBAGj8EeeTu8QdbK8s2CJsW7IFcMVVa4FDJVGbYHeTe1aSdMPE
+rewZLCim0tdt0pB35iUUTwIlDvGVbJp51bfdHygb/BYyTBAHW8MiXwWBkDYT1TzQ
+3+d+Iw/m9lidoo5NCNpnpM4P7z+DMkJ2odeqDpsFJ07e7nFDCscL5ysAcbRMoNNQ
+Nv/PH3X/ski2V+wFVkIUmAfyvuiKWrYNeabHObiz+Rj8NUk2Swuxfw3lQQAfCSzG
+Mp0Rv5wuTB3e5oRzX1Kc9vkb89kkRSUf6ktQ4Qo/ij0sg59GqkSAFJ6Ng1qmjP0+
+acjhlnJDt40YvXKkX07QZm3Ti5EjNpo4xpmj7+U=
+          </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://indico.test.uu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indico.test.uu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://indico.test.uu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indico.test.uu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indico.test.uu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indico.test.uu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://indico.test.uu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indico.test.uu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indico.test.uu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indico.test.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indico.test.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://indico.test.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://indico.test.uu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://indico.test.uu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Indico TEST</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </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 xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
+    <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 57040596..5ae09a3b 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -712,4 +712,5 @@
   <xi:include href="swamid-2.0/play.mau.se.xml"/>
   <xi:include href="swamid-2.0/kauplay.kau.se.xml"/>
   <xi:include href="swamid-2.0/play.ju.se.xml"/>
+  <xi:include href="swamid-2.0/indico.test.uu.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3