diff options
| author |   Ramesh Parthasarathy <ramesh.parthasarathy@att.com> | 2019-11-21 02:04:03 +0000 |
|---|---|---|
| committer | Ramesh Parthasarathy <ramesh.parthasarathy@att.com> | 2019-11-21 04:47:42 +0000 |
| commit | 837beb73d7aa6e8f7e4e932ac71e59663b868992 (patch) | |
| tree | a0cc058f5dd9a6df9a0bab9f1d4ec28c7f99700e /common | |
| parent | 70c24f9edcb8351ca8f184294c0815db5eba1904 (diff) | |
Added AAF Integration related changes
Created two profiles for the application
to run. Basic profile will allow the
application to run in the current
spring security authentication. AAF profile
will authenticate and authorize requests with
AAF. if no profile is given, it will fallback
to basic.
Change-Id: I2576f02e7afca3c10e02aaffef66a60fa1c4dd1a
Issue-ID: SO-2451
Signed-off-by: Ramesh Parthasarathy(rp6768)<ramesh.parthasarathy@att.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/pom.xml | 11 | ||||
| -rw-r--r-- | common/src/main/java/org/onap/so/security/WebSecurityConfig.java | 8 |
2 files changed, 12 insertions, 7 deletions
diff --git a/common/pom.xml b/common/pom.xml index 3690d7b5a1..7c7eec21cc 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -131,6 +131,17 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.onap.aaf.authz</groupId> + <artifactId>aaf-cadi-aaf</artifactId> + <version>2.1.9</version> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>org.reflections</groupId> <artifactId>reflections</artifactId> <version>0.9.11</version> diff --git a/common/src/main/java/org/onap/so/security/WebSecurityConfig.java b/common/src/main/java/org/onap/so/security/WebSecurityConfig.java index 635784c642..44ac62d14f 100644 --- a/common/src/main/java/org/onap/so/security/WebSecurityConfig.java +++ b/common/src/main/java/org/onap/so/security/WebSecurityConfig.java @@ -32,7 +32,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; @ConfigurationProperties(prefix = "spring.security") -public class WebSecurityConfig extends WebSecurityConfigurerAdapter { +public class WebSecurityConfig { private List<UserCredentials> credentials; private List<String> roles = new ArrayList<>(); @@ -65,10 +65,4 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { public BCryptPasswordEncoder passwordEncoder() { return new BCryptPasswordEncoder(); } - - @Override - protected void configure(AuthenticationManagerBuilder auth) throws Exception { - auth.userDetailsService(userDetailsService()).passwordEncoder(passwordEncoder()); - } - } |