-
Notifications
You must be signed in to change notification settings - Fork 830
fix: validate SDS URL #9030
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.
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
Merged
Merged
fix: validate SDS URL #9030
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
5c1b3a3
fix: add validation for SDS URL
zirain 6db9f74
fix
zirain 8309c17
lint
zirain fbf86dd
fix test
zirain 709509d
reject UDS with host
zirain 184833b
fix lint
zirain 2435dbe
fix related path check
zirain e69cfad
release notes
zirain d9b806e
fix
zirain File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| // Copyright Envoy Gateway Authors | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // The full text of the Apache license is available in the LICENSE file at | ||
| // the root of the repo. | ||
|
|
||
| package net | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "net/url" | ||
| ) | ||
|
|
||
| // ParseURL return host and port if the URL is a valid HTTP, HTTPS or UDS, | ||
| // return the scheme and host:port if it's valid. | ||
| func ParseURL(urlStr string) (scheme, hostAndPort string, err error) { | ||
| u, err := url.Parse(urlStr) | ||
| if err != nil { | ||
| return "", "", fmt.Errorf("invalid URL: %w", err) | ||
| } | ||
|
|
||
| switch u.Scheme { | ||
| case "http", "https": | ||
|
zirain marked this conversation as resolved.
|
||
| // TODO: support http and https scheme | ||
| return "", "", fmt.Errorf("unsupported URL scheme: %s", u.Scheme) | ||
| case "unix": | ||
| // For Unix Domain Socket, return the path as host, empty port. | ||
| // unix:///absolute/path has empty host and path="/absolute/path". | ||
| // unix://./relative/path (SPIFFE workload API format) has host="." and path="/relative/path"; | ||
| // combine them so the caller receives "./relative/path". | ||
| if u.Host != "" && u.Host != "." { | ||
| return "", "", fmt.Errorf("unix URL must not contain a host, use unix:///absolute/path") | ||
| } | ||
| if u.Path == "" && u.Host != "." { | ||
| return "", "", fmt.Errorf("unix URL must contain a path") | ||
| } | ||
|
|
||
| return u.Scheme, u.Host + u.Path, nil | ||
| default: | ||
| return "", "", fmt.Errorf("unsupported URL scheme: %s", u.Scheme) | ||
| } | ||
| } | ||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This would break upgrades from v1.8.0 to v1.9.0. Would it make sense to default to UDS for url without scheme?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it's experimental, it should be fine.
I'm fine to add compatibility in v1.9, cc @envoyproxy/gateway-maintainers WDYT?
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If this breaking change is acceptable, it's better to cp this into v1.8.1 to break early.