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

Feature/SK-583 | Bump grpcio and grpcio-tools #487

Closed
wants to merge 3 commits into from
Closed

Feature/SK-583 | Bump grpcio and grpcio-tools #487

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
80d5efc
Fixes problem with download of ssl cert when using python 3.9
stefanhellander Nov 15, 2023
6e58f98
Removed unused import of ssl.
stefanhellander Nov 15, 2023
2c1bf98
Bumped versions of grpcio and grpcio-tools. Removed support for Pytho…
stefanhellander Nov 15, 2023
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
20 changes: 18 additions & 2 deletions fedn/fedn/network/clients/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import os
import queue
import re
import ssl
import socket
import sys
import tempfile
import threading
Expand All @@ -15,7 +15,9 @@
from io import BytesIO

import grpc
from cryptography.hazmat.primitives.serialization import Encoding
from google.protobuf.json_format import MessageToJson
from OpenSSL import SSL

import fedn.common.net.grpc.fedn_pb2 as fedn
import fedn.common.net.grpc.fedn_pb2_grpc as rpc
Expand Down Expand Up @@ -149,6 +151,20 @@ def _add_grpc_metadata(self, key, value):
# Set metadata using tuple concatenation
self.metadata += ((key, value),)

def _get_ssl_certificate(self, domain, port=443):
context = SSL.Context(SSL.SSLv23_METHOD)
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
sock.connect((domain, port))
ssl_sock = SSL.Connection(context, sock)
ssl_sock.set_tlsext_host_name(domain.encode())
ssl_sock.set_connect_state()
ssl_sock.do_handshake()
cert = ssl_sock.get_peer_certificate()
ssl_sock.close()
sock.close()
cert = cert.to_cryptography().public_bytes(Encoding.PEM).decode()
return cert

def _connect(self, client_config):
"""Connect to assigned combiner.

Expand Down Expand Up @@ -186,7 +202,7 @@ def _connect(self, client_config):
elif self.config['secure']:
secure = True
print("CLIENT: using CA certificate for GRPC channel")
cert = ssl.get_server_certificate((host, port))
cert = self._get_ssl_certificate(host, port=port)

credentials = grpc.ssl_channel_credentials(cert.encode('utf-8'))
if self.config['token']:
Expand Down
6 changes: 3 additions & 3 deletions fedn/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
author_email='[email protected]',
url='https://www.scaleoutsystems.com',
py_modules=['fedn'],
python_requires='>=3.7,<3.11',
python_requires='>=3.8,<=3.12',
install_requires=[
"PyYAML>=5.4",
"requests",
"urllib3>=1.26.4",
"minio",
"python-slugify",
"grpcio~=1.48.0",
"grpcio-tools",
"grpcio~=1.59.0",
"grpcio-tools~=1.59.0",
"numpy>=1.21.6",
"protobuf",
"pymongo",
Expand Down
Loading