The Unified and Autonomous Development Platform
Escape pattern field of build job param to prevent security vulnerability
Robin Shen39d95ab8122c
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/InputSpec.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/InputSpec.javaindex 814ef2d4cf..6fdf788e24 100644--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/InputSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/InputSpec.java@@ -105,7 +105,7 @@ public abstract class InputSpec implements Serializable {return Lists.newArrayList();}- protected String escape(String string) {+ public static String escape(String string) {String escaped = JavaEscape.escapeJava(string);// escape $ character since it has special meaning in groovy stringescaped = escaped.replace("$", "\\$");diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/TextInput.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/TextInput.javaindex a5d0a51f80..229162fec1 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/TextInput.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/TextInput.java@@ -15,6 +15,7 @@ public class TextInput {public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes,String pattern, DefaultValueProvider defaultValueProvider) {+ pattern = InputSpec.escape(pattern);int index = indexes.get(inputSpec.getName());StringBuffer buffer = new StringBuffer();inputSpec.appendField(buffer, index, "String");@@ -24,7 +25,7 @@ public class TextInput {if (pattern != null)buffer.append(" @Pattern(regexp=\"" + pattern + "\", message=\"Should match regular expression: " + pattern + "\")\n");inputSpec.appendMethods(buffer, index, "String", null, defaultValueProvider);-+return buffer.toString();}diff --git a/server-product/src/test/java/io/onedev/server/product/Test.java b/server-product/src/test/java/io/onedev/server/product/Test.javaindex 8ce47824ed..1bc98e632b 100644--- a/server-product/src/test/java/io/onedev/server/product/Test.java+++ b/server-product/src/test/java/io/onedev/server/product/Test.java@@ -5,5 +5,5 @@ public class Test {@org.junit.Testpublic void test() {}-+}\ No newline at end of file