From ad9b701a00c237ae8e462de76b500c8612866da6 Mon Sep 17 00:00:00 2001
From: Toine Siebelink <toine.siebelink@est.tech>
Date: Wed, 20 Sep 2023 09:35:10 +0000
Subject: Revert "Migrate CPS to Spring-boot 3.0"

This reverts commit 9693ec51cf6526082f0ad0c3ad208d144cbbb163.

Reason for revert: Bug fix delivery

Change-Id: I73bdc1528192c662983b0bbef73b10b6d612a719
Signed-off-by: egernug <gerard.nugent@est.tech>
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
---
 .../src/main/java/org/onap/cps/config/WebSecurityConfig.java        | 6 +++---
 cps-application/src/main/resources/application.yml                  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'cps-application/src')

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 c8b250963..aedc6a8d6 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
@@ -54,7 +54,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
     ) {
@@ -80,8 +80,8 @@ public class WebSecurityConfig {
         http
                 .httpBasic()
                 .and()
-                .authorizeHttpRequests()
-                .requestMatchers(permitUris).permitAll()
+                .authorizeRequests()
+                .antMatchers(permitUris).permitAll()
                 .anyRequest().authenticated()
                 .and()
                 .csrf().disable();
diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml
index 016356801..58748271c 100644
--- a/cps-application/src/main/resources/application.yml
+++ b/cps-application/src/main/resources/application.yml
@@ -140,10 +140,10 @@ springdoc:
             - name: cps-ncmp-inventory
               url: /api-docs/cps-ncmp/openapi-inventory.yaml
 
-permit-uri: /manage/**,/swagger-ui.html,/swagger-ui/**,/swagger-resources/**,/api-docs/**
 
 security:
     # comma-separated uri patterns which do not require authorization
+    permit-uri: /manage/**,/swagger-ui.html,/swagger-ui/**,/swagger-resources/**,/api-docs/**
     auth:
         username: ${CPS_USERNAME}
         password: ${CPS_PASSWORD}
-- 
cgit 1.2.3-korg