internal: Remove max_program_size from regex #3093
Merged
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
stevesloka
commented
Nov 3, 2020
| GoogleRe2: &matcher.RegexMatcher_GoogleRE2{ | ||
| MaxProgramSize: protobuf.UInt32(maxRegexProgramSize), | ||
| }, | ||
| GoogleRe2: &matcher.RegexMatcher_GoogleRE2{}, |
There was a problem hiding this comment.
This whole file could be deleted probably, these tests don't really test anything.
Codecov Report
@@ Coverage Diff @@
## main #3093 +/- ##
==========================================
+ Coverage 73.15% 73.19% +0.03%
==========================================
Files 103 103
Lines 6412 6421 +9
==========================================
+ Hits 4691 4700 +9
Misses 1618 1618
Partials 103 103
|
jpeach
approved these changes
Nov 4, 2020
|
|
||
| // ValidateRegex returns an error if the supplied | ||
| // regex is invalid. | ||
| func ValidateRegex(regex string) error { |
There was a problem hiding this comment.
Nit: Best to add a comment that this is specifically validating RE2 regex syntax because that I what we are programming into Envoy (though Go isn't identicall apparently?).
internal/dag/ingress_processor.go
Outdated
Comment on lines
145
to
149
| p.WithError(err). | ||
| WithField("name", ing.GetName()). | ||
| WithField("namespace", ing.GetNamespace()). | ||
| WithField("regex", path). | ||
| Errorf("path regex is not valid: %s", err) |
There was a problem hiding this comment.
Suggested change
| p.WithError(err). | |
| WithField("name", ing.GetName()). | |
| WithField("namespace", ing.GetNamespace()). | |
| WithField("regex", path). | |
| Errorf("path regex is not valid: %s", err) | |
| p.WithError(err). | |
| WithField("name", ing.GetName()). | |
| WithField("namespace", ing.GetNamespace()). | |
| WithField("regex", path). | |
| Error("invalid path regular expression") |
since the error is already logged by WithError()
internal/dag/ingress_processor.go
Outdated
Comment on lines
189
to
191
| err := ValidateRegex(path) | ||
| if err != nil { | ||
| return nil, err | ||
| } |
There was a problem hiding this comment.
Suggested change
| err := ValidateRegex(path) | |
| if err != nil { | |
| return nil, err | |
| } | |
| if err := ValidateRegex(path); err != nil { | |
| return nil, err | |
| } |
nit :)
| @@ -1509,6 +1509,48 @@ func TestRoutePrefixRouteRegex(t *testing.T) { | |||
| TypeUrl: routeType, | |||
| Nonce: "1", | |||
| }) | |||
|
|
|||
| // add default/kuard to translator. | |||
stevesloka
force-pushed
the
validateRegex
branch
2 times, most recently
from
3b53497
to
fbd27f0
Compare
The Regex `max_program_size` is deprecated from Envoy and the control plane should do this validation now. Removes the max_program_size field and adds a regex compile check to the Ingress resource builder. Fixes projectcontour#2933 Signed-off-by: Steve Sloka <slokas@vmware.com>
stevesloka
force-pushed
the
validateRegex
branch
from
fbd27f0
to
5776b2b
Compare
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.
The Regex
max_program_sizeis deprecated from Envoy and the control plane shoulddo this validation now. Removes the max_program_size field and adds a regex compile
check to the Ingress resource builder.
Fixes #2933
Signed-off-by: Steve Sloka slokas@vmware.com