From: egernug <gerard.nugent@est.tech>
Date: Mon, 27 Nov 2023 12:52:07 +0000 (+0000)
Subject: Return permit-uri from root to securty
X-Git-Tag: 3.4.1~30
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ff598422ebf5bb21bb66eddc68042ebc0512b77d;p=cps.git

Return permit-uri from root to securty

In Springboot 3.0 an error was observed with security.permit-uri throwing a PatternParseException.
This appears to be fixed in 3.1.2

Issue-ID: CPS-1875

Signed-off-by: egernug <gerard.nugent@est.tech>
Change-Id: I8dd4f66868a5cc4db636d77f123ad5dbbd61f4b4
---

diff --git a/cps-application/src/main/java/org/onap/cps/config/WebSecurityConfig.java b/cps-application/src/main/java/org/onap/cps/config/WebSecurityConfig.java
index 120e0f365..0b6d0dba1 100644
--- a/cps-application/src/main/java/org/onap/cps/config/WebSecurityConfig.java
+++ b/cps-application/src/main/java/org/onap/cps/config/WebSecurityConfig.java
@@ -53,7 +53,7 @@ public class WebSecurityConfig {
      * @param password   password
      */
     public WebSecurityConfig(
-            @Autowired @Value("${permit-uri}") final String permitUris,
+            @Autowired @Value("${security.permit-uri}") final String permitUris,
             @Autowired @Value("${security.auth.username}") final String username,
             @Autowired @Value("${security.auth.password}") final String password
     ) {
diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml
index e84b1937b..89969b9c6 100644
--- a/cps-application/src/main/resources/application.yml
+++ b/cps-application/src/main/resources/application.yml
@@ -139,10 +139,11 @@ springdoc:
             - name: cps-ncmp-inventory
               url: /api-docs/cps-ncmp/openapi-inventory.yaml
 
-permit-uri: /actuator/**,/swagger-ui.html,/swagger-ui/**,/swagger-resources/**,/api-docs/**
+
 
 security:
     # comma-separated uri patterns which do not require authorization
+    permit-uri: /actuator/**,/swagger-ui.html,/swagger-ui/**,/swagger-resources/**,/api-docs/**
     auth:
         username: ${CPS_USERNAME}
         password: ${CPS_PASSWORD}