Add support for RuleGroup CRD #6
Merged
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
|
Skipping CI for Draft Pull Request. |
ack-prow
bot
added
the
do-not-merge/work-in-progress
|
/test all |
1 similar comment
|
/test all |
This was referenced Aug 8, 2024
ack-prow bot
pushed a commit
to aws-controllers-k8s/code-generator
that referenced
this pull request
Aug 14, 2024
Issue #, if available: prerequisite for WAFv2 [RuleGroup](aws-controllers-k8s/wafv2-controller#6) and [WebACL](aws-controllers-k8s/wafv2-controller#7) CRDs Description of changes: Some WAFv2 API fields have empty json specs `{}`, e.g. https://docs.aws.amazon.com/waf/latest/APIReference/API_AllQueryArguments.html For these type of fields, codegen currently errors out because it infers their gotypes as e.g. `AllQueryArguments *AllQueryArguments` but does not generate a `type AllQueryArguments struct` since the struct itself is empty, and not picked up by `newFieldRecurse` function. The solution proposed in this PR is to allow users to define `marker-shapes`, which instruct codegen to overwrite the type of these empty structs as `[]byte`, both when generating the APIs and when setting up the SDK. e.g. [generator.yaml](https://github.com/aws-controllers-k8s/wafv2-controller/blob/bb682409da8f96c5035783602b9d948c8cc8e21f/apis/v1alpha1/generator.yaml#L15-L24) for WAFv2, and inline: ``` empty_shapes: - All - Method - UriPath - QueryString - AllQueryArguments - RateLimitIP - RateLimitForwardedIP - RateLimitHTTPMethod - NoneAction ``` By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
TiberiuGC
force-pushed
the
resource/rule-groups
branch
from
bb68240 to
7ed2689
Compare
ack-prow
bot
removed
the
do-not-merge/work-in-progress
TiberiuGC
force-pushed
the
resource/rule-groups
branch
from
7ed2689 to
239a645
Compare
a-hilaly
reviewed
Aug 15, 2024
apis/v1alpha1/types.go
Outdated
| // use in web requests in an effort to bypass detection. | ||
| type TextTransformation struct { | ||
| Priority *int64 `json:"priority,omitempty"` | ||
| Type *string `json:"type_,omitempty"` |
There was a problem hiding this comment.
We can rename this json tag to type
There was a problem hiding this comment.
Can you point me to a similar example 🙏🏻 ?
There was a problem hiding this comment.
apis/v1alpha1/types.go
Outdated
| // A rule statement that inspects for cross-site scripting (XSS) attacks. In | ||
| // XSS attacks, the attacker uses vulnerabilities in a benign website as a vehicle | ||
| // to inject malicious client-site scripts into other legitimate web browsers. | ||
| XssMatchStatement *XssMatchStatement `json:"xssMatchStatement,omitempty"` |
There was a problem hiding this comment.
Should we add an exception in pkg/names about Xss/XSS?
apis/v1alpha1/types.go
Outdated
| // A rule statement that inspects for malicious SQL code. Attackers insert malicious | ||
| // SQL code into web requests to do things like modify your database or extract | ||
| // data from it. | ||
| SQLiMatchStatement *SQLiMatchStatement `json:"sqliMatchStatement,omitempty"` |
apis/v1alpha1/types.go
Outdated
| // | ||
| // Provide the JA3 fingerprint string from the logs in your string match statement | ||
| // specification, to match with any future requests that have the same TLS configuration. | ||
| JA3Fingerprint *JA3Fingerprint `json:"jA3Fingerprint,omitempty"` |
TiberiuGC
force-pushed
the
resource/rule-groups
branch
from
27267cd to
d9616ee
Compare
|
/test all |
|
/retest |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: a-hilaly, TiberiuGC The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
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 #, if available: aws-controllers-k8s/community#1300
Description of changes:
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.