Resolves SWAMIDOPS-7706

1 files changed, 56 insertions, 46 deletions

diff --git a/swamid-2.0/vfu-test.su.se-shibboleth.sso.xml b/swamid-2.0/vfu-test.su.se-shibboleth.sso.xml
index 73a0c1e5..5ca7815e 100644
--- a/swamid-2.0/vfu-test.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/vfu-test.su.se-shibboleth.sso.xml
@@ -1,6 +1,26 @@
 <?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://vfu-test.su.se/Shibboleth.sso">
-  <md:Extensions>
+  <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/hei-service</samla:AttributeValue>
@@ -12,9 +32,16 @@
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vfu-test.su.se/Shibboleth.sso/WAYF" index="1"/>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vfu-test.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vfu-test.su.se/Shibboleth.sso/SWAMID" index="3"/>
+      <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://vfu-test.su.se/Shibboleth.sso/WAYF"/>
+      <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://vfu-test.su.se/Shibboleth.sso/WAYF" 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://vfu-test.su.se/Shibboleth.sso/WAYF/wavelan"/>
+      <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://vfu-test.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
+      <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://vfu-test.su.se/Shibboleth.sso/WAYF/idp.secure.su.se"/>
+      <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://vfu-test.su.se/Shibboleth.sso/WAYF/idp.it.su.se"/>
+      <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://vfu-test.su.se/Shibboleth.sso/SWAMID"/>
+      <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://vfu-test.su.se/Shibboleth.sso/SWAMID" index="3"/>
+      <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://vfu-test.su.se/Shibboleth.sso/WAYF/guest-idp.it.su.se"/>
+      <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://vfu-test.su.se/Shibboleth.sso/WAYF/guest-idp-test.it.su.se"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Verksamhetsförlagd utbildning Stockholms universitet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Workplace Situated Education at Stockholm University</mdui:DisplayName>
@@ -22,55 +49,39 @@
         <mdui:Description xml:lang="en">VFU is workplace situated education where the education takes place at a work place</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>vfu-test-sp01</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=vfu-test-sp01</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC7jCCAdagAwIBAgIJAMHrBJCNk0AAMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDXZmdS10ZXN0LXNwMDEwHhcNMTIwNzE5MDgwNjM0WhcNMjIwNzE3MDgwNjM0
+          <ds:X509Certificate>MIIC7jCCAdagAwIBAgIJAKDWuE2EOEoGMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+BAMTDXZmdS10ZXN0LXNwMDEwHhcNMTUwNjAzMTMwNzUzWhcNMjUwNTMxMTMwNzUz
 WjAYMRYwFAYDVQQDEw12ZnUtdGVzdC1zcDAxMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAmBW8qCtmwHpL5ChqWHXuyEFnlxE9Y10YBayuXlZejRrPr6wr
