Checkout Tools
  • last updated 4 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Synch 2.4.x and trunk:

Merge r1787229 from trunk

- core: print r->uri during failure

Merge r1842919 from trunk

- core: Call va_end before returning in the error case

Merge r1842926 from trunk

- mod_cache_disk: fix a Coverity warning

Merge r1856490 from trunk

- core: Provide TEST_CHAR macro in test_char.h

Merge r1862051 from trunk

- tag some pools

Merge r1864865 from trunk

- core: Fix a signed/unsigned comparison that can never match

Merge r1865871 from trunk

- mod_session: leave a hint about session expiration at TRACE2

Merge r1867256 from trunk

- mod_ssl: Fix a typo

Submitted by: covener,jorton,jorton,ylavic,jorton,jailletc36,covener,jailletc36

Reviewed by: jailletc36, jim, ylavic

Backported by: jailletc36

  1. … 10 more files in changeset.
mod_proxy_http: forward 100-continue, and minimize race conditions when

reusing backend connections. PR 60330.

+1: ylavic, icing, jim

ylavic: plus http://svn.apache.org/r1856036 (opt-out)

2.4.x patch: http://people.apache.org/~ylavic/patches/httpd-2.4.x-forward_100_continue-v6.patch

+1: ylavic, jim, minfrin

  1. … 10 more files in changeset.
Merge r1837056 from trunk:

*) http: Enforce consistently no response body with both 204 and 304

statuses. [Yann Ylavic]

  1. … 8 more files in changeset.
Merge r1418761, r1418765, r1510295, r1757147, r1805163, r1818924, r1827374, r1831772, r1832351, r1832951, r1815004 from trunk:

Don't claim "BIO dump follows" if it is not logged due to log level config.

make ssl_io_data_dump respect per-conn loglevel

add high trace level log messages for debugging buffering and write completion

* modules/ssl/ssl_engine_kernel.c (ssl_callback_SessionTicket): Fail

if RAND_bytes() fails; possible per API, although not in practice

with the OpenSSL implementation.

Fix typo in log message.

ap_add_common_vars(): use apr_pstrmemdup().

This avoids a transient replacement/restore of '?' by '\0' in r->filename.

Use 'ap_request_has_body()' instead of duplicating its implemenation.

The logic in 'ap_request_has_body()' is:

has_body = (!r->header_only

&& (r->kept_body

|| apr_table_get(r->headers_in, "Transfer-Encoding")

|| ( (cls = apr_table_get(r->headers_in, "Content-Length"))

&& (apr_strtoff(&cl, cls, &estr, 10) == APR_SUCCESS)

&& (!*estr)

&& (cl > 0) )

)

);

So the test is slighly different from the original code. (but this looks fine to me)

This also has the advantage to avoid a redundant call to 'apr_table_get()' and to improve readability.

While at it, move the test '!r->expecting_100' a few lines above because it is cheap.

PR62368: Print the unparsed URI in AH03454

... to include r->args and get otherwise get as close to possible to

what came in over the wire.

Submitted By: Hank Ibell <hwibell gmail.com>

Committed By: covener

All error handling paths of this function call 'apr_brigade_destroy()' , except this one.

So add it here too.

Probably spotted with the help of the Coccinelle software (Thx Julia for the patch and for Coccinelle)

See PR 53016

* modules/proxy/proxy_util.c (ap_proxy_share_worker): Skip creating subpool

for debugging unless debug-level logging is enabled. No functional change.

mod_watchdog: Correct some log messages and fix

compiler warning

"'rv' may be used uninitialized in this function".

Follow up to r1722154.

Submitted by: sf, jorton, jorton, ylavic, jailletc36, covener, jailletc36, jorton, rjung

Reviewed by: jailletc36, jim, jorton

  1. … 10 more files in changeset.
Merge r1827362, r1828926, r1828927, r1829557, r1829573, r1829645, r1829657 from trunk:

core: ap_getline_core() reads nothing for n == 0.

PR62199: add worker parameter ResponseFieldSize to mod_proxy

Submitted By: Hank Ibell

Committed By: covener

add log id for r1828926

core: Add and handle AP_GETLINE_NOSPC_EOL flag in ap_rgetline_core().

This tells the ap_getline() family of functions to consume the end of line

when the buffer is exhausted.

PR 62198.

mod_proxy_http: make use of AP_GETLINE_NOSPC_EOL in ap_proxygetline().

Fixes response header thrown away after the previous one was considered too

large and truncated.

PR 62196.

core: forward flags to recursive/folding call to ap_rgetline_core().

We still need them when folding, other than AP_GETLINE_FOLD itself of course.

mod_proxy_http: follow up to r1829573: remain EBCDIC friendly.

Keep using ap_rgetline() as before r1829573, since ap_rgetline_core() is

EBCDIC agnostic.

Submitted by: ylavic, covener, covener, ylavic, ylavic, ylavic, ylavic

Reviewed by: ylavic, covener, rpluem

  1. … 8 more files in changeset.
Merge r1827359 from trunk:

PR62200: EBCDIC: ap_rgetline APR_ENOSPC

On EBCDIC systems, translation does not occur in ap_rgetline() if the line is

