Skip to content

Add support for PP2_SUBTYPE_SSL_GROUP - #12921

Merged
maskit merged 1 commit into
apache:masterfrom
maskit:pp_tls_group
Mar 3, 2026
Merged

maskit merged 1 commit into
apache:masterfrom
maskit:pp_tls_group

Conversation

@maskit

@maskit maskit commented Feb 27, 2026

Copy link
Copy Markdown
Member

No description provided.

@maskit maskit added this to the 11.0.0 milestone Feb 27, 2026
@maskit maskit self-assigned this Feb 27, 2026
@maskit

maskit commented Feb 27, 2026

Copy link
Copy Markdown
Member Author

[approve ci centos]

2 similar comments
@maskit

maskit commented Feb 27, 2026

Copy link
Copy Markdown
Member Author

[approve ci centos]

@maskit

maskit commented Feb 27, 2026

Copy link
Copy Markdown
Member Author

[approve ci centos]

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Adds end-to-end support for the PROXY Protocol v2 TLS sub-TLV PP2_SUBTYPE_SSL_GROUP so that ATS can parse it, expose it via ProxyProtocol, and log it as a first-class log field.

Changes:

  • Add PP2_SUBTYPE_SSL_GROUP constant and ProxyProtocol::get_tlv_ssl_group() accessor.
  • Add a new logging marshal function and register a new log field (proxy_protocol_tls_group / pptg).
  • Extend the Proxy Protocol v2 parser unit test and update logging field documentation.

Reviewed changes

Copilot reviewed 7 out of 7 changed files in this pull request and generated no comments.

Show a summary per file
File Description
src/proxy/logging/LogAccess.cc Implements marshaling of the TLS group string from PROXY Protocol context for logging.
include/proxy/logging/LogAccess.h Declares the new marshaling method for the logging subsystem.
src/proxy/logging/Log.cc Registers the new log field proxy_protocol_tls_group with symbol pptg.
include/iocore/net/ProxyProtocol.h Defines PP2_SUBTYPE_SSL_GROUP and declares the new accessor.
src/iocore/net/ProxyProtocol.cc Implements get_tlv_ssl_group() via existing SSL sub-TLV parsing logic.
src/iocore/net/unit_tests/test_ProxyProtocol.cc Updates v2 TLV test fixture lengths and validates parsing of the new SSL group subtype.
doc/admin-guide/logging/formatting.en.rst Documents the new pptg logging field.

@bneradt bneradt left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@maskit
maskit merged commit 37a801a into apache:master Mar 3, 2026
19 checks passed
cmcfarlen pushed a commit that referenced this pull request Jun 9, 2026
cmcfarlen added a commit that referenced this pull request Jun 9, 2026
PR #12921 (PP2_SUBTYPE_SSL_GROUP) was authored against pre-#13123 master
where m_http_sm was accessible directly on LogAccess. On 10.2.x we
already picked the LogData refactor (#13124, the 10.2.x-targeted twin of
master's #13123), which moves transaction state behind m_data->get_pp_*
getters. Rewrite the new marshal function to match the existing
marshal_proxy_protocol_tls_cipher / _version pattern.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
@cmcfarlen cmcfarlen modified the milestones: 11.0.0, 10.2.0 Jun 16, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants