provide environment variable alternatives

Author: jochen-testingbot

README.markdown

@@ -37,6 +37,16 @@ You can obtain a free key and secret from https://testingbot.com/members/user/ed
 
 **Hint:** Instead of passing the key and secret to the command, you can have them as environment variables `${TESTINGBOT_KEY}` and `${TESTINGBOT_SECRET}`.
 
+### Avoiding credentials in the process list
+
+CLI options whose value contains a password show up in `ps` / process listings. Three options can be set via environment variables instead. The CLI flag still takes precedence; the env var is used as a fallback when the flag is absent.
+
+| CLI flag | Env var | Format |
+|---------|---------|--------|
+| `--auth` | `TESTINGBOT_AUTH` | `host:port:user:password` — comma-separated for multiple entries |
+| `--proxy-userpwd` | `TESTINGBOT_PROXY_USERPWD` | `user:password` |
+| `--metrics-auth` | `TESTINGBOT_METRICS_AUTH` | `user:password` |
+
 Options
 -------
 

src/main/java/com/testingbot/tunnel/App.java

@@ -138,22 +138,22 @@ public static void main(String... args) throws Exception {
         options.addOption(metrics);
 
         Option metricsAuthOpt = Option.builder().longOpt("metrics-auth").hasArg().argName("user:password")
-                .desc("Require HTTP Basic auth on the /metrics (Prometheus) endpoint. Format: user:password. Off by default.").build();
+                .desc("Require HTTP Basic auth on the /metrics (Prometheus) endpoint. Format: user:password. Off by default. Env: TESTINGBOT_METRICS_AUTH.").build();
         options.addOption(metricsAuthOpt);
 
         Option proxy = new Option("Y", "proxy", true, "Specify an upstream proxy.");
         proxy.setArgName("PROXYHOST:PROXYPORT");
         options.addOption(proxy);
 
-        Option basicAuth = new Option("a", "auth", true, "Performs Basic Authentication for specific hosts.");
+        Option basicAuth = new Option("a", "auth", true, "Performs Basic Authentication for specific hosts. Env: TESTINGBOT_AUTH (comma-separated for multiple entries).");
         basicAuth.setArgs(Option.UNLIMITED_VALUES);
         basicAuth.setArgName("host:port:user:passwd");
         options.addOption(basicAuth);
 
         Option pacOption = Option.builder().longOpt("pac").hasArg().desc("Proxy autoconfiguration. Should be a http(s) URL").build();
         options.addOption(pacOption);
 
-        Option proxyAuth = new Option("z", "proxy-userpwd", true, "Username and password required to access the proxy configured with --proxy.");
+        Option proxyAuth = new Option("z", "proxy-userpwd", true, "Username and password required to access the proxy configured with --proxy. Env: TESTINGBOT_PROXY_USERPWD.");
         proxyAuth.setArgName("user:pwd");
         options.addOption(proxyAuth);
 
@@ -378,32 +378,46 @@ public static void main(String... args) throws Exception {
                 app.setMetricsPort(Integer.parseInt(line));
             }
 
-            if (commandLine.hasOption("metrics-auth")) {
-                String value = commandLine.getOptionValue("metrics-auth");
-                if (value == null || !value.contains(":") || value.startsWith(":")) {
-                    throw new ParseException("--metrics-auth must be in the form user:password");
+            String metricsAuthValue = commandLine.hasOption("metrics-auth")
+                    ? commandLine.getOptionValue("metrics-auth")
+                    : System.getenv("TESTINGBOT_METRICS_AUTH");
+            if (metricsAuthValue != null && !metricsAuthValue.isEmpty()) {
+                if (!metricsAuthValue.contains(":") || metricsAuthValue.startsWith(":")) {
+                    throw new ParseException("--metrics-auth / TESTINGBOT_METRICS_AUTH must be in the form user:password");
                 }
-                app.setMetricsAuth(value);
+                app.setMetricsAuth(metricsAuthValue);
             }
 
             if (commandLine.hasOption("tunnel-identifier")) {
                 String identifierValue = commandLine.getOptionValue("tunnel-identifier");
                 app.setTunnelIdentifier(identifierValue.substring(0, Math.min(identifierValue.length(), 50)));
             }
 
+            String[] authValues = null;
             if (commandLine.hasOption("auth")) {
-                for (String optionValue : commandLine.getOptionValues("auth")) {
+                authValues = commandLine.getOptionValues("auth");
+            } else {
+                String envAuth = System.getenv("TESTINGBOT_AUTH");
+                if (envAuth != null && !envAuth.isEmpty()) {
+                    authValues = envAuth.split(",");
+                }
+            }
+            if (authValues != null) {
+                for (String optionValue : authValues) {
                     if (optionValue.split(":").length < 4) {
                         throw new ParseException("ERROR: Auth value must contain host:port:user:password value: " + optionValue);
                     }
                 }
-                app.setBasicAuth(commandLine.getOptionValues("auth"));
+                app.setBasicAuth(authValues);
             }
 
-            if (commandLine.hasOption("proxy-userpwd")) {
-                String line = commandLine.getOptionValue("proxy-userpwd");
-                app.setProxyAuth(line);
+            String proxyAuthValue = commandLine.hasOption("proxy-userpwd")
+                    ? commandLine.getOptionValue("proxy-userpwd")
+                    : System.getenv("TESTINGBOT_PROXY_USERPWD");
+            if (proxyAuthValue != null && !proxyAuthValue.isEmpty()) {
+                app.setProxyAuth(proxyAuthValue);
             }
+
             if (commandLine.hasOption("noproxy")) {
                 app.noProxy = true;
             }