[karaf] branch master updated: [KARAF-7008] Use env/prop substitution support in SSH client config

[jbonofre]

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new 128e91f  [KARAF-7008] Use env/prop substitution support in SSH client 
config
     new 44c539d  Merge pull request #1326 from jbonofre/KARAF-7008
128e91f is described below

commit 128e91f5cf9c6eb5e5598616126bf6e43ecd264c
Author: jbonofre <jbono...@apache.org>
AuthorDate: Mon Mar 8 06:20:08 2021 +0100

    [KARAF-7008] Use env/prop substitution support in SSH client config
---
 .../java/org/apache/karaf/client/ClientConfig.java | 76 ++++++++++++++++++++--
 1 file changed, 71 insertions(+), 5 deletions(-)

diff --git a/client/src/main/java/org/apache/karaf/client/ClientConfig.java 
b/client/src/main/java/org/apache/karaf/client/ClientConfig.java
index 59c2b4e..0a48ca6 100644
--- a/client/src/main/java/org/apache/karaf/client/ClientConfig.java
+++ b/client/src/main/java/org/apache/karaf/client/ClientConfig.java
@@ -16,14 +16,13 @@
  */
 package org.apache.karaf.client;
 
+import org.apache.felix.utils.properties.InterpolationHelper;
 import org.apache.felix.utils.properties.Properties;
 import org.apache.felix.utils.properties.TypedProperties;
 import org.apache.karaf.util.config.PropertiesLoader;
 
 import java.io.File;
-import java.util.LinkedHashSet;
-import java.util.Set;
-import java.util.Map;
+import java.util.*;
 
 public class ClientConfig {
 
@@ -234,13 +233,71 @@ public class ClientConfig {
         System.exit(0);
     }
 
-    private static TypedProperties loadProps(File file, Properties context) {
-        TypedProperties props = new TypedProperties((name, key, value) -> 
context.getProperty(value));
+    private static TypedProperties loadProps(File file, Properties 
configProperties) {
+        // TypedProperties props = new TypedProperties((name, key, value) -> 
context.getProperty(value));
+        TypedProperties props = new TypedProperties();
         try {
             props.load(file);
         } catch (Exception e) {
             System.err.println("Warning: could not load properties from: " + 
file + ": " + e);
         }
+        // interpolation
+        // 0. configProperties
+        for (String key : props.keySet()) {
+            Object value = props.get(key);
+            if (configProperties.get(value) != null) {
+                props.put(key, configProperties.get(value));
+            }
+        }
+        // 1. check "implicit" system property
+        String pid = "org.apache.karaf.shell";
+        for (String key : props.keySet()) {
+            String env = (pid + "." + key).toUpperCase().replaceAll("\\.", 
"_");
+            String sys = pid + "." + key;
+            if (System.getenv(env) != null) {
+                String value = 
InterpolationHelper.substVars(System.getenv(env), null,null, 
convertDictionaryToMap(props));
+                if (props.get(key) != null && (props.get(key) instanceof 
Number)) {
+                    props.put(key, Integer.parseInt(value));
+                } else {
+                    props.put(key, value);
+                }
+            } else if (System.getProperty(sys) != null) {
+                String value = 
InterpolationHelper.substVars(System.getProperty(sys), null, null, 
convertDictionaryToMap(props));
+                if (props.get(key) != null && (props.get(key) instanceof 
Number)) {
+                    props.put(key, Integer.parseInt(value));
+                } else {
+                    props.put(key, value);
+                }
+            }
+        }
+        // 2. check ${env:*}
+        for (String key : props.keySet()) {
+            String value = ((String) props.get(key));
+            if (value.startsWith("${env:")) {
+                String env = value.substring("${env:".length() + 1);
+                if (env.lastIndexOf(":") != -1) {
+                    env = value.substring(0, env.lastIndexOf(":"));
+                }
+                if (env.lastIndexOf("}") != -1) {
+                    env = value.substring(0, env.lastIndexOf("}"));
+                }
+                props.put(key, System.getenv(env));
+            }
+        }
+        // 3. check ${prop:*}
+        for (String key : props.keySet()) {
+            String value = (String) props.get(key);
+            if (value.startsWith("${prop:")) {
+                String prop = value.substring("${prop:".length() + 1);
+                if (prop.lastIndexOf(":") != -1) {
+                    prop = value.substring(0, prop.lastIndexOf(":"));
+                }
+                if (prop.lastIndexOf("}") != -1) {
+                    prop = value.substring(0, prop.lastIndexOf("}"));
+                }
+                props.put(key, System.getProperty(prop));
+            }
+        }
         return props;
     }
 
@@ -344,4 +401,13 @@ public class ClientConfig {
         return idleTimeout;
     }
 
+    private static Map<String, String> convertDictionaryToMap(TypedProperties 
dictionary) {
+        Map<String, String> converted = new HashMap<>();
+        Set<String> keys = dictionary.keySet();
+        for (String key : keys) {
+            converted.put(key, dictionary.get(key).toString());
+        }
+        return converted;
+    }
+
 }