Resolves RT ticket 2745

2 files changed, 92 insertions, 0 deletions

diff --git a/swamid-2.0/comanage-dev.sunet.se-shibboleth.xml b/swamid-2.0/comanage-dev.sunet.se-shibboleth.xml
new file mode 100644
index 00000000..e6b92b4a
--- /dev/null
+++ b/swamid-2.0/comanage-dev.sunet.se-shibboleth.xml
@@ -0,0 +1,91 @@
+<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://comanage-dev.sunet.se/shibboleth">
+  <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 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/nren-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.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://comanage-dev.sunet.se/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Sunets COmanage-dev</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Sunet's COmanage-dev</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">COmanage-dev hos Sunet</mdui:Description>
+        <mdui:Description xml:lang="en">COmanage-dev at Sunet</mdui:Description>
+      </mdui:UIInfo>
+      <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://comanage-dev.sunet.se/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:KeyName>3cb975108504</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>comanage-dev.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEOzCCAqOgAwIBAgIUc3/eDTvR0d7wEfjRyCyUVmNOLNUwDQYJKoZIhvcNAQEL
+BQAwIDEeMBwGA1UEAxMVY29tYW5hZ2UtZGV2LnN1bmV0LnNlMB4XDTIwMDMxNTE5
+NTQwMloXDTMwMDMxMzE5NTQwMlowIDEeMBwGA1UEAxMVY29tYW5hZ2UtZGV2LnN1
+bmV0LnNlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA2jLYt60oYVCe
+Xr/7uq27DzH7Ecv2sEXwMsi7pg35EJ2QuhWG2yNeoTofPioLuGNyb0vAK20p08Tb
+gcipGL+wwKnvFsJ9pjKmADitK09X8fD2RhjEq/b4VlXfZK9v8rIuu9g5fQWdXeqD
+EM8h0lOVH7XOOhQtj2z6w9YCCXhH5W2JQ08Z/EY+vWeTcEvvyTjVV0uDdtJMNpPd
+IBhLSe7jlfCFwxbRGAQH7/C7AdDyZR7ZuGEiiZRpYsb+ef4ftGghKgcN8I/WV8/2
+TA4fcm+bBW3X5BrhPqpWzOZ6iOxL5yMn5OEtp9WxQhxoMF70Dw599tI9AUZ9i1ew
+1ETKsgQZ3/m7/i60qoQ3RCjV6XnKPOJDR8/AvZZdjmLXIHmcjrXzuz8Vf1JqWx9I
+5bBl/LhLtOls7bgw7jb3z3XxoCfUN9JnUIWU+7BCjg43GBGNuZPaenFh3Wb+WGrz
+NGVtcphHUb54o+GOSwokVe93x7LgA2o3hylWWBl1kUx5FbCEDSQPAgMBAAGjbTBr
+MEoGA1UdEQRDMEGCFWNvbWFuYWdlLWRldi5zdW5ldC5zZYYoaHR0cHM6Ly9jb21h
+bmFnZS1kZXYuc3VuZXQuc2Uvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU1IkJPOTK6mVw
+sl/RpsMpkE7UmRQwDQYJKoZIhvcNAQELBQADggGBAAcyCcC3cMCVBRsxQomMWYOP
+FbR83x/x+KaLe89ECyUB32HGKhrqbR7TkmarXD8kmEKBWMPUS99oGSkTderPMyXL
+vxhQC0qRsoAop4ix4VrXDCBqY56xZw3DNHOwe+J+lp3w42HND/tjZRsF1XVubaX7
+xdKPeV+9iic7TQIRbYiLXpPhgN7DR1NYnHR+I5fRSWJYrwjnvK7MfBh6IVrov24c
+TAYhe5QsFogQ8GWv76pBESGf5JLYfx+S0TswvFurRuPg6rHQliAYiohgInCWQNma
+PoLlxz6O5D3Mce3E5RkE/1rVjS41oBuD4T+xt7T/uCPEQC2AXupFdAKU5Xn9L8gQ
+fTfn36RSPDS1H2lb/hJ2GSnvcq58u3cEOkO+W9+PzGel/6db4yzZne6leu3ZcU+Y
+dCo0J9TAp9AF4ezsUi50VgWonSgdnutLtEZSZ9kbZJO/VAM1Zbax2NwkmejKcyTi
+T10PWaKrl44Xu5NN4+QWzR4HDFyjoJXR/7oW7l4hzQ==
+</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://comanage-dev.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://comanage-dev.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://comanage-dev.sunet.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://comanage-dev.sunet.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+  </md:SPSSODescriptor>
+<md:Organization>
+    <md:OrganizationName xml:lang="en">SUNET</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish University Network (SUNET)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sunet.se</md:OrganizationURL>
+</md:Organization>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index ffa9723c..a7ce2c4f 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -371,6 +371,7 @@
   <xi:include href="swamid-2.0/comanage.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/comanage-test.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/comanage-test-ds.sunet.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/comanage-dev.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp-test.comanage.sunet.se-sp.xml"/>
   <xi:include href="swamid-2.0/idp.comanage.sunet.se-sp.xml"/>
   <xi:include href="swamid-2.0/idpaas.swamid.se-sp.xml"/>