Skip to content

make server.py compatible with Python3.13 #737

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

Open
karamyaqin wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −10
Open

make server.py compatible with Python3.13 #737

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
32 changes: 22 additions & 10 deletions kmip/services/server/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import optparse
import os
import signal
import six
import socket
import ssl
import sys
Expand Down Expand Up @@ -243,7 +243,7 @@ def start(self):
self.manager = multiprocessing.Manager()
self.policies = self.manager.dict()
policies = copy.deepcopy(operation_policy.policies)
for policy_name, policy_set in six.iteritems(policies):
for policy_name, policy_set in policies.items():
self.policies[policy_name] = policy_set

self.policy_monitor = monitor.PolicyDirectoryMonitor(
Expand Down Expand Up @@ -287,17 +287,29 @@ def interrupt_handler(trigger, frame):
for cipher in auth_suite_ciphers:
self._logger.debug(cipher)

self._socket = ssl.wrap_socket(
self._socket,
keyfile=self.config.settings.get('key_path'),
# ssl.wrap_socket() was removed in Python 3.12+; build an SSLContext
# and use its wrap_socket() method instead, which is the supported
# replacement and preserves the same TLS configuration.
ssl_context = ssl.SSLContext(self.auth_suite.protocol)
ssl_context.verify_mode = ssl.CERT_REQUIRED
ssl_context.load_cert_chain(
certfile=self.config.settings.get('certificate_path'),
keyfile=self.config.settings.get('key_path')
)
ssl_context.load_verify_locations(
cafile=self.config.settings.get('ca_path')
)
ssl_context.set_ciphers(self.auth_suite.ciphers)

self._socket = ssl_context.wrap_socket(
self._socket,
server_side=True,
cert_reqs=ssl.CERT_REQUIRED,
ssl_version=self.auth_suite.protocol,
ca_certs=self.config.settings.get('ca_path'),
do_handshake_on_connect=False,
suppress_ragged_eofs=True,
ciphers=self.auth_suite.ciphers
suppress_ragged_eofs=True
)

try:
Expand Down