From 0a449b165cc07b584e4467ff55a3ed16ca53fff0 Mon Sep 17 00:00:00 2001
From: Scott Gasch <scott@gasch.org>
Date: Fri, 25 Mar 2022 09:00:33 -0700
Subject: [PATCH] Obscure some passwords/keys. There's actually nothing
valuable here because the machines this is talking to are behind a firewall
on my local network and not exposed anywhere.
---
camera_utils.py | 7 +++----
requirements.txt | 2 ++
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/camera_utils.py b/camera_utils.py
index 9e17c42..378d286 100644
--- a/camera_utils.py
+++ b/camera_utils.py
@@ -15,6 +15,7 @@ import requests
import decorator_utils
import exceptions
+import scott_secrets
logger = logging.getLogger(__name__)
@@ -67,9 +68,7 @@ def fetch_camera_image_from_video_server(
"""Fetch the raw webcam image from the video server."""
camera_name = camera_name.replace(".house", "")
camera_name = camera_name.replace(".cabin", "")
- url = (
- f"http://10.0.0.226:8080/Umtxxf1uKMBniFblqeQ9KRbb6DDzN4/jpeg/GKlT2FfiSQ/{camera_name}/s.jpg"
- )
+ url = f"http://10.0.0.226:8080/{scott_secrets.SHINOBI_KEY1}/jpeg/{scott_secrets.SHINOBI_KEY2}/{camera_name}/s.jpg"
logger.debug('Fetching image from %s', url)
try:
response = requests.get(url, stream=False, timeout=10.0)
@@ -136,7 +135,7 @@ def camera_name_to_hostname(camera_name: str) -> str:
def fetch_camera_image_from_rtsp_stream(camera_name: str, *, width: int = 256) -> Optional[bytes]:
"""Fetch the raw webcam image straight from the webcam's RTSP stream."""
hostname = camera_name_to_hostname(camera_name)
- stream = f"rtsp://camera:IaLaIok@{hostname}:554/live"
+ stream = f"rtsp://camera:{scott_secrets.CAMERA_PASSWORD}@{hostname}:554/live"
logger.debug('Fetching image from RTSP stream %s', stream)
try:
cmd = [
diff --git a/requirements.txt b/requirements.txt
index f8b9cc7..fe2a4ba 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,6 +6,7 @@ bitstring
black
cloudpickle
coverage
+fastapi[all]
flake8
holidays
meross-iot
@@ -13,6 +14,7 @@ mypy
nltk
numpy
overrides
+prometheus-fastapi-instrumentator
pychromecast
pyserial
python-dateutil
--
2.49.0