Nucypher
/
nucypher
mirror of https://github.com/nucypher/nucypher.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use middleare client for certificate handling during IP checkups.

pull/2462/head
Kieran Prasch 2020-12-21 23:31:52 -08:00
parent 099fedcb64
commit 19a6cf4f54
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nucypher/network/middleware.py
View File

@ -286,7 +286,3 @@ class RestMiddleware:
params=params) params=params)
return response return response
def ping(self, node):
response = self.client.get(node_or_sprout=node, path=f"ping", timeout=2)
return response

31
nucypher/utilities/networking.py
View File

@ -14,18 +14,15 @@
You should have received a copy of the GNU Affero General Public License You should have received a copy of the GNU Affero General Public License
along with nucypher. If not, see <https://www.gnu.org/licenses/>. along with nucypher. If not, see <https://www.gnu.org/licenses/>.
""" """
from urllib.parse import urlparse
import random import random
import requests import requests
from requests.exceptions import RequestException, HTTPError from requests.exceptions import RequestException, HTTPError
from typing import Union from typing import Union
from nucypher.blockchain.economics import StandardTokenEconomics
from nucypher.characters.lawful import Ursula from nucypher.characters.lawful import Ursula
from nucypher.config.storages import LocalFileBasedNodeStorage from nucypher.network.middleware import RestMiddleware, NucypherMiddlewareClient
from nucypher.network.middleware import RestMiddleware from nucypher.utilities.logging import Logger
class UnknownIPAddress(RuntimeError): class UnknownIPAddress(RuntimeError):
@ -52,7 +49,12 @@ def get_external_ip_from_url_source(url: str, certificate=None) -> Union[str, No
return response.text return response.text
def get_external_ip_from_default_teacher(network: str, federated_only: bool = False) -> Union[str, None]: def get_external_ip_from_default_teacher(network: str,
federated_only: bool = False,
log=None
) -> Union[str, None]:
if not log:
log = Logger('whoami')
try: try:
top_teacher_url = RestMiddleware.TEACHER_NODES[network][0] top_teacher_url = RestMiddleware.TEACHER_NODES[network][0]
@ -61,23 +63,32 @@ def get_external_ip_from_default_teacher(network: str, federated_only: bool = Fa
return # just move on. return # just move on.
teacher = Ursula.from_teacher_uri(teacher_uri=top_teacher_url, teacher = Ursula.from_teacher_uri(teacher_uri=top_teacher_url,
federated_only=federated_only, federated_only=federated_only,
min_stake=StandardTokenEconomics._default_minimum_allowed_locked) min_stake=0) # TODO: Handle (more than) min stake here
response = teacher.network_middleware.ping()
client = NucypherMiddlewareClient()
response = client.get(node_or_sprout=teacher, path=f"ping", timeout=2) # TLS certificate login within
if response.status_code == 200: if response.status_code == 200:
log.info(f'Fetched external IP address from default teacher ({top_teacher_url}).')
return response.text return response.text
def get_external_ip_from_known_nodes(known_nodes, sample_size: int = 3): def get_external_ip_from_known_nodes(known_nodes, sample_size: int = 3, log: Logger = None):
if not log:
log = Logger('whoami')
sample = random.sample(known_nodes, sample_size) sample = random.sample(known_nodes, sample_size)
for node in sample: for node in sample:
ip = get_external_ip_from_url_source(url=node.rest_url()) ip = get_external_ip_from_url_source(url=node.rest_url())
if ip: if ip:
log.info(f'Fetched external IP address from randomly selected known node(s).')
return ip return ip
def get_external_ip_from_centralized_source() -> str: def get_external_ip_from_centralized_source(log: Logger = None) -> str:
endpoint = 'https://ifconfig.me/' endpoint = 'https://ifconfig.me/'
ip = get_external_ip_from_url_source(url=endpoint) ip = get_external_ip_from_url_source(url=endpoint)
if not log:
log = Logger('whoami')
log.info(f'Fetched external IP address from centralized source ({endpoint}).')
return ip return ip