Repository navigation
mod_ssl: Fix "Require ssl-verify-client" denied on HTTP/2 secondary c… - #959
Open
arturobernalg wants to merge 1 commit into
Open
arturobernalg wants to merge 1 commit into
arturobernalg wants to merge 1 commit into
Conversation
…onnections. ssl_authz_verify_client_check() read the SSLConnRec off r->connection directly. On an HTTP/2 secondary (stream) connection that object has no SSLConnRec of its own -- the handshake state lives on the master connection -- so the check always found no SSL and denied the request, even though SSL_CLIENT_VERIFY itself already read SUCCESS for the same request. Every other mod_ssl hook touching a request already falls back to r->connection->master in this situation (ssl_hook_Access(), modssl_request_is_tls()); this one didn't. Reuse modssl_request_is_tls(), which already does that fallback, instead of duplicating the lookup. This backports the trunk fix (56156a7, PR apache#913) to 2.4.x. PR 70284
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.
ssl_authz_verify_client_check() read the SSLConnRec off r->connection directly. On an HTTP/2 secondary (stream) connection that object has no SSLConnRec of its own -- the handshake state lives on the master connection -- so the check always found no SSL and denied the request, even though SSL_CLIENT_VERIFY itself already read SUCCESS for the same request. Every other mod_ssl hook touching a request already falls back to r->connection->master in this situation (ssl_hook_Access(), modssl_request_is_tls()); this one didn't.
Reuse modssl_request_is_tls(), which already does that fallback, instead of duplicating the lookup.
This backports the trunk fix (56156a7, #913) to 2.4.x.
BZ: https://bz.apache.org/bugzilla/show_bug.cgi?id=70284
(see
SECURITY.mdandhttps://www.apache.org/security/#reporting-a-vulnerability).
APLOGNO()tag;numbers are assigned by a committer at merge time (see
docs/log-message-tags/README).changes-entries/*.txtfile is included,following the template in
README.CHANGES(not needed otherwise).test/modules/xxxdirectory matching themodules/xxxmodule source,or
test/modules/corefor core server changes. On Unix, verify thesepass locally with e.g.
make check-pytest PYTEST_DIRS=test/modules/xxx.