arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-06 05:21:22 +03:00
Code

fix urlDecode points (#2212)

Browse Source 
Fixes:
https://github.com/esp8266/Arduino/issues/1989
https://github.com/esp8266/Arduino/issues/2198
This commit is contained in:
Me No Dev 2016-07-01 02:37:15 +03:00 committed by GitHub
parent 9cc2bab276
commit af06847f4a
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
libraries/ESP8266WebServer/src/Parsing.cpp
View File

@ -91,7 +91,7 @@ bool ESP8266WebServer::_parseRequest(WiFiClient& client) {
String searchStr = ""; String searchStr = "";
int hasSearch = url.indexOf('?'); int hasSearch = url.indexOf('?');
if (hasSearch != -1){ if (hasSearch != -1){
searchStr = url.substring(hasSearch + 1); searchStr = urlDecode(url.substring(hasSearch + 1));
url = url.substring(0, hasSearch); url = url.substring(0, hasSearch);
} }
_currentUri = url; _currentUri = url;
@ -135,6 +135,7 @@ bool ESP8266WebServer::_parseRequest(WiFiClient& client) {
String headerName; String headerName;
String headerValue; String headerValue;
bool isForm = false; bool isForm = false;
bool isEncoded = false;
uint32_t contentLength = 0; uint32_t contentLength = 0;
//parse headers //parse headers
while(1){ while(1){
@ -150,17 +151,20 @@ bool ESP8266WebServer::_parseRequest(WiFiClient& client) {
headerValue.trim(); headerValue.trim();
_collectHeader(headerName.c_str(),headerValue.c_str()); _collectHeader(headerName.c_str(),headerValue.c_str());
#ifdef DEBUG_ESP_HTTP_SERVER #ifdef DEBUG_ESP_HTTP_SERVER
DEBUG_OUTPUT.print("headerName: "); DEBUG_OUTPUT.print("headerName: ");
DEBUG_OUTPUT.println(headerName); DEBUG_OUTPUT.println(headerName);
DEBUG_OUTPUT.print("headerValue: "); DEBUG_OUTPUT.print("headerValue: ");
DEBUG_OUTPUT.println(headerValue); DEBUG_OUTPUT.println(headerValue);
#endif #endif
if (headerName == "Content-Type"){ if (headerName == "Content-Type"){
if (headerValue.startsWith("text/plain")){ if (headerValue.startsWith("text/plain")){
isForm = false; isForm = false;
} else if (headerValue.startsWith("multipart/form-data")){ } else if (headerValue.startsWith("application/x-www-form-urlencoded")){
isForm = false;
isEncoded = true;
} else if (headerValue.startsWith("multipart/")){
boundaryStr = headerValue.substring(headerValue.indexOf('=')+1); boundaryStr = headerValue.substring(headerValue.indexOf('=')+1);
isForm = true; isForm = true;
} }
@ -178,19 +182,22 @@ bool ESP8266WebServer::_parseRequest(WiFiClient& client) {
free(plainBuf); free(plainBuf);
return false; return false;
} }
#ifdef DEBUG_ESP_HTTP_SERVER
DEBUG_OUTPUT.print("Plain: ");
DEBUG_OUTPUT.println(plainBuf);
#endif
if (contentLength > 0) { if (contentLength > 0) {
if (searchStr != "") searchStr += '&'; if(isEncoded){
if(plainBuf[0] == '{' || plainBuf[0] == '[' || strstr(plainBuf, "=") == NULL){ //url encoded form
String decoded = urlDecode(plainBuf);
size_t decodedLen = decoded.length();
memcpy(plainBuf, decoded.c_str(), decodedLen);
plainBuf[decodedLen] = 0;
} else {
//plain post json or other data //plain post json or other data
searchStr += "plain="; searchStr += "plain=";
searchStr += plainBuf;
} else {
searchStr += plainBuf;
} }
searchStr += plainBuf;
#ifdef DEBUG_ESP_HTTP_SERVER
DEBUG_OUTPUT.print("Plain: ");
DEBUG_OUTPUT.println(plainBuf);
#endif
free(plainBuf); free(plainBuf);
} }
} }
@ -303,7 +310,7 @@ void ESP8266WebServer::_parseArguments(String data) {
} }
RequestArgument& arg = _currentArgs[iarg]; RequestArgument& arg = _currentArgs[iarg];
arg.key = data.substring(pos, equal_sign_index); arg.key = data.substring(pos, equal_sign_index);
arg.value = urlDecode(data.substring(equal_sign_index + 1, next_arg_index)); arg.value = data.substring(equal_sign_index + 1, next_arg_index);
#ifdef DEBUG_ESP_HTTP_SERVER #ifdef DEBUG_ESP_HTTP_SERVER
DEBUG_OUTPUT.print("arg "); DEBUG_OUTPUT.print("arg ");
DEBUG_OUTPUT.print(iarg); DEBUG_OUTPUT.print(iarg);