WAFv2: fix incorrect ARNs in Cloudfront scope #8660
Merged
+40
−15
Conversation
This file contains 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
Backend has "aws" region in case of global services like Cloudfront, however they are managed from us-east-1 and have a corresponding ARN.
cloudfront global scope is managed from us-east-1 region: https://docs.aws.amazon.com/waf/latest/APIReference/API_CreateIPSet.html#WAF-CreateIPSet-request-Scope base_backend stores global region as "aws": https://github.com/getmoto/moto/blob/d00aa025b6c3d37977508b5d5e81ecad4ca15159/moto/core/base_backend.py#L272 Therefore region needs to be overriden to correctly form the ARN.
get_partition already handles all the cases and setting region to global for special partitions doesn't seem to be correct specifically for WAF ARNs (gov doesn't have its own Cloudfront and China is not global).
ARN region is not indicative by itself in case of WAF for Cloudfront.
1 task
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #8660 +/- ##
=======================================
Coverage 92.75% 92.75%
=======================================
Files 1252 1252
Lines 108676 108678 +2
=======================================
+ Hits 100807 100809 +2
Misses 7869 7869
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
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.
Issue
Reported in localstack/localstack#12272.
ARN for WAF resources in Cloudfront scope should specify
us-east-1region. Currently region is being set toglobalin moto.I checked in AWS console that it stands true for all WAF resources: Web ACLs, IP sets, Regex pattern sets, Rule groups.
The regression was likely introduced in #7710.
Solution
Region for global scope backend defaults to
"aws". It needs to be overridden withus-east-1for ARN purposes as Cloudfront-related resources are managed fromus-east-1and have it specified in ARN. However backend itself should stay separate for global and regional, to distinguish between WAF for us-east-1 and WAF for Cloudfront.ARNs for global and regional resources for
us-east-1differ only in resource name prefix -global/andregional/respectively.