larger than the buffer size.

(note: No STATUS vote for EBCDIC fix)

Submitted By: Hank Ibell

Committed By: covener

  1. … 1 more file in changeset.
core: For consistency, ensure that read lines are NUL terminated on any

error, not only on buffer full.

trunk patch: http://svn.apache.org/r1824303

+1: ylavic, rpluem, minfrin

  1. … 3 more files in changeset.
Merge r1808230 from trunk:

* server/protocol.c (ap_content_length_filter): Rewrite the content

length filter to avoid arbitrary memory consumption for streaming

responses (e.g. large CGI script output). Ensures C-L is still

generated in common cases (static content, small CGI script output),

but this DOES change behaviour and some responses will end up

chunked rather than C-L computed.

PR: 61222

Submitted by: jorton, rpluem

Reviewed by: jorton, wrowe, ylavic

  1. … 2 more files in changeset.
Restore single-char field names inadvertantly disallowed in 2.4.25.

Backports: r1800173

PR: 61220

Submitted by: ylavic

Reviewed by: wrowe, jchampion, ylavic

  1. … 2 more files in changeset.
SECURITY: CVE-2017-3167 (cve.mitre.org)

Use of the ap_get_basic_auth_pw() by third-party modules outside of the

authentication phase may lead to authentication requirements being

bypassed.

Merge r1796348 from trunk:

core: Deprecate ap_get_basic_auth_pw() and add ap_get_basic_auth_components().

Submitted By: Emmanuel Dreyfus <manu netbsd.org>, jchampion, coverner

Reviewed by: covener, ylavic, jim

  1. … 8 more files in changeset.
Merge r1777354 from trunk:

old IBM EBCDIC fix that never got shared.

Submitted by: covener

Reviewed by: covener, wrowe, ylavic (by inspection)

  1. … 4 more files in changeset.
Fix some spelling errors in comments
Merge r1773159 from trunk:

Partial port of proposed r1773158 for httpd-2.x only; this change causes all

illegible protocol args to be rejected, irrespective of the strict toggle as

we expect this to occur with a garbage raw SP embedded in the request URI.

Simplifies the code using the protocol 0.9 sentinal to set up an http/1.0

error response.

String duplication of r1773158 is uninteresting, httpd-2.x has a const protocol

member.

Submitted by: rpluem, wrowe

Submitted by: wrowe

Reviewed/backported by: jim

  1. … 3 more files in changeset.
Meant to commit this to the merge branch for consideration; reverting r1773158
As noted by rpluem, r->protocol isn't const char *. Ensure the exit cases

are pstrdup'ed. Note that r->protocol = "" is not in a return path.

Simplify the garbage-in protocol handling without consideration to 'strict'

settings. It is expected to be caused by an invalid raw SP in the URL.

Backports: r1773159 (with pstrdup enhancement)

Submitted by: rpluem, wrowe

Reverted in r1773160 (for further STATUS review)

------------------------------------------------------------------------

r1772419 | covener | 2016-12-02 19:10:53 -0500 (Fri, 02 Dec 2016) | 7 lines

Merge r1772418 from trunk:

loop in checking response headers

w/ HTTPProtocolOptions Unsafe

------------------------------------------------------------------------

r1772236 | wrowe | 2016-12-01 11:29:27 -0500 (Thu, 01 Dec 2016) | 8 lines

Appears we cannot disallow this whitespace, since the chunk BNF coexisted

with the implied *LWS rule, before RFC7230 eliminated the later. Whether

this is actually OWS or BWS is an editorial decision beyond our pay grade.

Backports: r1765475

Submitted by: wrowe

------------------------------------------------------------------------

r1771697 | rpluem | 2016-11-28 04:59:00 -0500 (Mon, 28 Nov 2016) | 4 lines

Merge r1771690 from trunk:

* Fix numbers count in comment.

------------------------------------------------------------------------

r1771696 | rpluem | 2016-11-28 04:56:42 -0500 (Mon, 28 Nov 2016) | 1 line

* Revert 1771372: As Bill points out correctly. Only backport trunk revisions to this branch.

------------------------------------------------------------------------

r1771372 | rpluem | 2016-11-25 14:55:18 -0500 (Fri, 25 Nov 2016) | 1 line

* Fix numbers count in comment.

------------------------------------------------------------------------

r1770870 | wrowe | 2016-11-22 13:44:21 -0500 (Tue, 22 Nov 2016) | 3 lines

Optimize away one more strchr.

Backports: 1770869

------------------------------------------------------------------------

r1770868 | wrowe | 2016-11-22 13:34:25 -0500 (Tue, 22 Nov 2016) | 8 lines

List discussion resulted in rejecting all but SP characters in the request

line, but in the strict mode prioritize excessive space testing over bad

space testing (which is captured later) and make both more efficient

(at this test ll[0] is already whitespace or \0 char). Also correct a comment.

Backports: r1770867

Submitted by: wrowe

------------------------------------------------------------------------

r1770846 | covener | 2016-11-22 09:32:45 -0500 (Tue, 22 Nov 2016) | 5 lines

Merge r1770817 from trunk:

