[JENKINS-44039] Fix multiline script blocks containing single quotes

jenkinsci · Aug 24, 2017 · 45389a1 · 45389a1
1 parent 1d2fc7f
commit 45389a1
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 1 deletion.
diff --git a/...l-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTValue.java b/...l-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTValue.java
@@ -121,7 +121,7 @@ public String toGroovy() {
                     if (str.indexOf('\n') == -1) {
                         return "'" + (str.replace("'", "\\'")) + "'";
                     } else {
-                        return "'''" + (str.replace("'''", "\\'\\'\\'")) + "'''";
+                        return "'''" + (str.replace("'", "\\'")) + "'''";
                     }
                 } else if (getValue() != null) {
                     return getValue().toString();

diff --git a/...on/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/BaseParserLoaderTest.java b/...on/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/BaseParserLoaderTest.java
@@ -143,4 +143,16 @@ protected void findErrorInJSON(String expectedError, String jsonName) throws Exc
 
     }
 
+    protected void successfulJson(String jsonName) throws Exception {
+        JsonNode json = JsonLoader.fromString(fileContentsFromResources("json/" + jsonName + ".json"));
+
+        assertNotNull("Couldn't parse JSON for " + jsonName, json);
+        assertFalse("Couldn't parse JSON for " + jsonName, json.size() == 0);
+        assertFalse("Couldn't parse JSON for " + jsonName, json.isNull());
+
+        JSONParser jp = new JSONParser(new SimpleJsonTree(json));
+        jp.parse();
+
+        assertTrue(jp.getErrorCollector().getErrorCount() == 0);
+    }
 }
diff --git a/...est/java/org/jenkinsci/plugins/pipeline/modeldefinition/validator/JSONValidationTest.java b/...est/java/org/jenkinsci/plugins/pipeline/modeldefinition/validator/JSONValidationTest.java
@@ -94,4 +94,10 @@ public void jsonParameterTypeCoercion() throws Exception {
     public void jsonMismatchedQuotes() throws Exception {
         findErrorInJSON(Messages.JSONParser_InvalidGroovyString("hello\\'"), "jsonMismatchedQuotes");
     }
+
+    @Issue("JENKINS-44039")
+    @Test
+    public void singleQuoteInMultiline() throws Exception {
+        successfulJson("singleQuoteInMultiline");
+    }
 }
diff --git a/pipeline-model-definition/src/test/resources/json/singleQuoteInMultiline.json b/pipeline-model-definition/src/test/resources/json/singleQuoteInMultiline.json
@@ -0,0 +1,31 @@
+{"pipeline": {
+  "agent": {
+    "type": "any"
+  },
+  "stages": [{
+    "name": "Build",
+    "branches": [{
+      "name": "default",
+      "steps": [{
+        "name": "sh",
+        "arguments": [{
+          "key": "script",
+          "value": {
+            "isLiteral": true,
+            "value": "echo \"42\""
+          }
+        }]
+      }, {
+        "name": "script",
+        "arguments": [{
+          "key": "scriptBlock",
+          "value": {
+            "isLiteral": true,
+            "value": "def initialize = load('jenkins/pipeline/initialize.groovy')\ninitialize()\n\necho 'done initializing'"
+          }
+        }]
+      }]
+    }]
+  }]
+}
+}