From 06108e3b23d676e5d81b319d7e187676dca953ef Mon Sep 17 00:00:00 2001
From: Anders Lördal <anders.lordal@hig.se>
Date: Thu, 3 Jul 2014 12:35:37 +0200
Subject: Resolves SWAMIDOPS-7281

---
 .../shh.pingpong.se-Shibboleth.sso-Metadata.xml    | 82 ++++++++++++++++++++++
 ...st-shh.pingpong.net-Shibboleth.sso-Metadata.xml | 80 +++++++++++++++++++++
 swamid-sp-2.0.mxml                                 |  2 +
 3 files changed, 164 insertions(+)
 create mode 100644 swamid-2.0/shh.pingpong.se-Shibboleth.sso-Metadata.xml
 create mode 100644 swamid-2.0/test-shh.pingpong.net-Shibboleth.sso-Metadata.xml

diff --git a/swamid-2.0/shh.pingpong.se-Shibboleth.sso-Metadata.xml b/swamid-2.0/shh.pingpong.se-Shibboleth.sso-Metadata.xml
new file mode 100644
index 00000000..7192a0cc
--- /dev/null
+++ b/swamid-2.0/shh.pingpong.se-Shibboleth.sso-Metadata.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shh.pingpong.se/Shibboleth.sso/Metadata">
+  <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://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">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv"> PING PONG vid Sophiahemmets högskola </mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en"> PING PONG at Sophiahemmet University </mdui:DisplayName>
+        <mdui:Description xml:lang="sv"> Lärplattformen PING PONG vid Sophiahemmets högskola. </mdui:Description>
+        <mdui:Description xml:lang="en"> The learning platform PING PONG at Sophiahemmet University. </mdui:Description>
+        <mdui:Logo height="168" width="50">https://www.pingpong.se/static/pingpong-logo-168x50.png </mdui:Logo>
+        <mdui:Logo height="16" width="16">https://www.pingpong.se/static/pingpong-logo-16x16.png</mdui:Logo>
+      </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://shh.pingpong.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://shh.pingpong.se/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://lillaedet.pingpong.se/shibboleth</ds:KeyName>
+        <ds:KeyName>lillaedet.pingpong.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lillaedet.pingpong.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJAMNpqZY0cUukMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+BAMTFWxpbGxhZWRldC5waW5ncG9uZy5zZTAeFw0xMjAxMTgxMDU4MjZaFw0yMjAx
+MTUxMDU4MjZaMCAxHjAcBgNVBAMTFWxpbGxhZWRldC5waW5ncG9uZy5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM8GQM1LnsvyXPnZh9ZlWhG3gkJB
+0H8I7kkVO017B7AmQvFingsCaIHBFnglKRyTml5lw5My4NGi9QVWLSd5IIoDD9Is
+uRR5tEU0+G6eyxQy08MZMB0XwamC+8BsU/0rOc5zmA+iAS3LDZO4m+gLOwWYorbg
+a6ViHplIrOUOBeUT1j4D3MJs5LBpJ/Ruvf4sAzP/eA8uCr7Wo13Geq+8lJodV917
+D+/KbGbOHZMkhCb9iCZpdJVvnVGWWuQbYMfAxaRcGkIMKZOcFiseCJ1tUlrb9YFD
+WuPcF7kFr0nzGmqVyqFd7zedMNzIEyBVlEa3YwcwxQSlopVf9FBm5FNGi88CAwEA
+AaNtMGswSgYDVR0RBEMwQYIVbGlsbGFlZGV0LnBpbmdwb25nLnNlhihodHRwczov
+L2xpbGxhZWRldC5waW5ncG9uZy5zZS9zaGliYm9sZXRoMB0GA1UdDgQWBBQS1rOl
+mFqPheIlLCkc2f6dkjPjGDANBgkqhkiG9w0BAQUFAAOCAQEAYJ+J6GqQXCjnDI4j
+jeT1SSEpDmEgH4JtaJbth2Ymz1lw8DAwF51aXK+9ylY239V2tQ7cVYdYdeNLsK8S
+i8WGFEPepAJevRES3TbZmBkx63vg6KFtONBFa4FiDAHv7Ja7fGPC/jo4+7V+174j
+wdfS6g4c1YW8xMNOHgdAbeMVk365DD3vYv796T6m9oaZfp41fOkvQ2Ly7lD1P53d
+kYPtN92O/M+IGG8b3FF4UQ3tTnC8N9D6YF18X5GK+W1tSQfZ7jAf3sAK9yrXuZv2
+AyhVkxRiEnLD4tvVDNFseCCzGAomlzCuOU2QY5TyK6VbtwKvxZvUc6GQF5y7h1aN
+UIZtDw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <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://shh.pingpong.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shh.pingpong.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shh.pingpong.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shh.pingpong.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shh.pingpong.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shh.pingpong.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shh.pingpong.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shh.pingpong.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/test-shh.pingpong.net-Shibboleth.sso-Metadata.xml b/swamid-2.0/test-shh.pingpong.net-Shibboleth.sso-Metadata.xml
new file mode 100644
index 00000000..7c9e840a
--- /dev/null
+++ b/swamid-2.0/test-shh.pingpong.net-Shibboleth.sso-Metadata.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-shh.pingpong.net/Shibboleth.sso/Metadata">
+  <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://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">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv"> PING PONG vid Sophiahemmets högskola </mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en"> PING PONG at Sophiahemmet University </mdui:DisplayName>
+        <mdui:Description xml:lang="sv"> Lärplattformen PING PONG vid Sophiahemmets högskola. </mdui:Description>
+        <mdui:Description xml:lang="en"> The learning platform PING PONG at Sophiahemmet University. </mdui:Description>
+        <mdui:Logo height="168" width="50">https://www.pingpong.se/static/pingpong-logo-168x50.png </mdui:Logo>
+        <mdui:Logo height="16" width="16">https://www.pingpong.se/static/pingpong-logo-16x16.png</mdui:Logo>
+      </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://test-shh.pingpong.net/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://test-shh.pingpong.net/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>test-server.pingpong.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=test-server.pingpong.net</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDzCCAfegAwIBAgIJAIreASj6FsJYMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+BAMTGHRlc3Qtc2VydmVyLnBpbmdwb25nLm5ldDAeFw0xNDA2MjcxMjQ4MDhaFw0y
+NDA2MjQxMjQ4MDhaMCMxITAfBgNVBAMTGHRlc3Qtc2VydmVyLnBpbmdwb25nLm5l
+dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANcJkAXw1cx7St7PPOAP
+UNqdouPe0CSVWODuSEtm8orAub2l9hDnfJiE/K62BYBZGZUaHjrtubaoaKRWts1m
+KSGUmfjwc38wjW5JBGTPAsTqWukNT89CzeKqNWEuPAk8Tcp1hrb+yCCqUtUcZSKL
+H6Zo8dHKCko+2HpYs4SKlJ6TukY9iB/D742FAn9+T7Sjd3XLJgb27LdElZ+Mt1Zl
+QyVeh+VzJHzMjLd8lVi4RwwkVA4T28p056ODUfQ3o4h8JrPSlZVGEb+Ayuq2QRED
+yll+DUGeuGqH/vVBp9n4EUSNTh/GJZ8lbJJcogsHjYIGkIDRi6bPZMnnE6nGSGhT
+pAECAwEAAaNGMEQwIwYDVR0RBBwwGoIYdGVzdC1zZXJ2ZXIucGluZ3BvbmcubmV0
+MB0GA1UdDgQWBBSrXLwS1q7qwcr20Gawl48anQBGLjANBgkqhkiG9w0BAQUFAAOC
+AQEAj54wf6+eQkGfEjUY4ZZZdk5xByccWZjH6gwjYFdjDEsI83YbOVjuCAA46uDG
+TM9YWeg55J3+H/doRkhNbV8nHbNeuzHyHuuixtP7xREl4dRCSu0EQxgJ2FAyo3X+
+6S8wmTtBCXRTXEcgp9jSRLE6iE2EOY2fWa6pxWfLCfQBwSoI2pRXo69OU6vHWO/a
+fuT6EONz4D9pi7t8w6gfnBh+6boCt9KzpnIhq59YOHvcK8PHcMpXz+jSW1W2ZPnE
+umEfUjub2UD/FBc9kMEDX6Qkz7Jr8HF/C414A9IcVXiUxDX8WX3AGpjmV/H4+qna
+OWWW78/lmlGJYmT4C6Fba3Ifag==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <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://test-shh.pingpong.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-shh.pingpong.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-shh.pingpong.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-shh.pingpong.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test-shh.pingpong.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-shh.pingpong.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-shh.pingpong.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test-shh.pingpong.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 06222ede..8c006eb2 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -314,4 +314,6 @@
   <xi:include href="swamid-2.0/konto-test.weblogin.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/lobo2.lab.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/tools.kib.ki.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/shh.pingpong.se-Shibboleth.sso-Metadata.xml"/>
+  <xi:include href="swamid-2.0/test-shh.pingpong.net-Shibboleth.sso-Metadata.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3