From 469914c6c9889b710344e330da660bd2e0a5ae63 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Sun, 4 Aug 2019 21:17:22 -0400 Subject: [PATCH] SP-150 file upload decoder --- .../sparkd/http/MultipartFormDecoder.cpp | 5 ++ src/server/sparkd/http/MultipartFormDecoder.h | 9 ++++ src/server/sparkd/http/WebServer.cpp | 51 +++++++++++++++++-- 3 files changed, 60 insertions(+), 5 deletions(-) create mode 100644 src/server/sparkd/http/MultipartFormDecoder.cpp create mode 100644 src/server/sparkd/http/MultipartFormDecoder.h diff --git a/src/server/sparkd/http/MultipartFormDecoder.cpp b/src/server/sparkd/http/MultipartFormDecoder.cpp new file mode 100644 index 000000000..199c59efd --- /dev/null +++ b/src/server/sparkd/http/MultipartFormDecoder.cpp @@ -0,0 +1,5 @@ +#include "MultipartFormDecoder.h" +namespace bts { +namespace http { + +}} //namespace diff --git a/src/server/sparkd/http/MultipartFormDecoder.h b/src/server/sparkd/http/MultipartFormDecoder.h new file mode 100644 index 000000000..8379a7310 --- /dev/null +++ b/src/server/sparkd/http/MultipartFormDecoder.h @@ -0,0 +1,9 @@ +#pragma once + +namespace bts { +namespace http { + +class MultipartFormDecoder { +}; + +}} //namespace diff --git a/src/server/sparkd/http/WebServer.cpp b/src/server/sparkd/http/WebServer.cpp index 544e3f238..d28ea4eae 100644 --- a/src/server/sparkd/http/WebServer.cpp +++ b/src/server/sparkd/http/WebServer.cpp @@ -13,6 +13,7 @@ #include #include +#include #include #include @@ -174,14 +175,54 @@ namespace http { _mtimer->observe((utils::TimeStamp::now() - start).microseconds() / 1000.0); } + void bad_request(connection_ptr& con, const std::string& message) { + con->set_body(message); + con->set_status(websocketpp::http::status_code::bad_request); + } + + std::vector split_string(std::string body, std::string& deliniator) { + std::vector result; + size_t i = body.find(deliniator); + while(i != std::string::npos) { + result.push_back(body.substr(0,i)); + body = body.substr(i + deliniator.size()); + i = body.find(deliniator); + } + return result; + } + void handle_file_upload(connection_ptr& con) { - // NOTE: to work this requires enctype="multipart/form-data" - // otherwise all these strings turn out empty auto content_type = con->get_request_header("Content-Type"); - auto content_length = con->get_request_header("Content-Length"); - auto request = con->get_request().get_body(); + // Check that we have multipart/form-data + // parse out the boundary + // get the body + // split the body up by the boundary + // strip headers from the content + // parse out filename? (optional) + // send body on its way + + // multipart/form-data; boundary=---------------------------20830301425829 + const std::string mpfd = "multipart/form-data; boundary="; + auto pos = content_type.find(mpfd); + if (pos == std::string::npos) { + return bad_request(con, "Invalid form encoding. Please use multipart/form-data"); + } + auto boundary = content_type.substr(pos + mpfd.size()); + std::cout << boundary; + auto body = con->get_request_body(); - std::cout << body << std::endl; + + std::ofstream output; + output.open("/tmp/uplog"); + + auto parts = split_string(body, boundary); + size_t count = 0; + for(const auto& t : parts) { + output << "Part " << count << std::endl; + ++count; + output << t << std::endl; + output << "========================" << std::endl; + } con->set_body("got it"); con->set_status(websocketpp::http::status_code::ok);