tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-27 07:34:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #356 from docker/fix-non-interactive

Browse Source 
Add check on exec looking for arguments
This commit is contained in:
Guillaume Tardif 2020-07-07 12:41:44 +02:00 committed by GitHub
commit 16acc36033
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
azure/backend.go
View File

@ -193,6 +193,10 @@ func getGroupAndContainerName(containerID string) (groupName string, containerNa
} }
func (cs *aciContainerService) Exec(ctx context.Context, name string, command string, reader io.Reader, writer io.Writer) error { func (cs *aciContainerService) Exec(ctx context.Context, name string, command string, reader io.Reader, writer io.Writer) error {
err := verifyExecCommand(command)
if err != nil {
return err
}
groupName, containerAciName := getGroupAndContainerName(name) groupName, containerAciName := getGroupAndContainerName(name)
containerExecResponse, err := execACIContainer(ctx, cs.ctx, command, groupName, containerAciName) containerExecResponse, err := execACIContainer(ctx, cs.ctx, command, groupName, containerAciName)
if err != nil { if err != nil {
@ -208,6 +212,15 @@ func (cs *aciContainerService) Exec(ctx context.Context, name string, command st
) )
} }
func verifyExecCommand(command string) error {
tokens := strings.Split(command, " ")
if len(tokens) > 1 {
return errors.New("ACI exec command does not accept arguments to the command. " +
"Only the binary should be specified")
}
return nil
}
func (cs *aciContainerService) Logs(ctx context.Context, containerName string, req containers.LogsRequest) error { func (cs *aciContainerService) Logs(ctx context.Context, containerName string, req containers.LogsRequest) error {
groupName, containerAciName := getGroupAndContainerName(containerName) groupName, containerAciName := getGroupAndContainerName(containerName)
var tail *int32 var tail *int32

9
azure/backend_test.go
View File

@ -61,6 +61,15 @@ func (suite *BackendSuiteTest) TestErrorMessageRunSingleContainerNameWithCompose
Expect(err.Error()).To(Equal("invalid container name. ACI container name cannot include \"_\"")) Expect(err.Error()).To(Equal("invalid container name. ACI container name cannot include \"_\""))
} }
func (suite *BackendSuiteTest) TestVerifyCommand() {
err := verifyExecCommand("command") // Command without an argument
Expect(err).To(BeNil())
err = verifyExecCommand("command argument") // Command with argument
Expect(err).NotTo(BeNil())
Expect(err.Error()).To(Equal("ACI exec command does not accept arguments to the command. " +
"Only the binary should be specified"))
}
func TestBackendSuite(t *testing.T) { func TestBackendSuite(t *testing.T) {
RegisterTestingT(t) RegisterTestingT(t)
suite.Run(t, new(BackendSuiteTest)) suite.Run(t, new(BackendSuiteTest))

9
tests/aci-e2e/e2e-aci_test.go
View File

@ -150,6 +150,15 @@ func (s *E2eACISuite) TestACIBackend() {
Expect(output).To(ContainSubstring("GET")) Expect(output).To(ContainSubstring("GET"))
}) })
s.T().Run("exec command", func(t *testing.T) {
output := s.NewDockerCommand("exec", testContainerName, "pwd").ExecOrDie()
Expect(output).To(ContainSubstring("/"))
output = s.NewDockerCommand("exec", testContainerName, "echo", "fail_with_argument").ExecOrDie()
Expect(output).To(ContainSubstring("ACI exec command does not accept arguments to the command. " +
"Only the binary should be specified"))
})
s.T().Run("follow logs from nginx", func(t *testing.T) { s.T().Run("follow logs from nginx", func(t *testing.T) {
timeChan := make(chan time.Time) timeChan := make(chan time.Time)