From 5ed8353dcfbd603b7e5f68d51826a14320d1e08a Mon Sep 17 00:00:00 2001 From: Christopher Faulet Date: Mon, 15 Jul 2019 11:26:30 +0200 Subject: [PATCH] CLEANUP: h2: Remove functions converting h2 requests to raw HTTP/1.1 ones Because the h2 multiplexer only uses the HTX mode, following H2 functions were removed : * h2_prepare_h1_reqline * h2_make_h1_request() * h2_make_h1_trailers() --- include/common/h2.h | 2 - src/h2.c | 364 -------------------------------------------- 2 files changed, 366 deletions(-) diff --git a/include/common/h2.h b/include/common/h2.h index 9b9684d2d..1e0cf5ee8 100644 --- a/include/common/h2.h +++ b/include/common/h2.h @@ -201,8 +201,6 @@ extern struct h2_frame_definition h2_frame_definition[H2_FT_ENTRIES]; /* various protocol processing functions */ -int h2_make_h1_request(struct http_hdr *list, char *out, int osize, unsigned int *msgf, unsigned long long *body_len); -int h2_make_h1_trailers(struct http_hdr *list, char *out, int osize); int h2_parse_cont_len_header(unsigned int *msgf, struct ist *value, unsigned long long *body_len); int h2_make_htx_request(struct http_hdr *list, struct htx *htx, unsigned int *msgf, unsigned long long *body_len); int h2_make_htx_response(struct http_hdr *list, struct htx *htx, unsigned int *msgf, unsigned long long *body_len); diff --git a/src/h2.c b/src/h2.c index 990d602b1..c41da8e5e 100644 --- a/src/h2.c +++ b/src/h2.c @@ -44,370 +44,6 @@ struct h2_frame_definition h2_frame_definition[H2_FT_ENTRIES] = { [H2_FT_CONTINUATION ] = { .dir = 3, .min_id = 1, .max_id = H2_MAX_STREAM_ID, .min_len = 0, .max_len = H2_MAX_FRAME_LEN, }, }; -/* Prepare the request line into <*ptr> (stopping at ) from pseudo headers - * stored in . indicates what was found so far. This should be - * called once at the detection of the first general header field or at the end - * of the request if no general header field was found yet. Returns 0 on success - * or a negative error code on failure. Upon success, is updated with a - * few H2_MSGF_* flags indicating what was found while parsing. - */ -static int h2_prepare_h1_reqline(uint32_t fields, struct ist *phdr, char **ptr, char *end, unsigned int *msgf) -{ - char *out = *ptr; - int uri_idx = H2_PHDR_IDX_PATH; - - if ((fields & H2_PHDR_FND_METH) && isteq(phdr[H2_PHDR_IDX_METH], ist("CONNECT"))) { - /* RFC 7540 #8.2.6 regarding CONNECT: ":scheme" and ":path" - * MUST be omitted ; ":authority" contains the host and port - * to connect to. - */ - if (fields & H2_PHDR_FND_SCHM) { - /* scheme not allowed */ - goto fail; - } - else if (fields & H2_PHDR_FND_PATH) { - /* path not allowed */ - goto fail; - } - else if (!(fields & H2_PHDR_FND_AUTH)) { - /* missing authority */ - goto fail; - } - // otherwise OK ; let's use the authority instead of the URI - uri_idx = H2_PHDR_IDX_AUTH; - *msgf |= H2_MSGF_BODY_TUNNEL; - } - else if ((fields & (H2_PHDR_FND_METH|H2_PHDR_FND_SCHM|H2_PHDR_FND_PATH)) != - (H2_PHDR_FND_METH|H2_PHDR_FND_SCHM|H2_PHDR_FND_PATH)) { - /* RFC 7540 #8.1.2.3 : all requests MUST include exactly one - * valid value for the ":method", ":scheme" and ":path" phdr - * unless it is a CONNECT request. - */ - if (!(fields & H2_PHDR_FND_METH)) { - /* missing method */ - goto fail; - } - else if (!(fields & H2_PHDR_FND_SCHM)) { - /* missing scheme */ - goto fail; - } - else { - /* missing path */ - goto fail; - } - } - - /* 7540#8.1.2.3: :path must not be empty */ - if (!phdr[uri_idx].len) - goto fail; - - if (out + phdr[H2_PHDR_IDX_METH].len + 1 + phdr[uri_idx].len + 11 > end) { - /* too large */ - goto fail; - } - - memcpy(out, phdr[H2_PHDR_IDX_METH].ptr, phdr[H2_PHDR_IDX_METH].len); - out += phdr[H2_PHDR_IDX_METH].len; - *(out++) = ' '; - - memcpy(out, phdr[uri_idx].ptr, phdr[uri_idx].len); - out += phdr[uri_idx].len; - memcpy(out, " HTTP/1.1\r\n", 11); - out += 11; - - *ptr = out; - return 0; - fail: - return -1; -} - -/* Takes an H2 request present in the headers list terminated by a name - * being and emits the equivalent HTTP/1.1 request according to the - * rules documented in RFC7540 #8.1.2. The output contents are emitted in - * for a max of bytes, and the amount of bytes emitted is returned. In - * case of error, a negative error code is returned. - * - * Upon success, is filled with a few H2_MSGF_* flags indicating what - * was found while parsing. The caller must set it to zero in or H2_MSGF_BODY - * if a body is detected (!ES). - * - * The headers list must be composed of : - * - n.name != NULL, n.len > 0 : literal header name - * - n.name == NULL, n.len > 0 : indexed pseudo header name number - * among H2_PHDR_IDX_* - * - n.name ignored, n.len == 0 : end of list - * - in all cases except the end of list, v.name and v.len must designate a - * valid value. - * - * The Cookie header will be reassembled at the end, and for this, the - * will be used to create a linked list, so its contents may be destroyed. - */ -int h2_make_h1_request(struct http_hdr *list, char *out, int osize, unsigned int *msgf, unsigned long long *body_len) -{ - struct ist phdr_val[H2_PHDR_NUM_ENTRIES]; - char *out_end = out + osize; - uint32_t fields; /* bit mask of H2_PHDR_FND_* */ - uint32_t idx; - int ck, lck; /* cookie index and last cookie index */ - int phdr; - int ret; - int i; - - lck = ck = -1; // no cookie for now - fields = 0; - for (idx = 0; list[idx].n.len != 0; idx++) { - if (!list[idx].n.ptr) { - /* this is an indexed pseudo-header */ - phdr = list[idx].n.len; - } - else { - /* this can be any type of header */ - /* RFC7540#8.1.2: upper case not allowed in header field names */ - for (i = 0; i < list[idx].n.len; i++) - if ((uint8_t)(list[idx].n.ptr[i] - 'A') < 'Z' - 'A') - goto fail; - - phdr = h2_str_to_phdr(list[idx].n); - } - - if (phdr > 0 && phdr < H2_PHDR_NUM_ENTRIES) { - /* insert a pseudo header by its index (in phdr) and value (in value) */ - if (fields & ((1 << phdr) | H2_PHDR_FND_NONE)) { - if (fields & H2_PHDR_FND_NONE) { - /* pseudo header field after regular headers */ - goto fail; - } - else { - /* repeated pseudo header field */ - goto fail; - } - } - fields |= 1 << phdr; - phdr_val[phdr] = list[idx].v; - continue; - } - else if (phdr != 0) { - /* invalid pseudo header -- should never happen here */ - goto fail; - } - - /* regular header field in (name,value) */ - if (!(fields & H2_PHDR_FND_NONE)) { - /* no more pseudo-headers, time to build the request line */ - ret = h2_prepare_h1_reqline(fields, phdr_val, &out, out_end, msgf); - if (ret != 0) - goto leave; - fields |= H2_PHDR_FND_NONE; - } - - if (isteq(list[idx].n, ist("host"))) - fields |= H2_PHDR_FND_HOST; - - if (isteq(list[idx].n, ist("content-length"))) { - ret = h2_parse_cont_len_header(msgf, &list[idx].v, body_len); - if (ret < 0) - goto fail; - - if (ret == 0) - continue; // skip this duplicate - } - - /* these ones are forbidden in requests (RFC7540#8.1.2.2) */ - if (isteq(list[idx].n, ist("connection")) || - isteq(list[idx].n, ist("proxy-connection")) || - isteq(list[idx].n, ist("keep-alive")) || - isteq(list[idx].n, ist("upgrade")) || - isteq(list[idx].n, ist("transfer-encoding"))) - goto fail; - - if (isteq(list[idx].n, ist("te")) && !isteq(list[idx].v, ist("trailers"))) - goto fail; - - /* cookie requires special processing at the end */ - if (isteq(list[idx].n, ist("cookie"))) { - list[idx].n.len = -1; - - if (ck < 0) - ck = idx; - else - list[lck].n.len = idx; - - lck = idx; - continue; - } - - if (out + list[idx].n.len + 2 + list[idx].v.len + 2 > out_end) { - /* too large */ - goto fail; - } - - /* copy "name: value" */ - memcpy(out, list[idx].n.ptr, list[idx].n.len); - out += list[idx].n.len; - *(out++) = ':'; - *(out++) = ' '; - - memcpy(out, list[idx].v.ptr, list[idx].v.len); - out += list[idx].v.len; - *(out++) = '\r'; - *(out++) = '\n'; - } - - /* RFC7540#8.1.2.1 mandates to reject response pseudo-headers (:status) */ - if (fields & H2_PHDR_FND_STAT) - goto fail; - - /* Let's dump the request now if not yet emitted. */ - if (!(fields & H2_PHDR_FND_NONE)) { - ret = h2_prepare_h1_reqline(fields, phdr_val, &out, out_end, msgf); - if (ret != 0) - goto leave; - } - - /* complete with missing Host if needed */ - if ((fields & (H2_PHDR_FND_HOST|H2_PHDR_FND_AUTH)) == H2_PHDR_FND_AUTH) { - /* missing Host field, use :authority instead */ - if (out + 6 + phdr_val[H2_PHDR_IDX_AUTH].len + 2 > out_end) { - /* too large */ - goto fail; - } - - memcpy(out, "host: ", 6); - memcpy(out + 6, phdr_val[H2_PHDR_IDX_AUTH].ptr, phdr_val[H2_PHDR_IDX_AUTH].len); - out += 6 + phdr_val[H2_PHDR_IDX_AUTH].len; - *(out++) = '\r'; - *(out++) = '\n'; - } - - if ((*msgf & (H2_MSGF_BODY|H2_MSGF_BODY_TUNNEL|H2_MSGF_BODY_CL)) == H2_MSGF_BODY) { - /* add chunked encoding */ - if (out + 28 > out_end) - goto fail; - memcpy(out, "transfer-encoding: chunked\r\n", 28); - out += 28; - } - - /* now we may have to build a cookie list. We'll dump the values of all - * visited headers. - */ - if (ck >= 0) { - if (out + 8 > out_end) { - /* too large */ - goto fail; - } - memcpy(out, "cookie: ", 8); - out += 8; - - do { - if (out + list[ck].v.len + 2 > out_end) { - /* too large */ - goto fail; - } - memcpy(out, list[ck].v.ptr, list[ck].v.len); - out += list[ck].v.len; - ck = list[ck].n.len; - - if (ck >= 0) { - *(out++) = ';'; - *(out++) = ' '; - } - } while (ck >= 0); - - if (out + 2 > out_end) { - /* too large */ - goto fail; - } - *(out++) = '\r'; - *(out++) = '\n'; - } - - /* And finish */ - if (out + 2 > out_end) { - /* too large */ - goto fail; - } - - *(out++) = '\r'; - *(out++) = '\n'; - ret = out + osize - out_end; - leave: - return ret; - - fail: - return -1; -} - -/* Takes an H2 headers list terminated by a name being and - * emits the equivalent HTTP/1.1 trailers block not including the empty line. - * The output contents are emitted in for a max of bytes, and the - * amount of bytes emitted is returned. In case of error, a negative error code - * is returned. The caller must have verified that the message in the buffer is - * compatible with receipt of trailers. - * - * The headers list must be composed of : - * - n.name != NULL, n.len > 0 : literal header name - * - n.name == NULL, n.len > 0 : indexed pseudo header name number - * among H2_PHDR_IDX_* (illegal here) - * - n.name ignored, n.len == 0 : end of list - * - in all cases except the end of list, v.name and v.len must designate a - * valid value. - */ -int h2_make_h1_trailers(struct http_hdr *list, char *out, int osize) -{ - char *out_end = out + osize; - uint32_t idx; - int i; - - for (idx = 0; list[idx].n.len != 0; idx++) { - if (!list[idx].n.ptr) { - /* This is an indexed pseudo-header (RFC7540#8.1.2.1) */ - goto fail; - } - - /* RFC7540#8.1.2: upper case not allowed in header field names */ - for (i = 0; i < list[idx].n.len; i++) - if ((uint8_t)(list[idx].n.ptr[i] - 'A') < 'Z' - 'A') - goto fail; - - if (h2_str_to_phdr(list[idx].n) != 0) { - /* This is a pseudo-header (RFC7540#8.1.2.1) */ - goto fail; - } - - /* these ones are forbidden in trailers (RFC7540#8.1.2.2) */ - if (isteq(list[idx].n, ist("host")) || - isteq(list[idx].n, ist("content-length")) || - isteq(list[idx].n, ist("connection")) || - isteq(list[idx].n, ist("proxy-connection")) || - isteq(list[idx].n, ist("keep-alive")) || - isteq(list[idx].n, ist("upgrade")) || - isteq(list[idx].n, ist("te")) || - isteq(list[idx].n, ist("transfer-encoding"))) - goto fail; - - if (out + list[idx].n.len + 2 + list[idx].v.len + 2 > out_end) { - /* too large */ - goto fail; - } - - /* copy "name: value" */ - memcpy(out, list[idx].n.ptr, list[idx].n.len); - out += list[idx].n.len; - *(out++) = ':'; - *(out++) = ' '; - - memcpy(out, list[idx].v.ptr, list[idx].v.len); - out += list[idx].v.len; - *(out++) = '\r'; - *(out++) = '\n'; - } - - return out + osize - out_end; - - fail: - return -1; -} - /* Parse the Content-Length header field of an HTTP/2 request. The function * checks all possible occurrences of a comma-delimited value, and verifies * if any of them doesn't match a previous value. It returns <0 if a value