lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复HttpRequest.getBody由于URLDecode导致的BUG

Browse Source
This commit is contained in:
Redkale
2017-03-02 12:35:14 +08:00
parent c5d0582807
commit 5bc9f77b7b
2 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/org/redkale/net/http/HttpRequest.java
View File

@@ -92,7 +92,6 @@ public class HttpRequest extends Request<HttpContext> {
if (!readLine(buffer, array)) return -1;
Charset charset = this.context.getCharset();
int index = 0;
array.urlDecode();
int offset = array.find(index, ' ');
if (offset <= 0) return -1;
this.method = array.toString(index, offset, charset).trim();
@@ -103,10 +102,10 @@ public class HttpRequest extends Request<HttpContext> {
if (off > 0) offset = off;
int qst = array.find(index, offset, (byte) '?');
if (qst > 0) {
this.requestURI = array.toString(index, qst - index, charset).trim();
this.requestURI = array.toDecodeString(index, qst - index, charset).trim();
addParameter(array, qst + 1, offset - qst - 1);
} else {
this.requestURI = array.toString(index, offset - index, charset).trim();
this.requestURI = array.toDecodeString(index, offset - index, charset).trim();
}
if (this.requestURI.contains("../")) return -1;
index = ++offset;
@@ -175,7 +174,6 @@ public class HttpRequest extends Request<HttpContext> {
private void parseBody() {
if (this.boundary || bodyparsed) return;
array.urlDecode();
addParameter(array, 0, array.size());
bodyparsed = true;
}
@@ -190,10 +188,10 @@ public class HttpRequest extends Request<HttpContext> {
if (valpos > 0) addParameter(array, valpos + 1, limit - valpos - 1);
return;
}
String name = array.toString(offset, keypos - offset, charset);
String name = array.toDecodeString(offset, keypos - offset, charset);
if (name.charAt(0) == '<') return; //内容可能是xml格式; 如: <?xml version="1.0"
++keypos;
String value = array.toString(keypos, (valpos < 0) ? (limit - keypos) : (valpos - keypos), charset);
String value = array.toDecodeString(keypos, (valpos < 0) ? (limit - keypos) : (valpos - keypos), charset);
this.params.addValue(name, value);
if (valpos >= 0) {
addParameter(array, valpos + 1, limit - valpos - 1);