summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-10-13 20:29:57 +0200
committermadmaxoft <github@xoft.cz>2013-10-13 20:29:57 +0200
commitefb7d4fd3e9d20facf6a5b3d41bee8ca3d894bbc (patch)
tree9a39bde0b280721461c7597631182a08d7921c86
parentMerge branch 'metadata' of git://github.com/tigerw/MCServer into tigerw-metadata. (diff)
downloadcuberite-efb7d4fd3e9d20facf6a5b3d41bee8ca3d894bbc.tar
cuberite-efb7d4fd3e9d20facf6a5b3d41bee8ca3d894bbc.tar.gz
cuberite-efb7d4fd3e9d20facf6a5b3d41bee8ca3d894bbc.tar.bz2
cuberite-efb7d4fd3e9d20facf6a5b3d41bee8ca3d894bbc.tar.lz
cuberite-efb7d4fd3e9d20facf6a5b3d41bee8ca3d894bbc.tar.xz
cuberite-efb7d4fd3e9d20facf6a5b3d41bee8ca3d894bbc.tar.zst
cuberite-efb7d4fd3e9d20facf6a5b3d41bee8ca3d894bbc.zip
-rw-r--r--source/HTTPServer/HTTPFormParser.cpp12
-rw-r--r--source/HTTPServer/HTTPFormParser.h17
-rw-r--r--source/WebAdmin.cpp13
-rw-r--r--source/WebAdmin.h6
4 files changed, 41 insertions, 7 deletions
diff --git a/source/HTTPServer/HTTPFormParser.cpp b/source/HTTPServer/HTTPFormParser.cpp
index 7db7b4e6d..596db424e 100644
--- a/source/HTTPServer/HTTPFormParser.cpp
+++ b/source/HTTPServer/HTTPFormParser.cpp
@@ -52,6 +52,18 @@ cHTTPFormParser::cHTTPFormParser(cHTTPRequest & a_Request, cCallbacks & a_Callba
+cHTTPFormParser::cHTTPFormParser(eKind a_Kind, const char * a_Data, int a_Size, cCallbacks & a_Callbacks) :
+ m_Callbacks(a_Callbacks),
+ m_Kind(a_Kind),
+ m_IsValid(true)
+{
+ Parse(a_Data, a_Size);
+}
+
+
+
+
+
void cHTTPFormParser::Parse(const char * a_Data, int a_Size)
{
if (!m_IsValid)
diff --git a/source/HTTPServer/HTTPFormParser.h b/source/HTTPServer/HTTPFormParser.h
index b92ef9d3c..a554ca5a4 100644
--- a/source/HTTPServer/HTTPFormParser.h
+++ b/source/HTTPServer/HTTPFormParser.h
@@ -26,6 +26,13 @@ class cHTTPFormParser :
public cMultipartParser::cCallbacks
{
public:
+ enum eKind
+ {
+ fpkURL, ///< The form has been transmitted as parameters to a GET request
+ fpkFormUrlEncoded, ///< The form has been POSTed or PUT, with Content-Type of "application/x-www-form-urlencoded"
+ fpkMultipart, ///< The form has been POSTed or PUT, with Content-Type of "multipart/form-data"
+ } ;
+
class cCallbacks
{
public:
@@ -40,8 +47,12 @@ public:
} ;
+ /// Creates a parser that is tied to a request and notifies of various events using a callback mechanism
cHTTPFormParser(cHTTPRequest & a_Request, cCallbacks & a_Callbacks);
+ /// Creates a parser with the specified content type that reads data from a string
+ cHTTPFormParser(eKind a_Kind, const char * a_Data, int a_Size, cCallbacks & a_Callbacks);
+
/// Adds more data into the parser, as the request body is received
void Parse(const char * a_Data, int a_Size);
@@ -54,12 +65,6 @@ public:
static bool HasFormData(const cHTTPRequest & a_Request);
protected:
- enum eKind
- {
- fpkURL, ///< The form has been transmitted as parameters to a GET request
- fpkFormUrlEncoded, ///< The form has been POSTed or PUT, with Content-Type of "application/x-www-form-urlencoded"
- fpkMultipart, ///< The form has been POSTed or PUT, with Content-Type of "multipart/form-data"
- };
/// The callbacks to call for incoming file data
cCallbacks & m_Callbacks;
diff --git a/source/WebAdmin.cpp b/source/WebAdmin.cpp
index 08817139a..daec2f925 100644
--- a/source/WebAdmin.cpp
+++ b/source/WebAdmin.cpp
@@ -185,8 +185,19 @@ void cWebAdmin::HandleWebadminRequest(cHTTPConnection & a_Connection, cHTTPReque
HTTPfd.Name = itr->first;
TemplateRequest.Request.FormData[itr->first] = HTTPfd;
TemplateRequest.Request.PostParams[itr->first] = itr->second;
- TemplateRequest.Request.Params[itr->first] = itr->second;
} // for itr - Data->m_Form[]
+
+ // Parse the URL into individual params:
+ size_t idxQM = a_Request.GetURL().find('?');
+ if (idxQM != AString::npos)
+ {
+ cHTTPFormParser URLParams(cHTTPFormParser::fpkURL, a_Request.GetURL().c_str() + idxQM + 1, a_Request.GetURL().length() - idxQM - 1, *Data);
+ URLParams.Finish();
+ for (cHTTPFormParser::const_iterator itr = URLParams.begin(), end = URLParams.end(); itr != end; ++itr)
+ {
+ TemplateRequest.Request.Params[itr->first] = itr->second;
+ } // for itr - URLParams[]
+ }
}
// Try to get the template from the Lua template script
diff --git a/source/WebAdmin.h b/source/WebAdmin.h
index 16b5dd4dc..72c77ddfb 100644
--- a/source/WebAdmin.h
+++ b/source/WebAdmin.h
@@ -56,8 +56,14 @@ struct HTTPRequest
AString Path;
AString Username;
// tolua_end
+
+ /// Parameters given in the URL, after the questionmark
StringStringMap Params; // >> EXPORTED IN MANUALBINDINGS <<
+
+ /// Parameters posted as a part of a form - either in the URL (GET method) or in the body (POST method)
StringStringMap PostParams; // >> EXPORTED IN MANUALBINDINGS <<
+
+ /// Same as PostParams
FormDataMap FormData; // >> EXPORTED IN MANUALBINDINGS <<
} ; // tolua_export