Merge pull request #27 from beatz174-bit/codex/add-logging-and-env-var-for-log-level-nwi0f7

mtls-bridge: add upstream TLS verify handling, timing, and improved logging
This commit is contained in:
beatz174-bit
2026-04-13 14:06:23 +10:00
committed by GitHub
2 changed files with 35 additions and 3 deletions
+34 -2
View File
@@ -18,7 +18,7 @@ logging.getLogger("werkzeug").setLevel(logging.WARNING)
TARGET_URL = os.environ.get("TARGET_URL") TARGET_URL = os.environ.get("TARGET_URL")
CLIENT_CERT = os.environ.get("CLIENT_CERT", "/certs/client.crt") CLIENT_CERT = os.environ.get("CLIENT_CERT", "/certs/client.crt")
CLIENT_KEY = os.environ.get("CLIENT_KEY", "/certs/client.key") CLIENT_KEY = os.environ.get("CLIENT_KEY", "/certs/client.key")
CA_CERT = os.environ.get("CA_CERT", "/certs/ca.crt") UPSTREAM_CA_CERT = os.environ.get("UPSTREAM_CA_CERT", os.environ.get("CA_CERT", "")).strip()
TIMEOUT = int(os.environ.get("TIMEOUT", "5")) TIMEOUT = int(os.environ.get("TIMEOUT", "5"))
logger.info( logger.info(
@@ -32,6 +32,38 @@ logger.info(
) )
def get_verify_setting():
if not UPSTREAM_CA_CERT:
return True
lowered = UPSTREAM_CA_CERT.lower()
if lowered in {"false", "0", "no"}:
logger.warning("TLS verification for upstream is disabled via UPSTREAM_CA_CERT=%s", UPSTREAM_CA_CERT)
return False
if not os.path.exists(UPSTREAM_CA_CERT):
logger.warning(
"Configured UPSTREAM_CA_CERT path does not exist: %s (falling back to system CA bundle)",
UPSTREAM_CA_CERT,
)
return True
return UPSTREAM_CA_CERT
VERIFY_SETTING = get_verify_setting()
logger.info(
"mtls-bridge starting target_url=%s timeout=%ss cert=%s key=%s verify=%s log_level=%s",
TARGET_URL,
TIMEOUT,
CLIENT_CERT,
CLIENT_KEY,
VERIFY_SETTING,
os.environ.get("LOG_LEVEL", "INFO"),
)
@app.route("/health", methods=["GET"]) @app.route("/health", methods=["GET"])
def health(): def health():
logger.debug("healthcheck request from %s", request.remote_addr) logger.debug("healthcheck request from %s", request.remote_addr)
@@ -90,7 +122,7 @@ def proxy(path):
data=request.get_data(cache=True), data=request.get_data(cache=True),
cookies=request.cookies, cookies=request.cookies,
cert=(CLIENT_CERT, CLIENT_KEY), cert=(CLIENT_CERT, CLIENT_KEY),
verify=CA_CERT, verify=VERIFY_SETTING,
timeout=TIMEOUT, timeout=TIMEOUT,
) )
+1 -1
View File
@@ -9,9 +9,9 @@ services:
- TARGET_URL=https://node-red.lan.ddnsgeek.com/docker-update-lockouts/clear - TARGET_URL=https://node-red.lan.ddnsgeek.com/docker-update-lockouts/clear
- CLIENT_CERT=/certs/clients/office-pc/office-pc.crt - CLIENT_CERT=/certs/clients/office-pc/office-pc.crt
- CLIENT_KEY=/certs/clients/office-pc/office-pc.key - CLIENT_KEY=/certs/clients/office-pc/office-pc.key
- CA_CERT=/certs/ca/clients-ca.crt
- TIMEOUT=5 - TIMEOUT=5
- LOG_LEVEL=${MTLS_BRIDGE_LOG_LEVEL:-INFO} - LOG_LEVEL=${MTLS_BRIDGE_LOG_LEVEL:-INFO}
- UPSTREAM_CA_CERT=${MTLS_BRIDGE_UPSTREAM_CA_CERT:-}
volumes: volumes:
- ${PROJECT_ROOT}/core/traefik/certs:/certs:ro - ${PROJECT_ROOT}/core/traefik/certs:/certs:ro
healthcheck: healthcheck: