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

Merge pull request #7164 from giuseppe/volumes-chown-no-recurse

Browse Source 
volumes: do not recurse when chowning
This commit is contained in:
OpenShift Merge Robot
2020-07-31 07:19:02 -04:00
committed by GitHub
parent e911875b6a 10627228be
commit bb96c8918b
2 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
libpod/container_internal.go
View File

@ -1534,9 +1534,6 @@ func (c *Container) chownVolume(volumeName string) error {
return errors.Wrapf(err, "error retrieving named volume %s for container %s", volumeName, c.ID()) return errors.Wrapf(err, "error retrieving named volume %s for container %s", volumeName, c.ID())
} }
uid := int(c.config.Spec.Process.User.UID)
gid := int(c.config.Spec.Process.User.GID)
vol.lock.Lock() vol.lock.Lock()
defer vol.lock.Unlock() defer vol.lock.Unlock()
@ -1547,22 +1544,34 @@ func (c *Container) chownVolume(volumeName string) error {
if vol.state.NeedsChown { if vol.state.NeedsChown {
vol.state.NeedsChown = false vol.state.NeedsChown = false
uid := int(c.config.Spec.Process.User.UID)
gid := int(c.config.Spec.Process.User.GID)
if c.config.IDMappings.UIDMap != nil {
p := idtools.IDPair{
UID: uid,
GID: gid,
}
mappings := idtools.NewIDMappingsFromMaps(c.config.IDMappings.UIDMap, c.config.IDMappings.GIDMap)
newPair, err := mappings.ToHost(p)
if err != nil {
return errors.Wrapf(err, "error mapping user %d:%d", uid, gid)
}
uid = newPair.UID
gid = newPair.GID
}
vol.state.UIDChowned = uid vol.state.UIDChowned = uid
vol.state.GIDChowned = gid vol.state.GIDChowned = gid
if err := vol.save(); err != nil { if err := vol.save(); err != nil {
return err return err
} }
err := filepath.Walk(vol.MountPoint(), func(path string, info os.FileInfo, err error) error {
if err != nil { mountPoint := vol.MountPoint()
return err
} if err := os.Lchown(mountPoint, uid, gid); err != nil {
if err := os.Lchown(path, uid, gid); err != nil {
return err
}
return nil
})
if err != nil {
return err return err
} }
} }

8
test/system/070-build.bats
View File

@ -143,7 +143,7 @@ RUN mkdir -p /a/b/c
RUN ln -s /no/such/nonesuch /a/b/c/badsymlink RUN ln -s /no/such/nonesuch /a/b/c/badsymlink
RUN ln -s /bin/mydefaultcmd /a/b/c/goodsymlink RUN ln -s /bin/mydefaultcmd /a/b/c/goodsymlink
RUN touch /a/b/c/myfile RUN touch /a/b/c/myfile
RUN chown -h 1:2 /a/b/c/badsymlink /a/b/c/goodsymlink /a/b/c/myfile RUN chown -h 1:2 /a/b/c/badsymlink /a/b/c/goodsymlink && chown -h 4:5 /a/b/c/myfile
VOLUME /a/b/c VOLUME /a/b/c
# Test for environment passing and override # Test for environment passing and override
@ -216,18 +216,18 @@ Labels.$label_name | $label_value
# be they dangling or valid, would barf with # be they dangling or valid, would barf with
# Error: chown <mountpath>/_data/symlink: ENOENT # Error: chown <mountpath>/_data/symlink: ENOENT
run_podman run --rm build_test stat -c'%u:%g:%N' /a/b/c/badsymlink run_podman run --rm build_test stat -c'%u:%g:%N' /a/b/c/badsymlink
is "$output" "0:0:'/a/b/c/badsymlink' -> '/no/such/nonesuch'" \ is "$output" "1:2:'/a/b/c/badsymlink' -> '/no/such/nonesuch'" \
"bad symlink to nonexistent file is chowned and preserved" "bad symlink to nonexistent file is chowned and preserved"
run_podman run --rm build_test stat -c'%u:%g:%N' /a/b/c/goodsymlink run_podman run --rm build_test stat -c'%u:%g:%N' /a/b/c/goodsymlink
is "$output" "0:0:'/a/b/c/goodsymlink' -> '/bin/mydefaultcmd'" \ is "$output" "1:2:'/a/b/c/goodsymlink' -> '/bin/mydefaultcmd'" \
"good symlink to existing file is chowned and preserved" "good symlink to existing file is chowned and preserved"
run_podman run --rm build_test stat -c'%u:%g' /bin/mydefaultcmd run_podman run --rm build_test stat -c'%u:%g' /bin/mydefaultcmd
is "$output" "2:3" "target of symlink is not chowned" is "$output" "2:3" "target of symlink is not chowned"
run_podman run --rm build_test stat -c'%u:%g:%N' /a/b/c/myfile run_podman run --rm build_test stat -c'%u:%g:%N' /a/b/c/myfile
is "$output" "0:0:/a/b/c/myfile" "file in volume is chowned to root" is "$output" "4:5:/a/b/c/myfile" "file in volume is chowned"
# Clean up # Clean up
run_podman rmi -f build_test run_podman rmi -f build_test