Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-25 18:03:50 +00:00
Code Issues Projects Releases Wiki Activity

don't call set_alpn_protos if ALPNs are empty, refs pyca/pyopenssl#992 (#4457)

Browse Source
This commit is contained in:
Maximilian Hils 2021-02-17 18:38:12 +01:00 committed by GitHub
parent c8eca9a396
commit ff4120d4f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mitmproxy/net/tls.py
View File

@ -3,7 +3,7 @@ import os
import threading import threading
from enum import Enum from enum import Enum
from pathlib import Path from pathlib import Path
from typing import Iterable, Callable, Optional, Tuple, List, Any, BinaryIO from typing import Iterable, Callable, Optional, Sequence, Tuple, List, Any, BinaryIO
import certifi import certifi
from cryptography.hazmat.primitives.asymmetric import rsa from cryptography.hazmat.primitives.asymmetric import rsa
@ -134,7 +134,7 @@ def create_proxy_server_context(
ca_path: Optional[str], ca_path: Optional[str],
ca_pemfile: Optional[str], ca_pemfile: Optional[str],
client_cert: Optional[str], client_cert: Optional[str],
alpn_protos: Optional[Iterable[bytes]], alpn_protos: Optional[Sequence[bytes]],
) -> SSL.Context: ) -> SSL.Context:
context: SSL.Context = _create_ssl_context( context: SSL.Context = _create_ssl_context(
method=Method.TLS_CLIENT_METHOD, method=Method.TLS_CLIENT_METHOD,
@ -177,7 +177,7 @@ def create_proxy_server_context(
except SSL.Error as e: except SSL.Error as e:
raise RuntimeError(f"Cannot load TLS client certificate: {e}") from e raise RuntimeError(f"Cannot load TLS client certificate: {e}") from e
if alpn_protos is not None: if alpn_protos:
# advertise application layer protocols # advertise application layer protocols
context.set_alpn_protos(alpn_protos) context.set_alpn_protos(alpn_protos)