mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-11-22 21:41:50 +03:00
limit go2rtc exec and echo to frigate's ffmpeg and disable ngrok (#24983)
CI / AMD64 Build (push) Canceled after 0s
CI / AMD64 Smoke Test (push) Canceled after 0s
CI / ARM Build (push) Canceled after 0s
CI / Jetson Jetpack 6 (push) Canceled after 0s
CI / AMD64 Extra Build (push) Canceled after 0s
CI / ARM Extra Build (push) Canceled after 0s
CI / Synaptics Build (push) Canceled after 0s
CI / Assemble and push default build (push) Canceled after 0s
CI / AMD64 Build (push) Canceled after 0s
CI / AMD64 Smoke Test (push) Canceled after 0s
CI / ARM Build (push) Canceled after 0s
CI / Jetson Jetpack 6 (push) Canceled after 0s
CI / AMD64 Extra Build (push) Canceled after 0s
CI / ARM Extra Build (push) Canceled after 0s
CI / Synaptics Build (push) Canceled after 0s
CI / Assemble and push default build (push) Canceled after 0s
go2rtc merges its config files, and the HomeKit file and anything saved through go2rtc's unauthenticated config API load before Frigate's generated config. A planted exec: or echo: source, or an ngrok.command, ran whatever program it named, and as root under FRIGATE_ROOT_SERVICES=go2rtc. Unless GO2RTC_ALLOW_ARBITRARY_EXEC is set, the generated config now sets exec.allow_paths and echo.allow_paths to Frigate's ffmpeg and sets an empty ngrok.command, which override earlier files, and the config-save API rejects new exec and echo keys. The non-root docs note that a root go2rtc still isn't separated from the frigate user, since ffmpeg with arbitrary arguments can overwrite files as root.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
"""Tests for the go2rtc ffmpeg and ngrok options applied at startup."""
|
||||
"""Tests for the go2rtc exec-related options applied at startup."""
|
||||
|
||||
import unittest
|
||||
from unittest.mock import patch
|
||||
@@ -24,6 +24,18 @@ class TestApplyGo2rtcFfmpegConfig(unittest.TestCase):
|
||||
assert apply_go2rtc_ffmpeg_config(config, FFMPEG_PATH) == []
|
||||
assert config["ffmpeg"] == {"bin": FFMPEG_PATH}
|
||||
|
||||
def test_limits_exec_and_echo_to_ffmpeg(self):
|
||||
config = {}
|
||||
apply_go2rtc_ffmpeg_config(config, FFMPEG_PATH)
|
||||
assert config["exec"] == {"allow_paths": [FFMPEG_PATH]}
|
||||
assert config["echo"] == {"allow_paths": [FFMPEG_PATH]}
|
||||
|
||||
def test_forces_exec_allowlist_override(self):
|
||||
config = {"exec": {"allow_paths": ["/bin/bash"]}, "echo": {}}
|
||||
assert apply_go2rtc_ffmpeg_config(config, FFMPEG_PATH) == ["exec", "echo"]
|
||||
assert config["exec"] == {"allow_paths": [FFMPEG_PATH]}
|
||||
assert config["echo"] == {"allow_paths": [FFMPEG_PATH]}
|
||||
|
||||
def test_forces_bin_override(self):
|
||||
config = {"ffmpeg": {"bin": "/bin/sh", "global": "-c 'id' x"}}
|
||||
assert apply_go2rtc_ffmpeg_config(config, FFMPEG_PATH) == ["ffmpeg.bin"]
|
||||
@@ -34,10 +46,10 @@ class TestApplyGo2rtcFfmpegConfig(unittest.TestCase):
|
||||
assert apply_go2rtc_ffmpeg_config(config, FFMPEG_PATH) == []
|
||||
assert config["ffmpeg"]["global"] == "-vaapi_device /dev/dri/renderD128"
|
||||
|
||||
def test_drops_ngrok(self):
|
||||
def test_disables_ngrok(self):
|
||||
config = {"ngrok": {"command": "/bin/sh -c id"}}
|
||||
assert apply_go2rtc_ffmpeg_config(config, FFMPEG_PATH) == ["ngrok"]
|
||||
assert "ngrok" not in config
|
||||
assert config["ngrok"] == {"command": ""}
|
||||
|
||||
def test_allows_bin_and_ngrok_when_override_set(self):
|
||||
config = {
|
||||
@@ -48,6 +60,8 @@ class TestApplyGo2rtcFfmpegConfig(unittest.TestCase):
|
||||
assert apply_go2rtc_ffmpeg_config(config, FFMPEG_PATH) == []
|
||||
assert config["ffmpeg"]["bin"] == "/usr/bin/ffmpeg"
|
||||
assert config["ngrok"] == {"command": "ngrok tcp 8555"}
|
||||
assert "exec" not in config
|
||||
assert "echo" not in config
|
||||
|
||||
|
||||
class TestRestrictedGo2rtcVarExpansion(unittest.TestCase):
|
||||
|
||||
@@ -1235,14 +1235,15 @@ def find_restricted_go2rtc_stream_changes(
|
||||
|
||||
|
||||
# go2rtc runs `ffmpeg.bin` and `ngrok.command`, and every other `ffmpeg` key is a
|
||||
# template of ffmpeg arguments that `#video=<name>` and friends can reference
|
||||
_GO2RTC_EXEC_SECTIONS = ("ffmpeg", "ngrok")
|
||||
# template of ffmpeg arguments that `#video=<name>` and friends can reference.
|
||||
# `exec.allow_paths` and `echo.allow_paths` choose the binaries go2rtc may run.
|
||||
_GO2RTC_EXEC_SECTIONS = ("ffmpeg", "ngrok", "exec", "echo")
|
||||
|
||||
|
||||
def find_restricted_go2rtc_exec_changes(
|
||||
old_go2rtc: dict[str, Any] | None, new_go2rtc: dict[str, Any] | None
|
||||
) -> list[str]:
|
||||
"""Return the go2rtc ffmpeg and ngrok keys added or changed through the API.
|
||||
"""Return the go2rtc exec-related keys added or changed through the API.
|
||||
|
||||
These are only accepted with arbitrary exec enabled. Keys already in the
|
||||
saved config are left alone, the same as stream sources.
|
||||
@@ -1274,10 +1275,11 @@ def find_restricted_go2rtc_exec_changes(
|
||||
def apply_go2rtc_ffmpeg_config(
|
||||
go2rtc_config: dict[str, Any], ffmpeg_path: str
|
||||
) -> list[str]:
|
||||
"""Set go2rtc's ffmpeg binary for startup.
|
||||
"""Set go2rtc's ffmpeg binary and exec allowlist for startup.
|
||||
|
||||
Unless arbitrary exec is enabled, `ffmpeg.bin` is forced to Frigate's ffmpeg
|
||||
and `ngrok` is removed. Templates in the saved config are kept.
|
||||
Unless arbitrary exec is enabled, `ffmpeg.bin` is forced to Frigate's ffmpeg,
|
||||
`ngrok` is disabled, and go2rtc may only run Frigate's ffmpeg from `exec:` and
|
||||
`echo:` sources. Templates in the saved config are kept.
|
||||
|
||||
Returns:
|
||||
The keys that were overridden or removed
|
||||
@@ -1295,9 +1297,18 @@ def apply_go2rtc_ffmpeg_config(
|
||||
restricted.append("ffmpeg.bin")
|
||||
ffmpeg["bin"] = ffmpeg_path
|
||||
|
||||
if "ngrok" in go2rtc_config and not allowed:
|
||||
restricted.append("ngrok")
|
||||
del go2rtc_config["ngrok"]
|
||||
# go2rtc merges its config files and this one loads last, so setting these
|
||||
# keys also overrides the HomeKit file and anything saved through its API
|
||||
if not allowed:
|
||||
forced = {
|
||||
"ngrok": {"command": ""},
|
||||
"exec": {"allow_paths": [ffmpeg_path]},
|
||||
"echo": {"allow_paths": [ffmpeg_path]},
|
||||
}
|
||||
for key, value in forced.items():
|
||||
if key in go2rtc_config and go2rtc_config[key] != value:
|
||||
restricted.append(key)
|
||||
go2rtc_config[key] = value
|
||||
|
||||
return restricted
|
||||
|
||||
|
||||
Reference in New Issue
Block a user