walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix authority for --get-assets if IP adress is used in conjunction with user-defined :authority header

This commit is contained in:
Benedikt Christoph Wolters 2017-01-14 11:33:39 +01:00 committed by Tatsuhiro Tsujikawa
parent 91af4ed70d
commit 8f513fceca
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/nghttp.cc
View File

@ -1596,19 +1596,32 @@ void update_html_parser(HttpClient *client, Request *req, const uint8_t *data,
auto res_type = p.second; auto res_type = p.second;
http_parser_url u{}; http_parser_url u{};
if (http_parser_parse_url(uri.c_str(), uri.size(), 0, &u) == 0 && if (http_parser_parse_url(uri.c_str(), uri.size(), 0, &u) == 0) {
util::fieldeq(uri.c_str(), u, req->uri.c_str(), req->u, UF_SCHEMA) &&
util::fieldeq(uri.c_str(), u, req->uri.c_str(), req->u, UF_HOST) && const char *host_string = nullptr;
auto found =
std::find_if(std::begin(req->req_nva), std::end(req->req_nva),
[](const Header &nv) {
return ":authority" == nv.name || "host" == nv.name;
});
if (found != std::end(config.headers)) {
host_string = (*found).value.c_str();
}
if (util::fieldeq(uri.c_str(), u, req->uri.c_str(), req->u, UF_SCHEMA) &&
(util::fieldeq(uri.c_str(), u, req->uri.c_str(), req->u, UF_HOST) ||
(host_string != nullptr &&
util::fieldeq(uri.c_str(), u, UF_HOST, host_string))) &&
util::porteq(uri.c_str(), u, req->uri.c_str(), req->u)) { util::porteq(uri.c_str(), u, req->uri.c_str(), req->u)) {
// No POST data for assets // No POST data for assets
auto pri_spec = resolve_dep(res_type); auto pri_spec = resolve_dep(res_type);
if (client->add_request(uri, nullptr, 0, pri_spec, req->level + 1)) { if (client->add_request(uri, nullptr, 0, pri_spec, req->level + 1)) {
submit_request(client, config.headers, client->reqvec.back().get()); submit_request(client, config.headers, client->reqvec.back().get());
} }
} }
} }
}
req->html_parser->clear_links(); req->html_parser->clear_links();
} }
} // namespace } // namespace