Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2024-11-21 19:07:46 +01:00
Code Issues Projects Releases Wiki Activity

strip whitespaces when loading secrets (#12393)

Browse Source 
* strip whitespaces when loading secrets

* formatting
This commit is contained in:
Josh Thorpe 2024-07-12 21:36:15 +08:00 committed by GitHub
parent e416e44998
commit 8f51f7b4c4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/main/rootfs/usr/local/go2rtc/create_config.py
View File

@ -21,9 +21,9 @@ FRIGATE_ENV_VARS = {k: v for k, v in os.environ.items() if k.startswith("FRIGATE
if os.path.isdir("/run/secrets"): if os.path.isdir("/run/secrets"):
for secret_file in os.listdir("/run/secrets"): for secret_file in os.listdir("/run/secrets"):
if secret_file.startswith("FRIGATE_"): if secret_file.startswith("FRIGATE_"):
FRIGATE_ENV_VARS[secret_file] = Path( FRIGATE_ENV_VARS[secret_file] = (
os.path.join("/run/secrets", secret_file) Path(os.path.join("/run/secrets", secret_file)).read_text().strip()
).read_text() )
config_file = os.environ.get("CONFIG_FILE", "/config/config.yml") config_file = os.environ.get("CONFIG_FILE", "/config/config.yml")

4
frigate/api/auth.py
View File

@ -89,7 +89,9 @@ def get_jwt_secret() -> str:
# check docker secrets # check docker secrets
elif os.path.isfile(os.path.join("/run/secrets", JWT_SECRET_ENV_VAR)): elif os.path.isfile(os.path.join("/run/secrets", JWT_SECRET_ENV_VAR)):
logger.debug(f"Using jwt secret from {JWT_SECRET_ENV_VAR} docker secret file.") logger.debug(f"Using jwt secret from {JWT_SECRET_ENV_VAR} docker secret file.")
jwt_secret = Path(os.path.join("/run/secrets", JWT_SECRET_ENV_VAR)).read_text() jwt_secret = (
Path(os.path.join("/run/secrets", JWT_SECRET_ENV_VAR)).read_text().strip()
)
# check for the addon options file # check for the addon options file
elif os.path.isfile("/data/options.json"): elif os.path.isfile("/data/options.json"):
with open("/data/options.json") as f: with open("/data/options.json") as f:

6
frigate/config.py
View File

@ -62,9 +62,9 @@ FRIGATE_ENV_VARS = {k: v for k, v in os.environ.items() if k.startswith("FRIGATE
if os.path.isdir("/run/secrets") and os.access("/run/secrets", os.R_OK): if os.path.isdir("/run/secrets") and os.access("/run/secrets", os.R_OK):
for secret_file in os.listdir("/run/secrets"): for secret_file in os.listdir("/run/secrets"):
if secret_file.startswith("FRIGATE_"): if secret_file.startswith("FRIGATE_"):
FRIGATE_ENV_VARS[secret_file] = Path( FRIGATE_ENV_VARS[secret_file] = (
os.path.join("/run/secrets", secret_file) Path(os.path.join("/run/secrets", secret_file)).read_text().strip()
).read_text() )
DEFAULT_TRACKED_OBJECTS = ["person"] DEFAULT_TRACKED_OBJECTS = ["person"]
DEFAULT_ALERT_OBJECTS = ["person", "car"] DEFAULT_ALERT_OBJECTS = ["person", "car"]

4
frigate/plus.py
View File

@ -42,7 +42,9 @@ class PlusApi:
and os.access("/run/secrets", os.R_OK) and os.access("/run/secrets", os.R_OK)
and PLUS_ENV_VAR in os.listdir("/run/secrets") and PLUS_ENV_VAR in os.listdir("/run/secrets")
): ):
self.key = Path(os.path.join("/run/secrets", PLUS_ENV_VAR)).read_text() self.key = (
Path(os.path.join("/run/secrets", PLUS_ENV_VAR)).read_text().strip()
)
# check for the addon options file # check for the addon options file
elif os.path.isfile("/data/options.json"): elif os.path.isfile("/data/options.json"):
with open("/data/options.json") as f: with open("/data/options.json") as f: