X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Fcore%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Ffilter%2FCadiFilter.java;h=a2f168a1d5cfab0015370a45b4023894679fba20;hb=refs%2Fchanges%2F24%2F97124%2F3;hp=50efe8b44ad3c901f7f093c822fc619a18419607;hpb=bdce7667a6e272e2fa32e298d957a0d9090c5bc9;p=aaf%2Fauthz.git

diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/filter/CadiFilter.java b/cadi/core/src/main/java/org/onap/aaf/cadi/filter/CadiFilter.java
index 50efe8b4..a2f168a1 100644
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/filter/CadiFilter.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/filter/CadiFilter.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.
@@ -52,16 +52,16 @@ import org.onap.aaf.cadi.util.Timing;
 
 /**
  * CadiFilter
- * 
+ *
  * This class implements Servlet Filter, and ties together CADI implementations
- * 
+ *
  * This class can be used in a standard J2EE Servlet manner.  Optimal usage is for POJO operations, where
- * one can enforce this Filter being first and primary.  Depending on the Container, it 
- * may be more effective, in some cases, to utilize features that allow earlier determination of 
+ * one can enforce this Filter being first and primary.  Depending on the Container, it
+ * may be more effective, in some cases, to utilize features that allow earlier determination of
  * AUTHN (Authorization).  An example would be "Tomcat Valve".  These implementations, however, should
  * be modeled after the "init" and "doFilter" functions, and be kept up to date as this class changes.
- * 
- * 
+ *
+ *
  * @author Jonathan
  *
  */
@@ -73,18 +73,18 @@ public class CadiFilter implements Filter {
     private Object[] additionalTafLurs;
     private SideChain sideChain;
     private static int count=0;
-    
+
     public Lur getLur() {
         return httpChecker.getLur();
     }
-    
+
     /**
      * Construct a viable Filter
-     * 
-     * Due to the vagaries of many containers, there is a tendency to create Objects and call "Init" on 
+     *
+     * Due to the vagaries of many containers, there is a tendency to create Objects and call "Init" on
      * them at a later time.  Therefore, this object creates with an object that denies all access
      * until appropriate Init happens, just in case the container lets something slip by in the meantime.
-     * 
+     *
      */
     public CadiFilter() {
         additionalTafLurs = CadiHTTPManip.noAdditional;
@@ -92,10 +92,10 @@ public class CadiFilter implements Filter {
 
     /**
      * This constructor to be used when directly constructing and placing in HTTP Engine
-     * 
+     *
      * @param access
      * @param moreTafLurs
-     * @throws ServletException 
+     * @throws ServletException
      */
     public CadiFilter(Access access, Object ... moreTafLurs) throws ServletException {
         additionalTafLurs = moreTafLurs;
@@ -120,7 +120,7 @@ public class CadiFilter implements Filter {
 
     /**
      * Init
-     * 
+     *
      * Standard Filter "init" call with FilterConfig to obtain properties.  POJOs can construct a
      * FilterConfig with the mechanism of their choice, and standard J2EE Servlet engines utilize this
      * mechanism already.
@@ -128,15 +128,15 @@ public class CadiFilter implements Filter {
     //TODO Always validate changes against Tomcat AbsCadiValve and Jaspi CadiSAM Init functions
     public void init(FilterConfig filterConfig) throws ServletException {
         // need the Context for Logging, instantiating ClassLoader, etc
-        ServletContextAccess sca=new ServletContextAccess(filterConfig); 
+        ServletContextAccess sca=new ServletContextAccess(filterConfig);
         if (access==null) {
             access = sca;
         }
-        
+
         // Set Protected getter with base Access, for internal class instantiations
         init(new FCGet(access, sca.context(), filterConfig));
     }
-    
+
 
     @SuppressWarnings("unchecked")
     protected void init(Get getter) throws ServletException {
@@ -154,7 +154,7 @@ public class CadiFilter implements Filter {
        } catch (Exception e) {
            access.log(Level.INIT, "AAFTrustChecker cannot be loaded",e.getMessage());
        }
-       
+
        try {
            Class<Filter> cf=null;
            try {
@@ -167,7 +167,7 @@ public class CadiFilter implements Filter {
            access.log(Level.INIT, "AAFTrustChecker cannot be loaded",e.getMessage());
        }
 
-        
+
         // Synchronize, because some instantiations call init several times on the same object
         // In this case, the epiTaf will be changed to a non-NullTaf, and thus not instantiate twice.
         synchronized(CadiHTTPManip.noAdditional /*will always remain same Object*/) {
@@ -194,8 +194,8 @@ public class CadiFilter implements Filter {
                     pathExceptions = str.split("\\s*:\\s*");
                 }
             }
-    
-            /* 
+
+            /*
              * SETUP Permission Converters... those that can take Strings from a Vendor Product, and convert to appropriate AAF Permissions
              */
             if (mapPairs==null) {
@@ -227,7 +227,7 @@ public class CadiFilter implements Filter {
         }
 
         // Add API Enforcement Point
-        String enforce = getter.get(Config.CADI_API_ENFORCEMENT, null, true); 
+        String enforce = getter.get(Config.CADI_API_ENFORCEMENT, null, true);
         if(enforce!=null && enforce.length()>0) {
             sideChain.add(new CadiApiEnforcementFilter(access,enforce));
         }
@@ -236,7 +236,7 @@ public class CadiFilter implements Filter {
     }
 
     /**
-     * Containers call "destroy" when time to cleanup 
+     * Containers call "destroy" when time to cleanup
      */
     public void destroy() {
         // Synchronize, in case multiCadiFilters are used.
@@ -252,7 +252,7 @@ public class CadiFilter implements Filter {
 
     /**
      * doFilter
-     * 
+     *
      * This is the standard J2EE invocation.  Analyze the request, modify response as necessary, and
      * only call the next item in the filterChain if request is suitably Authenticated.
      */
@@ -295,7 +295,7 @@ public class CadiFilter implements Filter {
     }
 
 
-    /** 
+    /**
      * If PathExceptions exist, report if these should not have Authn applied.
      * @param hreq
      * @return
@@ -317,7 +317,7 @@ public class CadiFilter implements Filter {
         }
         return false;
     }
-    
+
     /**
      * Get Converter by Path
      */
@@ -332,7 +332,7 @@ public class CadiFilter implements Filter {
         }
         return NullPermConverter.singleton();
     }
-    
+
     /**
      * store PermConverters by Path prefix
      * @author Jonathan