Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dataclients/kubernetes: enable network backend address validation #2825

Merged
merged 1 commit into from
Jan 19, 2024
Merged

dataclients/kubernetes: enable network backend address validation #2825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions cmd/webhook/admission/admission_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,11 @@ func TestRouteGroupAdmitter(t *testing.T) {
inputFile: "rg-with-multiple-predicates.json",
message: `single predicate expected at \"Method(\\\"GET\\\") && Path(\\\"/\\\")\"\nsingle predicate expected at \" \"`,
},
{
name: "routegroup with invalid backends",
inputFile: "rg-with-invalid-backend-path.json",
message: `backend address \"http://example.com/foo\" does not match scheme://host format\nbackend address \"http://example.com/foo/bar\" does not match scheme://host format\nbackend address \"http://example.com/foo/\" does not match scheme://host format\nbackend address \"/foo\" does not match scheme://host format\nbackend address \"http://example.com/\" does not match scheme://host format\nbackend address \"example.com/\" does not match scheme://host format\nbackend address \"example.com/foo\" does not match scheme://host format\nbackend address \"http://example.com?foo=bar\" does not match scheme://host format\nbackend address \"example.com\" does not match scheme://host format`,
},
} {
t.Run(tc.name, func(t *testing.T) {
expectedResponse := responseAllowedFmt
Expand Down
3 changes: 1 addition & 2 deletions dataclients/kubernetes/definitions/routegroupvalidator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func (rgv *RouteGroupValidator) Validate(item *RouteGroupItem) error {
var errs []error
errs = append(errs, rgv.validateFilters(item))
errs = append(errs, rgv.validatePredicates(item))
// errs = append(errs, rgv.validateBackends(item))
errs = append(errs, rgv.validateBackends(item))

return errorsJoin(errs...)
}
Expand Down Expand Up @@ -93,7 +93,6 @@ func (rgv *RouteGroupValidator) validatePredicates(item *RouteGroupItem) error {
return errorsJoin(errs...)
}

//lint:ignore U1000 Disable address validation to prevent errors for existing RouteGroups
func (rgv *RouteGroupValidator) validateBackends(item *RouteGroupItem) error {
var errs []error
for _, backend := range item.Spec.Backends {
Expand Down
7 changes: 7 additions & 0 deletions dataclients/kubernetes/definitions/testdata/errorwrapdata/errors.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,10 @@ single predicate expected at "Path(\"/foo\") && Method(\"GET\")"
single predicate expected at ""
single filter expected at "inlineContent(\"/foo\") -> status(200)"
single filter expected at " "
backend address "http://example.com/foo" does not match scheme://host format
backend address "http://example.com/foo/bar" does not match scheme://host format
backend address "http://example.com/foo/" does not match scheme://host format
backend address "/foo" does not match scheme://host format
backend address "example.com/" does not match scheme://host format
backend address "http://example.com?foo=bar" does not match scheme://host format
backend address "example.com" does not match scheme://host format
8 changes: 8 additions & 0 deletions ...ients/kubernetes/definitions/testdata/validation/route-with-invalid-backend-with-path.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
backend address \\\"http://example\.com/foo\\\" does not match scheme://host format
backend address \\\"http://example\.com/foo/bar\\\" does not match scheme://host format
backend address \\\"/foo\\\" does not match scheme://host format
backend address \\\"/foo/bar\\\" does not match scheme://host format
backend address \\\"example\.com/foo\\\" does not match scheme://host format
backend address \\\"http://example\.com/\\\" does not match scheme://host format
backend address \\\"http://example\.com\?foo=bar\\\" does not match scheme://host format
backend address \\\"example\.com\\\" does not match scheme://host format