mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-09-30 20:06:51 +03:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1f9904e5e4 |
@@ -571,6 +571,8 @@ notifications:
|
|||||||
enabled: False
|
enabled: False
|
||||||
# Optional: Email for push service to reach out to
|
# Optional: Email for push service to reach out to
|
||||||
# NOTE: This is required to use notifications
|
# NOTE: This is required to use notifications
|
||||||
|
# NOTE: Email can be specified with an environment variable or docker secrets that must begin with 'FRIGATE_'.
|
||||||
|
# e.g. email: '{FRIGATE_NOTIFICATION_EMAIL}'
|
||||||
email: "admin@example.com"
|
email: "admin@example.com"
|
||||||
# Optional: Cooldown time for notifications in seconds (default: shown below)
|
# Optional: Cooldown time for notifications in seconds (default: shown below)
|
||||||
cooldown: 0
|
cooldown: 0
|
||||||
|
|||||||
+14
-3
@@ -306,9 +306,12 @@ def config(request: Request):
|
|||||||
mode="json", warnings="none", exclude_none=True
|
mode="json", warnings="none", exclude_none=True
|
||||||
)
|
)
|
||||||
|
|
||||||
# remove environment_vars for non-admin users
|
is_admin = request.headers.get("remote-role") == "admin"
|
||||||
if request.headers.get("remote-role") != "admin":
|
|
||||||
|
# hide environment_vars and the notification email from non-admin users
|
||||||
|
if not is_admin:
|
||||||
config.pop("environment_vars", None)
|
config.pop("environment_vars", None)
|
||||||
|
redact_credential(config["notifications"], "email")
|
||||||
|
|
||||||
# redact mqtt credentials
|
# redact mqtt credentials
|
||||||
redact_credential(config["mqtt"], "password")
|
redact_credential(config["mqtt"], "password")
|
||||||
@@ -365,7 +368,15 @@ def config(request: Request):
|
|||||||
camera_name
|
camera_name
|
||||||
)
|
)
|
||||||
if base_sections:
|
if base_sections:
|
||||||
camera_dict["base_config"] = base_sections
|
# copy so redaction below can't alter the profile manager's cache
|
||||||
|
camera_dict["base_config"] = copy.deepcopy(base_sections)
|
||||||
|
|
||||||
|
# cameras inherit the global notification email
|
||||||
|
if not is_admin:
|
||||||
|
redact_credential(camera_dict["notifications"], "email")
|
||||||
|
redact_credential(
|
||||||
|
camera_dict.get("base_config", {}).get("notifications", {}), "email"
|
||||||
|
)
|
||||||
|
|
||||||
# remove go2rtc stream passwords
|
# remove go2rtc stream passwords
|
||||||
go2rtc: dict[str, Any] = config_obj.go2rtc.model_dump(
|
go2rtc: dict[str, Any] = config_obj.go2rtc.model_dump(
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
from pydantic import Field
|
from pydantic import Field
|
||||||
|
|
||||||
from ..base import FrigateBaseModel
|
from ..base import FrigateBaseModel
|
||||||
|
from ..env import EnvString
|
||||||
|
|
||||||
__all__ = ["NotificationConfig"]
|
__all__ = ["NotificationConfig"]
|
||||||
|
|
||||||
@@ -11,7 +12,7 @@ class NotificationConfig(FrigateBaseModel):
|
|||||||
title="Enable notifications",
|
title="Enable notifications",
|
||||||
description="Enable or disable notifications for all cameras; can be overridden per-camera.",
|
description="Enable or disable notifications for all cameras; can be overridden per-camera.",
|
||||||
)
|
)
|
||||||
email: str | None = Field(
|
email: EnvString | None = Field(
|
||||||
default=None,
|
default=None,
|
||||||
title="Notification email",
|
title="Notification email",
|
||||||
description="Email address used for push notifications or required by certain notification providers.",
|
description="Email address used for push notifications or required by certain notification providers.",
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ from unittest.mock import Mock, patch
|
|||||||
|
|
||||||
import frigate.genai
|
import frigate.genai
|
||||||
from frigate.config import GenAIProviderEnum
|
from frigate.config import GenAIProviderEnum
|
||||||
|
from frigate.config.env import FRIGATE_ENV_VARS
|
||||||
from frigate.const import MODEL_CACHE_DIR, REDACTED_CREDENTIAL_SENTINEL
|
from frigate.const import MODEL_CACHE_DIR, REDACTED_CREDENTIAL_SENTINEL
|
||||||
from frigate.genai import GenAIClient
|
from frigate.genai import GenAIClient
|
||||||
from frigate.models import Event, Recordings, ReviewSegment
|
from frigate.models import Event, Recordings, ReviewSegment
|
||||||
@@ -92,6 +93,30 @@ class TestHttpApp(BaseTestHttp):
|
|||||||
mqtt = response.json()["mqtt"]
|
mqtt = response.json()["mqtt"]
|
||||||
assert mqtt["password"] == REDACTED_CREDENTIAL_SENTINEL
|
assert mqtt["password"] == REDACTED_CREDENTIAL_SENTINEL
|
||||||
|
|
||||||
|
def test_config_response_hides_notification_email_from_viewers(self):
|
||||||
|
self.minimal_config["notifications"] = {"email": "{FRIGATE_TEST_EMAIL}"}
|
||||||
|
|
||||||
|
with patch.dict(FRIGATE_ENV_VARS, {"FRIGATE_TEST_EMAIL": "me@example.com"}):
|
||||||
|
app = super().create_app()
|
||||||
|
|
||||||
|
assert app.frigate_config.notifications.email == "me@example.com"
|
||||||
|
|
||||||
|
with AuthTestClient(app) as client:
|
||||||
|
response = client.get(
|
||||||
|
"/config",
|
||||||
|
headers={"remote-user": "viewer", "remote-role": "viewer"},
|
||||||
|
)
|
||||||
|
assert response.status_code == 200
|
||||||
|
config = response.json()
|
||||||
|
assert config["notifications"]["email"] == REDACTED_CREDENTIAL_SENTINEL
|
||||||
|
assert (
|
||||||
|
config["cameras"]["front_door"]["notifications"]["email"]
|
||||||
|
== REDACTED_CREDENTIAL_SENTINEL
|
||||||
|
)
|
||||||
|
|
||||||
|
response = client.get("/config")
|
||||||
|
assert response.json()["notifications"]["email"] == "me@example.com"
|
||||||
|
|
||||||
def test_config_response_keeps_plus_model_reference(self):
|
def test_config_response_keeps_plus_model_reference(self):
|
||||||
model_id = "test_plus_reference"
|
model_id = "test_plus_reference"
|
||||||
model_path = os.path.join(MODEL_CACHE_DIR, model_id)
|
model_path = os.path.join(MODEL_CACHE_DIR, model_id)
|
||||||
|
|||||||
Reference in New Issue
Block a user