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.

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

Jump to bottom

Remove use of ssl.wrap_socket #1347

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Remove use of ssl.wrap_socket #1347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
341db26
Remove use of ssl.wrap_socket
s-t-e-v-e-n-k Sep 20, 2023
74b7724
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 20, 2023
b1a16e7
Merge branch 'develop' into no-more-ssl-wrap-socket
abhinavsingh Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion proxy/core/connection/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@
def wrap(self, keyfile: str, certfile: str) -> None:
self.connection.setblocking(True)
self.flush()
self._conn = ssl.wrap_socket(
ssl_context = ssl.SSLContext(protocol=ssl.PROTOCOL_TLS_CLIENT)
self._conn = ssl_context.wrap_socket(

Check failure

Code scanning / CodeQL

Use of insecure SSL/TLS version High

Insecure SSL/TLS protocol version TLSv1 allowed by
call to ssl.SSLContext
.
Insecure SSL/TLS protocol version TLSv1_1 allowed by
call to ssl.SSLContext
.
self.connection,
server_side=True,
certfile=certfile,
Expand Down
7 changes: 5 additions & 2 deletions tests/http/proxy/test_http_proxy_tls_interception.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ async def test_e2e(self, mocker: MockerFixture) -> None:
self.mock_ssl_context.return_value.wrap_socket.return_value = upstream_tls_sock

# Used for client wrapping
self.mock_ssl_wrap = mocker.patch('ssl.wrap_socket')
self.mock_ssl_wrap = mocker.patch('ssl.SSLContext')
client_tls_sock = mock.MagicMock(spec=ssl.SSLSocket)
self.mock_ssl_wrap.return_value = client_tls_sock
self.mock_ssl_wrap.return_value.wrap_socket.return_value = client_tls_sock

plain_connection = mock.MagicMock(spec=socket.socket)

Expand Down Expand Up @@ -251,6 +251,9 @@ async def asyncReturn(val: T) -> T:
)
assert self.flags.ca_cert_dir is not None
self.mock_ssl_wrap.assert_called_with(
protocol=ssl.PROTOCOL_TLS_CLIENT,
)
self.mock_ssl_wrap.return_value.wrap_socket.assert_called_with(
self._conn,
server_side=True,
keyfile=self.flags.ca_signing_key_file,
Expand Down
4 changes: 2 additions & 2 deletions tests/plugin/test_http_proxy_plugins_with_tls_interception.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def _setUp(self, request: Any, mocker: MockerFixture) -> None:
'proxy.http.proxy.server.TcpServerConnection',
)
self.mock_ssl_context = mocker.patch('ssl.create_default_context')
self.mock_ssl_wrap = mocker.patch('ssl.wrap_socket')
self.mock_ssl_wrap = mocker.patch('ssl.SSLContext')

self.mock_sign_csr.return_value = True
self.mock_gen_csr.return_value = True
Expand Down Expand Up @@ -82,7 +82,7 @@ def _setUp(self, request: Any, mocker: MockerFixture) -> None:
self.server_ssl_connection = mocker.MagicMock(spec=ssl.SSLSocket)
self.mock_ssl_context.return_value.wrap_socket.return_value = self.server_ssl_connection
self.client_ssl_connection = mocker.MagicMock(spec=ssl.SSLSocket)
self.mock_ssl_wrap.return_value = self.client_ssl_connection
self.mock_ssl_wrap.return_value.wrap_socket.return_value = self.client_ssl_connection

def has_buffer() -> bool:
return cast(bool, self.server.queue.called)
Expand Down