SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix multipart request regex pattern (#1612)

Browse Source 
* Fix multipart request regex pattern

* Add ? to \r to enable linux support in multipart regex
This commit is contained in:
Arkadiusz Kondas
2021-02-17 19:50:36 +01:00
committed by GitHub
parent d6437e43bb
commit 6853294573
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/internal/RegexPatterns.java
View File

@@ -93,18 +93,18 @@ public final class RegexPatterns {
}
public static String multipartParam(Object name, Object value) {
return ".*--(.*)\r\nContent-Disposition: form-data; name=\"" + name
+ "\"\r\n(Content-Type: .*\r\n)?(Content-Transfer-Encoding: .*\r\n)?(Content-Length: \\d+\r\n)?\r\n"
+ value + "\r\n--\\1.*";
return ".*--(.*)\r?\nContent-Disposition: form-data; name=\"" + name
+ "\"\r?\n(Content-Type: .*\r?\n)?(Content-Transfer-Encoding: .*\r?\n)?(Content-Length: \\d+\r?\n)?\r?\n"
+ value + "\r?\n--.*";
}
public static String multipartFile(Object name, Object filename, Object content,
Object contentType) {
return ".*--(.*)\r\nContent-Disposition: form-data; name=\"" + name
+ "\"; filename=\"" + filename + "\"\r\n(Content-Type: "
return ".*--(.*)\r?\nContent-Disposition: form-data; name=\"" + name
+ "\"; filename=\"" + filename + "\"\r?\n(Content-Type: "
+ toContentType(contentType)
+ "\r\n)?(Content-Transfer-Encoding: .*\r\n)?(Content-Length: \\d+\r\n)?\r\n"
+ content + "\r\n--\\1.*";
+ "\r?\n)?(Content-Transfer-Encoding: .*\r?\n)?(Content-Length: \\d+\r?\n)?\r?\n"
+ content + "\r?\n--.*";
}
private static String toContentType(Object contentType) {