Add special characters to escape.

h3xstream · h3xstream · commit 5950a3dfb5ca · 2016-12-16T12:16:12.000-05:00
diff --git a/burp-api/pom.xml b/burp-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>scriptgen-root-pom</artifactId>
         <groupId>com.h3xstream.scriptgen</groupId>
-        <version>6.0.0</version>
+        <version>6.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>scriptgen-root-pom</artifactId>
 
     <packaging>pom</packaging>
-    <version>6.0.0</version>
+    <version>6.1.0</version>
 
     <name>Reissue Request Scripter (root pom.xml)</name>
 
diff --git a/scriptgen-burp-plugin/pom.xml b/scriptgen-burp-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.h3xstream.scriptgen</groupId>
         <artifactId>scriptgen-root-pom</artifactId>
-        <version>6.0.0</version>
+        <version>6.1.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/scriptgen-core/pom.xml b/scriptgen-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.h3xstream.scriptgen</groupId>
         <artifactId>scriptgen-root-pom</artifactId>
-        <version>6.0.0</version>
+        <version>6.1.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/scriptgen-core/src/main/java/com/h3xstream/scriptgen/template/TemplateUtil.java b/scriptgen-core/src/main/java/com/h3xstream/scriptgen/template/TemplateUtil.java
@@ -60,6 +60,9 @@ else if(ch == '"') {
             else if(ch == '\\') {
                 buffer.append("\\\\");
             }
+            else if(ch == '$' || ch == '#') {
+                buffer.append("\\x"+String.format("%02x",Math.abs((int) ch)));
+            }
             else if( 32 <= ch && ch <= 126) { //Digits, alpha and most specials
                 buffer.append(ch);
             }
diff --git a/scriptgen-core/src/test/java/com/h3xstream/scriptgen/HttpRequestInfoFixtures.java b/scriptgen-core/src/test/java/com/h3xstream/scriptgen/HttpRequestInfoFixtures.java
@@ -46,6 +46,6 @@ public static HttpRequestInfo getPostMultiPartRequest() {
     }
 
     public static HttpRequestInfo getBrokenRequest() {
-        return new HttpRequestInfo("SPECIAL\"')(\\", "http://httpbin.org/broken?test=1\"')(aaaaaaaa\\", getParams, null, null, headers, multipartParams);
+        return new HttpRequestInfo("SPECIAL\"')(\\", "http://httpbin.org/brokentest=1${php}#{ruby}\"')(aaaaaaaa\\", getParams, null, null, headers, multipartParams);
     }
 }
diff --git a/scriptgen-zap-plugin/pom.xml b/scriptgen-zap-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.h3xstream.scriptgen</groupId>
         <artifactId>scriptgen-root-pom</artifactId>
-        <version>6.0.0</version>
+        <version>6.1.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,9 @@ else if(ch == '"') {`
`60`	`60`	`else if(ch == '\\') {`
`61`	`61`	`buffer.append("\\\\");`
`62`	`62`	`}`
	`63`	`+ else if(ch == '$' \|\| ch == '#') {`
	`64`	`+ buffer.append("\\x"+String.format("%02x",Math.abs((int) ch)));`
	`65`	`+ }`
`63`	`66`	`else if( 32 <= ch && ch <= 126) { //Digits, alpha and most specials`
`64`	`67`	`buffer.append(ch);`
`65`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,6 @@ public static HttpRequestInfo getPostMultiPartRequest() {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public static HttpRequestInfo getBrokenRequest() {`
`49`		`- return new HttpRequestInfo("SPECIAL\"')(\\", "http://httpbin.org/broken?test=1\"')(aaaaaaaa\\", getParams, null, null, headers, multipartParams);`
	`49`	`+ return new HttpRequestInfo("SPECIAL\"')(\\", "http://httpbin.org/brokentest=1${php}#{ruby}\"')(aaaaaaaa\\", getParams, null, null, headers, multipartParams);`
`50`	`50`	`}`
`51`	`51`	`}`