Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stop glob'ing on podman cp #3942

Merged
merged 1 commit into from
Sep 13, 2019
Merged

Stop glob'ing on podman cp #3942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 6 additions & 21 deletions cmd/podman/cp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func init() {
cpCommand.Command = _cpCommand
flags := cpCommand.Flags()
flags.BoolVar(&cpCommand.Extract, "extract", false, "Extract the tar file into the destination directory.")
flags.BoolVar(&cpCommand.Pause, "pause", false, "Pause the container while copying")
flags.BoolVar(&cpCommand.Pause, "pause", true, "Pause the container while copying")
cpCommand.SetHelpTemplate(HelpTemplate())
cpCommand.SetUsageTemplate(UsageTemplate())
}
Expand Down Expand Up @@ -147,7 +147,6 @@ func copyBetweenHostAndContainer(runtime *libpod.Runtime, src string, dest strin

hostOwner := idtools.IDPair{UID: int(hostUID), GID: int(hostGID)}

var glob []string
if isFromHostToCtr {
if isVol, volDestName, volName := isVolumeDestName(destPath, ctr); isVol {
path, err := pathWithVolumeMount(ctr, runtime, volDestName, volName, destPath)
Expand Down Expand Up @@ -209,13 +208,7 @@ func copyBetweenHostAndContainer(runtime *libpod.Runtime, src string, dest strin
srcPath = cleanedPath
}
}
glob, err = filepath.Glob(srcPath)
if err != nil {
return errors.Wrapf(err, "invalid glob %q", srcPath)
}
if len(glob) == 0 {
glob = append(glob, srcPath)
}

if !filepath.IsAbs(destPath) {
dir, err := os.Getwd()
if err != nil {
Expand All @@ -224,19 +217,11 @@ func copyBetweenHostAndContainer(runtime *libpod.Runtime, src string, dest strin
destPath = filepath.Join(dir, destPath)
}

var lastError error
for _, src := range glob {
if src == "-" {
src = os.Stdin.Name()
extract = true
}
err := copy(src, destPath, dest, idMappingOpts, &destOwner, extract, isFromHostToCtr)
if lastError != nil {
logrus.Error(lastError)
}
lastError = err
if src == "-" {
srcPath = os.Stdin.Name()
extract = true
}
return lastError
return copy(srcPath, destPath, dest, idMappingOpts, &destOwner, extract, isFromHostToCtr)
}

func getUser(mountPoint string, userspec string) (specs.User, error) {
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/cp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ var _ = Describe("Podman cp", func() {
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))

session = podmanTest.Podman([]string{"cp", "testctr:testfile", "testfile1"})
session = podmanTest.Podman([]string{"cp", "--pause=false", "testctr:testfile", "testfile1"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))

Expand All @@ -233,7 +233,7 @@ var _ = Describe("Podman cp", func() {
Expect(err).To(BeNil())
Expect(strings.Contains(string(cmdRet), "testuser")).To(BeFalse())

session = podmanTest.Podman([]string{"cp", "testfile1", "testctr:testfile2"})
session = podmanTest.Podman([]string{"cp", "--pause=false", "testfile1", "testctr:testfile2"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))

Expand Down
17 changes: 6 additions & 11 deletions test/system/065-cp.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,8 @@ load helpers
"echo $rand_content1 >/tmp/$rand_filename1;
echo $rand_content2 >/tmp/$rand_filename2"

run_podman cp 'cpcontainer:/tmp/*' $dstdir

test -e $dstdir/$rand_filename1 || die "file 1 not copied from container"
test -e $dstdir/$rand_filename2 || die "file 2 not copied from container"

is "$(<$dstdir/$rand_filename1)" "$rand_content1" "content of file 1"
is "$(<$dstdir/$rand_filename2)" "$rand_content2" "content of file 2"
# cp no longer supports wildcarding
run_podman 125 cp 'cpcontainer:/tmp/*' $dstdir

run_podman rm cpcontainer
}
Expand Down Expand Up @@ -150,13 +145,13 @@ load helpers

# Copy file from host into container, into a file named 'x'
# Note that the second has a trailing slash; this will trigger mkdir
run_podman cp $srcdir/$rand_filename1 cpcontainer:/tmp/d1/x
run_podman cp --pause=false $srcdir/$rand_filename1 cpcontainer:/tmp/d1/x
is "$output" "" "output from podman cp 1"

run_podman cp $srcdir/$rand_filename2 cpcontainer:/tmp/d2/x/
run_podman cp --pause=false $srcdir/$rand_filename2 cpcontainer:/tmp/d2/x/
is "$output" "" "output from podman cp 3"

run_podman cp $srcdir/$rand_filename3 cpcontainer:/tmp/d3/x
run_podman cp --pause=false $srcdir/$rand_filename3 cpcontainer:/tmp/d3/x
is "$output" "" "output from podman cp 3"

# Read back.
Expand Down Expand Up @@ -205,7 +200,7 @@ load helpers
"mkdir -p $graphroot; trap 'exit 0' 15;while :;do sleep 0.5;done"

# Copy from host into container.
run_podman cp $srcdir/$rand_filename cpcontainer:$graphroot/$rand_filename
run_podman cp --pause=false $srcdir/$rand_filename cpcontainer:$graphroot/$rand_filename

# ls, and confirm it's there.
run_podman exec cpcontainer ls -l $graphroot/$rand_filename
Expand Down