Repository navigation
validate: fix panic on missing host-specific hook - #825
Open
RaphaelFakhri wants to merge 1 commit into
Open
RaphaelFakhri wants to merge 1 commit into
RaphaelFakhri wants to merge 1 commit into
Conversation
With --host-specific, checkEventHooks reports a hook path that cannot be stat'ed, but then calls Mode() on the nil FileInfo anyway, so `oci-runtime-tool --host-specific validate` panics instead of printing the "cannot find hook" error. Only check the executable bit when the stat succeeds. Signed-off-by: Raphael Fakhri <153192858+RaphaelFakhri@users.noreply.github.com>
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
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.
With
--host-specific,checkEventHooksreports a hook path thatos.Statcannot find, but then callsMode()on the nilFileInfoanyway. As a result,oci-runtime-tool --host-specific validatepanics on any bundle whose hook path is missing on the host, instead of printing the "cannot find hook" error.This change checks the executable bit only when the stat succeeds.
Fixes #824
Testing
TestCheckHooksHostSpecific, which covers an executable hook, a non-executable hook, and a missing hook. Without the fix, the missing-hook case panics atvalidate/validate.go:302.--hooks-prestart-add '{"path":"/no/such/hook"}'now makesoci-runtime-tool --host-specific validateexit 1 withcannot find prestart hook: /no/such/hook. Before the fix, it panicked with exit code 2.go test ./validate/... ./generate/... ./filepath/,go vet ./validate/,gofmt -s -l validate/, andgolangci-lint run ./...(v2.15.0) all pass.