Merge branch 'develop'

e-gov · Oct 15, 2021 · 8f7d8ac · 8f7d8ac
2 parents 971c8b9 + fb1ae8d
commit 8f7d8ac
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 32 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <groupId>ee.ria.eidas.connector.specific</groupId>
     <artifactId>ee-specific-connector</artifactId>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
     <packaging>war</packaging>
     <name>ee-specific-connector</name>
     <description>EE specific eIDAS connector</description>
@@ -276,6 +276,9 @@
             <plugin>
                 <groupId>pl.project13.maven</groupId>
                 <artifactId>git-commit-id-plugin</artifactId>
+                <configuration>
+                    <offline>true</offline><!-- TODO Remove when >= 5.0.0 is used, there offline=true is default. -->
+                </configuration>
             </plugin>
         </plugins>
     </build>

diff --git a/src/test/resources/__files/sp_metadata/sp-invalid-name-id-format.xml b/src/test/resources/__files/sp_metadata/sp-invalid-name-id-format.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor ID="_4r8nxrosbtaoo11xylpt2mblscxr3xdxjhsvmpp" entityID="https://localhost:8888/metadata" validUntil="2021-10-12T08:28:31.040Z" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+<md:EntityDescriptor ID="_jttyvzmlg0phpaddwf1pi1gw7dakkgvxyvm59ho" entityID="https://localhost:8888/metadata" validUntil="2031-10-12T12:07:29.522Z" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
 <ds:SignedInfo>
 <ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
 <ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-<ds:Reference URI="#_4r8nxrosbtaoo11xylpt2mblscxr3xdxjhsvmpp">
+<ds:Reference URI="#_jttyvzmlg0phpaddwf1pi1gw7dakkgvxyvm59ho">
 <ds:Transforms>
 <ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
 <ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
 </ds:Transforms>
 <ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-<ds:DigestValue>qV+v56c3I9GRfSXDGsKbgcwqsDgHRvFeKDOgZ8RWQF5jX5DYgi9IHv3wkYAg/b3pEzBqGPT+vJwF&#xd;
-RiD4qWjHeQ==</ds:DigestValue>
+<ds:DigestValue>RKve6HhnEgbA5+gIXeaafZowu71WIGimL2PZU91qUYxKzw0aPeEhqBPKrk+y0alr0HoWOvv8Xbt4&#xd;
+ZebC1jJYgw==</ds:DigestValue>
 </ds:Reference>
 </ds:SignedInfo>
 <ds:SignatureValue>
-oN93b3ioZj4HrIjkiKXB7sre2+rIKI2vTD1+Fdjiw2gI8JGImbCh2G1kiSt7dJO9FXq9ovMHvcBm&#xd;
-OVdJvYEpyTAqj7C8VAhPbJXgecHoRP5hLx6dd1nqxzZHRtW+3OjA
+NI71TOm4tkUgcP27/XVPlElvREKB6mr3h2lm0wEVoDkqgBsKDGFLCTUaFngwoOkgPmMUT0OC76q7&#xd;
+GIdIa2LA2rqkyZ/AzHhbueXijGaOLT+0Jr1Q3W6EHgpxG4sIIu6x
 </ds:SignatureValue>
 <ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIB4zCCAWagAwIBAgIEGQUXYTAMBggqhkjOPQQDAwUAMEcxCzAJBgNVBAYTAkVFMQ0wCwYDVQQK
 EwR0ZXN0MQ0wCwYDVQQLEwR0ZXN0MRowGAYDVQQDExFTUC1tZXRhZGEtc2lnbmluZzAeFw0yMDA3

diff --git a/src/test/resources/__files/sp_metadata/sp1-expired-metadata-signing-cert.xml b/src/test/resources/__files/sp_metadata/sp1-expired-metadata-signing-cert.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor ID="_qdcl12x2p7rxjgekzrlcjwndirtjeb5p47yhdvo" entityID="https://localhost:9999/metadata" validUntil="2021-10-09T11:42:56.101Z" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+<md:EntityDescriptor ID="_kipicyagdi55gfq4cfx4oikj5s3mnv4csfi4ugb" entityID="https://localhost:9999/metadata" validUntil="2031-10-12T11:57:24.851Z" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
 <ds:SignedInfo>
 <ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
 <ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-<ds:Reference URI="#_qdcl12x2p7rxjgekzrlcjwndirtjeb5p47yhdvo">
+<ds:Reference URI="#_kipicyagdi55gfq4cfx4oikj5s3mnv4csfi4ugb">
 <ds:Transforms>
 <ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
 <ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
 </ds:Transforms>
 <ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-<ds:DigestValue>POtsmgIvny34Tqzd6GtdZRBASUIIDf2G0rlmCKfSgfSDBsTssYhHhZS09ca35/UuV0ocXW2FHGO9&#xd;
-xqKTj1fFog==</ds:DigestValue>
+<ds:DigestValue>6HBH64ihVNN1GPa7uLmnlWDrf/JUsBU/IJatRq8ZZ3L6tEIKpEoAZGEliKZlAWKiaIn/vl/bHl4s&#xd;
+dSQ2KVZ+jw==</ds:DigestValue>
 </ds:Reference>
 </ds:SignedInfo>
 <ds:SignatureValue>
