Batch work and client

[aaf/authz.git] / cadi / aaf / src / main / java / org / onap / aaf / cadi / configure / PropHolder.java

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PropHolder.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PropHolder.java
index 7feacb8..9d060e6 100644 (file)
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PropHolder.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PropHolder.java
@@ -31,7 +31,6 @@ import java.util.TreeMap;
 
 import org.onap.aaf.cadi.Access;
 import org.onap.aaf.cadi.Symm;
-import org.onap.aaf.cadi.config.Config;
 import org.onap.aaf.cadi.util.Chmod;
 import org.onap.aaf.misc.env.util.Chrono;
 
@@ -93,31 +92,38 @@ public class PropHolder {
                return keyfile.getAbsolutePath();
        }
 
-       public void add(final String tag, final String value) {
-               if(value==null) {
-                       props.put(tag,"");
-               } else {
-                       props.put(tag, value);
-               }
+       public String add(final String tag, final String value) {
+               final String rv = value==null?"":value;
+               props.put(tag, rv);
+               return rv;
        }
 
-       public void add(final String tag, Access orig, final String def) {
-               add(tag, orig.getProperty(tag, def));
+       public String add(final String tag, Access orig, final String def) {
+               return add(tag, orig.getProperty(tag, def));
        }
 
-       public void addEnc(final String tag, final String value) throws IOException {
+       public String addEnc(final String tag, final String value) throws IOException {
+               String rv;
                if(value==null) {
-                       props.put(tag,"");
+                       rv = "";
                } else {
                        if(symm==null) { // Lazy Instantiations... on a few PropFiles have Security
                                symm = ArtifactDir.getSymm(keyfile);
                        }
-                       props.put(tag, "enc:"+symm.enpass(value));
+                       rv = "enc:"+symm.enpass(value);
                }
+               props.put(tag, rv);
+               return rv;
        }
 
        public void addEnc(final String tag, Access orig, final String def) throws IOException {
-               addEnc(tag,orig.getProperty(tag, def));
+               String pwd = orig.getProperty(tag, def);
+               if(pwd==null) {
+                       return;
+               } else if(pwd.startsWith("enc:")) {
+                       pwd = orig.decrypt(pwd, true);
+               }
+               addEnc(tag,pwd);
        }
        
        public void write() throws IOException {
@@ -141,7 +147,7 @@ public class PropHolder {
                 pw.print('#');
             }
             pw.println();
-            pw.println("# Properties Generated by AT&T Certificate Manager");
+            pw.println("# Properties Generated by AAF Certificate Manager");
             pw.print("#   by ");
             pw.println(System.getProperty("user.name"));
             pw.print("#   on ");