X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Faaf%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Faaf%2Fv2_0%2FAAFAuthn.java;h=216468c265b2d655ec023f0b6d55ce3640dbf073;hb=07fb3ece74a9aa1fad8e2a9fab73b4de3e36853b;hp=edacdfdde2b590ea539a34e36a00555d55701e23;hpb=4b5a7d721d994a49057e9bfb403c7bff1b376660;p=aaf%2Fauthz.git

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java
index edacdfdd..216468c2 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java
@@ -29,10 +29,10 @@ import org.onap.aaf.cadi.CadiException;
 import org.onap.aaf.cadi.User;
 import org.onap.aaf.cadi.aaf.AAFPermission;
 import org.onap.aaf.cadi.client.Future;
-import org.onap.aaf.cadi.client.Rcli;
-import org.onap.aaf.cadi.config.Config;
 import org.onap.aaf.cadi.lur.ConfigPrincipal;
 
+import aaf.v2_0.CredRequest;
+
 public class AAFAuthn<CLIENT> extends AbsUserCache<AAFPermission> {
     private AAFCon<CLIENT> con;
     private String realm;
@@ -95,8 +95,8 @@ public class AAFAuthn<CLIENT> extends AbsUserCache<AAFPermission> {
         byte[] bytes = password.getBytes();
         User<AAFPermission> usr = getUser(user,bytes);
 
-        if(usr != null && !usr.permExpired()) {
-            if(usr.principal==null) {
+        if (usr != null && !usr.permExpired()) {
+            if (usr.principal==null) {
                 return "User already denied";
             } else {
                 return null; // good
@@ -108,7 +108,7 @@ public class AAFAuthn<CLIENT> extends AbsUserCache<AAFPermission> {
         // Statement
         switch(cp.revalidate(state)) {
             case REVALIDATED:
-                if(usr!=null) {
+                if (usr!=null) {
                     usr.principal = cp;
                 } else {
                     addUser(new User<AAFPermission>(cp,con.timeout));
@@ -118,7 +118,7 @@ public class AAFAuthn<CLIENT> extends AbsUserCache<AAFPermission> {
                 return "AAF Inaccessible";
             case UNVALIDATED:
                 addUser(new User<AAFPermission>(user,bytes,con.timeout));
-                return "User/Pass combo invalid for " + user;
+                return "user/pass combo invalid for " + user;
             case DENIED:
                 return "AAF denies API for " + user;
             default: 
@@ -139,13 +139,17 @@ public class AAFAuthn<CLIENT> extends AbsUserCache<AAFPermission> {
         public Resp revalidate(Object state) {
             try {
                 Miss missed = missed(getName(),getCred());
-                if(missed==null || missed.mayContinue()) {
-                    Rcli<CLIENT> client = con.client(Config.AAF_DEFAULT_VERSION).forUser(con.basicAuth(getName(), new String(getCred())));
-                    Future<String> fp = client.read(
-                            "/authn/basicAuth",
-                            "text/plain"
-                            );
-                    if(fp.get(con.timeout)) {
+                if (missed==null || missed.mayContinue()) {
+                	CredRequest cr = new CredRequest();
+                	cr.setId(getName());
+                	cr.setPassword(new String(getCred()));
+                	Future<String> fp = con.client().readPost("/authn/validate", con.credReqDF, cr);
+                    //Rcli<CLIENT> client = con.client().forUser(con.basicAuth(getName(), new String(getCred())));
+                    //Future<String> fp = client.read(
+                    //        "/authn/basicAuth",
+                    //        "text/plain"
+                    //       );
+                     if (fp.get(con.timeout)) {
                         expires = System.currentTimeMillis() + timeToLive;
                         addUser(new User<AAFPermission>(this, expires));
                         return Resp.REVALIDATED;