diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-06-03 09:56:32 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-06-03 09:56:32 +0200 |
| commit | 746afea3b95ebd770856263fd4056b339ee3a685 (patch) | |
| tree | e939a1d48ba144c47224216af3d05faf9d320565 /security-tools | |
| parent | 628432bf640ef1c20c39718dcbb508e4a56bf8b8 (diff) | |
Wrap values of variables in quotes
Diffstat (limited to 'security-tools')
3 files changed, 10 insertions, 10 deletions
diff --git a/security-tools/src/main/java/com/yahoo/vespa/security/tool/securityenv/UnixShell.java b/security-tools/src/main/java/com/yahoo/vespa/security/tool/securityenv/UnixShell.java index 1b4a9696c69..74630b4e1f4 100644 --- a/security-tools/src/main/java/com/yahoo/vespa/security/tool/securityenv/UnixShell.java +++ b/security-tools/src/main/java/com/yahoo/vespa/security/tool/securityenv/UnixShell.java @@ -18,9 +18,9 @@ enum UnixShell { void writeOutputVariables(PrintStream out, Map<String, String> outputVariables) { outputVariables.forEach((name, value) -> { out.print(name); - out.print('='); + out.print("=\""); out.print(value); // note: value is assumed to need no escaping - out.print("; export "); + out.print("\"; export "); out.print(name); out.println(';'); }); @@ -32,9 +32,9 @@ enum UnixShell { outputVariables.forEach((name, value) -> { out.print("setenv "); out.print(name); - out.print(' '); + out.print(" \""); out.print(value); // note: value is assumed to need no escaping - out.println(';'); + out.println("\";"); }); } }; diff --git a/security-tools/src/test/resources/bash-output.txt b/security-tools/src/test/resources/bash-output.txt index 9d603883953..421320f82d5 100644 --- a/security-tools/src/test/resources/bash-output.txt +++ b/security-tools/src/test/resources/bash-output.txt @@ -1,3 +1,3 @@ -VESPA_TLS_CA_CERT=/path/to/cacerts; export VESPA_TLS_CA_CERT; -VESPA_TLS_CERT=/path/to/certificate; export VESPA_TLS_CERT; -VESPA_TLS_PRIVATE_KEY=/path/to/key; export VESPA_TLS_PRIVATE_KEY; +VESPA_TLS_CA_CERT="/path/to/cacerts"; export VESPA_TLS_CA_CERT; +VESPA_TLS_CERT="/path/to/certificate"; export VESPA_TLS_CERT; +VESPA_TLS_PRIVATE_KEY="/path/to/key"; export VESPA_TLS_PRIVATE_KEY; diff --git a/security-tools/src/test/resources/csh-output.txt b/security-tools/src/test/resources/csh-output.txt index 6db3e613d90..47594af9339 100644 --- a/security-tools/src/test/resources/csh-output.txt +++ b/security-tools/src/test/resources/csh-output.txt @@ -1,3 +1,3 @@ -setenv VESPA_TLS_CA_CERT /path/to/cacerts; -setenv VESPA_TLS_CERT /path/to/certificate; -setenv VESPA_TLS_PRIVATE_KEY /path/to/key; +setenv VESPA_TLS_CA_CERT "/path/to/cacerts"; +setenv VESPA_TLS_CERT "/path/to/certificate"; +setenv VESPA_TLS_PRIVATE_KEY "/path/to/key"; |