X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-core%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fenv%2FAuthzTransFilter.java;h=e4420ab16b64adbf7638b397335da03ae026c4fa;hb=3d1706fcbe7f95830ff6fd23cf679ee55c6d0595;hp=a25c5f31a7349f35bed7af56768a6b858d31c230;hpb=ceda6e8bc270202bcb24340b86617110289c902e;p=aaf%2Fauthz.git

diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/env/AuthzTransFilter.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/env/AuthzTransFilter.java
index a25c5f31..e4420ab1 100644
--- a/auth/auth-core/src/main/java/org/onap/aaf/auth/env/AuthzTransFilter.java
+++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/env/AuthzTransFilter.java
@@ -23,12 +23,13 @@ package org.onap.aaf.auth.env;
 
 import java.security.Principal;
 
-import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.onap.aaf.auth.rserv.TransFilter;
 import org.onap.aaf.cadi.CadiException;
 import org.onap.aaf.cadi.Connector;
+import org.onap.aaf.cadi.LocatorException;
 import org.onap.aaf.cadi.TrustChecker;
 import org.onap.aaf.cadi.principal.TaggedPrincipal;
 import org.onap.aaf.cadi.principal.TrustPrincipal;
@@ -39,143 +40,151 @@ import org.onap.aaf.misc.env.TimeTaken;
 import org.onap.aaf.misc.env.Trans.Metric;
 
 public class AuthzTransFilter extends TransFilter<AuthzTrans> {
-	private AuthzEnv env;
-	public Metric serviceMetric;
-	public static Slot transIDslot,specialLogSlot;
+    private AuthzEnv env;
+    public Metric serviceMetric;
+    public static Slot transIDslot,specialLogSlot;
 
-	public static final String TRANS_ID_SLOT = "TRANS_ID_SLOT";
-	public static final String SPECIAL_LOG_SLOT = "SPECIAL_LOG_SLOT";
+    public static final String TRANS_ID_SLOT = "TRANS_ID_SLOT";
+    public static final String SPECIAL_LOG_SLOT = "SPECIAL_LOG_SLOT";
 
-	public static final int BUCKETSIZE = 2;
-	
-	public AuthzTransFilter(AuthzEnv env, Connector con, TrustChecker tc, Object ... additionalTafLurs) throws CadiException {
-		super(env.access(),con, tc, additionalTafLurs);
-		this.env = env;
-		serviceMetric = new Metric();
-		serviceMetric.buckets = new float[BUCKETSIZE];
-		if(transIDslot==null) {
-			transIDslot = env.slot(TRANS_ID_SLOT);
-		}
-		if(specialLogSlot==null) {
-			specialLogSlot = env.slot(SPECIAL_LOG_SLOT);
-		}
-	}
-	
-	@Override
-	protected AuthzTrans newTrans() {
-		AuthzTrans at = env.newTrans();
-		at.setLur(getLur());
-		return at;
-	}
+    public static final int BUCKETSIZE = 2;
+    
+    public AuthzTransFilter(AuthzEnv env, Connector con, TrustChecker tc, Object ... additionalTafLurs) throws CadiException, LocatorException {
+        super(env.access(),con, tc, additionalTafLurs);
+        this.env = env;
+        serviceMetric = new Metric();
+        serviceMetric.buckets = new float[BUCKETSIZE];
+        if (transIDslot==null) {
+            transIDslot = env.slot(TRANS_ID_SLOT);
+        }
+        if (specialLogSlot==null) {
+            specialLogSlot = env.slot(SPECIAL_LOG_SLOT);
+        }
+    }
+    
+    @Override
+    protected AuthzTrans newTrans(HttpServletRequest req, HttpServletResponse resp) {
+        AuthzTrans at = env.newTrans();
+        at.setLur(getLur());
+        at.set(req,resp);
+        return at;
+    }
 
-	@Override
-	protected TimeTaken start(AuthzTrans trans, ServletRequest request) {
-		trans.set((HttpServletRequest)request);
-		return trans.start("Trans " + //(context==null?"n/a":context.toString()) +
-		" IP: " + trans.ip() +
-		" Port: " + trans.port()
-		, Env.SUB);
-	}
+    @Override
+    protected TimeTaken start(AuthzTrans trans) {
+        return trans.start("Trans " + //(context==null?"n/a":context.toString()) +
+        " IP: " + trans.ip() +
+        " Port: " + trans.port()
+        , Env.SUB);
+    }
 
-	@Override
-	protected void authenticated(AuthzTrans trans, Principal p) {
-		trans.setUser((TaggedPrincipal)p); // We only work with TaggedPrincipals in Authz
-	}
+    @Override
+    protected void authenticated(AuthzTrans trans, Principal p) {
+        trans.setUser((TaggedPrincipal)p); // We only work with TaggedPrincipals in Authz
+    }
 
-	@Override
-	protected void tallyHo(AuthzTrans trans) {
-		Boolean b = trans.get(specialLogSlot, false);
-		LogTarget lt = b?trans.warn():trans.info();
-		
-		if(lt.isLoggable()) {
-			// Transaction is done, now post full Audit Trail
-			StringBuilder sb = new StringBuilder("AuditTrail\n");
-			// We'll grabAct sub-metrics for Remote Calls and JSON
-			// IMPORTANT!!! if you add more entries here, change "BUCKETSIZE"!!!
-			Metric m = trans.auditTrail(lt,1, sb, Env.REMOTE,Env.JSON);
+    @Override
+    protected void tallyHo(AuthzTrans trans, String target) {
+        Boolean b = trans.get(specialLogSlot, false);
+        LogTarget lt = b?trans.warn():trans.debug();
+        
+        if (lt.isLoggable()) {
+            // Transaction is done, now post full Audit Trail
+            StringBuilder sb = new StringBuilder("AuditTrail\n");
+            // We'll grabAct sub-metrics for Remote Calls and JSON
+            // IMPORTANT!!! if you add more entries here, change "BUCKETSIZE"!!!
+            Metric m = trans.auditTrail(lt,1, sb, Env.REMOTE,Env.JSON);
 
-			// Add current Metrics to total metrics
-			serviceMetric.total+= m.total;
-			for(int i=0;i<serviceMetric.buckets.length;++i) {
-				serviceMetric.buckets[i]+=m.buckets[i];
-			}
-			
-			Long tsi;
-			if((tsi=trans.get(transIDslot, null))!=null) {
-				sb.append("  TraceID=");
-				sb.append(Long.toHexString(tsi));
-				sb.append('\n');
-			}
-			// Log current info
-			sb.append("  Total: ");
-			sb.append(m.total);
-			sb.append(" Remote: ");
-			sb.append(m.buckets[0]);
-			sb.append(" JSON: ");
-			sb.append(m.buckets[1]);
-			lt.log(sb);
-		} else {
-			// Single Line entry
-			// IMPORTANT!!! if you add more entries here, change "BUCKETSIZE"!!!
-			StringBuilder content = new StringBuilder(); 
-			Metric m = trans.auditTrail(lt,1, content, Env.REMOTE,Env.JSON);
-			// Add current Metrics to total metrics
-			serviceMetric.total+= m.total;
-			for(int i=0;i<serviceMetric.buckets.length;++i) {
-				serviceMetric.buckets[i]+=m.buckets[i];
-			}
-			
-			StringBuilder sb = new StringBuilder();
-			sb.append("user=");
-			Principal p = trans.getUserPrincipal();
-			if(p==null) {
-				sb.append("n/a");
-			} else {
-				sb.append(p.getName());
-				if(p instanceof TrustPrincipal) {
-					sb.append('(');
-					sb.append(((TrustPrincipal)p).personalName()); // UserChain
-					sb.append(')');
-				} else { 
-					sb.append('[');
-					if(p instanceof TaggedPrincipal) {
-						sb.append(((TaggedPrincipal)p).tag());
-					} else {
-						sb.append(p.getClass().getSimpleName());
-					}
-					sb.append(']');
-				}
-			}
-			sb.append(",ip=");
-			sb.append(trans.ip());
-			sb.append(",port=");
-			sb.append(trans.port());
-//			Current code won't ever get here... Always does a Full Audit Trail
-//			Long tsi;
-//			if((tsi=trans.get(transIDslot, null))!=null) {
-//				sb.append(",TraceID=");
-//				sb.append(Long.toHexString(tsi));
-//			}
-			sb.append(",ms=");
-			sb.append(m.total);
-			sb.append(",meth=");
-			sb.append(trans.meth());
-			sb.append(",path=");
-			sb.append(trans.path());
+            // Add current Metrics to total metrics
+            serviceMetric.total+= m.total;
+            for (int i=0;i<serviceMetric.buckets.length;++i) {
+                serviceMetric.buckets[i]+=m.buckets[i];
+            }
+            
+            Long tsi;
+            if ((tsi=trans.get(transIDslot, null))!=null) {
+                sb.append("  TraceID=");
+                sb.append(Long.toHexString(tsi));
+                sb.append('\n');
+            }
+            // Log current info
+            sb.append("  Total: ");
+            sb.append(m.total);
+            sb.append(" Remote: ");
+            sb.append(m.buckets[0]);
+            sb.append(" JSON: ");
+            sb.append(m.buckets[1]);
+            lt.log(sb);
+        } else {
+            // Single Line entry
+            // IMPORTANT!!! if you add more entries here, change "BUCKETSIZE"!!!
+            StringBuilder content = new StringBuilder(); 
+            Metric m = trans.auditTrail(lt,1, content, Env.REMOTE,Env.JSON);
+            // Add current Metrics to total metrics
+            serviceMetric.total+= m.total;
+            for (int i=0;i<serviceMetric.buckets.length;++i) {
+                serviceMetric.buckets[i]+=m.buckets[i];
+            }
+            
+            StringBuilder sb = new StringBuilder();
+            sb.append("user=");
+            Principal p = trans.getUserPrincipal();
+            if (p==null) {
+                lt=trans.warn();
+                sb.append(target);
+                sb.append("[None]");
+            } else {
+                lt=trans.info();
+                sb.append(p.getName());
+                if (p instanceof TrustPrincipal) {
+                    sb.append('(');
+                    sb.append(((TrustPrincipal)p).personalName()); // UserChain
+                    sb.append(')');
+                } else { 
+                    sb.append('[');
+                    if (p instanceof TaggedPrincipal) {
+                        sb.append(((TaggedPrincipal)p).tag());
+                    } else {
+                        sb.append(p.getClass().getSimpleName());
+                    }
+                    sb.append(']');
+                }
+            }
+            String tag = trans.getTag();
+            if(tag!=null) {
+                sb.append(",tag=");
+                sb.append(tag);
+            }
+            sb.append(",ip=");
+            sb.append(trans.ip());
+            sb.append(",port=");
+            sb.append(trans.port());
+//            Current code won't ever get here... Always does a Full Audit Trail
+//            Long tsi;
+//            if ((tsi=trans.get(transIDslot, null))!=null) {
+//                sb.append(",TraceID=");
+//                sb.append(Long.toHexString(tsi));
+//            }
+            sb.append(",ms=");
+            sb.append(m.total);
+            sb.append(",meth=");
+            sb.append(trans.meth());
+            sb.append(",path=");
+            sb.append(trans.path());
 
-			if(content.length()>0) {
-				sb.append(",msg=\"");
-				int start = content.lastIndexOf(",msg=\"");
-				if(start>=0) {
-					sb.append(content,start+6,content.length()-1);
-				} else {
-					sb.append(content);
-				}
-				sb.append('"');
-			}
-			
-			trans.warn().log(sb);
-		}
-	}
+            if (content.length()>0) {
+                sb.append(",msg=\"");
+                int start = content.lastIndexOf(",msg=\"");
+                if (start>=0) {
+                    sb.append(content,start+6,content.length()-1);
+                } else {
+                    sb.append(content);
+                }
+                sb.append('"');
+            }
+            
+            lt.log(sb);
+        }
+    }
 
 }