Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions cli/command/container/kill.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ func NewKillCommand(dockerCli command.Cli) *cobra.Command {
Short: "Kill one or more running containers",
Args: cli.RequiresMinArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
if err := cli.CheckContainerNames(args...); err != nil {
return err
}
opts.containers = args
return runKill(dockerCli, &opts)
},
Expand Down
3 changes: 3 additions & 0 deletions cli/command/container/rm.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ func NewRmCommand(dockerCli command.Cli) *cobra.Command {
Short: "Remove one or more containers",
Args: cli.RequiresMinArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
if err := cli.CheckContainerNames(args...); err != nil {
return err
}
opts.containers = args
return runRm(dockerCli, &opts)
},
Expand Down
3 changes: 3 additions & 0 deletions cli/command/container/stop.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ func NewStopCommand(dockerCli command.Cli) *cobra.Command {
Short: "Stop one or more running containers",
Args: cli.RequiresMinArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
if err := cli.CheckContainerNames(args...); err != nil {
return err
}
opts.containers = args
opts.timeChanged = cmd.Flags().Changed("time")
return runStop(dockerCli, &opts)
Expand Down
29 changes: 29 additions & 0 deletions cli/names.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package cli

import (
"fmt"
"regexp"
"strings"
)

var (
validContainerNamePattern = regexp.MustCompile("^[a-zA-Z0-9][a-zA-Z0-9_.-]+$")
)

// CheckContainerName check container's name is valid or not
func CheckContainerName(name string) error {
if !validContainerNamePattern.MatchString(strings.TrimPrefix(name, "/")) {
return fmt.Errorf("container name %s is invalid", name)
}
return nil
}

// CheckContainerNames check containers' name is valid or not
func CheckContainerNames(names ...string) error {
for _, name := range names {
if err := CheckContainerName(name); err != nil {
return err
}
}
return nil
}