Removing unused warning after r1764961 changes.

------------------------------------------------------------------------

r1770789 | covener | 2016-11-21 20:58:06 -0500 (Mon, 21 Nov 2016) | 25 lines

Merge r1770786 from trunk:

remove Location: header checks for absolute URL

https://tools.ietf.org/html/rfc7231#section-7.1.2

The "Location" header field is used in some responses to refer to a

specific resource in relation to the response. The type of

relationship is defined by the combination of request method and

status code semantics.

Location = URI-reference

The field value consists of a single URI-reference. When it has the

form of a relative reference ([RFC3986], Section 4.2), the final

value is computed by resolving it against the effective request URI

([RFC3986], Section 5).

There is even an example with no scheme:

Location: /People.html#tim

------------------------------------------------------------------------

r1770386 | wrowe | 2016-11-18 09:45:32 -0500 (Fri, 18 Nov 2016) | 6 lines

Backport: r1769965

Submitted by: wrowe, rpluem

Actually cause the Host header to be overridden, as noted by rpluem,

and simplify now that there isn't a log-only mode.

------------------------------------------------------------------------

r1770173 | wrowe | 2016-11-17 07:09:32 -0500 (Thu, 17 Nov 2016) | 1 line

Merge of r1765451 did not apply cleanly, drop unneeded prototype.

------------------------------------------------------------------------

r1769675 | wrowe | 2016-11-14 13:57:12 -0500 (Mon, 14 Nov 2016) | 1 line

Add an entry about RFC strictness

------------------------------------------------------------------------

r1769674 | wrowe | 2016-11-14 13:54:42 -0500 (Mon, 14 Nov 2016) | 1 line

Clean up CHANGES for clarity

------------------------------------------------------------------------

r1769672 | wrowe | 2016-11-14 13:15:07 -0500 (Mon, 14 Nov 2016) | 31 lines

Dropped the never-released ap_has_cntrls() as it had very limited

and inefficient application at that, added ap_scan_vchar_obstext()

to accomplish a similar purpose.

Dropped HttpProtocolOptions StrictURL option, this will be better

handled in the future with a specific directive and perhaps multiple

levels of scrutiny, use ap_scan_vchar_obstext() to simply ensure there

are no control characters or whitespace within the URI.

Changed the scanning of the response header table by check_headers()

to follow the same rulesets as reading request headers. Disallow any

CTL character within a response header value, and any CTL or whitespace

in response header field name, even in strict mode.

Apply HttpProtocolOptions Strict to chunk header parsing, invalid

whitespace is invalid, line termination must follow CRLF convention.

Submitted by: wrowe

Backport: r1764961,1765112-1765115

When redrawing the parser, ap_get_http_token looked to be useful, but there's

no application for this yet in httpd, so hold off adding this function when

we backport the enhancements. ap_scan_http_token was entirely sufficient.

If the community wants this new function, we can add it when backporting

work is complete.

This patch, and the earlier patches Friday actually demanded an mmn major

bump due to struct member changes. In any final backport, new members must

be added to the end of the struct to retain an mmn minor designation.

Submitted by: wrowe

Backport: r1765451

------------------------------------------------------------------------

r1769669 | wrowe | 2016-11-14 12:59:10 -0500 (Mon, 14 Nov 2016) | 124 lines

Fix syntax

Submitted by: jailletc36

Backport: r1756862

Introduce StrictURI|UnsafeURI for RFC3986 enforcement

Submitted by: wrowe

Backport: r1756959

Surpress noise about syntax

Submitted by: wrowe

Backport: r1756978

Yann is correct, % is distinct from reserved and unreserved

Submitted by: wrowe

Backport: r1757062

As commented, ensure we don't flag a request as a rejected 0.9 request

if we identified any other parsing errors and handle all 0.9 request

errors as 400 BAD REQUEST, presuming HTTP/1.0 to deliver the error details.

Do not report 0.9 issues as 505 INVALID PROTOCOL because the client apparently

specified no protocol, and 505 post-dates the simple HTTP request mechanism.

Submitted by: wrowe

Backport: r1757065

Rename LenientWhitespace to UnsafeWhitespace and change StrictWhitespace

to the default behavior, after discussion with fielding et al about the

purpose of section 3.5. Update the documentation to clarify this.

This patch removes whitespace considerations from the Strict|Unsafe toggle

and consolidates them all in the StrictWhitespace|UnsafeWhitespace toggle.

Added a bunch of logic comments to read_request_line parsing.

Dropped the badwhitespace list for an all-or-nothing toggle in rrl.

Leading space before the method is optimized to be evaluated only once.

Toggled the request from HTTP/0.9 to HTTP/1.0 for more BAD_REQUEST cases.

Moved s/[\n\v\f\r]/ / cleanup logic earlier in the cycle, to operate on

each individual line read, and catch bad whitespace errors earlier.

This changes the obs-fold to more efficiently condense whitespace and

forces concatinatination with a single SP, always. Overrides are not

necessary since obs-fold is clearly deprecated.

Submitted by: wrowe

Backport: r1757589

Also catch invalid spaces between the URI <> Protocol in StrictWhitespace mode.

