1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG/MEDIUM: h1/h2/h3: reject forbidden chars in the Host header field

Browse Source 
In continuation with 9a05c1f574 ("BUG/MEDIUM: h2/h3: reject some
forbidden chars in :authority before reassembly") and the discussion
in issue #2941, @DemiMarie rightfully suggested that Host should also
be sanitized, because it is sometimes used in concatenation, such as
this:

    http-request set-url https://%[req.hdr(host)]%[pathq]

which was proposed as a workaround for h2 upstream servers that require
:authority here:

    https://www.mail-archive.com/haproxy@formilux.org/msg43261.html

The current patch then adds the same check for forbidden chars in the
Host header, using the same function as for the patch above, since in
both cases we validate the host:port part of the authority. This way
we won't reconstruct ambiguous URIs by concatenating Host and path.

Just like the patch above, this can be backported afer a period of
observation.
This commit is contained in:
Willy Tarreau 2025-05-16 14:58:52 +02:00
parent b84762b3e0
commit df00164fdd
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/h1.c
View File

@ -986,8 +986,14 @@ int h1_headers_to_hdr_list(char *start, const char *stop,
h1_parse_upgrade_header(h1m, v);
}
else if (!(h1m->flags & H1_MF_RESP) && isteqi(n, ist("host"))) {
if (host_idx == -1)
if (host_idx == -1) {
host_idx = hdr_count;
if (http_authority_has_forbidden_char(v)) {
state = H1_MSG_HDR_L2_LWS;
ptr = v.ptr; /* Set ptr on the error */
goto http_msg_invalid;
}
}
else {
if (!isteqi(v, hdr[host_idx].v)) {
state = H1_MSG_HDR_L2_LWS;

3
src/h2.c
View File

@ -411,10 +411,13 @@ int h2_make_htx_request(struct http_hdr *list, struct htx *htx, unsigned int *ms
}
if (isteq(list[idx].n, ist("host"))) {
/* skip duplicates */
if (fields & H2_PHDR_FND_HOST)
continue;
fields |= H2_PHDR_FND_HOST;
if (http_authority_has_forbidden_char(list[idx].v))
goto fail;
}
if (isteq(list[idx].n, ist("content-length"))) {

3
src/h3.c
View File

@ -863,7 +863,8 @@ static ssize_t h3_headers_to_htx(struct qcs *qcs, const struct buffer *buf,
if (isteq(list[hdr_idx].n, ist("host"))) {
struct ist prev_auth = authority;
if (h3_set_authority(qcs, &authority, list[hdr_idx].v)) {
if (http_authority_has_forbidden_char(list[hdr_idx].v) ||
h3_set_authority(qcs, &authority, list[hdr_idx].v)) {
h3s->err = H3_ERR_MESSAGE_ERROR;
qcc_report_glitch(h3c->qcc, 1);
len = -1;