Add junits for aaf auth provider

Issue-ID: OPTFRA-776
Signed-off-by: Zebek Bogumil <bogumil.zebek@nokia.com>
Change-Id: Id8928c9953ef236165b81917efd28084239ad3f2

1 files changed, 23 insertions, 7 deletions

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafAuthProvider.java b/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafAuthProvider.java
index 0a7a69e..079572d 100755
--- a/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafAuthProvider.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/aaf/AafAuthProvider.java
@@ -1,6 +1,7 @@
 /*

  * Copyright (c) 2019 AT&T Intellectual Property.

  * Modifications Copyright © 2018 IBM.

+ * Modifications Copyright © 2020 Nokia.

  *

  * Licensed under the Apache License, Version 2.0 (the "License");

  * you may not use this file except in compliance with the License.

@@ -27,11 +28,12 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  * See the License for the specific language governing permissions and

  * limitations under the License.

-*/

+ */

 

 package org.onap.optf.cmso.aaf;

 

 import java.util.ArrayList;

+

 import org.onap.optf.cmso.SpringProfiles;

 import org.onap.optf.cmso.aaf.AafClientCache.AuthorizationResult;

 import org.springframework.beans.factory.annotation.Autowired;

@@ -40,7 +42,6 @@ import org.springframework.core.env.Environment;
 import org.springframework.security.authentication.AuthenticationProvider;

 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

 import org.springframework.security.core.Authentication;

-import org.springframework.security.core.AuthenticationException;

 import org.springframework.security.web.authentication.WebAuthenticationDetails;

 import org.springframework.stereotype.Component;

 

@@ -48,6 +49,8 @@ import org.springframework.stereotype.Component;
 @Profile(SpringProfiles.AAF_AUTHENTICATION)

 public class AafAuthProvider implements AuthenticationProvider {

 

+    public static final Authentication NO_TOKEN_FOR_UNAUTHENTICATED_USER = null;

+    public static final String NO_SESSION_FOR_USER = null;

     @Autowired

     Environment env;

 

@@ -58,7 +61,16 @@ public class AafAuthProvider implements AuthenticationProvider {
     public Authentication authenticate(Authentication authentication) {

         String name = authentication.getName();

         String password = authentication.getCredentials().toString();

-        String sessionId = null;

+        String sessionId = getUserSessionId(authentication);

+        if (isAafAuthenticationActivate() && isUserNotAuthenticated(name, password, sessionId)) {

+            return NO_TOKEN_FOR_UNAUTHENTICATED_USER;

+        }

+        return new UsernamePasswordAuthenticationToken(name, password, new ArrayList<>());

+

+    }

+

+    private String getUserSessionId(Authentication authentication) {

+        String sessionId = NO_SESSION_FOR_USER;

         Object details = authentication.getDetails();

         if (details instanceof WebAuthenticationDetails) {

             WebAuthenticationDetails webAuthDetails = (WebAuthenticationDetails) details;

@@ -66,11 +78,15 @@ public class AafAuthProvider implements AuthenticationProvider {
                 sessionId = webAuthDetails.getRemoteAddress() + ":" + webAuthDetails.getSessionId();

             }

         }

-        if (env.getProperty(AafProperties.aafEnabled.toString(), Boolean.class, true) && clientCache.authenticate(name, password, sessionId) != AuthorizationResult.Authenticated ) {

-                return null;

-            }

-        return new UsernamePasswordAuthenticationToken(name, password, new ArrayList<>());

+        return sessionId;

+    }

+

+    private boolean isAafAuthenticationActivate() {

+        return env.getProperty(AafProperties.aafEnabled.toString(), Boolean.class, true);

+    }

 

+    private boolean isUserNotAuthenticated(String name, String password, String sessionId) {

+        return clientCache.authenticate(name, password, sessionId) != AuthorizationResult.Authenticated;

     }

 

     @Override