-Hq0M0sunOrX9ogkqm5j2M4eGmUIWFWXQto2JKzCnzJQ7HNQp/+1wj7kwJuc3TEj0dpUMWpH0Lx1O&#xd;
-lTroDXux+w==
+gogbkfDXCiE7QlP9m39Tj35EunF5pfCzGYlv+ZxAtCReaPC5XbsoNWiOm/OW1Ctz67FuNEOPFvEW&#xd;
+PZCrd6cMVQ==
 </ds:SignatureValue>
 <ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIB6TCCAY6gAwIBAgIEX4BJfzAKBggqhkjOPQQDAjB8MQswCQYDVQQGEwJFRTENMAsGA1UECAwE
 dGVzdDENMAsGA1UEBwwEdGVzdDENMAsGA1UECgwEdGVzdDENMAsGA1UECwwEdGVzdDExMC8GA1UE

diff --git a/src/test/resources/__files/sp_metadata/sp1-expired-request-signing-cert.xml b/src/test/resources/__files/sp_metadata/sp1-expired-request-signing-cert.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor ID="_eohzyus6qe4aap9hhsaxdfnc7k47yoqvsjj6jmu" entityID="https://localhost:9999/metadata" validUntil="2021-10-11T09:38:41.523Z" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+<md:EntityDescriptor ID="_9zzvjdmjs7uevet41qn34vtxw8crdpswxis6isr" entityID="https://localhost:9999/metadata" validUntil="2031-10-12T11:52:42.687Z" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
 <ds:SignedInfo>
 <ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
 <ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-<ds:Reference URI="#_eohzyus6qe4aap9hhsaxdfnc7k47yoqvsjj6jmu">
+<ds:Reference URI="#_9zzvjdmjs7uevet41qn34vtxw8crdpswxis6isr">
 <ds:Transforms>
 <ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
 <ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
 </ds:Transforms>
 <ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-<ds:DigestValue>ysFZCA5p8ZCRbgeBn3E61nBuDzQI+YKZ683dbdPPBRU4lMU5Lrei0tKV7nfeqXI8lRzvioEG5vMN&#xd;
-abs7hyBg4g==</ds:DigestValue>
+<ds:DigestValue>ej+i63HzxXWd5opFOEezOKNRGMy0HGRBpqavEYNPmpgYivdfmO0aXLJLz5dW0YWIfkAp3TvsUFPQ&#xd;
+CHPTmKkDmA==</ds:DigestValue>
 </ds:Reference>
 </ds:SignedInfo>
 <ds:SignatureValue>
-R0is2PJ4l33CgWigTZTLJT53K9Cy43KnpabBbHz0eXKqFcr2+DEEb8sBHwI0KsuFlulYLtkLp4jb&#xd;
-XZJHKDxWoA==
+jvhDi/vq3t5xQbVHIlXSlLa+55Jcfgic8uJNfgLBevFLX9My97eN47+aurYqWHoUmqRB17fSGmva&#xd;
+shF9rrOIPQ==
 </ds:SignatureValue>
 <ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIB+jCCAaGgAwIBAgIEX2d0YzAKBggqhkjOPQQDAjB0MQswCQYDVQQGEwJFRTENMAsGA1UECAwE
 dGVzdDENMAsGA1UEBwwEdGVzdDENMAsGA1UECgwEdGVzdDENMAsGA1UECwwEdGVzdDEpMCcGA1UE

diff --git a/src/test/resources/__files/sp_metadata/sp1-expired-response-encryption-cert.xml b/src/test/resources/__files/sp_metadata/sp1-expired-response-encryption-cert.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor ID="_5kinsv09vtabygvylubbmbuqix8zxpscrqbqiff" entityID="https://localhost:9999/metadata" validUntil="2021-10-11T09:41:56.693Z" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+<md:EntityDescriptor ID="_brk2wfe7a20ay2rsmcubn47qssful0dshmzql9j" entityID="https://localhost:9999/metadata" validUntil="2031-10-12T11:55:26.844Z" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
 <ds:SignedInfo>
 <ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
 <ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-<ds:Reference URI="#_5kinsv09vtabygvylubbmbuqix8zxpscrqbqiff">
+<ds:Reference URI="#_brk2wfe7a20ay2rsmcubn47qssful0dshmzql9j">
 <ds:Transforms>
 <ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
 <ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
 </ds:Transforms>
 <ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-<ds:DigestValue>Pt8zqAbYuwoCwtaAvxe8R4zQYE7TG/LBw8ZeRMJt1SodSV/eog0FNw9inJeZ/0kTJKBatju64D9L&#xd;
-Lco+Ayg8ng==</ds:DigestValue>
+<ds:DigestValue>+CGzCH8TRhiciBiE/3qoV+Hj6R9KGxT/IS5R4QV/57mxTfBwXOExafeaKv+TbjXB6/5Ez3bEkDA9&#xd;
+hmOcQnhTjw==</ds:DigestValue>
 </ds:Reference>
 </ds:SignedInfo>
 <ds:SignatureValue>
