Revert 1757391, sorry for the sloppy commit :-/ (a516c0c0) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

CHANGES

+0 −18

Original line number	Diff line number	Diff line
		@@ -4,18 +4,6 @@ Changes with Apache 2.2.32
		*) core: CVE-2016-5387: Mitigate [f]cgi "httpoxy" issues.
		[Dominic Scheirlinck <dominic vendhq.com>, Yann Ylavic]

		*) core: Support custom ErrorDocuments for HTTP 501 and 414 status codes.
		PR 57167 [Edward Lu <Chaosed0 gmail.com>]

		*) core: ErrorDocument now works for requests without a Host header.
		PR 48357. [Jeff Trawick]

		*) core: Enforce LimitRequestFieldSize after multiple headers with the same
		name have been merged. [Stefan Fritsch]

		*) core: reject NULLs in request line or request headers.
		PR 43039 [Nick Kew]

		*) mod_ssl: Fix a possible memory leak on restart for custom [EC]DH params.
		[Jan Kaluza, Yann Ylavic]

		@@ -3383,9 +3371,3 @@ Changes with Apache 2.0.x and later:

		*) http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/CHANGES?view=markup

		*) core: Support custom ErrorDocuments for HTTP 501 and 414 status codes.
		PR 57167 [Edward Lu <Chaosed0 gmail.com>]

		*) core: ErrorDocument now works for requests without a Host header.
		PR 48357. [Jeff Trawick]

STATUS

+0 −10

Original line number	Diff line number	Diff line
		@@ -193,16 +193,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
		https://raw.githubusercontent.com/wrowe/patches/master/backport-2.2.x-r951900-r1178566-r1185385-r1188745-r1352911-r1433613.patch
		+1: wrowe

		*) core: ErrorDocument now works for requests without a Host header.
		Support custom ErrorDocuments for HTTP 501 and 414 status codes.
		PR: 48357, 57167
		Submitted by: trawick, [Edward Lu <Chaosed0 gmail.com>]
		http://svn.apache.org/r1392347
		http://svn.apache.org/r1635762
		Backport:
		https://raw.githubusercontent.com/wrowe/patches/master/backport-2.2.x-r1392347-r1635762.patch
		+1: wrowe


		PATCHES/ISSUES THAT ARE STALLED

include/http_core.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -627,11 +627,6 @@ typedef struct {
		#define AP_MERGE_TRAILERS_DISABLE 2
		int merge_trailers;

		#define AP_HTTP09_UNSET 0
		#define AP_HTTP09_ENABLE 1
		#define AP_HTTP09_DISABLE 2
		char http09_enable;

		} core_server_config;

		/* for AddOutputFiltersByType in core.c */

server/protocol.c

+31 −88

