Skip to content

Fix SSL test_preauth_data_to_tls_server #6508

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
youknowone merged 1 commit into from
Dec 25, 2025
Merged

Fix SSL test_preauth_data_to_tls_server #6508

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions crates/stdlib/src/ssl/compat.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,8 @@ pub(super) enum SslError {
ZeroReturn,
/// Unexpected EOF without close_notify (protocol violation)
Eof,
/// Non-TLS data received before handshake completed
PreauthData,
/// Certificate verification error
CertVerification(rustls::CertificateError),
/// I/O error
Expand Down Expand Up @@ -562,6 +564,15 @@ impl SslError {
.upcast(),
SslError::ZeroReturn => create_ssl_zero_return_error(vm).upcast(),
SslError::Eof => create_ssl_eof_error(vm).upcast(),
SslError::PreauthData => {
// Non-TLS data received before handshake
Self::create_ssl_error_with_reason(
vm,
None,
"before TLS handshake with data",
"before TLS handshake with data",
)
}
SslError::CertVerification(cert_err) => {
// Use the proper cert verification error creator
create_ssl_cert_verification_error(vm, &cert_err).expect("unlikely to happen")
Expand Down Expand Up @@ -1245,6 +1256,12 @@ pub(super) fn ssl_do_handshake(
}
}

// InvalidMessage during handshake means non-TLS data was received
// before the handshake completed (e.g., HTTP request to TLS server)
if matches!(e, rustls::Error::InvalidMessage(_)) {
return Err(SslError::PreauthData);
}

// Certificate verification errors are already handled by from_rustls

return Err(SslError::from_rustls(e));
Expand Down
Loading