Resolves SWAMID-3631

2 files changed, 117 insertions, 0 deletions

diff --git a/swamid-2.0/wiki.pdc.kth.se.xml b/swamid-2.0/wiki.pdc.kth.se.xml
new file mode 100644
index 00000000..abb06fe2
--- /dev/null
+++ b/swamid-2.0/wiki.pdc.kth.se.xml
@@ -0,0 +1,116 @@
+<?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://wiki.pdc.kth.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>
+    <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://refeds.org/category/research-and-scholarship</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://wiki.pdc.kth.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://wiki.pdc.kth.se/Shibboleth.sso/Login" 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://wiki.pdc.kth.se/Shibboleth.sso/DS/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://wiki.pdc.kth.se/Shibboleth.sso/DS/Login" index="2"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">PDC Wiki</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">PDC Wiki</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">PDCs wiki dokumenterar PDCs system och rutiner.</mdui:Description>
+        <mdui:Description xml:lang="en">The PDC Wiki documents PDC's systems and procedures.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.pdc.kth.se/support</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:KeyName>cuttlefish.pdc.kth.se</ds:KeyName>
+        <ds:KeyName>https://cuttlefish.pdc.kth.se/shibboleth</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=cuttlefish.pdc.kth.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEMjCCApqgAwIBAgIJANAFDYIXK2eeMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
+BAMTFWN1dHRsZWZpc2gucGRjLmt0aC5zZTAgFw0yMDEyMDExMDUwNTZaGA8yMDUw
+MTEyNDEwNTA1NlowIDEeMBwGA1UEAxMVY3V0dGxlZmlzaC5wZGMua3RoLnNlMIIB
+ojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAzxihAv6niGR0aMtIoZhGBDyy
+tMuAk33JE3z7Zg/tJXGV2CYoODjmicquZ/oMU2VOCYnpSAva1K/FpVEAsDJHso7k
+3ytG+R67u1GPLMT18U4u12BeJIY1s3RtpmQo/TyiTWvEwIgDeDExjXcVm+k0xdgV
+H+QqT+KcaKTwHxESV4j6RXBXmClDI/AxqMfa782rPHSZss04V6A9P8W0N2uZsf20
+Z7H2xjtKIpf2KBQpR6gdzAC5FMgVYO+UZ+GzlEZnTNXu/UijjMHmTBo81hB4mIE7
+w2TERuTXSROToGLEUBe3wukNwW/3onERaQibX4sjGA70W4IXDwsaBuWGiYLGozbh
+Rr1p6rADRwy8aiGKwErqKsX+lQvSJCM7mMEX9aF7bAqBCdOBX1/zBEYWqYkeWYI+
+N3bPgEMf1bLHfuEmN0vhmr0iNuJUM84QztFqK++Vi4s4ipIMCUi5DoWYCCoqwy1j
+stXJ0dbYbkEuL+oFBPM7NJCl/V2f5rrH7TFWGyRtAgMBAAGjbTBrMEoGA1UdEQRD
+MEGCFWN1dHRsZWZpc2gucGRjLmt0aC5zZYYoaHR0cHM6Ly9jdXR0bGVmaXNoLnBk
+Yy5rdGguc2Uvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUho4wXJ/Dgi+HtOQ15NV8TUKF
+feAwDQYJKoZIhvcNAQELBQADggGBALXnwvsd+hZxCg9VU/RxaLCoyr0mYfKCoUOk
+ZGgWZ2k8R83llxC4zHJjjzWEqd+dSMBxIJifOMCWh/CQQ7jqngzSMgGuMFeZD2gn
+afjjIFintb5siiRkZbZabmY2gVvo5eHHKFor0SzrtYUPgnbJtJE3S50AomBYm5OV
+DNT04RSq635Mq4whmHaTNNkxL8/39Gkx2uW1WLorFCWm0Qr77uM78ehe1xyT1xnx
+c7Ym/hoZnWXFDOz4+JYuCGiK1I6G1stAIrgkJmZxrHA+s2jk4zuPvdcmlJLIEmlF
+ZaDtAI+0idkwJanAQVWzjqVW6YqjfPOIRcM1vY7sPBNCs4eo7WfBsz5XfAVd8YXU
+MszW0SbJycKKBosrfEmLqVvfkU39zVJBj0FZxfmybbcLAnnE0AAAySawXWP9vCVo
+iC0vZyfVeVSTgXKo/0dTJDsIEdJmRhVoJvYV81GZ1hdj9wxC/UTGWYaQbmBm+sfW
+4XIex1Jr/s7cyO6fR85bVOo0UsvLVA==
+</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://wiki.pdc.kth.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.pdc.kth.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.pdc.kth.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.pdc.kth.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.pdc.kth.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.pdc.kth.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.pdc.kth.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.pdc.kth.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.pdc.kth.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.pdc.kth.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">PDC KTH</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">PDC KTH</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Parallelldatorcentrum KTH</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">PDC Center for High Performance Computing KTH</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.pdc.kth.se/sv</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.pdc.kth.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>PDC Support</md:GivenName>
+    <md:EmailAddress>mailto:support@pdc.kth.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>PDC Support</md:GivenName>
+    <md:EmailAddress>mailto:support@pdc.kth.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>PDC Support</md:GivenName>
+    <md:EmailAddress>mailto:support@pdc.kth.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 0d7ae40f..5405e6aa 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -668,4 +668,5 @@
   <xi:include href="swamid-2.0/cuttlefish.pdc.kth.se.xml"/>
   <xi:include href="swamid-2.0/login.sto3.safespring.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sp.tshhosting.com-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/wiki.pdc.kth.se.xml"/>
 </md:EntitiesDescriptor>