Skip to content

ssl: store SSL socket owners as weak references #8423

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
Aug 2, 2026
Merged

ssl: store SSL socket owners as weak references #8423

Show file tree
Hide file tree
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
2 changes: 0 additions & 2 deletions Lib/test/test_asyncio/test_ssl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,6 @@ async def client(addr):
asyncio.wait_for(client(srv.addr),
timeout=support.SHORT_TIMEOUT))

@unittest.expectedFailure # TODO: RUSTPYTHON; - gc.collect() doesn't release SSLContext properly
def test_create_connection_memory_leak(self):
HELLO_MSG = b'1' * self.PAYLOAD_SIZE

Expand Down Expand Up @@ -1617,7 +1616,6 @@ async def test():
else:
self.fail('Unexpected ResourceWarning: {}'.format(cm.warning))

@unittest.expectedFailure # TODO: RUSTPYTHON; - gc.collect() doesn't release SSLContext properly
def test_handshake_timeout_handler_leak(self):
s = socket.socket(socket.AF_INET)
s.bind(('127.0.0.1', 0))
Expand Down
1 change: 0 additions & 1 deletion Lib/test/test_ssl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1479,7 +1479,6 @@ def dummycallback(sock, servername, ctx):
ctx.set_servername_callback(None)
ctx.set_servername_callback(dummycallback)

@unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: Expected 'mock' to not have been called. Called 1 times.
def test_sni_callback_on_dead_references(self):
# See https://github.com/python/cpython/issues/146080.
c_ctx = make_test_context()
Expand Down
39 changes: 31 additions & 8 deletions crates/stdlib/src/ssl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ mod _ssl {
VirtualMachine,
builtins::{
PyBaseExceptionRef, PyByteArray, PyBytesRef, PyListRef, PyStrRef, PyType,
PyTypeRef, PyUtf8StrRef,
PyTypeRef, PyUtf8StrRef, PyWeak,
},
convert::IntoPyException,
function::{
Expand Down Expand Up @@ -1920,7 +1920,12 @@ mod _ssl {
connection: PyMutex::new(None),
handshake_done: PyMutex::new(false),
session_was_reused: PyMutex::new(false),
owner: PyRwLock::new(args.owner.into_option()),
owner: PyRwLock::new(
args.owner
.into_option()
.map(|o| o.downgrade(None, vm))
.transpose()?,
),
Comment thread
coderabbitai[bot] marked this conversation as resolved.
// Filter out Python None objects - only store actual SSLSession objects
session: PyRwLock::new(args.session.into_option().filter(|s| !vm.is_none(s))),
incoming_bio: None,
Expand Down Expand Up @@ -1997,7 +2002,12 @@ mod _ssl {
connection: PyMutex::new(None),
handshake_done: PyMutex::new(false),
session_was_reused: PyMutex::new(false),
owner: PyRwLock::new(args.owner.into_option()),
owner: PyRwLock::new(
args.owner
.into_option()
.map(|o| o.downgrade(None, vm))
.transpose()?,
),
// Filter out Python None objects - only store actual SSLSession objects
session: PyRwLock::new(args.session.into_option().filter(|s| !vm.is_none(s))),
incoming_bio: Some(args.incoming),
Expand Down Expand Up @@ -2377,7 +2387,7 @@ mod _ssl {
#[pytraverse(skip)]
session_was_reused: PyMutex<bool>,
// Owner (SSLSocket instance that owns this _SSLSocket)
owner: PyRwLock<Option<PyObjectRef>>,
owner: PyRwLock<Option<PyRef<PyWeak>>>,

@youknowone youknowone Aug 2, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

👍

// Session for resumption
session: PyRwLock<Option<PyObjectRef>>,
// MemoryBIO mode (optional)
Expand Down Expand Up @@ -2734,7 +2744,19 @@ mod _ssl {
return Ok(());
};

let ssl_sock = self.owner.read().clone().unwrap_or_else(|| vm.ctx.none());
let ssl_sock = self
.owner
.read()
.as_ref()
.and_then(|owner| owner.upgrade())
.ok_or_else(|| {
super::compat::SslError::create_ssl_error_with_reason(
vm,
Some("SSL"),
"CALLBACK_FAILED",
"[SSL: CALLBACK_FAILED] callback failed",
)
})?;
let server_name_py: PyObjectRef = match sni_name {
Some(name) => vm.ctx.new_str(name.to_string()).into(),
None => vm.ctx.none(),
Expand Down Expand Up @@ -3955,12 +3977,13 @@ mod _ssl {

#[pygetset]
fn owner(&self) -> Option<PyObjectRef> {
self.owner.read().clone()
self.owner.read().as_ref().and_then(|owner| owner.upgrade())
}

#[pygetset(setter)]
fn set_owner(&self, owner: PyObjectRef, _vm: &VirtualMachine) {
*self.owner.write() = Some(owner);
fn set_owner(&self, owner: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
*self.owner.write() = Some(owner.downgrade(None, vm)?);
Ok(())
}

#[pygetset]
Expand Down
Loading