Fix: WAF alarm tripped by BlockedIPs and BlockedUserAgents rules (#7205) #7229
+97
−52
Conversation
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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## develop #7229 +/- ##
========================================
Coverage 85.01% 85.01%
========================================
Files 156 156
Lines 22420 22421 +1
========================================
+ Hits 19061 19062 +1
Misses 3359 3359 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
dsotirho-ucsc
force-pushed
the
issues/dsotirho-ucsc/7205-waf-blocked-alarm
branch
2 times, most recently
from
15a4ade to
57d9169
Compare
hannes-ucsc
requested changes
Jun 18, 2025
| @@ -23,6 +24,42 @@ def dashboard_body() -> str: | |||
| return body | |||
|
|
|||
|
|
|||
| def waf_blocked_alarm_metrics() -> list[tuple[str, str]]: | |||
There was a problem hiding this comment.
Brittle as glass. PL please
dsotirho-ucsc
force-pushed
the
issues/dsotirho-ucsc/7205-waf-blocked-alarm
branch
4 times, most recently
from
5616987 to
8136eb4
Compare
hannes-ucsc
requested changes
Jun 24, 2025
src/azul/__init__.py
Outdated
| @@ -1772,6 +1772,11 @@ def docker_image_gists_path(self) -> Path: | |||
|
|
|||
| blocked_user_agents_custom_regex_term = 'blocked_user_agents_custom' | |||
|
|
|||
| waf_block_rules_not_logged = [ | |||
There was a problem hiding this comment.
Still brittle, I think. PL please.
hannes-ucsc
added
2 reviews
dsotirho-ucsc
force-pushed
the
issues/dsotirho-ucsc/7205-waf-blocked-alarm
branch
2 times, most recently
from
06b1361 to
b4b6314
Compare
dsotirho-ucsc
force-pushed
the
issues/dsotirho-ucsc/7205-waf-blocked-alarm
branch
from
0de0bde to
1a6587e
Compare
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
dsotirho-ucsc
force-pushed
the
issues/dsotirho-ucsc/7205-waf-blocked-alarm
branch
from
1a6587e to
751a556
Compare
hannes-ucsc
requested changes
Jul 9, 2025
| rule['name'] | ||
| for rule in resources['aws_wafv2_web_acl']['api_gateway']['rule'] | ||
| if ( | ||
| ('block' in rule.get('action', {}) or 'none' in rule.get('override_action', {})) |
There was a problem hiding this comment.
I'd wrap this disjunction over two lines.
And PL please because the condition is not clear to me.
Comment on lines
172
to
173
| return { | ||
| **resources, |
| """ | ||
| Adds a metric alarm based on WAF blocking rules | ||
| """ | ||
| if config.enable_monitoring: |
There was a problem hiding this comment.
In this case, I'd invert the condition so that the one-liner else branch isn't dangling at the end, with the condition out of sight.
|
|
||
| def add_waf_blocked_alarm(resources: JSON) -> JSON: | ||
| """ | ||
| Adds a metric alarm based on WAF blocking rules |
There was a problem hiding this comment.
Suggested change
| Adds a metric alarm based on WAF blocking rules | |
| Add a metric alarm that trips if the ratio between blocked and overall requests goes above 25%, but only for rules not listed in … |
dsotirho-ucsc
force-pushed
the
issues/dsotirho-ucsc/7205-waf-blocked-alarm
branch
2 times, most recently
from
5a6ebda to
121ecea
Compare
hannes-ucsc
requested changes
Jul 14, 2025
| if ( | ||
| ( | ||
| 'block' in rule.get('action', {}) | ||
| # In the case of AWS Managed Rules, the rule's action is |
There was a problem hiding this comment.
Suggested change
| # In the case of AWS Managed Rules, the rule's action is | |
| # In the case of AWS-managed rules, each rule's action is |
dsotirho-ucsc
force-pushed
the
issues/dsotirho-ucsc/7205-waf-blocked-alarm
branch
2 times, most recently
from
da76a59 to
59f9c87
Compare
hannes-ucsc
approved these changes
Jul 15, 2025
Security design review
|
achave11-ucsc
force-pushed
the
issues/dsotirho-ucsc/7205-waf-blocked-alarm
branch
from
59f9c87 to
a6e3374
Compare
achave11-ucsc
added
the
sandbox
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.
Connected issues: #7205
Checklist
Author
developissues/<GitHub handle of author>/<issue#>-<slug>1 when the issue title describes a problem, the corresponding PR
title is
Fix:followed by the issue titleAuthor (partiality)
ptag to titles of partial commitspartialor completely resolves all connected issuespartiallabelAuthor (chains)
baseor this PR is not chained to another PRchainedor is not chained to another PRAuthor (reindex, API changes)
rtag to commit title or the changes introduced by this PR will not require reindexing of any deploymentreindex:devor the changes introduced by it will not require reindexing ofdevreindex:anvildevor the changes introduced by it will not require reindexing ofanvildevreindex:anvilprodor the changes introduced by it will not require reindexing ofanvilprodreindex:prodor the changes introduced by it will not require reindexing ofprodreindex:partialand its description documents the specific reindexing procedure fordev,anvildev,anvilprodandprodor requires a full reindex or carries none of the labelsreindex:dev,reindex:anvildev,reindex:anvilprodandreindex:prodAPIor this PR does not modify a REST APIa(A) tag to commit title for backwards (in)compatible changes or this PR does not modify a REST APIapp.pyor this PR does not modify a REST APIAuthor (upgrading deployments)
make docker_images.jsonand committed the resulting changes or this PR does not modifyazul_docker_images, or any other variables referenced in the definition of that variableutag to commit title or this PR does not require upgrading deploymentsupgradeor does not require upgrading deploymentsdeploy:sharedor does not modifydocker_images.json, and does not require deploying thesharedcomponent for any other reasondeploy:gitlabor does not require deploying thegitlabcomponentdeploy:runneror does not require deploying therunnerimageAuthor (hotfixes)
Ftag to main commit title or this PR does not include permanent fix for a temporary hotfixanvilprodandprod) have temporary hotfixes for any of the issues connected to this PRAuthor (before every review)
develop, squashed fixups from prior reviewsmake requirements_updateor this PR does not modifyrequirements*.txt,common.mk,MakefileandDockerfileRtag to commit title or this PR does not modifyrequirements*.txtreqsor does not modifyrequirements*.txtmake integration_testpasses in personal deployment or this PR does not modify functionality that could affect the IT outcomePeer reviewer (after approval)
System administrator (after approval)
demoorno demono demono sandboxN reviewslabel is accurateOperator (before pushing merge the commit)
reindex:…labels andrcommit title tagno demodevelop_select dev.shared && CI_COMMIT_REF_NAME=develop make -C terraform/shared apply_keep_unusedor this PR is not labeleddeploy:shared_select dev.gitlab && CI_COMMIT_REF_NAME=develop make -C terraform/gitlab applyor this PR is not labeleddeploy:gitlab_select anvildev.shared && CI_COMMIT_REF_NAME=develop make -C terraform/shared apply_keep_unusedor this PR is not labeleddeploy:shared_select anvildev.gitlab && CI_COMMIT_REF_NAME=develop make -C terraform/gitlab applyor this PR is not labeleddeploy:gitlabdeploy:gitlabdeploy:gitlabSystem administrator
dev.gitlabare complete or this PR is not labeleddeploy:gitlabanvildev.gitlabare complete or this PR is not labeleddeploy:gitlabOperator (before pushing merge the commit)
_select dev.gitlab && make -C terraform/gitlab/runneror this PR is not labeleddeploy:runner_select anvildev.gitlab && make -C terraform/gitlab/runneror this PR is not labeleddeploy:runnersandboxlabel or PR is labeledno sandboxdevor PR is labeledno sandboxanvildevor PR is labeledno sandboxsandboxdeployment or PR is labeledno sandboxanvilboxdeployment or PR is labeledno sandboxsandboxdeployment or PR is labeledno sandboxanvilboxdeployment or PR is labeledno sandboxsandboxor this PR does not remove catalogs or otherwise causes unreferenced indices indevanvilboxor this PR does not remove catalogs or otherwise causes unreferenced indices inanvildevsandboxor this PR is not labeledreindex:devanvilboxor this PR is not labeledreindex:anvildevsandboxor this PR is not labeledreindex:devanvilboxor this PR is not labeledreindex:anvildevpif the PR is also labeledpartialOperator (chain shortening)
developor this PR is not labeledbasechainedlabel from the blocked PR or this PR is not labeledbasebasebaselabel from this PR or this PR is not labeledbaseOperator (after pushing the merge commit)
devanvildevdevdevanvildevanvildev_select dev.shared && make -C terraform/shared applyor this PR is not labeleddeploy:shared_select anvildev.shared && make -C terraform/shared applyor this PR is not labeleddeploy:shareddevanvildevOperator (reindex)
devor this PR is neither labeledreindex:partialnorreindex:devanvildevor this PR is neither labeledreindex:partialnorreindex:anvildevdevor this PR is neither labeledreindex:partialnorreindex:devanvildevor this PR is neither labeledreindex:partialnorreindex:anvildevdevor this PR is neither labeledreindex:partialnorreindex:devanvildevor this PR is neither labeledreindex:partialnorreindex:anvildevdevor this PR does not require reindexingdevanvildevor this PR does not require reindexinganvildevdevor this PR does not require reindexingdevanvildevor this PR does not require reindexinganvildevdevor this PR does not require reindexingdevanvildevor this PR does not require reindexinganvildevdevor this PR does not require reindexingdevdevor this PR does not require reindexingdevdeploy_browserjob in the GitLab pipeline for this PR indevor this PR does not require reindexingdevanvildevor this PR does not require reindexinganvildevdeploy_browserjob in the GitLab pipeline for this PR inanvildevor this PR does not require reindexinganvildevOperator
deploy:shared,deploy:gitlab,deploy:runner,API,reindex:partial,reindex:anvilprodandreindex:prodlabels to the next promotion PRs or this PR carries none of these labelsdeploy:shared,deploy:gitlab,deploy:runner,API,reindex:partial,reindex:anvilprodandreindex:prodlabels, from the description of this PR to that of the next promotion PRs or this PR carries none of these labelsShorthand for review comments
Lline is too longWline wrapping is wrongQbad quotesFother formatting problem