(matching the test for the Method <> URI)

Submitted by: wrowe

Backport: r1757593

Correct RFC reference text (link was right)

Submitted by: wrowe

Backport: r1757711

First survey results, all intrinsicly bad input will be logged at the debug

level, no louder. This patch intentionally dodges the Limit* constrained tests

since administrators may shoot themselves in the foot, or be confronted with

impossibly long cookie values, etc.

Adjust the documentation to match.

Submitted by: wrowe

Backport: r1757920

Correct URL failure reporting.

Drop the second reporting of HEAD over HTTP/0.9 requests, we short-circuit

this early now in read_request_line() when presented anything other than

the sole "GET" method permitted by spec.

Revert to the correct APLOGNO ID for this case

Submitted by: wrowe

Backport: r1757921, r1757924

Folding StrictWhitespace into the Strict ruleset of RFC7230, per dev@ poll.

This choice is unanimous, although StrictURI (a different RFC) still hasn't

found absolute concensus.

Submitted by: wrowe

Backport: r1758226

Correct the parser construction for several optimizations,

based on the fact that bad whitespace shall not be permitted

or corrected in any operating mode, while preserving the

ability to extract bad method/uri/proto for later reporting

and diagnostics.

This change causes badwhitespace in the request line or any

request field line to always fail, and not honor the setting

of the HttpProtocolOptions Unsafe option. Mult SP characters

or trailing SP characters in the request line are still

permitted in Unsafe mode.

Adjusted several error message emits to match these changes.

Submitted by: wrowe

Backport: r1758263

Clarify documentation based on concensus decisions discussed on dev@

and reflecting the current implementation, clean up stray <p>

Submitted by: wrowe

Backport: r1758265, r1758266

New optional flag to enforce <CR><LF> line delimiters in ap_[r]getline,

created by overloading 'int fold' (1 or 0) as 'int flags', with the same

