opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 11:32:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

hooks/1.0.0: Error on empty process.args instead of panicking

Browse Source 
The process property is optional [1], which this package already
handled appropriately, although I've added a new test here to guard
against regressions.

The process.args entry is required when process is set [2], and it's
also required to contain at least one entry [3].  The previous
implementation here assumed that would always be satisfied, and
panicked on empty process.args.  With this commit, we avoid the panic
and instead return an error message explaining why the input was
invalid.

[1]: https://github.com/opencontainers/runtime-spec/blame/v1.0.1/config.md#L145
[2]: https://github.com/opencontainers/runtime-spec/blame/v1.0.1/config.md#L157
[3]: https://github.com/opencontainers/runtime-spec/blame/v1.0.1/config.md#L158

Reported-by: Brent Baude <bbaude@redhat.com>
Signed-off-by: W. Trevor King <wking@tremily.us>

Closes: #829
Approved by: mheon
This commit is contained in:
W. Trevor King
2018-05-24 13:18:52 -07:00
committed by Atomic Bot
parent b09fca74af
commit a7180cd545
2 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/hooks/1.0.0/when.go
View File

@ -75,6 +75,9 @@ func (when *When) Match(config *rspec.Spec, annotations map[string]string, hasBi
}
if config.Process != nil {
if len(config.Process.Args) == 0 {
return false, errors.New("process.args must have at least one entry")
}
command := config.Process.Args[0]
for _, cmdPattern := range when.Commands {
match, err := regexp.MatchString(cmdPattern, command)

42
pkg/hooks/1.0.0/when_test.go
View File

@ -142,25 +142,33 @@ func TestCommands(t *testing.T) {
"^/bin/sh$",
},
}
config := &rspec.Spec{Process: &rspec.Process{}}
config := &rspec.Spec{}
for _, test := range []struct {
name string
args []string
match bool
name string
process *rspec.Process
match bool
}{
{
name: "good",
args: []string{"/bin/sh", "a", "b"},
name: "good",
process: &rspec.Process{
Args: []string{"/bin/sh", "a", "b"},
},
match: true,
},
{
name: "extra characters",
args: []string{"/bin/shell", "a", "b"},
name: "extra characters",
process: &rspec.Process{
Args: []string{"/bin/shell", "a", "b"},
},
match: false,
},
{
name: "process unset",
match: false,
},
} {
t.Run(test.name, func(t *testing.T) {
config.Process.Args = test.args
config.Process = test.process
match, err := when.Match(config, map[string]string{}, false)
if err != nil {
t.Fatal(err)
@ -170,6 +178,22 @@ func TestCommands(t *testing.T) {
}
}
func TestCommandsEmptyProcessArgs(t *testing.T) {
when := When{
Commands: []string{
"^/bin/sh$",
},
}
config := &rspec.Spec{
Process: &rspec.Process{},
}
_, err := when.Match(config, map[string]string{}, false)
if err == nil {
t.Fatal("unexpected success")
}
assert.Regexp(t, "^process\\.args must have at least one entry$", err.Error())
}
func TestHasBindMountsAndCommands(t *testing.T) {
hasBindMounts := true
when := When{