diff options
| author |   egernug <gerard.nugent@est.tech> | 2023-11-27 12:52:07 +0000 |
|---|---|---|
| committer |   Priyank Maheshwari <priyank.maheshwari@est.tech> | 2023-11-28 12:02:14 +0000 |
| commit | 5ab41978e980d6ae1ae59ebc6cc9d75a9cbea37e (patch) | |
| tree | d6cc60c4ad665010901d1b3b0973d37cfd0c2ab6 | |
| parent | 86bd6d994d1daf3a3427a290a164af1081691a30 (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
(cherry picked from commit ff598422ebf5bb21bb66eddc68042ebc0512b77d)
| -rw-r--r-- | cps-application/src/main/java/org/onap/cps/config/WebSecurityConfig.java | 2 | ||||
| -rw-r--r-- | cps-application/src/main/resources/application.yml | 3 |
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} |