value 1 for AP_GETLINE_FOLD (which httpd doesn't use), and a new value

2 for AP_GETLINE_CRLF

Enforce CRLF when HttpProtocolOptions Strict is in force.

Correctly introduces a new t/TEST fail.

Submitted by: wrowe

Backport: r1758304

Calm some overly agressive crlf handling, and clarify

Submitted by: wrowe

Backport: r1758305, r1758313

Review of IE 11, Firefox 48 and Chrome 53 all indicate that ';' URI characters

are transmitted unencoded, per RFC3986 section 3.3 grammer. Correct httpd's

behavior to not encode ';' in proxied URI's or Location: response headers.

Submitted by: wrowe

Backport: r1760444

------------------------------------------------------------------------

r1769664 | wrowe | 2016-11-14 12:07:40 -0500 (Mon, 14 Nov 2016) | 48 lines

Drop unused, previously sscanf() target variables

Submitted by: wrowe

Backport: r1756821

Drop redundant == --rrl_none evaluation

Submitted by: rpluem

Backport: r1756823

server/protocol.c (read_request_line): Fix compiler warnings with GCC.

Submitted by: jorton

Backport: r1756824

Correct request header handling of whitespace with the new possible config of

HttpProtocolOptions Unsafe StrictWhitespace

I have elected not to preserve any significance to excess whitespace in the

now-deprecated obs-fold code path, that's certainly open for discussion.

This can be reviewed by tweaking t/conf/extra.conf to switch Strict to Unsafe.

Submitted by: wrowe

Backport: r1756847

A band-aid to resolve an immediate IBM MVS'ism

Submitted by: wrowe

Backport: r1756849

Resolve Netware (and other arch) build error for non-portable isascii()

Submitted by: wrowe

Backport: r1756934

Generally, the cart comes before the horse, this mirrors apr_lib.h

Submitted by: wrowe

Backport: r1756937

After lengthy investigation with covener's assistance, it seems we cannot

use a static table. We cannot change this to dynamic use of the local iconv

without build changes to avoid such use on cross-platform builds.

I'm satisfied if we trust iscntrl to at least catch all the most lethal

C0 Ctrls (we are promised it catches bad carriage control/line endings)

and leave this in the short term with an XXX to revisit at a future time.

The token stop never needed this table, because we can use the affirmative

list of token characters to define it.

Submitted by: wrowe, covener

Backport: r1756946

------------------------------------------------------------------------

r1769662 | wrowe | 2016-11-14 12:01:20 -0500 (Mon, 14 Nov 2016) | 46 lines

Rename the previously undocumented HTTPProtocol directive

to EnforceHTTPProtocol, and invert the default behavior

to strictly observe RFC 7230 unless otherwise configured.

And Document This.

The relaxation option is renamed 'Unsafe'. 'Strict' is no

longer case sensitive. 'min=0.9|1.0' is now the verbose

'Allow0.9' or 'Require1.0' case-insenstive grammer. The

exclusivity tests have been modified to detect conflicts.

The 'strict,log' option failed to enforce strict conformance,

and has been removed. Unsafe, informational logging is possible

in any loadable module, after the request data is unsafely

accepted.

This triggers a group of failures in t/apache/headers.t as

expected since those patterns violated RFC 7230 section 3.2.4.

Submitted by: wrowe

Backport: r1756540

Correct AP_HTTP_CONFORMANCE_ flags

Submitted by: wrowe

Backport: r1756555

Renaming this directive to HttpProtocolOptions after discussion on dev@

Submitted by: wrowe

Backport: r1756649

Perform correct, strict parsing of the request line, handling the

http protocol tag, url and method appropriately, and attempting

to extract values even in the presence of unusual whitespace in

keeping with section 3.5, prior to responding with whatever

error reply is needed. Conforms to RFC7230 in all respects,

the section 3.5 optional behavior can be disabled by the user

with a new HttpProtocolOptions StrictWhitespace flag. In all

cases, the_request is regenerated from the parsed components

with exactly two space characters.

Shift sf's 'strict' method check from the Strict behavior because

it violates forward proxy logic, adding a new RegisteredMethods

flag, as it will certainly be useful to some.

Submitted by: wrowe

Backport: r1756729

------------------------------------------------------------------------

r1769649 | wrowe | 2016-11-14 10:29:20 -0500 (Mon, 14 Nov 2016) | 124 lines

Improve legibility of reviewing the generated table, using hex rather than dec

Submitted by: wrowe

Backport: r1754536

Correct T_HTTP_TOKEN_STOP per RFC2068 (2.2) - RFC7230 (3.2.6),

which has always defined 'token' as CHAR or VCHAR - visible USASCII only.

NUL char is also a stop, end of parsing.

Submitted by: wrowe

Backport: r1754538

Be more explicit about NUL in case iscntrl is inconsistent

Submitted by: wrowe

Backport: r1754539

Introduce T_HTTP_CTRLS for efficiently finding non-text chars

Submitted by: wrowe

Backport: r1754540

Introduce ap_scan_http_field_content, ap_scan_http_token

and ap_get_http_token [later reverted] for more efficient

string handling.

Submitted by: wrowe

Backport: r1754541

With NUL as a TOKEN_STOP, this code is more efficient

Submitted by: wrowe

Backport: r1754544

We arrive here for more than one cause; offer a more general statement

Submitted by: wrowe

Backport: r1754547

Strictly observe spec on obs-fold

Submitted by: wrowe

Backport: r1754548

Leave an emphatic TODO per Jeff's observations

Submitted by: trawick

Backport: r1754555

Introduce ap_scan_http_token / ap_scan_http_field_content for a much

more efficient pass through the header text; rather than reparsing

the strings over and over under the HTTP_CONFORMANCE_STRICT fules.

Improve logic and legibility by eliminating multiple repetitive tests

of the STRICT flag, and simply reorder 'classic' behavior first and

this new parser second to simplify the diff. Because of the whitespace

change (which I had wished to dodge), reading this --ignore-all-space

is a whole lot easier. Particularly against 2.4.x branch, which is now

identical in the 'classic' logic flow. Both of which I'll share with dev@

Submitted by: wrowe

Backport: r1754556

Friendly catch by Rüdiger, restore line mis-removed by the previous commit

Submitted by: rpluem

Backport: r1754568

Clean up doubled-'{'

Correct usage for ap_scan_http_token (had used _get_ syntax)

Correct logic, detect no 'token' chars, or missing ':'

Submitted by: wrowe, rpluem

Backport: r1754569,r1754570,r1754577

Replacement solution to identify VCHAR/ASCII symbols, even in EBCDIC.

Looking for someone with an EBCDIC environment to post the output of

the test_char.h generated file for verification.

Submitted by: wrowe

Backport: r1754579

Clean up an edge case where obs-fold continuation preceeds the first header,

as with r1755098, but this time ensure the previous header processing logic

ensures there was a previous header as identified by jchampion.

This patch restructures the loop for legibility with a loop continuation,

allowing us to flatten all of this hard-to-follow code. The subsequent

patch will be a whitespace-only change for formatting.

Testing len > 0 is redundant when *field is a "\0" and mismatches here,

folded flag was a no-op, unused once we added continue; logic.

Fix these as initially attempted in r1755114.

Improve comments and reflow whitespace.

Submitted by: wrowe

Backport: r1755123,r1755124,r1755125,r1755126

As promised, reduce this logic by net 9 code lines, shifting the burden

of killing trailing whitespace to the purpose-agnostic read logic.

Whitespace before or after an obs-fold, and before or after a field value

have no semantic purpose at all. Because we are building a buffer for all

folded values, reducing the size of the newly allocated buffer is always

to our advantage.

Submitted by: wrowe

Backport: r1755233

Treat empty obs-fold line as a noop, eliminate all intra-obs-fold excess

whitespace, and observe the 1 SP per obs-folding per spec.

Submitted by: wrowe

Backport: r1755234,r1755235,r1755236

Treat empty obs-fold line as abusive traffic.

Submitted by: wrowe

Backport: r1755263

Stop reflecting irrelevant data to the request error notes, particularly

for abusive and malformed traffic the non-technical consumer of a user-agent

has no control over.

Simply take note where the administrator-configured limits have been exceeded,

that administrator can find details in the error log if desired.

Submitted by: wrowe

Backport: r1755264

Follow up to r1755264.

Don't crash when ap_rgetline() returns a NULL field on ENOSPC.

Submitted by: ylavic

Backport: r1755343

Follow on to r1755264, for the case of merged header length exceptions,

and ensure the field header name is truncated to a sane log width.

Submitted by: wrowe

Backport: r1755744

------------------------------------------------------------------------

r1769454 | wrowe | 2016-11-12 18:47:29 -0500 (Sat, 12 Nov 2016) | 2 lines

Partial Backport of r1746884, no-op changes that introduce patch conflicts.

------------------------------------------------------------------------

r1768978 | wrowe | 2016-11-09 09:39:05 -0500 (Wed, 09 Nov 2016) | 5 lines

Backports: r1687643

Submitted by: covener

be less weird in comment

------------------------------------------------------------------------

r1768977 | wrowe | 2016-11-09 09:37:34 -0500 (Wed, 09 Nov 2016) | 5 lines

Backports: r1687642

Submitted by: covener

elaborate on a misleading comment

------------------------------------------------------------------------

r1768971 | wrowe | 2016-11-09 09:32:09 -0500 (Wed, 09 Nov 2016) | 8 lines

core: Follow up to r1664205 (previously backported)

Don't let invalid r->proto_num/protocol out of read_request_line() reach

the output filters (when responding with 400 Bad Request).

Suggested by: rpluem

Backports: r1664576

------------------------------------------------------------------------

r1768969 | wrowe | 2016-11-09 09:23:00 -0500 (Wed, 09 Nov 2016) | 10 lines

Backport: r1610383

Submitted by: jailletc36

Simplify code.

Cases where 'loc' doesn't have any ':' or is starting with ':' are already

handled by 'ap_is_url()'

Calling 'apr_isascii()' seems useless.

------------------------------------------------------------------------

r1768968 | wrowe | 2016-11-09 09:20:45 -0500 (Wed, 09 Nov 2016) | 4 lines

Backport: r1546860

Submitted by: jailletc36

Fix missing space in message of protocol.c (other r1546860 changes ignored)

------------------------------------------------------------------------

r1768093 | wrowe | 2016-11-04 16:50:45 -0400 (Fri, 04 Nov 2016) | 7 lines

ap_rgetline_core() now pulls from r->proto_input_filters

for better input filtering behavior during chunked trailer

processing by ap_http_filter().

Backports: r1446421

Submitted by: joes

------------------------------------------------------------------------

r1768090 | wrowe | 2016-11-04 16:47:00 -0400 (Fri, 04 Nov 2016) | 7 lines

Stupid CodeWarrior compiler cant take vars with struct inits.

Ensure that is_v6literal is always initialized

Backports: r1428145, r1436457

Submitted by: fuankg, rpluem

------------------------------------------------------------------------

r1768036 | wrowe | 2016-11-04 10:20:16 -0400 (Fri, 04 Nov 2016) | 40 lines

Add an option to enforce stricter HTTP conformance

This is a first stab, the checks will likely have to be revised.

For now, we check

* if the request line contains control characters

* if the request uri has fragment or username/password

* that the request method is standard or registered with RegisterHttpMethod

* that the request protocol is of the form HTTP/[1-9]+.[0-9]+,

or missing for 0.9

* if there is garbage in the request line after the protocol

* if any request header contains control characters

* if any request header has an empty name

* for the host name in the URL or Host header:

- if an IPv4 dotted decimal address: Reject octal or hex values, require

exactly four parts

- if a DNS host name: Reject non-alphanumeric characters besides '.' and

'-'. As a side effect, this rejects multiple Host headers.

* if any response header contains control characters

* if any response header has an empty name

* that the Location response header (if present) has a valid scheme and is

absolute

If we have a host name both from the URL and the Host header, we replace the

Host header with the value from the URL to enforce RFC conformance.

There is a log-only mode, but the loglevels of the logged messages need some

thought/work. Currently, the checks for incoming data log for 'core' and the

checks for outgoing data log for 'http'. Maybe we need a way to configure the

loglevels separately from the core/http loglevels.

change protocol number parsing in strict mode according to HTTPbis draft

- only accept single digit version components

- don't accept white-space after protocol specification

Clean up comment, fix log tags.

Submitted by: sf

Backports: r1426877, r1426879, r1426988, r1426992

------------------------------------------------------------------------

r1768035 | wrowe | 2016-11-04 10:14:59 -0400 (Fri, 04 Nov 2016) | 14 lines

Correctly parse an IPv6 literal host specification in an absolute URL

in the request line.

- Fix handling of brackets [ ] surrounding the IPv6 address.

- Skip parsing r->hostname again if not necessary.

- Do some checks that the IPv6 address is sane. This is not done by

apr_parse_addr_port().

log client error at level debug, log broken Host header value

Backports: r1407006, r1426827

Submitted by: sf

------------------------------------------------------------------------

r1767942 | wrowe | 2016-11-03 14:01:23 -0400 (Thu, 03 Nov 2016) | 5 lines

Expose ap_method_register() to the admin with a new RegisterHttpMethod

directive.

Backports: r1407599

Submitted by: sf

------------------------------------------------------------------------

r1767941 | wrowe | 2016-11-03 13:57:50 -0400 (Thu, 03 Nov 2016) | 9 lines

New directive HttpProtocol which allows to disable HTTP/0.9 support

with min=0.9|1.0 syntax.

A tighter restriction off the version in the request line is still

possible with <If "%{SERVER_PROTOCOL_NUM} ..."> .

Submitted by: sf

Backports: r1406719, r1407643, r1425366

------------------------------------------------------------------------

r1767912 | wrowe | 2016-11-03 11:55:18 -0400 (Thu, 03 Nov 2016) | 1 line

Branch to bring http protocol parsing in 2.4.x in sync with trunk

------------------------------------------------------------------------

  1. … 13 more files in changeset.
Don't globber scoreboard request info if read_request_line() fails with

a timeout. In that case there's not yet any new useful request info

available.

Noticed via server-status for prefork showing request "NULL" after

keep-alive connections timed out.

PR: 59333.

Backports: 1742792

Submitted by: rjung

Reviewed by: ylavic, wrowe

  1. … 2 more files in changeset.
Merge r1727544 from trunk:

* Ensure that proto_num and protocol is set in another "error out early" edge

case. This can happen with invalid CONNECT requests as described in the PR.

PR: 58929

Submitted by: rpluem

Reviewed/backported by: jim

  1. … 3 more files in changeset.
Add APLOGNO, first chunk (those that were

detected by coccinelle).

There are some more but they are easier to

backport once these here are applied.

Backport of r1725392, r1725394, r1725395

and r1725468 from trunk.

Submitted by: rjung

Reviewed by: jim, ylavic

  1. … 38 more files in changeset.
Merge r1710095, r1710105, r1711902 from trunk:

core: Limit to ten the number of tolerated empty lines between request,

and consume them before the pipelining check to avoid possible response

delay when reading the next request without flushing.

Before this commit, the maximum number of empty lines was the same as

configured LimitRequestFields, defaulting to 100, which was way too much.

We now use a fixed/hard limit of 10 (DEFAULT_LIMIT_BLANK_LINES).

check_pipeline() is changed to check for (up to the limit) and comsume the

trailing [CR]LFs so that they won't be interpreted as pipelined requests,

otherwise we would block on the next read without flushing data, and hence

possibly delay pending response(s) until the next/real request comes in or

the keepalive timeout expires.

Finally, when the maximum number of empty line is reached in

read_request_line(), or that request line does not contains at least a method

and an (valid) URI, we can fail early and avoid some failure detected in

further processing.

core: follow up to r1710095.

Simplify logic in check_pipeline(), and log unexpected errors.

core: follow up to r1710095, r1710105.

We can do this in a single (no inner) loop, and simplify again the logic.

Submitted by: ylavic

Reviewed/backported by: jim

  1. … 5 more files in changeset.
Merge r1708107, r1709587, r1709602, r1709995, r1710231, r1710419, r1710572, r1710583, r1715023 from trunk:

mod_ssl: performing protocol switch directly after ALPN selection, mod_http2: connection hook inits network filters to force TLS handshake, reads input only if H2Direct explicitly enabled, changes H2Direct default to off even for cleartext connections

new ap_is_allowed_protocol() for testing configured protocols, added H2Upgrade on/off directive, changed H2Direct default back to on when h2c is in Protocols

moved ssl handshake trigger from mod_http2 to new process_connection hook in mod_ssl

mod_ssl: check request-server for TLS settings compatible to handshake server, allow request if equal, renegotiation checks: remember last used cipher_suite for optimizations, deny any regnegotiation in presence of master connection

announce protocol choices on first request

fixing compilation issue for older platform

disabling protocol upgrades on slave connections

first request on master connection only reports more preferred protocols in Upgrade header

mod_ssl: follow up to r1709602.

Fix "HTTP spoken on HTTPS port" broken by the SSL handshake trigger moved to

process_connection hook (r1709602) along with H2Direct speculative read.

Submitted by: icing, ylavic

Reviewed/backported by: jim

  1. … 11 more files in changeset.
Merge r1697855, r1697339, r1696428, r1696266, r1696264, r1695874, r1695727, r1692516, r1692486, r1610674, r1685069, r1693918, r1698116, r1698133, r1694950, r1700968, r1701005, r1701145, r1701178 from trunk:

adding ap_get_protocol(c) which safeguards against NULL returns, for use instead of direct calling ap_run_protocol_get

changed Protocols to let vhosts override servers, removed old H2Engine example from readme

creating ap_array_index in util, forwarding scheme into request processing, enabling SSL vars only when scheme is not http:, delayed connection creation until task worker assignment

removed unnecessary lingering_close and sbh update on end of protocol upgrade handling

introducing ap_array_index in util, used in protocol and mod_h2

fixes existing protocol missing in selection if not explicitly proposed

new directive ProtocolsHonorOrder, added documentation for Protocols feature, changed preference selection and config merging

removed accidental code

new Protocols directive and core API changes to enable protocol switching on HTTP Upgrade or ALPN, implemented in mod_ssl and mod_h2

SECURITY (CVE-2014-0117): Fix a crash in mod_proxy. In a reverse

proxy configuration, a remote attacker could send a carefully crafted

request which could crash a server process, resulting in denial of

service.

Thanks to Marek Kroemeke working with HP's Zero Day Initiative for

reporting this issue.

* server/util.c (ap_parse_token_list_strict): New function.

* modules/proxy/proxy_util.c (find_conn_headers): Use it here.

* modules/proxy/mod_proxy_http.c (ap_proxy_http_process_response):

Send a 400 for a malformed Connection header.

Submitted by: Edward Lu, breser, covener

http, mod_ssl: Introduce and return the 421 (Misdirected Request) status code

for clients requesting a hostname on a reused connection whose SNI (from the

TLS handshake) does not match.

PR 5802.

This allows HTTP/2 clients to fall back to a new connection as per:

https://tools.ietf.org/html/rfc7540#section-9.1.2

Proposed by: Stefan Eissing <stefan eissing.org>

Reviewed by: ylavic

c89

Allowing protocol_propose hooks to be called with offers=NULL, clarifying semantics as proposed by chaosed0@gmail.com

giving ap_array_index a start parameter, adding ap_array_contains

ap_process_request needs exportation for use in mod_h2 on Windows

final final change to the new ap_array_str_* functions after review

changed Protocols default to http/1.1 only, updated documentation, changed ap_select_protocol() to return NULL when no protocol could be agreed upon

mod_ssl: fix compiler warning (bad cast).

improvements in ap_select_protocol(), supplied by yann ylavic

Submitted by: icing, jorton, ylavic, covener, icing, icing, gsmith, icing, icing, ylavic, icing

Reviewed/backported by: jim

  1. … 16 more files in changeset.
core: Avoid a possible truncation of the faulty header included in the

HTML response when LimitRequestFieldSize is reached.

Submitted by: ylavic

Backports: 1683123

Reviewed by: jailletc36, ylavic, covener

  1. … 3 more files in changeset.
Merge r1664205 from trunk:

*) SECURITY: CVE-2015-0253 (cve.mitre.org)

