Skip to content

fix: reject invalid/expired stream authSig with 403 (avoid HA IP bans) #956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joyjit wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: reject invalid/expired stream authSig with 403 (avoid HA IP bans) #956

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions custom_components/webrtc/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@

import voluptuous as vol
from aiohttp import web
from aiohttp.web_exceptions import HTTPUnauthorized, HTTPGone, HTTPNotFound
from aiohttp.web_exceptions import (
HTTPForbidden,
HTTPGone,
HTTPNotFound,
HTTPUnauthorized,
)
from homeassistant.components.binary_sensor import HomeAssistant # fix tests
from homeassistant.components.camera import async_get_stream_source, async_get_image
from homeassistant.components.http import HomeAssistantView
Expand Down Expand Up @@ -247,8 +252,10 @@ async def get(self, request: web.Request):

# fix for https://github.com/AlexxIT/WebRTC/pull/320
elif not utils.validate_signed_request(request):
# you shall not pass
raise HTTPUnauthorized()
# Reject invalid/expired stream signatures with 403, not 401.
# HA's ban middleware treats HTTPUnauthorized as a failed login and
# can IP-ban the client after login_attempts_threshold hits (#955).
raise HTTPForbidden()

hass = request.app["hass"]

Expand Down Expand Up @@ -299,7 +306,8 @@ class HLSView(HomeAssistantView):

async def get(self, request: web.Request, filename: str):
if request.cookies.get(HLS_COOKIE) != HLS_SESSION:
raise HTTPUnauthorized()
# Same ban footgun as authSig above — do not raise 401 (#955).
raise HTTPForbidden()

if filename not in ("playlist.m3u8", "init.mp4", "segment.m4s", "segment.ts"):
raise HTTPNotFound()
Expand Down