Skip to content
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.

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

Add ALPN extension to client SSL Context #10156

Merged
merged 9 commits into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGES/10156.feature.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Enabled ALPN on default SSL contexts. This improves compatibility with some
proxies which don't work without this extension.
-- by :user:`Cycloctane`.
18 changes: 10 additions & 8 deletions aiohttp/connector.py
Original file line number Diff line number Diff line change
Expand Up @@ -772,14 +772,16 @@ def _make_ssl_context(verified: bool) -> SSLContext:
# No ssl support
return None # type: ignore[unreachable]
if verified:
return ssl.create_default_context()
sslcontext = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
sslcontext.options |= ssl.OP_NO_SSLv2
sslcontext.options |= ssl.OP_NO_SSLv3
sslcontext.check_hostname = False
sslcontext.verify_mode = ssl.CERT_NONE
sslcontext.options |= ssl.OP_NO_COMPRESSION
sslcontext.set_default_verify_paths()
sslcontext = ssl.create_default_context()
else:
sslcontext = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
sslcontext.options |= ssl.OP_NO_SSLv2
sslcontext.options |= ssl.OP_NO_SSLv3
sslcontext.check_hostname = False
sslcontext.verify_mode = ssl.CERT_NONE
sslcontext.options |= ssl.OP_NO_COMPRESSION
sslcontext.set_default_verify_paths()
sslcontext.set_alpn_protocols(("http/1.1",))
return sslcontext


Expand Down
24 changes: 24 additions & 0 deletions tests/test_client_functional.py
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,30 @@ async def handler(request: web.Request) -> web.Response:
assert txt == "Test message"


async def test_ssl_client_alpn(
aiohttp_server: AiohttpServer,
aiohttp_client: AiohttpClient,
ssl_ctx: ssl.SSLContext,
) -> None:

async def handler(request: web.Request) -> web.Response:
assert request.transport is not None
sslobj = request.transport.get_extra_info("ssl_object")
Dreamsorcerer marked this conversation as resolved.
Show resolved Hide resolved
return web.Response(text=sslobj.selected_alpn_protocol())

app = web.Application()
app.router.add_route("GET", "/", handler)
ssl_ctx.set_alpn_protocols(("http/1.1",))
server = await aiohttp_server(app, ssl=ssl_ctx)

connector = aiohttp.TCPConnector(ssl=False)
client = await aiohttp_client(server, connector=connector)
resp = await client.get("/")
assert resp.status == 200
txt = await resp.text()
assert txt == "http/1.1"


async def test_tcp_connector_fingerprint_ok(
aiohttp_server: AiohttpServer,
aiohttp_client: AiohttpClient,
Expand Down
Loading