administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-03 01:35:22 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes for formatting

Browse Source
This commit is contained in:
Nate Meyer 2022-11-05 11:12:54 -04:00
parent 8c8f3c1790
commit 0e1e057322
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frigate/restream.py
View File

@ -38,7 +38,9 @@ class RestreamApi:
self.relays[cam_name] = escape_special_characters(input.path) self.relays[cam_name] = escape_special_characters(input.path)
else: else:
# go2rtc only supports rtsp for direct relay, otherwise ffmpeg is used # go2rtc only supports rtsp for direct relay, otherwise ffmpeg is used
self.relays[cam_name] = get_manual_go2rtc_stream(escape_special_characters(input.path)) self.relays[cam_name] = get_manual_go2rtc_stream(
escape_special_characters(input.path)
)
for name, path in self.relays.items(): for name, path in self.relays.items():
params = {"src": path, "name": name} params = {"src": path, "name": name}

9
frigate/test/test_camera_pw.py
View File

@ -8,7 +8,9 @@ from frigate.util import clean_camera_user_pass, escape_special_characters
class TestUserPassCleanup(unittest.TestCase): class TestUserPassCleanup(unittest.TestCase):
def setUp(self) -> None: def setUp(self) -> None:
self.rtsp_with_pass = "rtsp://user:password@192.168.0.2:554/live" self.rtsp_with_pass = "rtsp://user:password@192.168.0.2:554/live"
self.rtsp_with_special_pass = "rtsp://user:password`~!@#$%^&*()-_;',.<>:\"\{\}\[\]@@192.168.0.2:554/live" self.rtsp_with_special_pass = (
"rtsp://user:password`~!@#$%^&*()-_;',.<>:\"\{\}\[\]@@192.168.0.2:554/live"
)
self.rtsp_no_pass = "rtsp://192.168.0.3:554/live" self.rtsp_no_pass = "rtsp://192.168.0.3:554/live"
def test_cleanup(self): def test_cleanup(self):
@ -25,7 +27,10 @@ class TestUserPassCleanup(unittest.TestCase):
def test_special_char_password(self): def test_special_char_password(self):
"""Test that special characters in pw are escaped, but not others.""" """Test that special characters in pw are escaped, but not others."""
escaped = escape_special_characters(self.rtsp_with_special_pass) escaped = escape_special_characters(self.rtsp_with_special_pass)
assert escaped == "rtsp://user:password%60~%21%40%23%24%25%5E%26%2A%28%29-_%3B%27%2C.%3C%3E%3A%22%5C%7B%5C%7D%5C%5B%5C%5D%40@192.168.0.2:554/live" assert (
escaped
== "rtsp://user:password%60~%21%40%23%24%25%5E%26%2A%28%29-_%3B%27%2C.%3C%3E%3A%22%5C%7B%5C%7D%5C%5B%5C%5D%40@192.168.0.2:554/live"
)
def test_no_special_char_password(self): def test_no_special_char_password(self):
"""Test that no change is made to path with no special characters.""" """Test that no change is made to path with no special characters."""