Original line number	Diff line number	Diff line
		@@ -433,13 +433,8 @@ AP_DECLARE(apr_status_t) ap_rgetline_core(char **s, apr_size_t n,
		}
		}
		}
		*read = bytes_handled;

		/* PR#43039: We shouldn't accept NULL bytes within the line */
		if (strlen(*s) < bytes_handled - 1) {
		return APR_EINVAL;
		}

		*read = bytes_handled;
		return APR_SUCCESS;
		}

		@@ -602,27 +597,18 @@ static int read_request_line(request_rec r, apr_bucket_brigade bb)
		* buffer before finding the end-of-line. This is only going to
		* happen if it exceeds the configured limit for a request-line.
		*/
		if (APR_STATUS_IS_ENOSPC(rv)) {
		if (rv == APR_ENOSPC) {
		r->status = HTTP_REQUEST_URI_TOO_LARGE;
		}
		else if (APR_STATUS_IS_TIMEUP(rv)) {
		r->status = HTTP_REQUEST_TIME_OUT;
		}
		else if (APR_STATUS_IS_EINVAL(rv)) {
		r->status = HTTP_BAD_REQUEST;
		}
		r->proto_num = HTTP_VERSION(1,0);
		r->protocol = apr_pstrdup(r->pool, "HTTP/1.0");
		return 0;
		}
		} while ((len <= 0) && (++num_blank_lines < max_blank_lines));

		#ifdef AP_DEBUG_THE_REQUEST
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
		"Request received from client: %s",
		ap_escape_logitem(r->pool, r->the_request));
		#endif

		r->request_time = apr_time_now();
		ll = r->the_request;
		r->method = ap_getword_white(r->pool, &ll);
		@@ -666,25 +652,6 @@ static int read_request_line(request_rec r, apr_bucket_brigade bb)
		return 1;
		}

		static int table_do_fn_check_lengths(void r_, const char key,
		const char *value)
		{
		request_rec *r = r_;
		if (value == NULL \|\| r->server->limit_req_fieldsize >= strlen(value) )
		return 1;

		r->status = HTTP_BAD_REQUEST;
		apr_table_setn(r->notes, "error-notes",
		apr_pstrcat(r->pool, "Size of a request header field "
		"after merging exceeds server limit.<br />"
		"\n<pre>\n",
		ap_escape_html(r->pool, key),
		"</pre>\n", NULL));
		ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, "Request header exceeds "
		"LimitRequestFieldSize after merging: %s", key);
		return 0;
		}

		/* get the length of the field name for logging, but no more than 80 bytes */
		#define LOG_NAME_MAX_LEN 80
		static int field_name_len(const char *field)
		@@ -732,29 +699,19 @@ AP_DECLARE(void) ap_get_mime_headers_core(request_rec r, apr_bucket_brigade bb
		* finding the end-of-line. This is only going to happen if it
		* exceeds the configured limit for a field size.
		*/
		if (rv == APR_ENOSPC) {
		const char *field_escaped;
		if (field && len) {
		if (rv == APR_ENOSPC && field) {
		/* ensure ap_escape_html will terminate correctly */
		field[len - 1] = '\0';
		field_escaped = ap_escape_html(r->pool, field);
		}
		else {
		field_escaped = field = "";
		}

		apr_table_setn(r->notes, "error-notes",
		apr_psprintf(r->pool,
		"Size of a request header field "
		"exceeds server limit.<br />\n"
		"<pre>\n%.*s\n</pre>\n",
		field_name_len(field_escaped),
		field_escaped));
		"<pre>\n%.*s\n</pre>/n",
		field_name_len(field),
		ap_escape_html(r->pool, field)));
		ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
		"Request header exceeds LimitRequestFieldSize%s"
		"%.*s",
		*field ? ": " : "",
		field_name_len(field), field);
		"Request header exceeds LimitRequestFieldSize: "
		"%.*s", field_name_len(field), field);
		}
		return;
		}
		@@ -770,21 +727,18 @@ AP_DECLARE(void) ap_get_mime_headers_core(request_rec r, apr_bucket_brigade bb
		apr_size_t fold_len = last_len + len + 1; /* trailing null */

		if (fold_len >= (apr_size_t)(r->server->limit_req_fieldsize)) {
		const char *field_escaped;

		r->status = HTTP_BAD_REQUEST;
		/* report what we have accumulated so far before the
		* overflow (last_field) as the field with the problem
		*/
		field_escaped = ap_escape_html(r->pool, last_field);
		apr_table_setn(r->notes, "error-notes",
		apr_psprintf(r->pool,
		"Size of a request header field "
		"after folding "
		"exceeds server limit.<br />\n"
		"<pre>\n%.*s\n</pre>\n",
		field_name_len(field_escaped),
		field_escaped));
		field_name_len(last_field),
		ap_escape_html(r->pool, last_field)));
		ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
		"Request header exceeds LimitRequestFieldSize "
		"after folding: %.*s",
		@@ -814,9 +768,6 @@ AP_DECLARE(void) ap_get_mime_headers_core(request_rec r, apr_bucket_brigade bb
		apr_table_setn(r->notes, "error-notes",
		"The number of request header fields "
		"exceeds this server's limit.");
		ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
		"Number of request headers exceeds "
		"LimitRequestFields");
		return;
		}

		@@ -830,7 +781,7 @@ AP_DECLARE(void) ap_get_mime_headers_core(request_rec r, apr_bucket_brigade bb
		(int)LOG_NAME_MAX_LEN,
		ap_escape_html(r->pool,
		last_field)));
		ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
		"Request header field is missing ':' "
		"separator: %.*s", (int)LOG_NAME_MAX_LEN,
		last_field);
		@@ -890,9 +841,6 @@ AP_DECLARE(void) ap_get_mime_headers_core(request_rec r, apr_bucket_brigade bb
		* field-name, following RFC 2616, 4.2.
		*/
		apr_table_compress(r->headers_in, APR_OVERLAP_TABLES_MERGE);

		/* enforce LimitRequestFieldSize for merged headers */
		apr_table_do(table_do_fn_check_lengths, r, r->headers_in, NULL);
		}

		AP_DECLARE(void) ap_get_mime_headers(request_rec *r)
		@@ -908,7 +856,7 @@ request_rec ap_read_request(conn_rec conn)
		request_rec *r;
		apr_pool_t *p;
		const char *expect;
		int access_status = HTTP_OK;
		int access_status;
		apr_bucket_brigade *tmp_bb;
		apr_socket_t *csd;
		apr_interval_time_t cur_timeout;
		@@ -960,23 +908,12 @@ request_rec ap_read_request(conn_rec conn)

		/* Get the request... */
		if (!read_request_line(r, tmp_bb)) {
		if (r->status == HTTP_REQUEST_URI_TOO_LARGE
		\|\| r->status == HTTP_BAD_REQUEST) {
		if (r->status == HTTP_REQUEST_URI_TOO_LARGE) {
		ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
		"request failed: client's request-line exceeds LimitRequestLine (longer than %d)",
		r->server->limit_req_line);
		}
		else if (r->method == NULL) {
		ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
		"request failed: invalid characters in URI");
		}
		access_status = r->status;
		r->status = HTTP_OK;
		ap_die(access_status, r);
		ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
		"request failed: URI too long (longer than %d)", r->server->limit_req_line);
		ap_send_error_response(r, 0);
		ap_update_child_status(conn->sbh, SERVER_BUSY_LOG, r);
		ap_run_log_transaction(r);
		r = NULL;
		apr_brigade_destroy(tmp_bb);
		return r;
		}
		@@ -1009,7 +946,7 @@ request_rec ap_read_request(conn_rec conn)

		ap_get_mime_headers_core(r, tmp_bb);
		if (r->status != HTTP_OK) {
		ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
		"request failed: error reading the headers");
		ap_send_error_response(r, 0);
		ap_update_child_status(conn->sbh, SERVER_BUSY_LOG, r);
		@@ -1056,7 +993,7 @@ request_rec ap_read_request(conn_rec conn)
		* headers! Have to dink things just to make sure the error message
		* comes through...
		*/
		ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
		"client sent invalid HTTP/0.9 request: HEAD %s",
		r->uri);
		r->header_only = 0;
		@@ -1097,8 +1034,8 @@ request_rec ap_read_request(conn_rec conn)
		* HTTP/1.1 mentions twice (S9, S14.23) that a request MUST contain
		* a Host: header, and the server MUST respond with 400 if it doesn't.
		*/
		access_status = HTTP_BAD_REQUEST;
		ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
		r->status = HTTP_BAD_REQUEST;
		ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
		"client sent HTTP/1.1 request without hostname "
		"(see RFC2616 section 14.23): %s", r->uri);
		}
		@@ -1113,8 +1050,14 @@ request_rec ap_read_request(conn_rec conn)
		ap_add_input_filter_handle(ap_http_input_filter_handle,
		NULL, r, r->connection);

		if (access_status != HTTP_OK
		\|\| (access_status = ap_run_post_read_request(r))) {
		if (r->status != HTTP_OK) {
		ap_send_error_response(r, 0);
		ap_update_child_status(conn->sbh, SERVER_BUSY_LOG, r);
		ap_run_log_transaction(r);
		return r;
		}

		if ((access_status = ap_run_post_read_request(r))) {
		ap_die(access_status, r);
		ap_update_child_status(conn->sbh, SERVER_BUSY_LOG, r);
		ap_run_log_transaction(r);
		@@ -1314,7 +1257,7 @@ AP_DECLARE(int) ap_get_basic_auth_pw(request_rec r, const char *pw)

		if (strcasecmp(ap_getword(r->pool, &auth_line, ' '), "Basic")) {
		/* Client tried to authenticate using wrong auth scheme */
		ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
		ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
		"client used wrong authentication scheme: %s", r->uri);
		ap_note_basic_auth_failure(r);
		return HTTP_UNAUTHORIZED;