cstrans-df-run: escape also \n in JSON output

Author: kdudka

cstrans-df-run.cc

@@ -83,7 +83,13 @@ void appendExecArgs(TStringList *pExecList, const std::string &str)
 
             case ES_BACK_SLASH:
                 // one back-slash has been consumed
-                arg.push_back(c);
+                if ('n' == c)
+                    arg.push_back('\n');
+                else if ('t' == c)
+                    arg.push_back('\t');
+                else
+                    // FIXME: this works for back-slash and quote only
+                    arg.push_back(c);
                 state = ES_SEEK_QUOT_CLOSE;
                 continue;
 
@@ -130,6 +136,7 @@ std::string runQuoteArg(std::string arg)
 {
     boost::algorithm::replace_all(arg, "\\", "\\\\");
     boost::algorithm::replace_all(arg, "\"", "\\\"");
+    boost::algorithm::replace_all(arg, "\n", "\\n");
     boost::algorithm::replace_all(arg, "\t", "\\t");
     return arg;
 }

tests/CMakeLists.txt

@@ -211,3 +211,4 @@ tests_cstrans_df_run(0004)
 tests_cstrans_df_run(0005)
 tests_cstrans_df_run(0006)
 tests_cstrans_df_run(0007)
+tests_cstrans_df_run(0008)

tests/cstrans-df-run/0008-stdin.txt

@@ -0,0 +1,13 @@
+FROM openshift/golang-builder:1.11 AS builder
+ENV SOURCE_GIT_COMMIT=39c2c111ea818cd16dbd11e31cc682cf2b4042d3 SOURCE_GIT_TAG=golang-github-prometheus-alertmanager-4.0.0-0.100.0-115-g39c2c11
+COPY . ${ALERTMANAGER_GOPATH}
+RUN ["sh", "-c", "echo \tOK\n"]
+FROM ubi7:7.6-159
+ENV SOURCE_GIT_COMMIT=39c2c111ea818cd16dbd11e31cc682cf2b4042d3 SOURCE_GIT_TAG=golang-github-prometheus-alertmanager-4.0.0-0.100.0-115-g39c2c11
+
+CMD        [ "--storage.path=/alertmanager" ]
+
+LABEL \
+        io.k8s.description="This is the Prometheus Alert Manager image." \
+        com.redhat.component="golang-github-prometheus-alertmanager-container" \
+        maintainer="OpenShift Development <[email protected]>"

tests/cstrans-df-run/0008-stdout.txt

@@ -0,0 +1,13 @@
+FROM openshift/golang-builder:1.11 AS builder
+ENV SOURCE_GIT_COMMIT=39c2c111ea818cd16dbd11e31cc682cf2b4042d3 SOURCE_GIT_TAG=golang-github-prometheus-alertmanager-4.0.0-0.100.0-115-g39c2c11
+COPY . ${ALERTMANAGER_GOPATH}
+RUN ["/opt/cov-sa-2019.09/bin/cov-build", "--dir=/cov", "--append-log", "sh", "-c", "echo \tOK\n"]
+FROM ubi7:7.6-159
+ENV SOURCE_GIT_COMMIT=39c2c111ea818cd16dbd11e31cc682cf2b4042d3 SOURCE_GIT_TAG=golang-github-prometheus-alertmanager-4.0.0-0.100.0-115-g39c2c11
+
+CMD        [ "--storage.path=/alertmanager" ]
+
+LABEL \
+        io.k8s.description="This is the Prometheus Alert Manager image." \
+        com.redhat.component="golang-github-prometheus-alertmanager-container" \
+        maintainer="OpenShift Development <[email protected]>"