witine/lookingglass
1
0
Fork 0
forked from mirrors/thatmattlove-hyperglass
Code Issues Pull requests Releases Activity

add ssl certificate error handling

Browse source
This commit is contained in:
checktheroads 2020-03-21 15:23:50 -07:00
parent eafd3734e6
commit b5b00e047d
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
hyperglass/execution/execute.py
View file

@ -9,6 +9,7 @@ hyperglass-frr API calls, returns the output back to the front end.
# Standard Library
import re
import signal
from ssl import CertificateError
# Third Party
import httpx
@ -249,7 +250,7 @@ class Connect:
signal.alarm(0)
return response
async def rest(self):
async def rest(self): # noqa: C901
"""Connect to a device running hyperglass-agent via HTTP."""
log.debug(f"Query parameters: {self.query}")
@ -319,7 +320,7 @@ class Connect:
rest_msg = " ".join(
re.findall(r"[A-Z][^A-Z]*", rest_error.__class__.__name__)
)
log.error(f"Error connecting to device {self.device.location}: {rest_msg}")
log.error(f"Error connecting to device {self.device.name}: {rest_msg}")
raise RestError(
params.messages.connection_error,
device_name=self.device.display_name,
@ -332,6 +333,16 @@ class Connect:
device_name=self.device.display_name,
error="System error",
)
except CertificateError as cert_error:
log.critical(str(cert_error))
msg_summary = " ".join(
re.findall(r"[A-Z][^A-Z]*", cert_error.__class__.__name__)
)
raise RestError(
params.messages.connection_error,
device_name=self.device.display_name,
error=f"{msg_summary}: {cert_error}",
)
if raw_response.status_code != 200:
log.error(f"Response code is {raw_response.status_code}")