orthanc: Core/HttpServer/MongooseServer.cpp comparison

comparison Core/HttpServer/MongooseServer.cpp @ 414:26290b46056b

http method faking

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Fri, 03 May 2013 21:57:32 +0200
parents	63f707278fc8
children	d558fa565c42

comparison

equal deleted inserted replaced

-:47d63c941902
+:26290b46056b
 return decoded.substr(0, semicolons);
 }
 }
+static bool ExtractMethod(Orthanc_HttpMethod& method,
+const struct mg_request_info *request,
+const HttpHandler::Arguments& headers,
+const HttpHandler::Arguments& argumentsGET)
+{
+std::string overriden;
+// Check whether some PUT/DELETE faking is done
+// 1. Faking with Google's approach
+HttpHandler::Arguments::const_iterator methodOverride =
+headers.find("x-http-method-override");
+if (methodOverride != headers.end())
+{
+overriden = methodOverride->second;
+}
+else if (!strcmp(request->request_method, "GET"))
+{
+// 2. Faking with Ruby on Rail's approach
+// GET /my/resource?_method=delete <=> DELETE /my/resource
+methodOverride = argumentsGET.find("_method");
+if (methodOverride != argumentsGET.end())
+{
+overriden = methodOverride->second;
+}
+}
+if (overriden.size() > 0)
+{
+// A faking has been done within this request
+Toolbox::ToUpperCase(overriden);
+if (overriden == "PUT")
+{
+method = Orthanc_HttpMethod_Put;
+}
+else if (overriden == "DELETE")
+{
+method = Orthanc_HttpMethod_Delete;
+}
+else
+{
+return false;
+}
+}
+// No PUT/DELETE faking was present
+if (!strcmp(request->request_method, "GET"))
+{
+method = Orthanc_HttpMethod_Get;
+}
+else if (!strcmp(request->request_method, "POST"))
+{
+method = Orthanc_HttpMethod_Post;
+}
+else if (!strcmp(request->request_method, "DELETE"))
+{
+method = Orthanc_HttpMethod_Delete;
+}
+else if (!strcmp(request->request_method, "PUT"))
+{
+method = Orthanc_HttpMethod_Put;
+}
+else
+{
+return false;
+}
+return true;
+}
 static void* Callback(enum mg_event event,
 struct mg_connection *connection,
 const struct mg_request_info *request)
 {
 if (event == MG_NEW_REQUEST)
 {
 MongooseServer* that = (MongooseServer*) (request->user_data);
 MongooseOutput output(connection);
-// Compute the method
-Orthanc_HttpMethod method;
+// Check remote calls
-if (!strcmp(request->request_method, "GET"))
-{
-method = Orthanc_HttpMethod_Get;
-}
-else if (!strcmp(request->request_method, "POST"))
-{
-method = Orthanc_HttpMethod_Post;
-}
-else if (!strcmp(request->request_method, "DELETE"))
-{
-method = Orthanc_HttpMethod_Delete;
-}
-else if (!strcmp(request->request_method, "PUT"))
-{
-method = Orthanc_HttpMethod_Put;
-}
-else
-{
-output.SendHeader(Orthanc_HttpStatus_405_MethodNotAllowed);
-return (void*) "";
-}
 if (!that->IsRemoteAccessAllowed() &&
 request->remote_ip != LOCALHOST)
 {
 SendUnauthorized(output);
 return (void*) "";
 }
-HttpHandler::Arguments arguments, headers;
+// Extract the HTTP headers
+HttpHandler::Arguments headers;
 for (int i = 0; i < request->num_headers; i++)
 {
 std::string name = request->http_headers[i].name;
 std::transform(name.begin(), name.end(), name.begin(), ::tolower);
 headers.insert(std::make_pair(name, request->http_headers[i].value));
 }
+// Extract the GET arguments
+HttpHandler::Arguments argumentsGET;
+if (!strcmp(request->request_method, "GET"))
+{
+HttpHandler::ParseGetQuery(argumentsGET, request->query_string);
+}
+// Compute the HTTP method, taking method faking into consideration
+Orthanc_HttpMethod method;
+if (!ExtractMethod(method, request, headers, argumentsGET))
+{
+output.SendHeader(Orthanc_HttpStatus_405_MethodNotAllowed);
+return (void*) "";
+}
 // Authenticate this connection
 if (that->IsAuthenticationEnabled() &&
 !Authorize(*that, headers, output))
 {
 return (void*) "";
 }
 }
-std::string postData;
+// Extract the body of the request for PUT and POST
+std::string body;
-if (method == Orthanc_HttpMethod_Get)
+if (method == Orthanc_HttpMethod_Post ||
-{
+method == Orthanc_HttpMethod_Put)
-HttpHandler::ParseGetQuery(arguments, request->query_string);
-}
-else if (method == Orthanc_HttpMethod_Post ||
-method == Orthanc_HttpMethod_Put)
 {
 HttpHandler::Arguments::const_iterator ct = headers.find("content-type");
 if (ct == headers.end())
 {
 output.SendHeader(Orthanc_HttpStatus_400_BadRequest);
 std::string contentType = ct->second;
 if (contentType.size() >= multipartLength &&
 !memcmp(contentType.c_str(), multipart, multipartLength))
 {
-status = ParseMultipartPost(postData, connection, headers, contentType, that->GetChunkStore());
+status = ParseMultipartPost(body, connection, headers, contentType, that->GetChunkStore());
 }
 else
 {
-status = ReadPostData(postData, connection, headers);
+status = ReadPostData(body, connection, headers);
 }
 switch (status)
 {
 case PostDataStatus_NoLength:
 default:
 break;
 }
 }
+// Call the proper handler for this URI
 UriComponents uri;
 Toolbox::SplitUriComponents(uri, request->uri);
 HttpHandler* handler = that->FindHandler(uri);
 if (handler)
 {
 try
 {
-handler->Handle(output, method, uri, headers, arguments, postData);
+handler->Handle(output, method, uri, headers, argumentsGET, body);
 }
 catch (OrthancException& e)
 {
 LOG(ERROR) << "MongooseServer Exception [" << e.What() << "]";
 output.SendHeader(Orthanc_HttpStatus_500_InternalServerError);

Mercurial > hg > orthanc

comparison Core/HttpServer/MongooseServer.cpp @ 414:26290b46056b