-
Notifications
You must be signed in to change notification settings - Fork 690
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
internal/envoy: switch to safe regex for path match
Updates #1351 Switch path regex matching to safe regex. Refactor matcher.RegexMatcher code to its own file and helper so it can be reused across internal/envoy and internal/contour. Also of note, internal/contour longestRouteFirst comparator has intimate knowledge of RouteMatch_SafeRegex which is probably not ideal. Signed-off-by: Dave Cheney <dave@cheney.net>
- Loading branch information
1 parent
a2cb6a0
commit 5c9497a
Showing
5 changed files
with
115 additions
and
47 deletions.
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| // Copyright © 2019 VMware | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package envoy | ||
|
|
||
| import ( | ||
| matcher "github.com/envoyproxy/go-control-plane/envoy/type/matcher" | ||
| "github.com/projectcontour/contour/internal/protobuf" | ||
| ) | ||
|
|
||
| // SafeRegexMatch retruns a matcher.RegexMatcher for the supplied regex. | ||
| // SafeRegexMatch does not escape regex meta characters. | ||
| func SafeRegexMatch(regex string) *matcher.RegexMatcher { | ||
| return &matcher.RegexMatcher{ | ||
| EngineType: &matcher.RegexMatcher_GoogleRe2{ | ||
| GoogleRe2: &matcher.RegexMatcher_GoogleRE2{ | ||
| MaxProgramSize: protobuf.UInt32(uint32(len(regex))), | ||
| }, | ||
| }, | ||
| Regex: regex, | ||
| } | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| // Copyright © 2019 VMware | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package envoy | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| matcher "github.com/envoyproxy/go-control-plane/envoy/type/matcher" | ||
| "github.com/projectcontour/contour/internal/assert" | ||
| "github.com/projectcontour/contour/internal/protobuf" | ||
| ) | ||
|
|
||
| func TestSafeRegexMatch(t *testing.T) { | ||
| tests := map[string]struct { | ||
| regex string | ||
| want *matcher.RegexMatcher | ||
| }{ | ||
| "blank regex": { | ||
| regex: "", | ||
| want: &matcher.RegexMatcher{ | ||
| EngineType: &matcher.RegexMatcher_GoogleRe2{ | ||
| GoogleRe2: &matcher.RegexMatcher_GoogleRE2{ | ||
| MaxProgramSize: protobuf.UInt32(0), | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| "simple": { | ||
| regex: "chrome", | ||
| want: &matcher.RegexMatcher{ | ||
| EngineType: &matcher.RegexMatcher_GoogleRe2{ | ||
| GoogleRe2: &matcher.RegexMatcher_GoogleRE2{ | ||
| MaxProgramSize: protobuf.UInt32(6), | ||
| }, | ||
| }, | ||
| Regex: "chrome", | ||
| }, | ||
| }, | ||
| "regex meta": { | ||
| regex: "[a-z]+$", | ||
| want: &matcher.RegexMatcher{ | ||
| EngineType: &matcher.RegexMatcher_GoogleRe2{ | ||
| GoogleRe2: &matcher.RegexMatcher_GoogleRE2{ | ||
| MaxProgramSize: protobuf.UInt32(7), | ||
| }, | ||
| }, | ||
| Regex: "[a-z]+$", // meta characters are not escaped. | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| for name, tc := range tests { | ||
| t.Run(name, func(t *testing.T) { | ||
| got := SafeRegexMatch(tc.regex) | ||
| assert.Equal(t, tc.want, got) | ||
| }) | ||
| } | ||
| } |
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
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