feature(chore):786 added alternative port for internal access only.

eclipse-tractusx · Jul 1, 2024 · b633d30 · b633d30
1 parent 7627515
commit b633d30
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/...kend/src/main/java/org/eclipse/tractusx/traceability/common/config/ApplicationConfig.java b/...kend/src/main/java/org/eclipse/tractusx/traceability/common/config/ApplicationConfig.java
@@ -47,6 +47,9 @@
 @EnableJpaRepositories(basePackages = "org.eclipse.tractusx.traceability.*")
 public class ApplicationConfig {
 
+    public static String APPLICATION_PATH = "/api";
+    public static String INTERNAL_ENDPOINT = "/internal";
+
     @Bean
     public InternalResourceViewResolver defaultViewResolver() {
         return new InternalResourceViewResolver();

diff --git a/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/SecurityConfig.java b/tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/config/SecurityConfig.java
@@ -50,10 +50,10 @@ public class SecurityConfig {
             "/v3/api-docs/**",
             "/swagger-ui/**",
             "/webjars/swagger-ui/**",
-            "/qualitynotifications/receive",
-            "/qualityalerts/receive",
-            "/qualitynotifications/update",
-            "/qualityalerts/update",
+            "/internal/qualitynotifications/receive",
+            "/internal/qualityalerts/receive",
+            "/internal/qualitynotifications/update",
+            "/internal/qualityalerts/update",
             "/callback/endpoint-data-reference",
             "/internal/endpoint-data-reference",
             "/actuator/**",

diff --git a/...src/main/java/org/eclipse/tractusx/traceability/common/config/TrustedEndpointsFilter.java b/...src/main/java/org/eclipse/tractusx/traceability/common/config/TrustedEndpointsFilter.java
@@ -78,6 +78,6 @@ public void doFilter(final ServletRequest servletRequest, final ServletResponse
     private boolean isRequestForTrustedEndpoint(final ServletRequest servletRequest) {
         log.warn(((HttpServletRequestWrapper) servletRequest).getRequestURI());
         return ((HttpServletRequestWrapper) servletRequest).getRequestURI()
-                .startsWith("/api/" + ApiConstants.API_PREFIX_INTERNAL);
+                .startsWith(ApplicationConfig.APPLICATION_PATH + ApplicationConfig.INTERNAL_ENDPOINT);
     }
 }
diff --git a/...se/tractusx/traceability/notification/domain/contract/EdcNotificationContractService.java b/...se/tractusx/traceability/notification/domain/contract/EdcNotificationContractService.java
@@ -21,6 +21,7 @@
  ********************************************************************************/
 package org.eclipse.tractusx.traceability.notification.domain.contract;
 
+import org.eclipse.tractusx.traceability.common.config.ApplicationConfig;
 import policies.response.PolicyResponse;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -155,6 +156,6 @@ private void revertNotificationAsset(String notificationAssetId) {
 
     private String createBaseUrl(org.eclipse.tractusx.traceability.notification.application.contract.model.NotificationType notificationType, NotificationMethod notificationMethod) {
         final String template = notificationType.equals(org.eclipse.tractusx.traceability.notification.application.contract.model.NotificationType.QUALITY_ALERT) ? TRACE_FOSS_QUALITY_NOTIFICATION_ALERT_URL_TEMPLATE : TRACE_FOSS_QUALITY_NOTIFICATION_INVESTIGATION_URL_TEMPLATE;
-        return traceabilityProperties.getUrl() + template.formatted(notificationMethod.getValue());
+        return traceabilityProperties.getUrl() + ApplicationConfig.INTERNAL_ENDPOINT + template.formatted(notificationMethod.getValue());
     }
 }
diff --git a/...java/org/eclipse/tractusx/traceability/notification/infrastructure/edc/EdcController.java b/...java/org/eclipse/tractusx/traceability/notification/infrastructure/edc/EdcController.java
@@ -38,6 +38,7 @@
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import static org.eclipse.tractusx.traceability.common.model.SecurityUtils.sanitize;
@@ -47,6 +48,7 @@
 @RestController
 @Validated
 @RequiredArgsConstructor
+@RequestMapping(path = "/internal")
 public class EdcController {
 
     private final NotificationReceiverService notificationReceiverService;