Skip to content

fix(gateway): eliminate ReDoS ambiguity in _WHO4_QUERY_RE (CodeQL #8) #891

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

Merged
GreenGrassBlueOcean merged 1 commit into from
Nov 10, 2026
Merged

fix(gateway): eliminate ReDoS ambiguity in _WHO4_QUERY_RE (CodeQL #8) #891

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion custom_components/myhome/gateway_sessions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ def _is_status_report_item(item: Any) -> bool:
)


_WHO4_QUERY_RE = re.compile(r"^\*#4\*(?P<where>[^#*]+(?:#[^*]+)*)(?:\*(?P<dim>\d+))?##$")
_WHO4_QUERY_RE = re.compile(r"^\*#4\*(?P<where>[^#*]+(?:#[^#*]+)*)(?:\*(?P<dim>\d+))?##$")
_WHO4_REPLY_RE = re.compile(
r"^\*(?:#4\*(?P<dim_where>[^*]+)\*.*|4\*[^*]+\*(?P<act_where>[^*]+))##$"
)
Expand Down
9 changes: 9 additions & 0 deletions tests/test_issue_886_myhomeserver1_41_zones.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,15 @@ async def test_pause_status_edge_cases_and_mixed_non_who4_collected_frames(
_mismatched_who4_reply_zones("*#4*60##", ["*1*1*11##", "*#4*34*0*0146##"])
== {"34"}
)
# Multi-segment WHERE (`#4#01`) and linear-time rejection of malformed `#`-repeated input (CodeQL py/redos)
assert (
_mismatched_who4_reply_zones("*#4*60#4#01*60##", ["*#4*34#4#01*60*55##"])
== {"34"}
)
assert (
_mismatched_who4_reply_zones("*#4*1" + "#a" * 40 + "!", ["*#4*34*0*0146##"])
is None
)

scheduler = FrameScheduler()
try:
Expand Down
Loading