-
Notifications
You must be signed in to change notification settings - Fork 140
FIX: add validation for containerID #726
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
Open
kaizakin
wants to merge
1
commit into
urunc-dev:main
Choose a base branch
from
kaizakin:fix/validate-containerid
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+38
−0
Open
Changes from all commits
Commits
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
Some comments aren't visible on the classic Files Changed page.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,6 +21,7 @@ import ( | |
| "os" | ||
| "os/exec" | ||
| "syscall" | ||
| "path/filepath" | ||
|
|
||
| "github.com/moby/sys/userns" | ||
| "github.com/sirupsen/logrus" | ||
|
|
@@ -37,6 +38,7 @@ const ( | |
| ) | ||
|
|
||
| var ErrEmptyContainerID = errors.New("container ID can not be empty") | ||
| var ErrInvalidID = errors.New("invalid container id format") | ||
|
|
||
| // checkArgs checks the number of arguments provided in the command-line context | ||
| // against the expected number, based on the specified checkType. | ||
|
|
@@ -72,6 +74,9 @@ func getUnikontainer(cmd *cli.Command) (*unikontainers.Unikontainer, error) { | |
| if containerID == "" { | ||
| return nil, ErrEmptyContainerID | ||
| } | ||
| if err := validateID(containerID); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| // We have already made sure in main.go that root is not nil | ||
| rootDir := cmd.String("root") | ||
|
|
@@ -160,3 +165,33 @@ func prepareXDGRuntimeDir(root string) error { | |
| } | ||
| return nil | ||
| } | ||
|
|
||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could you also add a comment citing the commit and file you used from the runc repo for this function? |
||
| // validateID validates the given ID string against the allowed characters. | ||
| func validateID(id string) error { | ||
| if len(id) < 1 { | ||
| return ErrInvalidID | ||
| } | ||
|
|
||
| // Allowed characters: 0-9 A-Z a-z _ + - . | ||
| for i := range len(id) { | ||
| c := id[i] | ||
| switch { | ||
| case c >= 'a' && c <= 'z': | ||
| case c >= 'A' && c <= 'Z': | ||
| case c >= '0' && c <= '9': | ||
| case c == '_': | ||
| case c == '+': | ||
| case c == '-': | ||
| case c == '.': | ||
| default: | ||
| return ErrInvalidID | ||
| } | ||
|
|
||
| } | ||
|
|
||
| if string(os.PathSeparator)+id != filepath.Clean(string(os.PathSeparator)+id) { | ||
| return ErrInvalidID | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
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.
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.
We should merge these checks.