{
struct http_request *req = &cl->request;
char *type, *path, *version;
+ int h_method, h_version;
type = strtok(data, " ");
path = strtok(NULL, " ");
if (!type || !path || !version)
return CLIENT_STATE_DONE;
+ memset(&cl->request, 0, sizeof(cl->request));
req->url = path;
- req->method = find_idx(http_methods, ARRAY_SIZE(http_methods), type);
- if (req->method < 0)
- return CLIENT_STATE_DONE;
- req->version = find_idx(http_versions, ARRAY_SIZE(http_versions), version);
- if (cl->request.version < 0)
+ h_method = find_idx(http_methods, ARRAY_SIZE(http_methods), type);
+ h_version = find_idx(http_versions, ARRAY_SIZE(http_versions), version);
+ if (h_method < 0 || h_version < 0) {
+ req->version = UH_HTTP_VER_1_0;
return CLIENT_STATE_DONE;
+ }
+
+ req->method = h_method;
+ req->version = h_version;
return CLIENT_STATE_HEADER;
}
return true;
}
+static bool rfc1918_filter_check(struct client *cl)
+{
+ if (!conf.rfc1918_filter)
+ return true;
+
+ if (!uh_addr_rfc1918(&cl->peer_addr) || uh_addr_rfc1918(&cl->srv_addr))
+ return true;
+
+ uh_client_error(cl, 403, "Forbidden",
+ "Rejected request from RFC1918 IP "
+ "to public server address");
+ return false;
+}
+
static void client_header_complete(struct client *cl)
{
+ if (!rfc1918_filter_check(cl))
+ return;
+
+ if (cl->request.expect_cont)
+ ustream_printf(cl->us, "HTTP/1.1 100 Continue\r\n\r\n");
+
uh_handle_request(cl);
}
if (isupper(*name))
*name = tolower(*name);
+ if (!strcasecmp(data, "Expect")) {
+ if (!strcasecmp(val, "100-continue"))
+ cl->request.expect_cont = true;
+ else {
+ uh_header_error(cl, 412, "Precondition Failed");
+ return;
+ }
+ }
+
+
blobmsg_add_string(&cl->hdr, data, val);
cl->state = CLIENT_STATE_HEADER;