diff options
author | 2020-12-22 11:45:13 +0000 | |
---|---|---|
committer | 2020-12-22 11:45:13 +0000 | |
commit | 5e78fb3b88eda2dd8d1a29173399328c2256ac09 (patch) | |
tree | ec0215f497bab034b54d33614209e11f1f083ad8 /certServiceClient/src/main/java/org | |
parent | fb53a57db1b771f62cb637e2e7d05c9fad23cd52 (diff) | |
parent | ee8b5cb717a4b7e37ef84e3e585be832d7d1794b (diff) |
Merge "[OOM-CERT-SERVICE] Align implementation with RFC4210"2.3.2
Diffstat (limited to 'certServiceClient/src/main/java/org')
2 files changed, 4 insertions, 4 deletions
diff --git a/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/factory/ClientConfigurationFactory.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/factory/ClientConfigurationFactory.java index f1541b04..2bd57f77 100644 --- a/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/factory/ClientConfigurationFactory.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/factory/ClientConfigurationFactory.java @@ -59,7 +59,7 @@ public class ClientConfigurationFactory implements ConfigurationFactory<ClientCo .orElseThrow(() -> new ClientConfigurationException(ClientConfigurationEnvs.OUTPUT_PATH + " is invalid.")); envsForClient.getCaName() - .filter(ClientEnvsValueValidators::isAlphaNumeric) + .filter(ClientEnvsValueValidators::isCaNameValid) .map(configuration::setCaName) .orElseThrow(() -> new ClientConfigurationException(ClientConfigurationEnvs.CA_NAME + " is invalid.")); diff --git a/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/validation/client/ClientEnvsValueValidators.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/validation/client/ClientEnvsValueValidators.java index 503b7e46..86d1e0f0 100644 --- a/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/validation/client/ClientEnvsValueValidators.java +++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/validation/client/ClientEnvsValueValidators.java @@ -20,11 +20,11 @@ package org.onap.oom.certservice.client.configuration.validation.client; public final class ClientEnvsValueValidators { - private static final String ALPHA_NUMERIC_REGEX = "^[a-zA-Z0-9]*$"; + private static final String CA_NAME_REGEX = "^[a-zA-Z0-9_.~-]{1,128}$"; private static final String VALID_PATH_REGEX = "^/|(/[a-zA-Z0-9_-]+)+/?$"; - public static boolean isAlphaNumeric(String caName) { - return caName.matches(ALPHA_NUMERIC_REGEX); + public static boolean isCaNameValid(String caName) { + return caName.matches(CA_NAME_REGEX); } public static boolean isPathValid(String path) { |