NFC-171 Allow compatible Web eID minor versions

Signed-off-by: Sander Kondratjev <sander.kondratjev@nortal.com>
Co-authored-by: Mart Somermaa <mrts@users.noreply.github.com>

Author: 2 people

src/main/java/eu/webeid/security/validator/versionvalidators/AuthTokenVersion11Validator.java

@@ -54,12 +54,13 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
+import java.util.regex.Pattern;
 
 import static eu.webeid.security.util.Strings.isNullOrEmpty;
 
 class AuthTokenVersion11Validator extends AuthTokenVersion1Validator implements AuthTokenVersionValidator {
 
-    private static final Set<String> V11_SUPPORTED_TOKEN_FORMAT = Set.of("web-eid:1.1");
+    private static final Pattern V11_SUPPORTED_TOKEN_FORMAT_PATTERN = Pattern.compile("^web-eid:1\\.1$");
     private static final Set<String> SUPPORTED_SIGNING_CRYPTO_ALGORITHMS = Set.of("ECC", "RSA");
     private static final Set<String> SUPPORTED_SIGNING_PADDING_SCHEMES = Set.of("NONE", "PKCS1.5", "PSS");
     private static final Set<String> SUPPORTED_SIGNING_HASH_FUNCTIONS = Set.of(
@@ -94,8 +95,8 @@ public AuthTokenVersion11Validator(
     }
 
     @Override
-    public boolean supports(String format) {
-        return format != null && V11_SUPPORTED_TOKEN_FORMAT.contains(format);
+    protected Pattern getSupportedFormatPattern() {
+        return V11_SUPPORTED_TOKEN_FORMAT_PATTERN;
     }
 
     @Override

src/main/java/eu/webeid/security/validator/versionvalidators/AuthTokenVersion1Validator.java

@@ -36,11 +36,12 @@
 import java.security.cert.TrustAnchor;
 import java.security.cert.X509Certificate;
 import java.util.Set;
+import java.util.regex.Pattern;
 
 class AuthTokenVersion1Validator implements AuthTokenVersionValidator {
 
     private static final String V1_SUPPORTED_TOKEN_FORMAT_PREFIX = "web-eid:1";
-    private static final Set<String> SUPPORTED_TOKEN_FORMATS = Set.of(V1_SUPPORTED_TOKEN_FORMAT_PREFIX, "web-eid:1.0");
+    private static final Pattern V1_SUPPORTED_TOKEN_FORMAT_PATTERN = Pattern.compile("^web-eid:1(?:\\.\\d+)?$");
     private final SubjectCertificateValidatorBatch simpleSubjectCertificateValidators;
     private final Set<TrustAnchor> trustedCACertificateAnchors;
     private final CertStore trustedCACertificateCertStore;
@@ -69,7 +70,11 @@ public AuthTokenVersion1Validator(
 
     @Override
     public boolean supports(String format) {
-        return format != null && SUPPORTED_TOKEN_FORMATS.contains(format);
+        return format != null && getSupportedFormatPattern().matcher(format).matches();
+    }
+
+    protected Pattern getSupportedFormatPattern() {
+        return V1_SUPPORTED_TOKEN_FORMAT_PATTERN;
     }
 
     @Override

src/test/java/eu/webeid/security/validator/versionvalidators/AuthTokenVersion11ValidatorTest.java

@@ -83,13 +83,13 @@ void setUp() {
 
     @ParameterizedTest
     @ValueSource(strings = {"web-eid:1.1"})
-    void whenFormatIsV11OrPrefixedVariant_thenSupportsReturnsTrue(String format) {
+    void whenFormatIsV11_thenSupportsReturnsTrue(String format) {
         assertThat(validator.supports(format)).isTrue();
     }
 
     @ParameterizedTest
     @NullAndEmptySource
-    @ValueSource(strings = {"web-eid:1", "web-eid:1.0", "web-eid:1.1.0", "web-eid:1.10", "web-eid:2", "webauthn:1.1"})
+    @ValueSource(strings = {"web-eid:1", "web-eid:1.0", "web-eid:1.1.0", "web-eid:1.10", "web-eid:1.2", "web-eid:2", "webauthn:1.1"})
     void whenFormatIsNullEmptyOrNotV11_thenSupportsReturnsFalse(String format) {
         assertThat(validator.supports(format)).isFalse();
     }

src/test/java/eu/webeid/security/validator/versionvalidators/AuthTokenVersion1ValidatorTest.java

@@ -61,15 +61,15 @@ class AuthTokenVersion1ValidatorTest {
     );
 
     @ParameterizedTest
-    @ValueSource(strings = {"web-eid:1", "web-eid:1.0"})
-    void whenFormatIsV1OrV10_thenSupportsReturnsTrue(String format) {
+    @ValueSource(strings = {"web-eid:1", "web-eid:1.0", "web-eid:1.1", "web-eid:1.10", "web-eid:1.999"})
+    void whenFormatIsValidMajorV1Format_thenSupportsReturnsTrue(String format) {
         assertThat(validator.supports(format)).isTrue();
     }
 
     @ParameterizedTest
     @NullAndEmptySource
-    @ValueSource(strings = {"web-eid", "web-eid:1.1", "web-eid:1.10", "web-eid:0.9", "web-eid:2", "webauthn:1"})
-    void whenFormatIsNullEmptyOrNotV1_thenSupportsReturnsFalse(String format) {
+    @ValueSource(strings = {"web-eid", "web-eid:1.", "web-eid:1.0TEST", "web-eid:1.1.0", "web-eid:0.9", "web-eid:2", "webauthn:1"})
+    void whenFormatIsNullEmptyOrMalformedOrNotV1_thenSupportsReturnsFalse(String format) {
         assertThat(validator.supports(format)).isFalse();
     }