summaryrefslogtreecommitdiffstats
path: root/cps-application/src
diff options
context:
space:
mode:
authoregernug <gerard.nugent@est.tech>2023-11-27 12:52:07 +0000
committeregernug <gerard.nugent@est.tech>2023-11-27 12:52:07 +0000
commitff598422ebf5bb21bb66eddc68042ebc0512b77d (patch)
treec02e86003e1f3a553c0a9e6fd40e02d2e67d6f13 /cps-application/src
parent605e2ad3d0e612a020d1a3236765e27154132afb (diff)
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
Diffstat (limited to 'cps-application/src')
-rw-r--r--cps-application/src/main/java/org/onap/cps/config/WebSecurityConfig.java2
-rw-r--r--cps-application/src/main/resources/application.yml3
2 files changed, 3 insertions, 2 deletions
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 120e0f3658..0b6d0dba1e 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 e84b1937b6..89969b9c6a 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}