Elgato_dark/bunkerweb
1
0
Fork 0
mirror of https://github.com/bunkerity/bunkerweb synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: Fix error handling in custom-cert.py

Browse source
This commit is contained in:
Théophile Diot 2024-08-19 10:22:19 +01:00
parent 13204be9b8
commit b1ce5cde1d
No known key found for this signature in database
GPG key ID: FA995104A0BA376A
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/common/core/customcert/jobs/custom-cert.py
View file

@ -43,6 +43,7 @@ def check_cert(cert_file: Union[Path, bytes], key_file: Union[Path, bytes], firs
cached, err = JOB.cache_file("cert.pem", cert_file, service_id=first_server, checksum=cert_hash, delete_file=False)
if not cached:
LOGGER.error(f"Error while caching custom-cert cert.pem file : {err}")
return False, err
key_hash = bytes_hash(key_file)
old_hash = JOB.cache_hash("key.pem", service_id=first_server)
@ -51,6 +52,7 @@ def check_cert(cert_file: Union[Path, bytes], key_file: Union[Path, bytes], firs
cached, err = JOB.cache_file("key.pem", key_file, service_id=first_server, checksum=key_hash, delete_file=False)
if not cached:
LOGGER.error(f"Error while caching custom-key key.pem file : {err}")
return False, err
return ret, ""
except BaseException as e:
@ -98,6 +100,7 @@ try:
except BaseException:
LOGGER.exception(f"Error while decoding cert data, skipping server {first_server}...")
skipped_servers.append(first_server)
status = 2
continue
if key_file:
@ -108,6 +111,7 @@ try:
except BaseException:
LOGGER.exception(f"Error while decoding key data, skipping server {first_server}...")
skipped_servers.append(first_server)
status = 2
continue
LOGGER.info(f"Checking certificate for {first_server} ...")
@ -115,10 +119,12 @@ try:
if isinstance(err, BaseException):
LOGGER.error(f"Exception while checking {first_server}'s certificate, skipping ... \n{err}")
skipped_servers.append(first_server)
status = 2
continue
elif err:
LOGGER.warning(f"Error while checking {first_server}'s certificate : {err}")
skipped_servers.append(first_server)
status = 2
continue
elif need_reload:
LOGGER.info(f"Detected change in {first_server}'s certificate")