Skip to content

Commit be650f4

Browse files
committed
ssl context wrapper change for test
1 parent 88bede2 commit be650f4

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

.github/workflows/integration.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
max-parallel: 15
5858
fail-fast: false
5959
matrix:
60-
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9']
60+
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.8', 'pypy-3.9']
6161
test-type: ['standalone', 'cluster']
6262
connection-type: ['hiredis', 'plain']
6363
env:
@@ -159,7 +159,7 @@ jobs:
159159
strategy:
160160
fail-fast: false
161161
matrix:
162-
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9']
162+
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.8', 'pypy-3.9']
163163
steps:
164164
- uses: actions/checkout@v4
165165
- uses: actions/setup-python@v5

tests/test_connect.py

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,23 @@ def get_request(self):
105105
if self._certfile is None:
106106
return super().get_request()
107107
newsocket, fromaddr = self.socket.accept()
108-
connstream = ssl.wrap_socket(
108+
context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
109+
context.load_cert_chain(certfile=self._certfile, keyfile=self._keyfile)
110+
context.options |= ssl.OP_NO_TLSv1_1
111+
connstream = context.wrap_socket(
109112
newsocket,
110113
server_side=True,
111-
certfile=self._certfile,
112-
keyfile=self._keyfile,
113-
ssl_version=ssl.PROTOCOL_TLSv1_2,
114+
# certfile=self._certfile,
115+
# keyfile=self._keyfile,
116+
# ssl_version=ssl.PROTOCOL_TLSv1_2,
114117
)
118+
# connstream = ssl.wrap_socket(
119+
# newsocket,
120+
# server_side=True,
121+
# certfile=self._certfile,
122+
# keyfile=self._keyfile,
123+
# ssl_version=ssl.PROTOCOL_TLSv1_2,
124+
# )
115125
return connstream, fromaddr
116126

117127

0 commit comments

Comments
 (0)