-7e0ZfzaW0aYVpz8rpImWbmdUt6wMbvaIUjcRgBwHpAffBH0Eaw3W/N0Xn/V9g/BKU2ZAHoCIYIYQ&#xd;
-QMmn8DrcoQ==
+raQE3GOxItoEcoHsXKu3pecn9LVy9yWFYWNW6pjxTRiaNujBBk4ryGb4e02I+IvAPjPvVI6O5pdp&#xd;
+imITnjZK7g==
 </ds:SignatureValue>
 <ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIB+jCCAaGgAwIBAgIEX2d0YzAKBggqhkjOPQQDAjB0MQswCQYDVQQGEwJFRTENMAsGA1UECAwE
 dGVzdDENMAsGA1UEBwwEdGVzdDENMAsGA1UECgwEdGVzdDENMAsGA1UECwwEdGVzdDEpMCcGA1UE

diff --git a/src/test/resources/__files/sp_metadata/sp1-expired-valid-until.xml b/src/test/resources/__files/sp_metadata/sp1-expired-valid-until.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor ID="_a5fuckj3p4lfvme63vq9lo9iz6bkrlgcpafjeti" entityID="https://localhost:9999/metadata" validUntil="2019-12-02T19:19:29.110Z" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+<md:EntityDescriptor ID="_egktxe1hfrqwvy8ntvenrsyp936psktvrtlpj80" entityID="https://localhost:9999/metadata" validUntil="2020-10-14T11:59:48.302Z" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
 <ds:SignedInfo>
 <ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
 <ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-<ds:Reference URI="#_a5fuckj3p4lfvme63vq9lo9iz6bkrlgcpafjeti">
+<ds:Reference URI="#_egktxe1hfrqwvy8ntvenrsyp936psktvrtlpj80">
 <ds:Transforms>
 <ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
 <ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
 </ds:Transforms>
 <ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-<ds:DigestValue>/qVhmnEYhMSnw5zyRInMeB+wLUOrO8PmFd+990ABiomTsNJaQ0Kdc9OfsLxhLnnRc+c3nd2ijvKU&#xd;
-e+p+bg4cLw==</ds:DigestValue>
+<ds:DigestValue>BEYlXOvD+Y7I6pdT9hTfD0/xpJh1vrVcUwRI8gj/S7M6SUZ96LQpgY73srXixGWUgdXDKgkwUsh0&#xd;
+gG9G8XdKKQ==</ds:DigestValue>
 </ds:Reference>
 </ds:SignedInfo>
 <ds:SignatureValue>
-+ubMWq626ZUFS878sI+yLEpnx2LfWxvavTQXkUBBvWPZyJ5+Or4C14LFJANVKrRUh8H6ZWKXsQ7h&#xd;
-GY1KGssqDw==
+jvqPl+bD4wYi6iDrPLvxRBJJ+0PEpiQV+CZcYsceqn0Sa9sPEat1xDGKUZlNk9zLTB3iwGsAGdaY&#xd;
+QDYGewOukg==
 </ds:SignatureValue>
 <ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIB+jCCAaGgAwIBAgIEX2d0YzAKBggqhkjOPQQDAjB0MQswCQYDVQQGEwJFRTENMAsGA1UECAwE
 dGVzdDENMAsGA1UEBwwEdGVzdDENMAsGA1UECgwEdGVzdDENMAsGA1UECwwEdGVzdDEpMCcGA1UE
@@ -57,4 +57,4 @@ rBWeo3iqrSXTWIu2RPJXIgBPYfSayRT3zdSP9xcDmYct6vXbZMyf1ICyTWPUT/rc/9UbejGY0nNc
 Rx6nDhLONzA8q0CukLc4jFMjamjTlzWqnWuLcKwfD76+X+Nq3CYjqBtcrJ64O3+v4HN6miDvE6fL
 sTvT7JtYvlnUFvNpMREB1NN3c+O9lS5z1eKYHJabMxXyQKJd13Md6tq9xnDxjKD1lz0DluGomZDL
 xzlEiE1vJeUD9Edgi091D3qsC3kLwuwPiULJor88R1D2hmE6BLC0YfQfB4IvQRcKsoKsl4WUVqZB
-YQMBRK/tmts8yreDLOKGlIThu9SkwLkC43r5xGgfKK/5shXzE1SKI2NiOCgtgqrOQQ==</ds:X509Certificate></ds:X509Data></ds:KeyInfo></md:KeyDescriptor><md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat><md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://localhost:9999/returnUrl" index="0"/></md:SPSSODescriptor></md:EntityDescriptor>
+YQMBRK/tmts8yreDLOKGlIThu9SkwLkC43r5xGgfKK/5shXzE1SKI2NiOCgtgqrOQQ==</ds:X509Certificate></ds:X509Data></ds:KeyInfo></md:KeyDescriptor><md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat><md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://localhost:9999/returnUrl" index="0"/></md:SPSSODescriptor></md:EntityDescriptor>