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

Merge branch 'dev' of github.com:bunkerity/bunkerweb into dev

Browse source
This commit is contained in:
florian 2024-03-16 13:36:21 +01:00
commit 1f6a55c4e0
No known key found for this signature in database
GPG key ID: 93EE47CC3D061500
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/common/core/selfsigned/jobs/self-signed.py
View file

@ -1,10 +1,10 @@
#!/usr/bin/env python3
from datetime import UTC, datetime, timedelta
from datetime import datetime, timedelta
from os import getenv, sep
from os.path import join
from pathlib import Path
from subprocess import DEVNULL, STDOUT, run
from subprocess import DEVNULL, run
from sys import exit as sys_exit, path as sys_path
from traceback import format_exc
from typing import Tuple
@ -26,13 +26,15 @@ status = 0
def generate_cert(first_server: str, days: str, subj: str, self_signed_path: Path) -> Tuple[bool, int]:
server_path = self_signed_path.joinpath(first_server)
cert_path = server_path.joinpath("cert.pem")
key_path = server_path.joinpath("key.pem")
if server_path.joinpath("cert.pem").is_file() and server_path.joinpath("key.pem").is_file():
if cert_path.is_file() and key_path.is_file():
if (
run(
["openssl", "x509", "-checkend", "86400", "-noout", "-in", server_path.joinpath("cert.pem").as_posix()],
["openssl", "x509", "-checkend", "86400", "-noout", "-in", cert_path.as_posix()],
stdin=DEVNULL,
stderr=STDOUT,
stderr=DEVNULL,
check=False,
).returncode
== 0
@ -46,7 +48,7 @@ def generate_cert(first_server: str, days: str, subj: str, self_signed_path: Pat
LOGGER.warning(
f"Expiration date of self-signed certificate for {first_server} is different from the one in the configuration, regenerating ..."
)
elif certificate.not_valid_after_utc < datetime.now(UTC):
elif certificate.not_valid_after_utc < datetime.now(tz=certificate.not_valid_after_utc.timetz().tzinfo):
LOGGER.warning(f"Self-signed certificate for {first_server} has expired, regenerating ...")
else:
LOGGER.info(f"Self-signed certificate for {first_server} is valid")
@ -66,9 +68,9 @@ def generate_cert(first_server: str, days: str, subj: str, self_signed_path: Pat
"-pkeyopt",
"ec_paramgen_curve:prime256v1",
"-keyout",
server_path.joinpath("key.pem").as_posix(),
key_path.as_posix(),
"-out",
server_path.joinpath("cert.pem").as_posix(),
cert_path.as_posix(),
"-days",
days,
"-subj",