Robust cgroup path parsing of docker container ID #1605
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
azdagron
requested review from
amartinezfayo,
APTy,
evan2645 and
mcpherrinm
as code owners
There was a problem hiding this comment.
Thanks @azdagron, it looks great!
I have a couple of small suggestions.
| // The "finder" found a container ID, but it was blank. This is a | ||
| // defensive measure against bad matcher patterns and shouldn't | ||
| // be possible with the default finder. | ||
| return "", fmt.Errorf("workloadattestor/docker: a pattern matched, but no container id was found") |
There was a problem hiding this comment.
Suggested change
| return "", fmt.Errorf("workloadattestor/docker: a pattern matched, but no container id was found") | |
| return "", errors.New("workloadattestor/docker: a pattern matched, but no container id was found") |
|
|
||
| type defaultContainerIDFinder struct{} | ||
|
|
||
| func (f *defaultContainerIDFinder) FindContainerID(cgroupPath string) (string, bool) { |
There was a problem hiding this comment.
I think that a small comment about this function would be good. We can point that dockerCGroupRE is used here and it would be good to explain the meaning of an empty string result and the boolean returned.
- Uses a simple regex to extract the 64 hex character container ID from any cgroup path with a "docker" whole word prefix somewhere before the ID. - Replaces the default finder with the above regex - Still supports the legacy and pattern-based finders Signed-off-by: Andrew Harding <andrew.harding@hpe.com>
azdagron
force-pushed
the
docker-attestor-container-id-parsing
branch
from
2e556c6 to
a185db6
Compare
|
Fixed a misspelling in a comment to pass the linter and squashed the commits. |
amartinezfayo
approved these changes
Jun 3, 2020
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.
Affected functionality
Changes the default docker container ID parsing behavior. Current default behavior parses cgroup paths that look like
/docker/<containerid>. This however does not work in general and the existing (undocumented) options are inflexible enough to handle cgroup paths like those generated by RHEL.@vbotez prepared a targeted fix with #1522 (thank you!!). It opened up a discussion of the desired semantics, which ended up being quite the departure for the direction the PR started with. This PR
summarizes the functionality we landed with during that discussion.
Description of change
Which issue this PR fixes
Fixes #1518