Ensure quotes and new lines are escaped in echo

HubSpot · Nov 2, 2016 · 5cc113b · 5cc113b · tpetr · Nov 4, 2016
1 parent 551c9d5
commit 5cc113b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/...utor/src/main/java/com/hubspot/singularity/executor/config/SingularityExecutorModule.java b/...utor/src/main/java/com/hubspot/singularity/executor/config/SingularityExecutorModule.java
@@ -11,7 +11,7 @@
 import com.google.inject.Singleton;
 import com.google.inject.name.Named;
 import com.hubspot.singularity.executor.handlebars.BashEscapedHelper;
-import com.hubspot.singularity.executor.handlebars.EscapedNewLinesHelper;
+import com.hubspot.singularity.executor.handlebars.EscapeNewLinesAndQuotesHelper;
 import com.hubspot.singularity.executor.handlebars.IfHasNewLinesHelper;
 import com.hubspot.singularity.executor.handlebars.IfPresentHelper;
 import com.hubspot.singularity.runner.base.config.SingularityRunnerBaseLogging;
@@ -93,7 +93,7 @@ public Handlebars providesHandlebars() {
     handlebars.registerHelper(BashEscapedHelper.NAME, new BashEscapedHelper());
     handlebars.registerHelper(IfPresentHelper.NAME, new IfPresentHelper());
     handlebars.registerHelper(IfHasNewLinesHelper.NAME, new IfHasNewLinesHelper());
-    handlebars.registerHelper(EscapedNewLinesHelper.NAME, new EscapedNewLinesHelper());
+    handlebars.registerHelper(EscapeNewLinesAndQuotesHelper.NAME, new EscapeNewLinesAndQuotesHelper());
 
     return handlebars;
   }

diff --git a/...tor/handlebars/EscapedNewLinesHelper.java → ...lebars/EscapeNewLinesAndQuotesHelper.java b/...tor/handlebars/EscapedNewLinesHelper.java → ...lebars/EscapeNewLinesAndQuotesHelper.java
@@ -5,9 +5,9 @@
 import com.github.jknack.handlebars.Helper;
 import com.github.jknack.handlebars.Options;
 
-public class EscapedNewLinesHelper implements Helper<Object> {
+public class EscapeNewLinesAndQuotesHelper implements Helper<Object> {
 
-  public static final String NAME = "escapedNewLines";
+  public static final String NAME = "escapeNewLinesAndQuotes";
 
   @Override
   public CharSequence apply(Object context, Options options) throws IOException {
@@ -23,6 +23,9 @@ public CharSequence apply(Object context, Options options) throws IOException {
       if (c == '\n') {
         sb.append('\\');
         sb.append('n');
+      } else if (c == '"') {
+        sb.append('\\');
+        sb.append('"');
       } else {
         sb.append(c);
       }

diff --git a/SingularityExecutor/src/main/resources/docker.sh.hbs b/SingularityExecutor/src/main/resources/docker.sh.hbs
@@ -150,8 +150,8 @@ mkdir -p {{{ runContext.taskAppDirectory }}}
 sudo chown -R {{{ runContext.user }}} {{{ runContext.taskAppDirectory }}}
 
 # Start up the container
-echo "Creating continer with: sudo -E -H -u {{{ runContext.user }}} docker create $DOCKER_OPTIONS {{#each envContext.env}}{{#ifHasNewLines value}}-e {{{name}}}={{#escapedNewLines value}}{{/escapedNewLines}}{{/ifHasNewLines}}{{/each}} $DOCKER_IMAGE {{{ runContext.cmd }}}"
-cid=`sudo -E -H -u {{{ runContext.user }}} docker create $DOCKER_OPTIONS {{#each envContext.env}}{{#ifHasNewLines value}}-e {{{name}}}={{#escapedNewLines value}}{{/escapedNewLines}}{{/ifHasNewLines}}{{/each}} $DOCKER_IMAGE {{{runContext.cmd }}}`
+echo -e "Creating continer with: sudo -E -H -u {{{ runContext.user }}} docker create $DOCKER_OPTIONS {{#each envContext.env}}{{#ifHasNewLines value}}-e {{{name}}}={{#escapeNewLinesAndQuotes value}}{{/escapeNewLinesAndQuotes}}{{/ifHasNewLines}}{{/each}} $DOCKER_IMAGE {{{ runContext.cmd }}}"
+cid=`sudo -E -H -u {{{ runContext.user }}} docker create $DOCKER_OPTIONS {{#each envContext.env}}{{#ifHasNewLines value}}-e {{{name}}}={{#escapeNewLinesAndQuotes value}}{{/escapeNewLinesAndQuotes}}{{/ifHasNewLines}}{{/each}} $DOCKER_IMAGE {{{runContext.cmd }}}`
 sudo -E -H -u {{{ runContext.user }}} docker start -a $cid >> {{{ runContext.logFile }}} 2>&1 &
 running=1