core: Fix a crash introduced in with ErrorDocument 400 pointing

to a local URL-path with the INCLUDES filter active, introduced

in 2.4.11. PR 57531. [Yann Ylavic]

Submitted By: ylavic

Committed By: covener

  1. … 3 more files in changeset.
Merge r1533765, r1621419, r1638159, r1638188, r1601603, r1638412, r1418763 from trunk

ssl: Axe needless string duplication in setup for call to apr_proc_create()

Fix sscanf format spotted by cppcheck

fix indent.

fix style

Private function doesn't need ap_ prefix.

tab vs space

rename variables: s should be the server_rec

Submitted by: trawick, jailletc36, jailletc36, jailletc36, takashi, jailletc36, sf

Reviewed by: jailletc36, ylavic, covener

Backported by: jailletc36

  1. … 8 more files in changeset.
Merge r1635762 from trunk:

Support custom ErrorDocuments for HTTP 501 and 414 status codes.

PR 57167 [Edward Lu <Chaosed0 gmail.com>]

Submitted By: Edward Lu <Chaosed0 gmail.com>

Committed By: covener

Submitted by: covener

Reviewed/backported by: jim

  1. … 3 more files in changeset.
Merge r1611978, r1612068 from trunk:

Add missing APLOGNO.

Refactor to keep APLOGNO on the same line as ap_log_error, when applicable.

