mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

src/nhttpd/yhttpd_core/yrequest.cpp: fix automount string decode

Browse Source
This commit is contained in:
satbaby
2012-12-22 16:42:00 +01:00
parent 2d1beb8402
commit 289e927e04
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/nhttpd/yhttpd_core/yrequest.cpp
View File

@@ -75,9 +75,8 @@ bool CWebserverRequest::HandleRequest(void) {
return false; return false;
if (Connection->Method == M_GET || Connection->Method == M_HEAD) { if (Connection->Method == M_GET || Connection->Method == M_HEAD) {
std::string tmp_line;
//read header (speed up: read rest of request in blockmode) //read header (speed up: read rest of request in blockmode)
tmp_line = Connection->sock->ReceiveBlock(); std::string tmp_line = Connection->sock->ReceiveBlock();
if (!Connection->sock->isValid) { if (!Connection->sock->isValid) {
Connection->Response.SendError(HTTP_INTERNAL_SERVER_ERROR); Connection->Response.SendError(HTTP_INTERNAL_SERVER_ERROR);
return false; return false;
@@ -116,7 +115,7 @@ bool CWebserverRequest::HandleRequest(void) {
// Split URL into path, filename, fileext .. UrlData[] // Split URL into path, filename, fileext .. UrlData[]
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
bool CWebserverRequest::ParseStartLine(std::string start_line) { bool CWebserverRequest::ParseStartLine(std::string start_line) {
std::string method, url, tmp; std::string method = "", url = "", tmp = "";
log_level_printf(8, "<ParseStartLine>: line: %s\n", start_line.c_str()); log_level_printf(8, "<ParseStartLine>: line: %s\n", start_line.c_str());
if (ySplitString(start_line, " ", method, tmp)) { if (ySplitString(start_line, " ", method, tmp)) {
@@ -155,7 +154,7 @@ bool CWebserverRequest::ParseStartLine(std::string start_line) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
bool CWebserverRequest::ParseParams(std::string param_string) { bool CWebserverRequest::ParseParams(std::string param_string) {
bool ende = false; bool ende = false;
std::string param, name = "", value, number; std::string param, name = "", value = "", number = "";
while (!ende) { while (!ende) {
if (!ySplitStringExact(param_string, "&", param, param_string)) if (!ySplitStringExact(param_string, "&", param, param_string))
@@ -171,6 +170,9 @@ bool CWebserverRequest::ParseParams(std::string param_string) {
} }
number = string_printf("%d", ParameterList.size() + 1); number = string_printf("%d", ParameterList.size() + 1);
log_level_printf(7, "ParseParams: name: %s value: %s\n", name.c_str(), value.c_str()); log_level_printf(7, "ParseParams: name: %s value: %s\n", name.c_str(), value.c_str());
if(value.empty()){
name = trim(decodeString(name));
}
ParameterList[number] = name; ParameterList[number] = name;
} }
return true; return true;
@@ -188,8 +190,9 @@ bool CWebserverRequest::ParseParams(std::string param_string) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
bool CWebserverRequest::ParseHeader(std::string header) { bool CWebserverRequest::ParseHeader(std::string header) {
bool ende = false; bool ende = false;
std::string sheader, name, value; std::string sheader = "", name = "", value = "";
HeaderList.clear(); if(!HeaderList.empty())
HeaderList.clear();
while (!ende) { while (!ende) {
if (!ySplitStringExact(header, "\r\n", sheader, header)) if (!ySplitStringExact(header, "\r\n", sheader, header))
@@ -209,7 +212,8 @@ bool CWebserverRequest::ParseHeader(std::string header) {
// query data is splitted and stored in ParameterList // query data is splitted and stored in ParameterList
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void CWebserverRequest::analyzeURL(std::string url) { void CWebserverRequest::analyzeURL(std::string url) {
ParameterList.clear(); if(!ParameterList.empty())
ParameterList.clear();
// URI decode // URI decode
//url = decodeString(url); //url = decodeString(url);
url = trim(url, "\r\n"); // non-HTTP-Standard: allow \r or \n in URL. Delete it. url = trim(url, "\r\n"); // non-HTTP-Standard: allow \r or \n in URL. Delete it.
@@ -240,7 +244,7 @@ void CWebserverRequest::analyzeURL(std::string url) {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
bool CWebserverRequest::HandlePost() { bool CWebserverRequest::HandlePost() {
//read header: line by line //read header: line by line
std::string raw_header, tmp_line; std::string raw_header = "", tmp_line = "";
do { do {
tmp_line = Connection->sock->ReceiveLine(); tmp_line = Connection->sock->ReceiveLine();
if (tmp_line == "") // Socket empty if (tmp_line == "") // Socket empty
@@ -270,7 +274,6 @@ bool CWebserverRequest::HandlePost() {
{ {
#ifdef Y_CONFIG_FEATURE_UPLOAD #ifdef Y_CONFIG_FEATURE_UPLOAD
std::string boundary = "--" + HeaderList["Content-Type"].substr(t.length(),HeaderList["Content-Type"].length() - t.length()); std::string boundary = "--" + HeaderList["Content-Type"].substr(t.length(),HeaderList["Content-Type"].length() - t.length());
std::string post_header;
do do
{ {
content_len = HandlePostBoundary(boundary, content_len); content_len = HandlePostBoundary(boundary, content_len);
@@ -285,9 +288,9 @@ bool CWebserverRequest::HandlePost() {
{ {
// handle normal form POST // handle normal form POST
log_level_printf(6, "Handle POST application/x-www-form-urlencoded\n"); log_level_printf(6, "Handle POST application/x-www-form-urlencoded\n");
std::string post_header;
// get message-body // get message-body
post_header = Connection->sock->ReceiveBlock(); std::string post_header = Connection->sock->ReceiveBlock();
while (post_header.length() < content_len) { while (post_header.length() < content_len) {
post_header += Connection->sock->ReceiveBlock(); post_header += Connection->sock->ReceiveBlock();
/* aprintf("POST form less data then expected\n"); /* aprintf("POST form less data then expected\n");
@@ -384,10 +387,9 @@ bool CWebserverRequest::HandlePost() {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
unsigned int CWebserverRequest::HandlePostBoundary(std::string boundary, unsigned int CWebserverRequest::HandlePostBoundary(std::string boundary,
unsigned int content_len) { unsigned int content_len) {
std::string tmp_line;
// read boundary // read boundary
tmp_line = Connection->sock->ReceiveLine(); std::string tmp_line = Connection->sock->ReceiveLine();
content_len -= tmp_line.length(); content_len -= tmp_line.length();
log_level_printf(2, "<POST Boundary> Start\n"); log_level_printf(2, "<POST Boundary> Start\n");
@@ -412,7 +414,7 @@ unsigned int CWebserverRequest::HandlePostBoundary(std::string boundary,
log_level_printf(2,"<POST Boundary> disposition !!this is a file!! found. line:(%s)\n", tmp_line.c_str()); log_level_printf(2,"<POST Boundary> disposition !!this is a file!! found. line:(%s)\n", tmp_line.c_str());
// get para from 'content-disposition: form-data; name="pics"; filename="file1.txt"' // get para from 'content-disposition: form-data; name="pics"; filename="file1.txt"'
// set to ParameterList["<name>"]="<filename>" // set to ParameterList["<name>"]="<filename>"
std::string left, right, var_name, var_value; std::string left = "", right = "", var_name = "", var_value = "";
if(!ySplitStringExact(tmp_line, "name=\"", left, right)) if(!ySplitStringExact(tmp_line, "name=\"", left, right))
{ {
log_level_printf(7,"<POST Boundary> no var_name START found. line:(%s)\n", tmp_line.c_str()); log_level_printf(7,"<POST Boundary> no var_name START found. line:(%s)\n", tmp_line.c_str());
@@ -461,8 +463,7 @@ unsigned int CWebserverRequest::HandlePostBoundary(std::string boundary,
} }
log_level_printf(7,"<POST Boundary> read file Start\n"); log_level_printf(7,"<POST Boundary> read file Start\n");
std::string upload_filename; std::string upload_filename = UPLOAD_TMP_FILE;
upload_filename = UPLOAD_TMP_FILE;
// Hook for Filename naming // Hook for Filename naming
Connection->HookHandler.Hooks_UploadSetFilename(upload_filename); Connection->HookHandler.Hooks_UploadSetFilename(upload_filename);
// Set upload filename to ParameterList["<name>_upload_filename"]="<upload_filename>" // Set upload filename to ParameterList["<name>_upload_filename"]="<upload_filename>"
@@ -543,7 +544,7 @@ unsigned int CWebserverRequest::HandlePostBoundary(std::string boundary,
// this part is a POST variable/parameter // this part is a POST variable/parameter
{ {
// get var_name from 'content-disposition: form-data; name="var_name"' // get var_name from 'content-disposition: form-data; name="var_name"'
std::string left, right, var_name, var_value; std::string left = "", right = "", var_name = "", var_value = "";
if (!ySplitStringExact(tmp_line, "name=\"", left, right)) { if (!ySplitStringExact(tmp_line, "name=\"", left, right)) {
log_level_printf(7, "<POST Boundary> no var_name START found. line:(%s)\n", tmp_line.c_str()); log_level_printf(7, "<POST Boundary> no var_name START found. line:(%s)\n", tmp_line.c_str());
return 0; return 0;