Tighten handshake validation and freeze trim characters#35
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Without the PCRE
Dmodifier a trailing$anchor also matches immediately before a final newline, andgetRequestHeaderscuts the handshake request line at the first CRLF, so a client sending a bare line feed before its first CRLF produced a request line with a trailing newline that still validated. The request-line pattern also left both dots inHTTP/1.1unescaped, so versions such asHTTP/1x1were accepted. The pattern now escapes the dots and carriesD, theserver_ssl_option-key pattern gains the same anchor, and a new test pins both rejections throughvalidateRequestHandshake.This also passes the pre-8.6 trim character set explicitly at the six calls that relied on the PHP default, in the handshake header parsing, key extraction, and failure diagnostics, since PHP 8.6 adds form feed to that default. This is the wrench counterpart of chrome-php/chrome#751.