From edb40c4b8d00519a9079b787764263a7345a4100 Mon Sep 17 00:00:00 2001
From: RIHTARSIC Joze <joze.rihtarsic@ext.ec.europa.eu>
Date: Fri, 25 Oct 2024 11:15:00 +0200
Subject: [PATCH] Fix identifier scheme validation
---
.../ec/edelivery/smp/config/enums/SMPPropertyEnum.java | 4 ++--
.../smp/services/resource/ResourceResolverService.java | 9 ---------
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/enums/SMPPropertyEnum.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/enums/SMPPropertyEnum.java
index 14c4cb560..3be27c49a 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/enums/SMPPropertyEnum.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/enums/SMPPropertyEnum.java
@@ -312,10 +312,10 @@ public enum SMPPropertyEnum {
"^(LOW|MEDIUM|HIGH)$", "Allowed values are: LOW, MEDIUM, HIGH"),
ALERT_USER_UPDATED_ENABLED("smp.alert.user.updated.enabled",
- "true", "Enable/disable the user creation alert",
+ "true", "Enable/disable the user update alert",
OPTIONAL, NOT_ENCRYPTED, NO_RESTART_NEEDED, BOOLEAN),
ALERT_USER_UPDATED_LEVEL("smp.alert.user.updated.level",
- "HIGH", "User creation alert level. Values: {LOW, MEDIUM, HIGH}",
+ "HIGH", "User update alert level. Values: {LOW, MEDIUM, HIGH}",
OPTIONAL, NOT_ENCRYPTED, NO_RESTART_NEEDED, STRING,
"^(LOW|MEDIUM|HIGH)$", "Allowed values are: LOW, MEDIUM, HIGH"),
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/ResourceResolverService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/ResourceResolverService.java
index de2c0a2fc..d08473fab 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/ResourceResolverService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/ResourceResolverService.java
@@ -49,7 +49,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Optional;
-import static eu.europa.ec.edelivery.smp.exceptions.ErrorCode.SML_INVALID_IDENTIFIER;
import static eu.europa.ec.edelivery.smp.logging.SMPLogger.SECURITY_MARKER;
import static org.apache.commons.lang3.StringUtils.*;
@@ -136,7 +135,6 @@ public class ResourceResolverService {
Identifier resourceId = identifierService.normalizeParticipantIdentifier(domain.getDomainCode(), currentParameter);
boolean isCaseSensitive = identifierService.isResourceIdentifierCaseSensitive(resourceId, domain.getDomainCode());
// validate identifier
- validateResourceIdentifier(resourceId);
DBResource resource = resolveResourceIdentifier(domain, resourceDef, resourceId, isCaseSensitive);
if (resource == null) {
// the resource must be found because if action is not "create" action nor the last parameter to be resolved
@@ -394,13 +392,6 @@ public class ResourceResolverService {
urlPathSegment, "Subresource [" + urlPathSegment + "] does not exist for resource type [" + resourceDef.getName() + "]"));
}
- public void validateResourceIdentifier(Identifier identifier) {
- LOG.debug("Validate resource identifier: [{}]", identifier);
- if (configurationService.getParticipantSchemeMandatory() && StringUtils.isBlank(identifier.getScheme())) {
- throw new SMPRuntimeException(SML_INVALID_IDENTIFIER, identifier.getValue());
- }
- }
-
public String getUsername(UserDetails user) {
return user == null ? "Anonymous" : user.getUsername();
}
--
GitLab