Stricter route parsing (+ CODEOWNERS update) #63
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
Update the required approver to the "Hubbers" group, rather than a list of individuals, to make the repository more resilient to ownership & role changes. Signed-off-by: Victoria Dye <[email protected]>
Move the route parsing done in 'bundle-server.go' to a new method
'core.ParseRoute'. In addition to the removal of excess path separators the
method already does, limit the characters in each segment of the route
(owner, repo, filename) to alphanumeric characters plus '-', '_', and '.'.
Also, explicitly block '.' and '..' path components. These measures are
added to prevent serving content from arbitrary relative paths in the bundle
server. If less stringent path validation is desired in the future, the
route parsing can be updated accordingly.
Update all functions that use a user-supplied route
('bundleWebServer.serve', 'repoProvider.CreateRepository',
'repoProvider.RemoveRoute') to use the new parsing function.
Signed-off-by: Victoria Dye <[email protected]>
dscho
approved these changes
Nov 22, 2023
|
|
||
| func ParseRoute(route string, repoOnly bool) (string, string, string, error) { | ||
| elements := strings.FieldsFunc(route, func(char rune) bool { return char == '/' }) | ||
| validElementPattern := regexp.MustCompile(`^[\w\.-]+$`) |
There was a problem hiding this comment.
I've verified by looking at https://github.com/google/re2/wiki/Syntax that \w is equivalent to [A-Za-z0-9_], i.e. it includes the underscore. Good.
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.
This pull request adds stricter validation around user-provided routes to repositories and bundles to avoid arbitrary relative path injection (e.g., a bundle route like "../../../").
Also, update the CODEOWNERS to a group instead of a list of individuals.