Skip to content

[3.12] gh-156793: Validate SSLContext.wrap_bio() parameters like wrap_socket() (GH-158503) #158513

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
Yhg1s merged 7 commits into from
Sep 30, 2026
Merged

[3.12] gh-156793: Validate SSLContext.wrap_bio() parameters like wrap_socket() (GH-158503) #158513

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9a9bff5
[3.12] gh-156793: Validate SSLContext.wrap_bio() parameters like wrap…
sethmlarson Sep 30, 2026
1712d5b
Replace make_test_context(), not in this branch
hugovk Sep 30, 2026
ca99e00
Raise a DeprecationWarning instead of ValueError
sethmlarson Sep 30, 2026
ff79789
Fix tests and comments, server_hostname='' still raises ValueError
sethmlarson Sep 30, 2026
2c440e8
Only emit new warning for server_hostname=None
sethmlarson Sep 30, 2026
d472f49
Update Misc/NEWS.d/next/Security/2026-09-16-14-05-19.gh-issue-156793.…
Yhg1s Sep 30, 2026
1962669
Update Misc/NEWS.d/next/Security/2026-09-23-11-34-30.gh-issue-156793.…
Yhg1s Sep 30, 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
Prev Previous commit
Next Next commit
Fix tests and comments, server_hostname='' still raises ValueError
  • Loading branch information
@sethmlarson
sethmlarson committed Sep 30, 2026
commit ff797896110b54d9a59dbe1a6a63d9d55baa331e
14 changes: 10 additions & 4 deletions Lib/test/test_asyncio/test_sslproto.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@ def test_check_hostname_accepts_server_hostname(self):
server_hostname='example.org')
self.addCleanup(ssl_proto._app_transport.close)

@support.subTests("server_hostname", [None, ''])
def test_check_hostname_requires_server_hostname(self, server_hostname):
def test_check_hostname_requires_server_hostname(self):
# A caller-supplied context asking for hostname checking used to be
# taken through wrap_bio() with no name to check against, verifying
# the certificate chain but never the peer's identity.
Expand All @@ -94,10 +93,17 @@ def test_check_hostname_requires_server_hostname(self, server_hostname):
sslcontext.check_hostname = True
app_proto = mock.Mock()
waiter = mock.Mock()
server_hostname = None

# Supplying an empty server_hostname fails with check_hostname enabled.
# Supplying no server_hostname warns with check_hostname enabled.
with self.assertWarnsRegex(
UserWarning,
DeprecationWarning,
'check_hostname requires server_hostname'):
sslproto.SSLProtocol(self.loop, app_proto, sslcontext,
waiter)

with self.assertWarnsRegex(
DeprecationWarning,
'check_hostname requires server_hostname'):
sslproto.SSLProtocol(self.loop, app_proto, sslcontext,
waiter,
Expand Down
38 changes: 20 additions & 18 deletions Lib/test/test_ssl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1725,7 +1725,7 @@ def test_bad_server_hostname(self):
with self.assertWarns(DeprecationWarning):
ctx.wrap_bio(ssl.MemoryBIO(), ssl.MemoryBIO(),
server_hostname=None)
with self.assertRaises(DeprecationWarning):
with self.assertRaises(ValueError):
ctx.wrap_bio(ssl.MemoryBIO(), ssl.MemoryBIO(),
server_hostname="")
with self.assertRaises(ValueError):
Expand Down Expand Up @@ -1817,30 +1817,32 @@ def test_check_hostname_requires_server_hostname(self):
client_context, _, hostname = testing_context()
self.assertTrue(client_context.check_hostname)

for server_hostname in (None, ""):
with self.subTest(server_hostname=server_hostname):
with self.assertWarnsRegex(
DeprecationWarning,
"check_hostname requires server_hostname"):
client_context.wrap_bio(ssl.MemoryBIO(), ssl.MemoryBIO(),
server_hostname=server_hostname)
# The sibling constructor refuses the very same call.
with socket.socket() as sock:
with self.assertWarnsRegex(
DeprecationWarning,
"check_hostname requires server_hostname"):
client_context.wrap_socket(
sock, server_hostname=server_hostname)
server_hostname = None
with self.assertWarnsRegex(
DeprecationWarning,
"check_hostname requires server_hostname"):
client_context.wrap_bio(ssl.MemoryBIO(), ssl.MemoryBIO(),
server_hostname=server_hostname)
# The sibling constructor refuses the very same call, but with
# a ValueError instead of DeprecationWarning.
with socket.socket() as sock:
with self.assertRaisesRegex(
ValueError,
"check_hostname requires server_hostname"):
client_context.wrap_socket(
sock, server_hostname=server_hostname)

# A name was all that was missing.
client_context.wrap_bio(ssl.MemoryBIO(), ssl.MemoryBIO(),
server_hostname=hostname)
with warnings_helper.check_no_warnings(self):
client_context.wrap_bio(ssl.MemoryBIO(), ssl.MemoryBIO(),
server_hostname=hostname)

# Asking for no hostname check remains a way to say so explicitly.
context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
context.check_hostname = False
self.assertFalse(context.check_hostname)
context.wrap_bio(ssl.MemoryBIO(), ssl.MemoryBIO())
with warnings_helper.check_no_warnings(self):
context.wrap_bio(ssl.MemoryBIO(), ssl.MemoryBIO())

def test_server_side_bad_params(self):
# A server neither sends a hostname nor resumes a client's session,
Expand Down
Loading