-aDKm18xyEeu6LjlNXGMg7J+NpaFRMn0b1Rq33Tx2TxMx728bgNsiO094+xzUocyE
-UMbrWjfsB9BNNw9tdm4S8i4sB5Mo7yomOJh9VXJXtilCg9p3T+SajjWlwDJe6vtD
-QvCbfKeJc/CrLK9oGJgPrc7lyNfaMQWc5jGlw6vLmXftkBjDHZwNBUn6z1TAP9pE
-h2NEuE4hIpZHQ+3TweRFKP2nBhsPUnatzxS0YeksUJbwGn+PJtVWFNtFuL9Eb5Y7
-FN1J88uwR38OgciXZ/2K6y9x72dsFfjYxvY6DQIDAQABozswOTAYBgNVHREEETAP
-gg12ZnUtdGVzdC1zcDAxMB0GA1UdDgQWBBSHqCsROHBMDPzQoty1Z/h+BGGDfTAN
-BgkqhkiG9w0BAQUFAAOCAQEAKvw2VkLcDR7YoSk+Q8wXAAZHxKhFOlFi1g0kYnD+
-pglyyrpAiNvMPRh0d5JXQPRhb8sC/08SmRFGANGQQesIG8zoeixoQGb01Exv+wXb
-cNVI84nZ1fG2CmLAhNeFBkMiFxp533u1o4T7d19VXvWCLaXRxoRq2DBDgBZ8GJ2m
-SlZbz/B4N/0pK4TcS+uGnrRv+OpNsGnu9T9DSXxEG8LGKSY3KTleIsK6ixHsGocN
-m/IvJPyRjHDMIg4qmqtkk9gWKRZkKyG3fbhINTuO30zeBkbZFkaHdcvEOejqXxUd
-oekPV73T8VB5Z870zPXiTtrpDjS4Rd+WlAcO0w4Q8wCVPg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>vfu-test-sp01</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=vfu-test-sp01</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC7jCCAdagAwIBAgIJAMHrBJCNk0AAMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDXZmdS10ZXN0LXNwMDEwHhcNMTIwNzE5MDgwNjM0WhcNMjIwNzE3MDgwNjM0
-WjAYMRYwFAYDVQQDEw12ZnUtdGVzdC1zcDAxMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAmBW8qCtmwHpL5ChqWHXuyEFnlxE9Y10YBayuXlZejRrPr6wr
-aDKm18xyEeu6LjlNXGMg7J+NpaFRMn0b1Rq33Tx2TxMx728bgNsiO094+xzUocyE
-UMbrWjfsB9BNNw9tdm4S8i4sB5Mo7yomOJh9VXJXtilCg9p3T+SajjWlwDJe6vtD
-QvCbfKeJc/CrLK9oGJgPrc7lyNfaMQWc5jGlw6vLmXftkBjDHZwNBUn6z1TAP9pE
-h2NEuE4hIpZHQ+3TweRFKP2nBhsPUnatzxS0YeksUJbwGn+PJtVWFNtFuL9Eb5Y7
-FN1J88uwR38OgciXZ/2K6y9x72dsFfjYxvY6DQIDAQABozswOTAYBgNVHREEETAP
-gg12ZnUtdGVzdC1zcDAxMB0GA1UdDgQWBBSHqCsROHBMDPzQoty1Z/h+BGGDfTAN
-BgkqhkiG9w0BAQUFAAOCAQEAKvw2VkLcDR7YoSk+Q8wXAAZHxKhFOlFi1g0kYnD+
-pglyyrpAiNvMPRh0d5JXQPRhb8sC/08SmRFGANGQQesIG8zoeixoQGb01Exv+wXb
-cNVI84nZ1fG2CmLAhNeFBkMiFxp533u1o4T7d19VXvWCLaXRxoRq2DBDgBZ8GJ2m
-SlZbz/B4N/0pK4TcS+uGnrRv+OpNsGnu9T9DSXxEG8LGKSY3KTleIsK6ixHsGocN
-m/IvJPyRjHDMIg4qmqtkk9gWKRZkKyG3fbhINTuO30zeBkbZFkaHdcvEOejqXxUd
-oekPV73T8VB5Z870zPXiTtrpDjS4Rd+WlAcO0w4Q8wCVPg==
+AQ8AMIIBCgKCAQEAqBHC96trgEAnc2lhXdp25vtIfLHe0gPdzM0NNI12zc+4WYsZ
+SlaR8+3gKI7vUf2239BfqHa7RVKAHE/r2i8d3N4caHH2R3dhqFRtat94jnCcodqj
+lZ/RXIUyqFL7MYi38+WbTUusFnMpKoHvR17r24p3veo+gaTFmpZGINu17xV5hvoG
+hkAYpkIi5SwVfbDFBU6fmfQOKKvfZKxlIUN1jpcj2V4LX6QLlS+EqVu8roaAUcMf
+4swdfr2vymiw3/+ft/Mvk1DinvCw1I6YC7Wia15KQXEFXL3qblvZE/qDGGibCDKc
+mD605oLiWYBctEGBjXmG3KwxWv54RYhpJ/O+IwIDAQABozswOTAYBgNVHREEETAP
+gg12ZnUtdGVzdC1zcDAxMB0GA1UdDgQWBBTfCdfu5uc8Vc9/Ot+TrX9gYANS3DAN
+BgkqhkiG9w0BAQUFAAOCAQEABpg1bhonX0T2nrxkMMKxO8UJeVT+Mdr5420CqqBp
+pvM6yQGg6R6ezA9UZZXNoZHm957JTYuCt4Xsi22ePXXbHOMzKcWkl/v2mX72n9tx
+fN3dmyK7SDn5tJ1YEeLf5fGzxoeBBrMRJeLNAV9WY11JZCtc+f9F0fxrTebB0EUs
+Qw3MbYJQSVnHXG5P6rJdKZ/hpDZ0PvKcsnZdxTUTq13M4jR+gSOV3/OKMI2oRlm4
+S93ScrA0zoYWayV9NZ1aBZW7mhaqg00AvcAbM1ZvA70pCsdhO6UH5dmGJVdE7zX+
+XOl0tx98AnNRgDTOuRoPtUa7Bg8w4puwklhK+gg+X01kZA==
 </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://vfu-test.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vfu-test.su.se/Shibboleth.sso/SLO/SOAP"/>
@@ -84,7 +95,6 @@ oekPV73T8VB5Z870zPXiTtrpDjS4Rd+WlAcO0w4Q8wCVPg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vfu-test.su.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vfu-test.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vfu-test.su.se/Shibboleth.sso/SAML2/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vfu-test.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu-test.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfu-test.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
   </md:SPSSODescriptor>