Validate MQTT TLS options before startup (#24951)
CI / Synaptics Build (push) Blocked by required conditions
CI / Assemble and push default build (push) Blocked by required conditions
CI / AMD64 Build (push) Waiting to run
CI / AMD64 Smoke Test (push) Blocked by required conditions
CI / ARM Build (push) Waiting to run
CI / Jetson Jetpack 6 (push) Waiting to run
CI / AMD64 Extra Build (push) Blocked by required conditions
CI / ARM Extra Build (push) Blocked by required conditions

* Validate MQTT TLS verification options before client startup

* Test MQTT configuration recovery with authentication available

* Cover both MQTT TLS verification values in safe-mode recovery

* Use a documentation address in MQTT regression tests

* Skip MQTT TLS validation when MQTT is disabled

* Simplify MQTT TLS validation regression coverage

---------

Co-authored-by: Peter Kay <dougle.peter.kay@googlemail.com>
This commit is contained in:
Peter Kay
2026-11-12 10:04:09 -06:00
committed by GitHub
co-authored by Peter Kay
parent a655ddcb2e
commit b2f5315e09
2 changed files with 34 additions and 0 deletions
+10
View File
@@ -84,3 +84,13 @@ class MqttConfig(FrigateBaseModel):
if (self.user is None) != (self.password is None):
raise ValueError("Password must be provided with username.")
return self
@model_validator(mode="after")
def tls_insecure_requires_tls(self) -> Self:
"""Reject TLS verification settings without TLS when MQTT is enabled."""
if self.enabled and self.tls_insecure is not None and self.tls_ca_certs is None:
raise ValueError(
"tls_insecure requires tls_ca_certs. Remove tls_insecure for plaintext "
"MQTT, or set tls_ca_certs to a CA certificate path to enable TLS."
)
return self
+24
View File
@@ -0,0 +1,24 @@
"""Tests for MQTT TLS configuration validation."""
import unittest
from contextlib import nullcontext
from pydantic import ValidationError
from frigate.config import MqttConfig
class TestMqttTls(unittest.TestCase):
def test_tls_insecure_requires_tls_only_when_enabled(self) -> None:
"""Require TLS for either explicit verification flag only if MQTT is enabled."""
for enabled in (True, False):
for insecure in (True, False):
expected = (
self.assertRaisesRegex(
ValidationError, "tls_insecure requires tls_ca_certs"
)
if enabled
else nullcontext()
)
with self.subTest(enabled=enabled, tls_insecure=insecure), expected:
MqttConfig(enabled=enabled, tls_insecure=insecure)