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=b350e2a7d57e6ada75362cce00d09609f162d9bc;hpb=047edb5a4312cc7dfb3172b7e11ab1a9e2315ba2;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 b350e2a7..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,142 +29,146 @@ 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;
-	
-	/**
-	 * Configure with Standard AAF properties, Stand alone
-	 * @param con
-	 * @throws Exception ..
-	 */
-	// Package on purpose
-	AAFAuthn(AAFCon<CLIENT> con) {
-		super(con.access,con.cleanInterval,con.highCount,con.usageRefreshTriggerCount);
-		this.con = con;
-	}
+    private AAFCon<CLIENT> con;
+    private String realm;
+    
+    /**
+     * Configure with Standard AAF properties, Stand alone
+     * @param con
+     * @throws Exception ..
+     */
+    // Package on purpose
+    AAFAuthn(AAFCon<CLIENT> con) {
+        super(con.access,con.cleanInterval,con.highCount,con.usageRefreshTriggerCount);
+        this.con = con;
+    }
 
-	/**
-	 * Configure with Standard AAF properties, but share the Cache (with AAF Lur)
-	 * @param con
-	 * @throws Exception 
-	 */
-	// Package on purpose
-	AAFAuthn(AAFCon<CLIENT> con, AbsUserCache<AAFPermission> cache) {
-		super(cache);
-		this.con = con;
-	}
-	
-	/**
-	 * Return Native Realm of AAF Instance.
-	 * 
-	 * @return
-	 */
-	public String getRealm() {
-		return realm;
-	}
+    /**
+     * Configure with Standard AAF properties, but share the Cache (with AAF Lur)
+     * @param con
+     * @throws Exception 
+     */
+    // Package on purpose
+    AAFAuthn(AAFCon<CLIENT> con, AbsUserCache<AAFPermission> cache) {
+        super(cache);
+        this.con = con;
+    }
+    
+    /**
+     * Return Native Realm of AAF Instance.
+     * 
+     * @return
+     */
+    public String getRealm() {
+        return realm;
+    }
 
-	/**
-	 * Returns null if ok, or an Error String;
-	 * 
-	 * Convenience function.  Passes "null" for State object
-	 */
-	public String validate(String user, String password) throws IOException {
-		return validate(user,password,null);
-	}
-	
-	/**
-	 * Returns null if ok, or an Error String;
-	 * 
-	 * For State Object, you may put in HTTPServletRequest or AuthzTrans, if available.  Otherwise,
-	 * leave null
-	 * 
-	 * @param user
-	 * @param password
-	 * @return
-	 * @throws IOException 
-	 * @throws CadiException 
-	 * @throws Exception
-	 */
-	public String validate(String user, String password, Object state) throws IOException {
-		password = access.decrypt(password, false);
-		byte[] bytes = password.getBytes();
-		User<AAFPermission> usr = getUser(user,bytes);
+    /**
+     * Returns null if ok, or an Error String;
+     * 
+     * Convenience function.  Passes "null" for State object
+     */
+    public String validate(String user, String password) throws IOException {
+        return validate(user,password,null);
+    }
+    
+    /**
+     * Returns null if ok, or an Error String;
+     * 
+     * For State Object, you may put in HTTPServletRequest or AuthzTrans, if available.  Otherwise,
+     * leave null
+     * 
+     * @param user
+     * @param password
+     * @return
+     * @throws IOException 
+     * @throws CadiException 
+     * @throws Exception
+     */
+    public String validate(String user, String password, Object state) throws IOException {
+        password = access.decrypt(password, false);
+        byte[] bytes = password.getBytes();
+        User<AAFPermission> usr = getUser(user,bytes);
 
-		if(usr != null && !usr.permExpired()) {
-			if(usr.principal==null) {
-				return "User already denied";
-			} else {
-				return null; // good
-			}
-		}
+        if (usr != null && !usr.permExpired()) {
+            if (usr.principal==null) {
+                return "User already denied";
+            } else {
+                return null; // good
+            }
+        }
 
-		AAFCachedPrincipal cp = new AAFCachedPrincipal(user, bytes, con.cleanInterval);
-		// Since I've relocated the Validation piece in the Principal, just revalidate, then do Switch
-		// Statement
-		switch(cp.revalidate(state)) {
-			case REVALIDATED:
-				if(usr!=null) {
-					usr.principal = cp;
-				} else {
-					addUser(new User<AAFPermission>(cp,con.timeout));
-				}
-				return null;
-			case INACCESSIBLE:
-				return "AAF Inaccessible";
-			case UNVALIDATED:
-				addUser(new User<AAFPermission>(user,bytes,con.timeout));
-				return "User/Pass combo invalid for " + user;
-			case DENIED:
-				return "AAF denies API for " + user;
-			default: 
-				return "AAFAuthn doesn't handle Principal " + user;
-		}
-	}
-	
-	private class AAFCachedPrincipal extends ConfigPrincipal implements CachedPrincipal {
-		private long expires;
-		private long timeToLive;
+        AAFCachedPrincipal cp = new AAFCachedPrincipal(user, bytes, con.cleanInterval);
+        // Since I've relocated the Validation piece in the Principal, just revalidate, then do Switch
+        // Statement
+        switch(cp.revalidate(state)) {
+            case REVALIDATED:
+                if (usr!=null) {
+                    usr.principal = cp;
+                } else {
+                    addUser(new User<AAFPermission>(cp,con.timeout));
+                }
+                return null;
+            case INACCESSIBLE:
+                return "AAF Inaccessible";
+            case UNVALIDATED:
+                addUser(new User<AAFPermission>(user,bytes,con.timeout));
+                return "user/pass combo invalid for " + user;
+            case DENIED:
+                return "AAF denies API for " + user;
+            default: 
+                return "AAFAuthn doesn't handle Principal " + user;
+        }
+    }
+    
+    private class AAFCachedPrincipal extends ConfigPrincipal implements CachedPrincipal {
+        private long expires;
+        private long timeToLive;
 
-		private AAFCachedPrincipal(String name, byte[] pass, int timeToLive) {
-			super(name,pass);
-			this.timeToLive = timeToLive;
-			expires = timeToLive + System.currentTimeMillis();
-		}
+        private AAFCachedPrincipal(String name, byte[] pass, int timeToLive) {
+            super(name,pass);
+            this.timeToLive = timeToLive;
+            expires = timeToLive + System.currentTimeMillis();
+        }
 
-		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)) {
-						expires = System.currentTimeMillis() + timeToLive;
-						addUser(new User<AAFPermission>(this, expires));
-						return Resp.REVALIDATED;
-					} else {
-						addMiss(getName(), getCred());
-						return Resp.UNVALIDATED;
-					}
-				} else {
-					return Resp.UNVALIDATED;
-				}
-			} catch (Exception e) {
-				con.access.log(e);
-				return Resp.INACCESSIBLE;
-			}
-		}
+        public Resp revalidate(Object state) {
+            try {
+                Miss missed = missed(getName(),getCred());
+                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;
+                    } else {
+                        addMiss(getName(), getCred());
+                        return Resp.UNVALIDATED;
+                    }
+                } else {
+                    return Resp.UNVALIDATED;
+                }
+            } catch (Exception e) {
+                con.access.log(e);
+                return Resp.INACCESSIBLE;
+            }
+        }
 
-		public long expires() {
-			return expires;
-		}
-	}
+        public long expires() {
+            return expires;
+        }
+    }
 
 }