Skip to content

Python 3.12: microserver.test.ext wrap_socket update #10247

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
bneradt merged 1 commit into from
Aug 18, 2023
Merged

Python 3.12: microserver.test.ext wrap_socket update #10247

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions tests/gold_tests/autest-site/microserver.test.ext
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,12 @@ def uServerUpAndRunning(serverHost, port, isSsl, isIPv6, request, clientcert='',
plain_sock = socket.socket(socket.AF_INET)

if isSsl:
context = ssl.create_default_context(ssl.Purpose.SERVER_AUTH)
context.check_hostname = False
context.verify_mode = ssl.CERT_NONE
if clientcert != '' or clientkey != '':
sock = ssl.wrap_socket(plain_sock, keyfile=clientkey, certfile=clientcert)
else:
sock = ssl.wrap_socket(plain_sock)
context.load_cert_chain(certfile=clientcert, keyfile=clientkey)
sock = context.wrap_socket(plain_sock)
else:
sock = plain_sock

Expand All @@ -138,11 +140,11 @@ def uServerUpAndRunning(serverHost, port, isSsl, isIPv6, request, clientcert='',
"Connection refused: {0}:{1}".format(
serverHost, port))
return False
except ssl.SSLError:
except ssl.SSLError as e:
host.WriteDebug(
['uServerUpAndRunning', 'when'],
"SSL connection error: {0}:{1}".format(
serverHost, port))
"SSL connection error: {0}:{1}:{2}".format(
serverHost, port, e))
return False

sock.sendall(request.encode())
Expand Down