Skip to content

feat(tls): record negotiated TLS version #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
0x676e67 merged 6 commits into from
Aug 12, 2025
Merged

feat(tls): record negotiated TLS version #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
67b98ed
feat(tls): add more TLS extension matching
0x676e67 Aug 9, 2025
35e43f4
Merge remote-tracking branch 'origin/main' into feat
0x676e67 Aug 12, 2025
909a09a
feat(tls): record negotiated TLS version
0x676e67 Aug 12, 2025
5b0e1fd
Update src/server/tracker/inspector/tls/hello.rs
0x676e67 Aug 12, 2025
8e74779
Update src/server/tracker/info.rs
0x676e67 Aug 12, 2025
d10dfd3
Update src/server/tracker/inspector/tls/hello.rs
0x676e67 Aug 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/server/tracker/accept.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ where
let (mut stream, service) = acceptor.accept(TlsInspector::new(stream), service).await?;
let mut connect_track = ConnectionTrack::default();
connect_track.set_client_hello(stream.get_mut().0.client_hello());
connect_track.set_tls_version_negotiated(stream.get_ref().1.protocol_version());

let stream = match stream.get_ref().1.alpn_protocol() {
// If ALPN is set to HTTP/2, use Http2Inspector
Expand Down
27 changes: 21 additions & 6 deletions src/server/tracker/info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use axum::{
http::{header::USER_AGENT, HeaderValue, Method, Request},
};
use serde::{Serialize, Serializer};
use tokio_rustls::rustls::ProtocolVersion;

use super::inspector::{ClientHello, Frame, Http1Headers, Http2Frame, LazyClientHello};

Expand All @@ -28,6 +29,8 @@ pub struct Http2TrackInfo {
/// Collects TLS, HTTP/1, and HTTP/2 handshake info for tracking.
#[derive(Clone, Default)]
pub struct ConnectionTrack {
Comment thread
0x676e67 marked this conversation as resolved.
/// The TLS protocol version that was negotiated for this connection, if any.
tls_version_negotiated: Option<ProtocolVersion>,
client_hello: Option<LazyClientHello>,
http1_headers: Option<Http1Headers>,
http2_frames: Option<Http2Frame>,
Expand Down Expand Up @@ -216,6 +219,12 @@ where
// ==== impl ConnectionTrack ====

impl ConnectionTrack {
/// Set TLS version negotiated during the handshake.
#[inline]
pub fn set_tls_version_negotiated(&mut self, version: Option<ProtocolVersion>) {
self.tls_version_negotiated = version;
}

/// Set TLS client hello
#[inline]
pub fn set_client_hello(&mut self, client_hello: Option<LazyClientHello>) {
Expand Down Expand Up @@ -248,17 +257,23 @@ impl TrackInfo {
req: Request<Body>,
connection_track: ConnectionTrack,
) -> TrackInfo {
let headers = req.headers();
let mut tls = connection_track
.client_hello
.and_then(LazyClientHello::parse)
.map(TlsTrackInfo::new);

if let Some(tls) = tls.as_mut() {
tls.0
.set_tls_version_negotiated(connection_track.tls_version_negotiated);
}

let track_info = TrackInfo {
donate: Self::DONATE_URL,
address: addr,
http_version: format!("{:?}", req.version()),
method: req.method().clone(),
user_agent: headers.get(USER_AGENT).cloned(),
tls: connection_track
.client_hello
.and_then(LazyClientHello::parse)
.map(TlsTrackInfo::new),
user_agent: req.headers().get(USER_AGENT).cloned(),
tls,
http1: connection_track.http1_headers.map(Http1TrackInfo::new),
http2: connection_track.http2_frames.and_then(Http2TrackInfo::new),
};
Expand Down
13 changes: 13 additions & 0 deletions src/server/tracker/inspector/tls/hello.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

use serde::Serialize;
use tls_parser::{TlsCipherSuite, TlsExtensionType, TlsMessage, TlsMessageHandshake};
use tokio_rustls::rustls::ProtocolVersion;

use super::{
enums::{
Expand Down Expand Up @@ -54,6 +55,8 @@ impl LazyClientHello {
pub struct ClientHello {
/// TLS version of message
tls_version: TlsVersion,
Comment thread
0x676e67 marked this conversation as resolved.
/// The final TLS version negotiated during the handshake
tls_version_negotiated: Option<TlsVersion>,
client_random: String,
session_id: Option<String>,
/// A list of compression methods supported by client
Expand Down Expand Up @@ -233,6 +236,15 @@ pub struct OidFilter {
}

impl ClientHello {
Comment thread
0x676e67 marked this conversation as resolved.
/// Sets the negotiated TLS version for this `ClientHello`.
///
/// # Parameters
/// - `version`: An `Option<ProtocolVersion>` representing the negotiated TLS version.
/// If `Some`, the version is set; if `None`, no version was negotiated.
pub fn set_tls_version_negotiated(&mut self, version: Option<ProtocolVersion>) {
self.tls_version_negotiated = version.map(u16::from).map(TlsVersion::from);
}

pub fn parse(buf: &[u8]) -> Option<Self> {
let (_, r) = tls_parser::parse_tls_raw_record(buf).ok()?;
let (_, msg_list) = tls_parser::parse_tls_record_with_header(r.data, &r.hdr).ok()?;
Expand All @@ -247,6 +259,7 @@ impl ClientHello {

let mut client_hello = ClientHello {
tls_version: TlsVersion::from(payload.version.0),
tls_version_negotiated: None,
client_random: hex::encode(payload.random),
session_id: payload.session_id.map(hex::encode),
compression_algorithms: payload
Expand Down
Loading