Yiri Wen / mbed-http

fix the problem http request with '\0' and fixx query string in url

Fork of mbed-http by sandbox

source/http_request_builder.h@10:ec9b75c349aa, 2017-03-03 (annotated)

Committer:
ihere1
Date:
Fri Mar 03 10:51:56 2017 +0000
Revision:
10:ec9b75c349aa
Parent:
7:2e3eedb9ca5c 
fix the problem http request with '\0' and fix query string in url

Who changed what in which revision?

UserRevisionLine numberNew contents of line
Jan Jongboom 0:910f5949759f 1 /*
Jan Jongboom 0:910f5949759f 2 * PackageLicenseDeclared: Apache-2.0
Jan Jongboom 0:910f5949759f 3 * Copyright (c) 2017 ARM Limited
Jan Jongboom 0:910f5949759f 4 *
Jan Jongboom 0:910f5949759f 5 * Licensed under the Apache License, Version 2.0 (the "License");
Jan Jongboom 0:910f5949759f 6 * you may not use this file except in compliance with the License.
Jan Jongboom 0:910f5949759f 7 * You may obtain a copy of the License at
Jan Jongboom 0:910f5949759f 8 *
Jan Jongboom 0:910f5949759f 9 * http://www.apache.org/licenses/LICENSE-2.0
Jan Jongboom 0:910f5949759f 10 *
Jan Jongboom 0:910f5949759f 11 * Unless required by applicable law or agreed to in writing, software
Jan Jongboom 0:910f5949759f 12 * distributed under the License is distributed on an "AS IS" BASIS,
Jan Jongboom 0:910f5949759f 13 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Jan Jongboom 0:910f5949759f 14 * See the License for the specific language governing permissions and
Jan Jongboom 0:910f5949759f 15 * limitations under the License.
Jan Jongboom 0:910f5949759f 16 */
Jan Jongboom 0:910f5949759f 17
Jan Jongboom 0:910f5949759f 18 #ifndef _MBED_HTTP_REQUEST_BUILDER_H_
Jan Jongboom 0:910f5949759f 19 #define _MBED_HTTP_REQUEST_BUILDER_H_
Jan Jongboom 0:910f5949759f 20
Jan Jongboom 0:910f5949759f 21 #include <string>
Jan Jongboom 0:910f5949759f 22 #include <map>
Jan Jongboom 0:910f5949759f 23 #include "http_parser.h"
Jan Jongboom 0:910f5949759f 24 #include "http_parsed_url.h"
Jan Jongboom 0:910f5949759f 25
Jan Jongboom 0:910f5949759f 26 class HttpRequestBuilder {
Jan Jongboom 0:910f5949759f 27 public:
Jan Jongboom 0:910f5949759f 28 HttpRequestBuilder(http_method a_method, ParsedUrl* a_parsed_url)
Jan Jongboom 0:910f5949759f 29 : method(a_method), parsed_url(a_parsed_url)
Jan Jongboom 0:910f5949759f 30 {
Jan Jongboom 0:910f5949759f 31 set_header("Host", string(parsed_url->host()));
Jan Jongboom 0:910f5949759f 32 }
Jan Jongboom 0:910f5949759f 33
Jan Jongboom 0:910f5949759f 34 /**
Jan Jongboom 0:910f5949759f 35 * Set a header for the request
Jan Jongboom 0:910f5949759f 36 * If the key already exists, it will be overwritten...
Jan Jongboom 0:910f5949759f 37 */
Jan Jongboom 0:910f5949759f 38 void set_header(string key, string value) {
Jan Jongboom 0:910f5949759f 39 map<string, string>::iterator it = headers.find(key);
Jan Jongboom 0:910f5949759f 40
Jan Jongboom 0:910f5949759f 41 if (it != headers.end()) {
Jan Jongboom 0:910f5949759f 42 it->second = value;
Jan Jongboom 0:910f5949759f 43 }
Jan Jongboom 0:910f5949759f 44 else {
Jan Jongboom 0:910f5949759f 45 headers.insert(headers.end(), pair<string, string>(key, value));
Jan Jongboom 0:910f5949759f 46 }
Jan Jongboom 0:910f5949759f 47 }
Jan Jongboom 0:910f5949759f 48
ihere1 10:ec9b75c349aa 49 char* build(const void* body, size_t body_size, size_t &size) {
Jan Jongboom 0:910f5949759f 50 const char* method_str = http_method_str(method);
Jan Jongboom 0:910f5949759f 51
ihere1 10:ec9b75c349aa 52 if (method == HTTP_POST || method == HTTP_PUT) {
Jan Jongboom 0:910f5949759f 53 char buffer[10];
Jan Jongboom 0:910f5949759f 54 snprintf(buffer, 10, "%d", body_size);
Jan Jongboom 0:910f5949759f 55 set_header("Content-Length", string(buffer));
Jan Jongboom 0:910f5949759f 56 }
Jan Jongboom 0:910f5949759f 57
Jan Jongboom 0:910f5949759f 58 // first line is METHOD PATH+QUERY HTTP/1.1\r\n
ihere1 10:ec9b75c349aa 59 size += strlen(method_str) + 1 + strlen(parsed_url->path()) + (strlen(parsed_url->query()) ? strlen(parsed_url->query()) + 1 : 0) + 1 + 8 + 2;
Jan Jongboom 0:910f5949759f 60
Jan Jongboom 0:910f5949759f 61 // after that we'll do the headers
Jan Jongboom 0:910f5949759f 62 typedef map<string, string>::iterator it_type;
Jan Jongboom 0:910f5949759f 63 for(it_type it = headers.begin(); it != headers.end(); it++) {
Jan Jongboom 0:910f5949759f 64 // line is KEY: VALUE\r\n
Jan Jongboom 0:910f5949759f 65 size += it->first.length() + 1 + 1 + it->second.length() + 2;
Jan Jongboom 0:910f5949759f 66 }
Jan Jongboom 0:910f5949759f 67
Jan Jongboom 0:910f5949759f 68 // then the body, first an extra newline
Jan Jongboom 0:910f5949759f 69 size += 2;
Jan Jongboom 0:910f5949759f 70
Jan Jongboom 0:910f5949759f 71 // body
Jan Jongboom 0:910f5949759f 72 size += body_size;
Jan Jongboom 0:910f5949759f 73
Jan Jongboom 0:910f5949759f 74 // extra newline
Jan Jongboom 0:910f5949759f 75 size += 2;
Jan Jongboom 0:910f5949759f 76
Jan Jongboom 0:910f5949759f 77 // Now let's print it
Jan Jongboom 0:910f5949759f 78 char* req = (char*)calloc(size + 1, 1);
Jan Jongboom 0:910f5949759f 79 char* originalReq = req;
Jan Jongboom 0:910f5949759f 80
ihere1 10:ec9b75c349aa 81 if (strlen(parsed_url->query())) {
ihere1 10:ec9b75c349aa 82 sprintf(req, "%s %s?%s HTTP/1.1\r\n", method_str, parsed_url->path(), parsed_url->query());
ihere1 10:ec9b75c349aa 83 } else {
ihere1 10:ec9b75c349aa 84 sprintf(req, "%s %s%s HTTP/1.1\r\n", method_str, parsed_url->path(), parsed_url->query());
Jan Jongboom 7:2e3eedb9ca5c 85 }
ihere1 10:ec9b75c349aa 86 req += strlen(method_str) + 1 + strlen(parsed_url->path()) + (strlen(parsed_url->query()) ? strlen(parsed_url->query()) + 1 : 0) + 1 + 8 + 2;
Jan Jongboom 0:910f5949759f 87
Jan Jongboom 0:910f5949759f 88 typedef map<string, string>::iterator it_type;
Jan Jongboom 0:910f5949759f 89 for(it_type it = headers.begin(); it != headers.end(); it++) {
Jan Jongboom 0:910f5949759f 90 // line is KEY: VALUE\r\n
Jan Jongboom 0:910f5949759f 91 sprintf(req, "%s: %s\r\n", it->first.c_str(), it->second.c_str());
Jan Jongboom 0:910f5949759f 92 req += it->first.length() + 1 + 1 + it->second.length() + 2;
Jan Jongboom 0:910f5949759f 93 }
Jan Jongboom 0:910f5949759f 94
Jan Jongboom 0:910f5949759f 95 sprintf(req, "\r\n");
Jan Jongboom 0:910f5949759f 96 req += 2;
Jan Jongboom 0:910f5949759f 97
Jan Jongboom 0:910f5949759f 98 if (body_size > 0) {
ihere1 10:ec9b75c349aa 99 memcpy(req, body, body_size);
Jan Jongboom 0:910f5949759f 100 }
Jan Jongboom 0:910f5949759f 101 req += body_size;
Jan Jongboom 0:910f5949759f 102
Jan Jongboom 0:910f5949759f 103 sprintf(req, "\r\n");
Jan Jongboom 0:910f5949759f 104 req += 2;
Jan Jongboom 0:910f5949759f 105
Jan Jongboom 0:910f5949759f 106 // Uncomment to debug...
Jan Jongboom 0:910f5949759f 107 // printf("----- BEGIN REQUEST -----\n");
Jan Jongboom 0:910f5949759f 108 // printf("%s", originalReq);
Jan Jongboom 0:910f5949759f 109 // printf("----- END REQUEST -----\n");
Jan Jongboom 0:910f5949759f 110
Jan Jongboom 0:910f5949759f 111 return originalReq;
Jan Jongboom 0:910f5949759f 112 }
Jan Jongboom 0:910f5949759f 113
Jan Jongboom 0:910f5949759f 114 private:
Jan Jongboom 0:910f5949759f 115 http_method method;
Jan Jongboom 0:910f5949759f 116 ParsedUrl* parsed_url;
Jan Jongboom 0:910f5949759f 117 map<string, string> headers;
Jan Jongboom 0:910f5949759f 118 };
Jan Jongboom 0:910f5949759f 119
Jan Jongboom 0:910f5949759f 120 #endif // _MBED_HTTP_REQUEST_BUILDER_H_