X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Fcore%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2FPropAccess.java;h=9f4b4b9f0ae53ccbd2f47aaf4928824c9e09e878;hb=c42c3f014a3a84bbb9f12f690fdf2a840f9138a4;hp=461ef43cfb6b80b464f8d843bc163dba22409265;hpb=2b5103e038a7727734097a671d331db9aaab77ba;p=aaf%2Fauthz.git

diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/PropAccess.java b/cadi/core/src/main/java/org/onap/aaf/cadi/PropAccess.java
index 461ef43c..9f4b4b9f 100644
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/PropAccess.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/PropAccess.java
@@ -3,6 +3,8 @@
  * org.onap.aaf
  * ===========================================================================
  * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ * 
+ * Modifications Copyright (C) 2018 IBM.
  * ===========================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,13 +23,16 @@
 
 package org.onap.aaf.cadi;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
 import java.io.PrintWriter;
+import java.io.StringBufferInputStream;
 import java.io.StringWriter;
+import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -37,14 +42,20 @@ import java.util.Properties;
 
 import org.onap.aaf.cadi.config.Config;
 import org.onap.aaf.cadi.config.SecurityInfo;
+import org.onap.aaf.cadi.util.Split;
 
 public class PropAccess implements Access {
     // Sonar says cannot be static... it's ok.  not too many PropAccesses created.
-    private final SimpleDateFormat iso8601 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
+    private final SimpleDateFormat iso8601 = newISO8601();
+    private Symm symm;
+    		
+    public static SimpleDateFormat newISO8601() {
+    	return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
+    }
 
     public static final Level DEFAULT = Level.AUDIT;
     
-    private Symm symm;
+    
     private int level;
     private Properties props;
     private List<String> recursionProtection = null;
@@ -93,59 +104,43 @@ public class PropAccess implements Access {
         int eq;
         for (String arg : args) {
             if ((eq=arg.indexOf('='))>0) {
-            	String key = arg.substring(0, eq);
-                if(Config.CADI_PROP_FILES.equals(key)) {
-                	nprops.setProperty(key,arg.substring(eq+1));
-                }
+                nprops.setProperty(arg.substring(0, eq),arg.substring(eq+1));
             }
         }
         init(nprops);
-        
-        // Re-overlay Args
-        for (String arg : args) {
-            if ((eq=arg.indexOf('='))>0) {
-                props.setProperty(arg.substring(0, eq),arg.substring(eq+1));
-            }
-        }
     }
     
-    protected void init(Properties p) {
+    protected synchronized void init(Properties p) {
         // Make sure these two are set before any changes in Logging
         name = "cadi";
-        level=DEFAULT.maskOf();
         
         props = new Properties();
-        
-        // Find the "cadi_prop_files"
-        //  First in VM Args
+        // First, load related System Properties
         for (Entry<Object,Object> es : System.getProperties().entrySet()) {
             String key = es.getKey().toString();
-            if(Config.CADI_PROP_FILES.equals(key)) {
-            	props.put(key,es.getValue().toString());
-            }
+            for (String start : new String[] {"cadi_","aaf_","cm_"}) {
+                if (key.startsWith(start)) {
+                    props.put(key, es.getValue());
+                }
+            }            
         }
-        
         // Second, overlay or fill in with Passed in Props
         if (p!=null) {
             props.putAll(p);
         }
         
+        // Preset LogLevel
+        String sLevel = props.getProperty(Config.CADI_LOGLEVEL); 
         // Third, load any Chained Property Files
         load(props.getProperty(Config.CADI_PROP_FILES));
         
-        // Fourth, System.getProperties takes precedence over Files
-        for (Entry<Object,Object> es : System.getProperties().entrySet()) {
-            String key = es.getKey().toString();
-            for (String start : new String[] {"HOSTNAME","cadi_","aaf_","cm_"}) {
-                if (key.startsWith(start)) {
-                    props.put(key, es.getValue());
-                }
-            }            
-        }
-        
-        String sLevel = props.getProperty(Config.CADI_LOGLEVEL); 
-        if (sLevel!=null) {
-            level=Level.valueOf(sLevel).maskOf(); 
+        if(sLevel==null) { // if LogLev wasn't set before, check again after Chained Load
+	        sLevel = props.getProperty(Config.CADI_LOGLEVEL); 
+	        if (sLevel==null) {
+	        	level=DEFAULT.maskOf();
+	        } else {
+	            level=Level.valueOf(sLevel).maskOf(); 
+	        }
         }
         // Setup local Symmetrical key encryption
         if (symm==null) {
@@ -160,51 +155,42 @@ public class PropAccess implements Access {
         
         name = props.getProperty(Config.CADI_LOGNAME, name);
         
-        specialConversions();
-    }
-
-    private void specialConversions() {
-        // Critical - if no Security Protocols set, then set it.  We'll just get messed up if not
-        if (props.get(Config.CADI_PROTOCOLS)==null) {
-            props.setProperty(Config.CADI_PROTOCOLS, SecurityInfo.HTTPS_PROTOCOLS_DEFAULT);
-        }
-        
-        Object temp;
-        temp=props.get(Config.CADI_PROTOCOLS);
-        if (props.get(Config.HTTPS_PROTOCOLS)==null && temp!=null) {
-            props.put(Config.HTTPS_PROTOCOLS, temp);
-        }
+        SecurityInfo.setHTTPProtocols(this);
         
-        if (temp!=null) {
-            if ("1.7".equals(System.getProperty("java.specification.version")) 
-                    && (temp==null || (temp instanceof String && ((String)temp).contains("TLSv1.2")))) {
-                System.setProperty(Config.HTTPS_CIPHER_SUITES, Config.HTTPS_CIPHER_SUITES_DEFAULT);
-            }
-        }
     }
-
+    
+   
     private void load(String cadi_prop_files) {
         if (cadi_prop_files==null) {
             return;
         }
         String prevKeyFile = props.getProperty(Config.CADI_KEYFILE);
-        int prev = 0, end = cadi_prop_files.length();
-        int idx;
-        String filename;
-        while (prev<end) {
-            idx = cadi_prop_files.indexOf(File.pathSeparatorChar,prev);
-            if (idx<0) {
-                idx = end;
-            }
-            File file = new File(filename=cadi_prop_files.substring(prev,idx));
+
+        
+        for(String filename : Split.splitTrim(File.pathSeparatorChar, cadi_prop_files)) {
+            Properties fileProps = new Properties();
+            File file = new File(filename);
             if (file.exists()) {
                 printf(Level.INIT,"Loading CADI Properties from %s",file.getAbsolutePath());
                 try {
                     FileInputStream fis = new FileInputStream(file);
                     try {
-                        props.load(fis);
+                        fileProps.load(fis);
+                        // Only load props from recursion which are not already in props
+                        // meaning top Property file takes precedence
+                        for(Entry<Object, Object> es : fileProps.entrySet()) {
+                        	if(props.get(es.getKey())==null) {
+                        		String key = es.getKey().toString();
+                        		String value = es.getValue().toString();
+                        		props.put(key, value);
+                        		if(key.contains("pass")) {
+                        			value = "XXXXXXX";
+                        		}
+                        		printf(Level.DEBUG,"  %s=%s",key,value);
+                        	}
+                        }
                         // Recursively Load
-                        String chainProp = props.getProperty(Config.CADI_PROP_FILES);
+                        String chainProp = fileProps.getProperty(Config.CADI_PROP_FILES);
                         if (chainProp!=null) {
                             if (recursionProtection==null) {
                                 recursionProtection = new ArrayList<>();
@@ -224,7 +210,6 @@ public class PropAccess implements Access {
             } else {
                 printf(Level.WARN,"Warning: recursive CADI Property %s does not exist",file.getAbsolutePath());
             }
-            prev = idx+1;
         }
         
         // Trim 
@@ -264,8 +249,6 @@ public class PropAccess implements Access {
                 printf(Level.ERROR,"%s=%s is an Invalid Log Level",Config.CADI_LOGLEVEL,loglevel);
             }
         }
-        
-        specialConversions();
     }
     
     @Override
@@ -281,31 +264,41 @@ public class PropAccess implements Access {
         }
     }
 
-    protected StringBuilder buildMsg(Level level, Object[] elements) {
+    public StringBuilder buildMsg(Level level, Object[] elements) {
         return buildMsg(name,iso8601,level,elements);
     }
-
-    public static StringBuilder buildMsg(final String name, final SimpleDateFormat sdf, Level level, Object[] elements) { 
-        StringBuilder sb = new StringBuilder(sdf.format(new Date()));
-        sb.append(' ');
-        sb.append(level.name());
-        sb.append(" [");
-        sb.append(name);
-        
+    
+    /*
+     * Need to pass in DateFormat per thread, because not marked as thread safe
+     */
+    public static StringBuilder buildMsg(final String name, final DateFormat sdf, Level level, Object[] elements) {
+    	final StringBuilder sb;
         int end = elements.length;
-        if (end<=0) {
-            sb.append("] ");
-        } else {
-            int idx = 0;
-            if(elements[idx]!=null  && 
-            	elements[idx] instanceof Integer) {
-                sb.append('-');
-                sb.append(elements[idx]);
-                ++idx;
-            }
-            sb.append("] ");
-            write(true,sb,elements);
-        }
+    	if(sdf==null) {
+    		sb = new StringBuilder();
+    		write(true,sb,elements);
+    	} else {
+    		sb = new StringBuilder(
+    				sdf.format(new Date())
+    				);
+            sb.append(' ');
+            sb.append(level.name());
+            sb.append(" [");
+            sb.append(name);
+	        if (end<=0) {
+	            sb.append("] ");
+	        } else {
+	            int idx = 0;
+	            if(elements[idx]!=null  && 
+	            	elements[idx] instanceof Integer) {
+	                sb.append('-');
+	                sb.append(elements[idx]);
+	                ++idx;
+	            }
+	            sb.append("] ");
+	            write(true,sb,elements);
+	        }
+    	}
         return sb;
     }
     
@@ -315,6 +308,11 @@ public class PropAccess implements Access {
             if (o!=null) {
             	if(o.getClass().isArray()) {
             		first = write(first,sb,(Object[])o);
+            	} else if(o instanceof Throwable) {
+            		ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            		PrintStream ps = new PrintStream(baos);
+            		((Throwable)o).printStackTrace(ps);
+            		sb.append(baos.toString());
             	} else {
 	                s=o.toString();
 	                if (first) {