Merge branch 'master' of md-master.swamid.se:swamid-metadata

Conflicts:
	swamid-sp-2.0.mxml

3 files changed, 120 insertions, 0 deletions

diff --git a/swamid-2.0/shibboleth.antagning.se-shibboleth-idp.xml b/swamid-2.0/shibboleth.antagning.se-shibboleth-idp.xml
index 809fa9d7..6fb895e7 100644
--- a/swamid-2.0/shibboleth.antagning.se-shibboleth-idp.xml
+++ b/swamid-2.0/shibboleth.antagning.se-shibboleth-idp.xml
@@ -21,6 +21,15 @@ MIIBwjCCAWygAwIBAgIJALANRraT06m8MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF3NoaWJib2xl
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDTDCCAjSgAwIBAgIJAJnCjgPyD5z4MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGguYW50YWduaW5nLnNlMB4XDTE0MTIxODA4MjAzNVoXDTI0MTIxNTA4MjAzNVowIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5hbnRhZ25pbmcuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+5lIFn1Td3qxstitszLSIfXPSMrjMLep5S5zwDU81hbkJoAbOWPNMovYkMiie16Rh66TUayhr7wnNneWtWUpsgQm3DeRGQnsdkFsiR4eDwvuBFUdi0b/egBviys6BHK5/YOuJYZROmN/wPgSTcVMui5IYVwgcL3xROCkbSxJxQVmr8R22IMV9KIc6DtANMufiHwlf4xXZ7AIb/j9ZFMsAzdSzPbTufNmnpr/6ww/6I5g2iuYfa9bC/88G16qJ52oSyk2LkOvE3GuL5259bh/IRLAyOWg34mg6gNFliKdgT+yo1IUN6R2MT2qGm7kW5aSNOVWHnoPlk1ccv3H0ZueXAgMBAAGjgYQwgYEwHQYDVR0OBBYEFFBZMWHu/uUxUTC2hR+Yp2QwykUSMFIGA1UdIwRLMEmAFFBZMWHu/uUxUTC2hR+Yp2QwykUSoSakJDAiMSAwHgYDVQQDExdzaGliYm9sZXRoLmFudGFnbmluZy5zZYIJAJnCjgPyD5z4MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBALG4+NwZRd0ArQqLkmEg3ERawa0JlnIUpqe5pp8trHgtfOnICZvp0Mo/l5jbw/4K5VgVidto/pB55q55fg5e+Kvl2qN8QTmUX0Ys82et/0b/JMDj+W9rubMW3x83fOa1iRy9lWlY8zwkdRpaM7JQvqck6jwiI3PRr1x4x8cPt3d+QTjhzvV7HCzrb0qWK2xsKCTkF+GREdIslPYWjgTJwHSP945Kmya/cD5kJK0xExiewzbx3gAVTufdcq29Cd5xb5bqOyri9Ag4v8Ro8b28x4bS6DstiYu+F/kKwUjnvM9tR27WFtS9XFBBGBnjNfLaIEYLFZz+872cPMrpmAd5yfg=
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.antagning.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
@@ -43,6 +52,14 @@ MIIBwjCCAWygAwIBAgIJALANRraT06m8MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF3NoaWJib2xl
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDTDCCAjSgAwIBAgIJAJnCjgPyD5z4MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGguYW50YWduaW5nLnNlMB4XDTE0MTIxODA4MjAzNVoXDTI0MTIxNTA4MjAzNVowIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5hbnRhZ25pbmcuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+5lIFn1Td3qxstitszLSIfXPSMrjMLep5S5zwDU81hbkJoAbOWPNMovYkMiie16Rh66TUayhr7wnNneWtWUpsgQm3DeRGQnsdkFsiR4eDwvuBFUdi0b/egBviys6BHK5/YOuJYZROmN/wPgSTcVMui5IYVwgcL3xROCkbSxJxQVmr8R22IMV9KIc6DtANMufiHwlf4xXZ7AIb/j9ZFMsAzdSzPbTufNmnpr/6ww/6I5g2iuYfa9bC/88G16qJ52oSyk2LkOvE3GuL5259bh/IRLAyOWg34mg6gNFliKdgT+yo1IUN6R2MT2qGm7kW5aSNOVWHnoPlk1ccv3H0ZueXAgMBAAGjgYQwgYEwHQYDVR0OBBYEFFBZMWHu/uUxUTC2hR+Yp2QwykUSMFIGA1UdIwRLMEmAFFBZMWHu/uUxUTC2hR+Yp2QwykUSoSakJDAiMSAwHgYDVQQDExdzaGliYm9sZXRoLmFudGFnbmluZy5zZYIJAJnCjgPyD5z4MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBALG4+NwZRd0ArQqLkmEg3ERawa0JlnIUpqe5pp8trHgtfOnICZvp0Mo/l5jbw/4K5VgVidto/pB55q55fg5e+Kvl2qN8QTmUX0Ys82et/0b/JMDj+W9rubMW3x83fOa1iRy9lWlY8zwkdRpaM7JQvqck6jwiI3PRr1x4x8cPt3d+QTjhzvV7HCzrb0qWK2xsKCTkF+GREdIslPYWjgTJwHSP945Kmya/cD5kJK0xExiewzbx3gAVTufdcq29Cd5xb5bqOyri9Ag4v8Ro8b28x4bS6DstiYu+F/kKwUjnvM9tR27WFtS9XFBBGBnjNfLaIEYLFZz+872cPMrpmAd5yfg=                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
     <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.antagning.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
