Skip to content

fix SSL callback #6688

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 2 commits into from
Jan 10, 2026
Merged

fix SSL callback #6688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
901a895
fix SSL callback
youknowone Jan 10, 2026
3c715b9
Auto-format: cargo fmt --all
github-actions[bot] Jan 10, 2026
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
4 changes: 0 additions & 4 deletions Lib/_opcode_metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@

_specializations = {}





_specialized_opmap = {}

opmap = {
Expand Down
28 changes: 26 additions & 2 deletions crates/stdlib/src/ssl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// spell-checker: ignore ssleof aesccm aesgcm getblocking setblocking ENDTLS
// spell-checker: ignore ssleof aesccm aesgcm getblocking setblocking ENDTLS TLSEXT

//! Pure Rust SSL/TLS implementation using rustls
//!
Expand Down Expand Up @@ -2652,7 +2652,31 @@ mod _ssl {
};
let initial_context: PyObjectRef = self.context.read().clone().into();

let result = callback.call((ssl_sock, server_name_py, initial_context), vm)?;
// catches exceptions from the callback and reports them as unraisable
let result = match callback.call((ssl_sock, server_name_py, initial_context), vm) {
Ok(result) => result,
Err(exc) => {
vm.run_unraisable(
exc,
Some("in ssl servername callback".to_owned()),
callback.clone(),
);
// Return SSL error like SSL_TLSEXT_ERR_ALERT_FATAL
let ssl_exc: PyBaseExceptionRef = vm
.new_os_subtype_error(
PySSLError::class(&vm.ctx).to_owned(),
None,
"SNI callback raised exception",
)
.upcast();
let _ = ssl_exc.as_object().set_attr(
"reason",
vm.ctx.new_str("TLSV1_ALERT_INTERNAL_ERROR"),
vm,
);
return Err(ssl_exc);
}
};

// Check return value type (must be None or integer)
if !vm.is_none(&result) {
Expand Down
Loading