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-895 | Use the system's default cert store #711

Merged
merged 1 commit into from
Sep 27, 2024
Merged

Feature/SK-895 | Use the system's default cert store #711

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
23 changes: 2 additions & 21 deletions fedn/network/clients/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import os
import queue
import re
import socket
import sys
import threading
import time
Expand All @@ -13,9 +12,7 @@

import grpc
import requests
from cryptography.hazmat.primitives.serialization import Encoding
from google.protobuf.json_format import MessageToJson
from OpenSSL import SSL
from tenacity import retry, stop_after_attempt

import fedn.network.grpc.fedn_pb2 as fedn
Expand Down Expand Up @@ -158,20 +155,6 @@ 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, combiner_config):
"""Connect to combiner.

Expand Down Expand Up @@ -203,10 +186,8 @@ def connect(self, combiner_config):
channel = grpc.secure_channel("{}:{}".format(host, str(port)), credentials)
elif self.config["secure"]:
secure = True
logger.info("Using CA certificate for GRPC channel.")
cert = self._get_ssl_certificate(host, port=port)

credentials = grpc.ssl_channel_credentials(cert.encode("utf-8"))
logger.info("Using default location for root certificates.")
credentials = grpc.ssl_channel_credentials()
if self.config["token"]:
token = self.config["token"]
auth_creds = grpc.metadata_call_credentials(GrpcAuth(token))
Expand Down
Loading