Add missing APLOGNO.

Refactor some lines to keep APLOGNO on the same line as ap_log_error, when applicable.

Split lines longer than 80.

Improve alignment.

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 18 more files in changeset.
SECURITY: CVE-2013-5704 (cve.mitre.org)

core: HTTP trailers could be used to replace HTTP headers

late during request processing, potentially undoing or

otherwise confusing modules that examined or modified

request headers earlier. Adds "MergeTrailers" directive to restore

legacy behavior.

Submitted by: Edward Lu, Yann Ylavic, Joe Orton, Eric Covener

Backports: r1610814

Reviewed by: covener, wrowe, ylavic

  1. … 11 more files in changeset.
Merge r1524192, r1524770, r1527925, r1541270, r1541368 from trunk:

Update rationale

draft-ietf-httpbis-p1-messaging-23 fixes regarding interactions

between TE and content-length in the same req/resp.

PR 55616 (add missing APLOGNO), part 1

Wrap at 80 still, here at httpd project

Use a distinguishing APLOGNO for unk t-e with read-until-close behavior

Submitted by: jim, kbrand, wrowe, wrowe

Reviewed/backported by: jim

  1. … 9 more files in changeset.
Merge r1487528, r1563379, r1563381, r1565711 from trunk:

* server/protocol.c (r_flush): Use int return type as per declaration

of apr_vformatter(); no functional change.

Use %pm in order to save 8k of stack in 'ap_pcfg_strerror'

s/apr_pstrndup/apr_pstrmemdup/ when applicable

follow-up to r1096569:

remove unnecessary total_modules calculation

Submitted by: jorton, jailletc36, jailletc36, trawick

Reviewed/backported by: jim

  1. … 5 more files in changeset.