Private
Public Access
Centralize rule feed/tag scoping in the engine and fix backlog re-apply (T5)
reapply_rules_for_user_backlog narrowed its *backlog* to the triggering rule's feed/tag scope, but then loaded every enabled rule for the user and ran all of them against that backlog with no per-rule scope check — so re-applying one feed- or tag-scoped rule could also fire an unrelated rule scoped to a different feed/tag, if it happened to match. rule_in_scope() moves the feed/tag scope check into the engine itself (apply_filter_rules_for_feed already computed this per-subscription via query filters; it now just passes the tag ids and lets the engine decide), so backlog re-apply and ingest-time dispatch can't drift into scoping rules differently again. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
f2ee793cf8
commit
91c0b1dd26
3 files changed
+117
-17
No files matched your search
@@ -1,3 +1,5 @@
|
||||
import time
|
||||
|
||||
import pytest
|
||||
from django.contrib.auth import get_user_model
|
||||
|
||||
@@ -10,7 +12,7 @@ from apps.articles.models import (
|
||||
)
|
||||
from apps.feeds.models import Feed
|
||||
|
||||
from .engine import evaluate_rules_for_article, rule_matches
|
||||
from .engine import evaluate_rules_for_article, rule_in_scope, rule_matches
|
||||
from .models import FilterRule
|
||||
|
||||
User = get_user_model()
|
||||
@@ -87,6 +89,22 @@ class TestRuleMatches:
|
||||
rule = make_rule(user, match_type=FilterRule.MATCH_REGEX, match_value="(unclosed")
|
||||
assert rule_matches(rule, article) is False
|
||||
|
||||
def test_catastrophic_backtracking_regex_times_out_instead_of_hanging(self, user, article):
|
||||
# (a+)+$ against a long run of a's followed by a non-matching
|
||||
# character is a textbook ReDoS pattern — left unguarded this
|
||||
# takes on the order of a minute (confirmed locally); the
|
||||
# REGEX_TIMEOUT_SECONDS guard in apps.rules.engine must interrupt
|
||||
# it well before that instead of hanging the caller.
|
||||
article.title = "a" * 30 + "!"
|
||||
rule = make_rule(user, match_type=FilterRule.MATCH_REGEX, match_value=r"(a+)+$")
|
||||
|
||||
start = time.monotonic()
|
||||
result = rule_matches(rule, article)
|
||||
elapsed = time.monotonic() - start
|
||||
|
||||
assert result is False
|
||||
assert elapsed < 5
|
||||
|
||||
def test_content_field_strips_html_tags(self, user, article):
|
||||
rule = make_rule(user, match_field=FilterRule.FIELD_CONTENT, match_value="Lots of details")
|
||||
assert rule_matches(rule, article) is True
|
||||
@@ -104,6 +122,24 @@ class TestRuleMatches:
|
||||
assert rule_matches(rule, article) is True
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
class TestRuleInScope:
|
||||
def test_unscoped_rule_applies_to_any_feed(self, user):
|
||||
rule = make_rule(user)
|
||||
assert rule_in_scope(rule, feed_id=999, subscription_tag_ids=set()) is True
|
||||
|
||||
def test_feed_scoped_rule_only_applies_to_its_own_feed(self, user, feed):
|
||||
rule = make_rule(user, feed=feed)
|
||||
assert rule_in_scope(rule, feed_id=feed.id, subscription_tag_ids=set()) is True
|
||||
assert rule_in_scope(rule, feed_id=feed.id + 1, subscription_tag_ids=set()) is False
|
||||
|
||||
def test_tag_scoped_rule_only_applies_when_the_feed_carries_that_tag(self, user):
|
||||
tag = Tag.objects.create(user=user, name="work")
|
||||
rule = make_rule(user, tag=tag)
|
||||
assert rule_in_scope(rule, feed_id=1, subscription_tag_ids={tag.id}) is True
|
||||
assert rule_in_scope(rule, feed_id=1, subscription_tag_ids=set()) is False
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
class TestApplyRuleAction:
|
||||
def test_star_action(self, user, article):
|
||||
|
||||
Reference in new issue
Block a user