Skip to content

containers: strip any bind mode from run volumes #3445

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

Open
breken-ai wants to merge 1 commit into
base: main
Choose a base branch
from
+34 −4
Open

containers: strip any bind mode from run volumes #3445

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
8 changes: 4 additions & 4 deletions docker/models/containers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1187,10 +1187,10 @@ def _host_volume_from_bind(bind):
bits = rest.split(':', 1)
if len(bits) == 1 or bits[1] in ('ro', 'rw'):
return drive + bits[0]
elif bits[1].endswith(':ro') or bits[1].endswith(':rw'):
return bits[1][:-3]
else:
return bits[1]
# bits[1] is "dest" or "dest:mode", where mode can be any bind option
# ("ro", "z", "ro,Z", "rw,rprivate", "cached", ...)
dest_drive, dest = ntpath.splitdrive(bits[1])
return dest_drive + dest.split(':', 1)[0]


ExecResult = namedtuple('ExecResult', 'exit_code,output')
Expand Down
30 changes: 30 additions & 0 deletions tests/unit/models_containers_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,36 @@ def test_create(self):
)
client.api.inspect_container.assert_called_with(FAKE_CONTAINER_ID)

def test_create_volumes_with_bind_options(self):
# Mode options other than a bare "ro"/"rw" (SELinux labels,
# propagation, macOS consistency, ...) must not leak into the
# container's anonymous volume list.
binds = [
'/tmp:/mnt/z:z',
'/tmp:/mnt/ro-z:ro,Z',
'/tmp:/mnt/rprivate:rw,rprivate',
'src:/mnt/cached:cached',
'volumename:/mnt/nocopy:nocopy',
'/tmp:/mnt/ro:ro',
'C:\\windows\\path:D:\\hello\\world:ro,Z',
]
client = make_fake_client()
client.containers.create('alpine', volumes=binds)
client.api.create_container.assert_called_with(
image='alpine',
command=None,
volumes=[
'/mnt/z',
'/mnt/ro-z',
'/mnt/rprivate',
'/mnt/cached',
'/mnt/nocopy',
'/mnt/ro',
'D:\\hello\\world',
],
host_config={'Binds': binds, 'NetworkMode': 'default'},
)

def test_create_with_image_object(self):
client = make_fake_client()
image = client.images.get(FAKE_IMAGE_ID)
Expand Down