Conversation
kriss39
force-pushed
the
fix/website-policy-cache-scope
branch
from
September 16, 2026 19:24
4fb53a0 to
519dc5c
Compare
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
This fixes a small cache bug in the website blocklist logic.
load_website_blocklist()already checks that a cached policy belongs to the current profile and is still within the cache TTL. However,check_website_access()had a separate fast path for disabled policies that skipped those checks.That could cause two problems:
config.yaml, the old disabled cache could continue to be used even after its TTL expired.The fix keeps the fast path, but makes it use the same path + TTL validation as the normal cache lookup.
This is related to #58526, which fixed the main cache lookup, but the disabled-policy shortcut was still bypassing that logic.
Changes
Testing
I reproduced both cases against the current
mainbehavior.Before the fix:
With this change:
I also ran:
which passed.
I also searched existing issues and PRs before opening this. #52082 has related website-policy cache tests, but it does not cover the cross-profile disabled-cache case or the expired disabled-cache path fixed here.