diff --git a/swamid-2.0/verify.studentbeans.com-shibboleth.xml b/swamid-2.0/verify.studentbeans.com-shibboleth.xml
new file mode 100644
index 00000000..a016d6da
--- /dev/null
+++ b/swamid-2.0/verify.studentbeans.com-shibboleth.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://verify.studentbeans.com/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" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <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 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://verify.studentbeans.com/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://verify.studentbeans.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Student Beans</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>verify.studentbeans.com</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=developers@thebeansgroup.com,CN=verify.studentbeans.com,O=The Beans Group Ltd,L=London,ST=London,C=UK</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEODCCAyCgAwIBAgIJANJg6RwX4lGaMA0GCSqGSIb3DQEBBQUAMIGcMQswCQYD
+VQQGEwJVSzEPMA0GA1UECAwGTG9uZG9uMQ8wDQYDVQQHDAZMb25kb24xHDAaBgNV
+BAoME1RoZSBCZWFucyBHcm91cCBMdGQxIDAeBgNVBAMMF3ZlcmlmeS5zdHVkZW50
+YmVhbnMuY29tMSswKQYJKoZIhvcNAQkBFhxkZXZlbG9wZXJzQHRoZWJlYW5zZ3Jv
+dXAuY29tMB4XDTE0MDQxMDE1MzcyNloXDTI0MDQwNzE1MzcyNlowgZwxCzAJBgNV
+BAYTAlVLMQ8wDQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxvbmRvbjEcMBoGA1UE
+CgwTVGhlIEJlYW5zIEdyb3VwIEx0ZDEgMB4GA1UEAwwXdmVyaWZ5LnN0dWRlbnRi
+ZWFucy5jb20xKzApBgkqhkiG9w0BCQEWHGRldmVsb3BlcnNAdGhlYmVhbnNncm91
+cC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqGDfRStUUNFor
+otpdWs83wj0xQQ4sP0PfIyWV7kjGNSBA4WuyqX/nxz0prwJfOKzdNKcCdM9ZR8vD
+AzjeDJ5Y2vneAKhmGMjucEPoy5Zb9dC6fFP2M6mmM47oAFGT2rzTZKFWbAKyV0f8
+zE6K+Ddq//dmkA5IwTWpq63c/ouEtG8IP8kGdthpQLmNvhg1C0Afko/xydvs2LXh
+y3XZUxKEDSu3NhvIWxE4iv7TTs4vnXvQLmPd3xSWQZEbd+/golvl0hs6tsBCQR8T
+fUjgUCatbzT177hkhhHNkhlYLaUtf6k/9mO1U1t8aIDA+wlA0Js+irTqxLi4OmgK
+2XtMjERRAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
+U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSq41Sfw3DoEWvPwtTW
+7Z2Za78S0DAfBgNVHSMEGDAWgBSq41Sfw3DoEWvPwtTW7Z2Za78S0DANBgkqhkiG
+9w0BAQUFAAOCAQEAfxOkl3ajUkZMYII16kS/SFEQGCQ+KGAvaBFZsVm0fkdGKLhm
+fCM56Y9yx38PNUG90AACWSxGAjzvRbwV6AwLgOtqO9yGUQMtMgITRa6Gw35DVhWT
+Iz6w5KFhKX0iCM+NGAQaPGnM0c5Y7zwyI/fBeO9VfAcXUwBPu1eUeoQitzv6/XXz
+LzmtbQlpgBWPfi30tXx0ZfJALdWkP54Bbubw7nC8KlMZInpTdtot/CYqk6K1yZ5K
+dbTF8jXsONg/RSWzM2N6J42swNHz1NzcVCbwtvlu8sPzLWftRGLZFLWpj3SJR3mr
+UKG+a99pFdmiJhaVmr6ppycpR94IcDJb+8Px5A==
+</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://verify.studentbeans.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.studentbeans.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://verify.studentbeans.com/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.studentbeans.com/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.studentbeans.com/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Beans Group</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Beans Group</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">The Beans Group</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.thebeansgroup.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.thebeansgroup.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName> William</md:GivenName>
+    <md:SurName> Harris</md:SurName>
+    <md:EmailAddress>william@thebeansgroup.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 356fdcc4..3f25e25c 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -339,4 +339,5 @@
   <xi:include href="swamid-2.0/test.lararlyftet-validering.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sp-utv.ldc.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml"/>
+  <xi:include href="swamid-2.0/verify.studentbeans.com-shibboleth.xml"/>
 </md:EntitiesDescriptor>