mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-10-19 21:22:50 +03:00
Josh HawkinsandGitHub
9a0672a64d
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
CI / Synaptics Build (push) Blocked by required conditions
CI / Assemble and push default build (push) Blocked by required conditions
* keep /config out of the root environment in the frigate run script
The script exported HOME=/config and prepended /config/.local/lib to LD_LIBRARY_PATH while still root, then ran python3, ffmpeg, grep, and opt_in_out as root. The runtime user owns /config, so it could plant a .pth file in the user site-packages or a library on the loader path and get code run as root on the next start. Root helpers now run with root's environment (and python3 -I), and HOME, LD_LIBRARY_PATH, and PATH reach only the dropped process through env on the s6-setuidgid line. opt_in_out runs as the runtime user, so the openvino marker no longer gets written into /config by root.
* don't follow a planted symlink when writing /dev/shm/go2rtc.yaml
After the first start the go2rtc user owned /dev/shm/go2rtc.yaml and could swap it for a dangling symlink. The run script's -f test was false for a dangling link, so the link survived, and root's create_config.py then created the link target and the chown handed it to go2rtc. The run script now removes any existing entry, create_config.py creates the file with O_EXCL and O_NOFOLLOW at mode 0640, and the chown uses -h.
* run root python helpers in isolated mode and keep HOME=/config for non-root containers
The previous commit only set HOME=/config when dropping from root, so a container started with --user lost it. The other root-run helpers in the go2rtc, nginx, and certsync scripts now use python3 -I too, so they never load user site-packages or PYTHON* variables.
* validate networking.listen values before rendering them into nginx config
ListenConfig and get_nginx_settings.py only checked that the text after the last colon parsed as an int, and tempio rendered the raw string into the listen directive, so a value like "5000; location /x/ { alias /; } #:5000" injected nginx directives. Both now go through parse_listen_address, which accepts only a port, IPv4:port, or [IPv6]:port with a 1 to 65535 port and rebuilds the value from the parsed parts. get_nginx_settings.py falls back to the default port on an invalid value so nginx still serves the safe-mode UI.
* tighten comments
* accept hostnames, wildcards, and padded values in networking.listen
The stricter parser broke localhost:5000, *:5000, and values with surrounding whitespace that the old int() parsing accepted. parse_listen_address now strips the value and accepts RFC 1123 hostnames and *, still rebuilding the rendered value from the parsed parts. The ListenConfig validator runs in before mode, because pydantic coerced true to port 1 while get_nginx_settings.py rejected it and fell back to 5000, so the auth internal port and nginx disagreed.
* always create go2rtc.yaml after removing it and don't let opt_in_out stop frigate
The go2rtc else-branch was only reachable when a regular file was planted between rm and the test, and then loaded that file as go2rtc's config. create_config.py now runs unconditionally and its exclusive create fails closed. opt_in_out runs after s6-svc -O, so a failure there was terminal under errexit.
* fall back to default listen ports when either is invalid or they collide
* keep valid listen values and refuse to start nginx when the ports collide
64 lines
2.1 KiB
Python
64 lines
2.1 KiB
Python
from pydantic import Field, field_validator, model_validator
|
|
|
|
from frigate.util.config import parse_listen_address
|
|
|
|
from .base import FrigateBaseModel
|
|
|
|
__all__ = ["IPv6Config", "ListenConfig", "NetworkingConfig"]
|
|
|
|
|
|
class IPv6Config(FrigateBaseModel):
|
|
enabled: bool = Field(
|
|
default=False,
|
|
title="Enable IPv6",
|
|
description="Enable IPv6 support for Frigate services (API and UI) where applicable.",
|
|
)
|
|
|
|
|
|
class ListenConfig(FrigateBaseModel):
|
|
internal: int | str = Field(
|
|
default=5000,
|
|
title="Internal port",
|
|
description="Internal listening port for Frigate (default 5000).",
|
|
)
|
|
external: int | str = Field(
|
|
default=8971,
|
|
title="External port",
|
|
description="External listening port for Frigate (default 8971).",
|
|
)
|
|
|
|
# Runs before pydantic coerces a bool to an int port, which
|
|
# get_nginx_settings.py rejects when it reads the raw YAML
|
|
@field_validator("internal", "external", mode="before")
|
|
@classmethod
|
|
def validate_listen(cls, value: int | str) -> int | str:
|
|
return parse_listen_address(value)[0]
|
|
|
|
@property
|
|
def internal_port(self) -> int:
|
|
return parse_listen_address(self.internal)[1]
|
|
|
|
@property
|
|
def external_port(self) -> int:
|
|
return parse_listen_address(self.external)[1]
|
|
|
|
@model_validator(mode="after")
|
|
def validate_distinct_ports(self) -> "ListenConfig":
|
|
if self.internal_port == self.external_port:
|
|
raise ValueError("internal and external must listen on different ports")
|
|
|
|
return self
|
|
|
|
|
|
class NetworkingConfig(FrigateBaseModel):
|
|
ipv6: IPv6Config = Field(
|
|
default_factory=IPv6Config,
|
|
title="IPv6 configuration",
|
|
description="IPv6-specific settings for Frigate network services.",
|
|
)
|
|
listen: ListenConfig = Field(
|
|
default_factory=ListenConfig,
|
|
title="Listening ports configuration",
|
|
description="Configuration for internal and external listening ports. This is for advanced users. For the majority of use cases it's recommended to change the ports section of your Docker compose file.",
|
|
)
|