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=e78a488948dd4e8281eb8ede1761b7b947ef1455;hb=1296352d8eafee57f982a4342ad79ada4aa56d28;hp=06fd310edf228f4cf1b06b7c8ae5194ac53ae065;hpb=4b5a7d721d994a49057e9bfb403c7bff1b376660;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 06fd310e..e78a4889 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
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,8 +23,8 @@ 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;
@@ -48,31 +48,30 @@ public class AuthzTransFilter extends TransFilter<AuthzTrans> {
     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, LocatorException {
         super(env.access(),con, tc, additionalTafLurs);
         this.env = env;
         serviceMetric = new Metric();
         serviceMetric.buckets = new float[BUCKETSIZE];
-        if(transIDslot==null) {
+        if (transIDslot==null) {
             transIDslot = env.slot(TRANS_ID_SLOT);
         }
-        if(specialLogSlot==null) {
+        if (specialLogSlot==null) {
             specialLogSlot = env.slot(SPECIAL_LOG_SLOT);
         }
     }
-    
+
     @Override
-    protected AuthzTrans newTrans(HttpServletRequest req) {
+    protected AuthzTrans newTrans(HttpServletRequest req, HttpServletResponse resp) {
         AuthzTrans at = env.newTrans();
         at.setLur(getLur());
-        at.set(req);
+        at.set(req,resp);
         return at;
     }
 
     @Override
-    protected TimeTaken start(AuthzTrans trans, ServletRequest request) {
-        trans.set((HttpServletRequest)request);
+    protected TimeTaken start(AuthzTrans trans) {
         return trans.start("Trans " + //(context==null?"n/a":context.toString()) +
         " IP: " + trans.ip() +
         " Port: " + trans.port()
@@ -85,11 +84,11 @@ public class AuthzTransFilter extends TransFilter<AuthzTrans> {
     }
 
     @Override
-    protected void tallyHo(AuthzTrans trans) {
+    protected void tallyHo(AuthzTrans trans, String target) {
         Boolean b = trans.get(specialLogSlot, false);
-        LogTarget lt = b?trans.warn():trans.info();
-        
-        if(lt.isLoggable()) {
+        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
@@ -98,12 +97,12 @@ public class AuthzTransFilter extends TransFilter<AuthzTrans> {
 
             // Add current Metrics to total metrics
             serviceMetric.total+= m.total;
-            for(int i=0;i<serviceMetric.buckets.length;++i) {
+            for (int i=0;i<serviceMetric.buckets.length;++i) {
                 serviceMetric.buckets[i]+=m.buckets[i];
             }
-            
+
             Long tsi;
-            if((tsi=trans.get(transIDslot, null))!=null) {
+            if ((tsi=trans.get(transIDslot, null))!=null) {
                 sb.append("  TraceID=");
                 sb.append(Long.toHexString(tsi));
                 sb.append('\n');
@@ -119,28 +118,31 @@ public class AuthzTransFilter extends TransFilter<AuthzTrans> {
         } else {
             // Single Line entry
             // IMPORTANT!!! if you add more entries here, change "BUCKETSIZE"!!!
-            StringBuilder content = new StringBuilder(); 
+            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) {
+            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");
+            if (p==null) {
+                lt=trans.warn();
+                sb.append(target);
+                sb.append("[None]");
             } else {
+                lt=trans.info();
                 sb.append(p.getName());
-                if(p instanceof TrustPrincipal) {
+                if (p instanceof TrustPrincipal) {
                     sb.append('(');
                     sb.append(((TrustPrincipal)p).personalName()); // UserChain
                     sb.append(')');
-                } else { 
+                } else {
                     sb.append('[');
-                    if(p instanceof TaggedPrincipal) {
+                    if (p instanceof TaggedPrincipal) {
                         sb.append(((TaggedPrincipal)p).tag());
                     } else {
                         sb.append(p.getClass().getSimpleName());
@@ -148,35 +150,42 @@ public class AuthzTransFilter extends TransFilter<AuthzTrans> {
                     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) {
+//            if ((tsi=trans.get(transIDslot, null))!=null) {
 //                sb.append(",TraceID=");
 //                sb.append(Long.toHexString(tsi));
 //            }
             sb.append(",ms=");
             sb.append(m.total);
+            sb.append(",status=");
+            sb.append(trans.hresp().getStatus());
             sb.append(",meth=");
             sb.append(trans.meth());
             sb.append(",path=");
             sb.append(trans.path());
 
-            if(content.length()>0) {
+            if (content.length()>0) {
                 sb.append(",msg=\"");
                 int start = content.lastIndexOf(",msg=\"");
-                if(start>=0) {
+                if (start>=0) {
                     sb.append(content,start+6,content.length()-1);
                 } else {
                     sb.append(content);
                 }
                 sb.append('"');
             }
-            
-            trans.warn().log(sb);
+
+            lt.log(sb);
         }
     }