URL encode HTTP request path (#106)

* URL encode HTTP request path

* better hexify

* add URL encoding test

Author: ekoby

src/http_req.c

@@ -97,14 +97,35 @@ void free_hdr_list(um_header_list *l) {
     }
 }
 
+#define HEXIFY(c) (((c) < 10) ? '0' + (c) : 'A' + (c) - 10)
+
+static size_t write_url_encoded(char *buf, const char *url) {
+    static char unsafe[] = "\"<>%{}|\\^`";
+    char *p = buf;
+    for(; *url != 0; url++) {
+        if (*url <= ' ' || strchr(unsafe, *url) != NULL) {
+            *p++ = '%';
+            *p++ = HEXIFY((*url >> 4) & 0xf);
+            *p++ = HEXIFY(*url & 0xf);
+        } else {
+            *p++ = *url;
+        }
+    }
+    return p - buf;
+}
+
 size_t http_req_write(um_http_req_t *req, char *buf, size_t maxlen) {
     const char *pfx = "";
     if (req->client && req->client->prefix) {
         pfx = req->client->prefix;
     }
-    size_t len = snprintf(buf, maxlen,
-                          "%s %s%s HTTP/1.1\r\n",
-                          req->method, pfx, req->path);
+
+    size_t len = 0;
+    len += snprintf(buf, maxlen, "%s ", req->method);
+    len += write_url_encoded(buf + len, pfx);
+    len += write_url_encoded(buf + len, req->path);
+    len += snprintf(buf + len, maxlen - len, " HTTP/1.1\r\n");
+
 
     if (strcmp(req->method, "POST") == 0 ||
         strcmp(req->method, "PUT") == 0 ||

tests/http_tests.cpp

@@ -822,6 +822,28 @@ TEST_CASE("HTTP deflate", "[http]") {
     CHECK(resp.resp_body_end_called == 1);
 
 
+    std::cout << resp.req_body << std::endl;
+
+    um_http_close(&clt, nullptr);
+}
+
+TEST_CASE("URL encode", "[http]") {
+    UvLoopTest test;
+
+    um_http_t clt;
+    resp_capture resp(resp_body_cb);
+
+    um_http_init(test.loop, &clt, "https://www.google.com/search");
+    um_http_req_t *req = um_http_req(&clt, "GET", R"(?query=this is a <test>!)", resp_capture_cb, &resp);
+
+    test.run();
+
+    CHECK(resp.code == HTTP_STATUS_OK);
+    CHECK_THAT(resp.http_version, Equals("1.1"));
+    CHECK_THAT(resp.status, Equals("OK"));
+    CHECK(resp.resp_body_end_called == 1);
+    CHECK_THAT(resp.body, Contains("this is a test", Catch::CaseSensitive::No));
+
     std::cout << resp.req_body << std::endl;
 
     um_http_close(&clt, nullptr);