From 4c3dcf893c14e70655126445f206a71acf50625c Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Fri, 13 Apr 2018 09:34:54 +0200
Subject: Resolves SWAMIDOPS-605

---
 swamid-2.0/portalfhs.onricoh.se-shibboleth.xml | 105 +++++++++++++++++++++++++
 swamid-sp-2.0.mxml                             |   1 +
 2 files changed, 106 insertions(+)
 create mode 100644 swamid-2.0/portalfhs.onricoh.se-shibboleth.xml

diff --git a/swamid-2.0/portalfhs.onricoh.se-shibboleth.xml b/swamid-2.0/portalfhs.onricoh.se-shibboleth.xml
new file mode 100644
index 00000000..4682d115
--- /dev/null
+++ b/swamid-2.0/portalfhs.onricoh.se-shibboleth.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://portalfhs.onricoh.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" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">eduPrint</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">eduPrint</mdui:DisplayName>
+        <mdui:Description xml:lang="en">eduPrint is a print and photocopying system for students and employees at the Swedish Defence University. Use eduPrint to print, make photocopies and scan documents and images.</mdui:Description>
+        <mdui:Description xml:lang="sv">eduPrint är ett utskrifts- och kopieringssystem för studenter och anställda vid Försvarshögskolan. Med eduPrint kan du skriva ut, kopiera och skanna dokument och bilder.</mdui:Description>
+        <mdui:Logo height="50" width="50">https://portalfhs.onricoh.se/resources/img/eduPrint.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="50" width="50">https://portalfhs.onricoh.se/resources/img/eduPrint.jpg</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://zero.comaround.com/link/d2e636d519154413bf3af8713aac07bf/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://zero.comaround.com/link/d2e636d519154413bf3af8713aac07bf/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <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://portalfhs.onricoh.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>edp-fhs-prn01.fhs.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=edp-fhs-prn01.fhs.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEAzCCAmugAwIBAgIJAPUMhYxLe2qHMA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
+BAMTFGVkcC1maHMtcHJuMDEuZmhzLnNlMB4XDTE3MDYxMjEyMTA1MVoXDTI3MDYx
+MDEyMTA1MVowHzEdMBsGA1UEAxMUZWRwLWZocy1wcm4wMS5maHMuc2UwggGiMA0G
+CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDK2+Y9AgzBG1XgcY0JRgN5b+JeoyDJ
+QNT0ToSWt35pK7ocMDaZPOhhWEuFAQkePcZhcoI9RY6TmEzXfPShIdR9zLZN7kNQ
+hurvXXgJl2yk0Jf/Gc1fCWbM+k/UR2hq2zFtkcviS9P2IbX2aXa2M8odtv2DELFT
+5JUjMub9zCdQLPm9672egWLS9sW9QdUycuSZnzHBhMelfGR58T2K9fBw6DgSx5JL
+0h6EGo0S+JpKGriifkAaUkhBq9oAG7WDW01Xl5vovUbvxbFsZo5HpIxID+sP35Ri
+umsWVIfSV8S/LWhkK32/vHhis5Nr2TR07c2HwkFHSAQxyzAudAJd33dA2TZHvXbb
+aiamP3egIJ8Om5xtzKX8QkJVPLrcARFs3haYMBnMVQP9MFY2u87HntPNLQT365AO
+YcFxpVHSIe8DTYRXlIpXm5khcPHs+lmaFBkMttRt6FN/4z3b039YIYOEzKiqUCdj
+lpNtkJur9+wQqn4b41nkN+0NiAT7auLS/uUCAwEAAaNCMEAwHwYDVR0RBBgwFoIU
+ZWRwLWZocy1wcm4wMS5maHMuc2UwHQYDVR0OBBYEFKxKn+8yFuBl5yHzmCh/3YRc
+qX7LMA0GCSqGSIb3DQEBCwUAA4IBgQBxpgPS6xeI2NpICo4uZrBB23vI4BM75sDq
+3ZxYDgXyutSx01D0RpdnlQX5WSXjEZCitPlQ7IPh7eht2E0gebrol3kIKdiMqlmj
+wjzoH1tzA+yRjFDjxTgX2GYvTy0ibDLJ/PNwRgKNW/jQhmBSi2Mq+cWBn87CIj9i
+Ib82vpFN2WZK/jKq+omQM/wDqEmw6FqieB3bm+JKvqRjiomfnje4whYhNb06yeiK
+khpNuwVbnY3EAM3I1UpPPUWYZbCjUR4O0sioKLM0HjPtJdKXdLPqdWk7O62Wbvpw
+fxCRxAYWaStMLUeM1Mg7OlqJdMiU21hx7GNxK6smi9/ScWlvoPZLR8TvDfpjzkod
+n6uUaExnxQbwTbNQ5w71X6mzxR++IsV8C1Vwv5tcZqdy+kCZY4Ocwhfr/6GI8+42
+KH46fYXyT9sVFAcBZD8IexNaVETOv9gQNy3db3fBFRN3yafcL5S5jeffFLKTsj38
+CD7PLZk/IkwF0hNDcLbY51g4UEz40tQ=
+</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://portalfhs.onricoh.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://portalfhs.onricoh.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://portalfhs.onricoh.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portalfhs.onricoh.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://portalfhs.onricoh.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portalfhs.onricoh.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://portalfhs.onricoh.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://portalfhs.onricoh.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ricoh Sweden AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ricoh Sweden AB</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ricoh.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Ricoh</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:kundservice@ricoh.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ricoh</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:kundservice@ricoh.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index d263e3ec..74e06ed3 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -695,4 +695,5 @@
   <xi:include href="swamid-2.0/acs-ra21.mnt.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/medlem.sus.su.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
   <xi:include href="swamid-2.0/play.test.umu.se.xml"/>
+  <xi:include href="swamid-2.0/portalfhs.onricoh.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3