Skip to content

Fix Bind.parse for Windows drive paths written with forward slashes #2652

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
Develop-KIM wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix Bind.parse for Windows drive paths written with forward slashes #2652

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
5 changes: 3 additions & 2 deletions docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,9 @@ public PropagationMode getPropagationMode() {
*/
public static Bind parse(String serialized) {
try {
// Split by ':' but not ':\' (Windows-style path)
String[] parts = serialized.split(":(?!\\\\)");
// Split by ':' but not the ':' that follows a Windows drive letter,
// whether written with a backslash (C:\host) or a forward slash (C:/host).
String[] parts = serialized.split(":(?!\\\\)(?<!^[A-Za-z]:)");
switch (parts.length) {
case 2: {
return new Bind(parts[0], new Volume(parts[1]));
Expand Down
33 changes: 33 additions & 0 deletions docker-java/src/test/java/com/github/dockerjava/api/model/BindTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,39 @@ public void parseReadWriteWindows() {
assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE));
}

@Test
public void parseUsingDefaultAccessModeForwardSlashWindows() {
Bind bind = Bind.parse("C:/host:/container");
assertThat(bind.getPath(), is("C:/host"));
assertThat(bind.getVolume().getPath(), is("/container"));
assertThat(bind.getAccessMode(), is(AccessMode.DEFAULT));
assertThat(bind.getSecMode(), is(SELContext.none));
assertThat(bind.getNoCopy(), nullValue());
assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE));
}

@Test
public void parseReadWriteForwardSlashWindows() {
Bind bind = Bind.parse("C:/host:/container:rw");
assertThat(bind.getPath(), is("C:/host"));
assertThat(bind.getVolume().getPath(), is("/container"));
assertThat(bind.getAccessMode(), is(rw));
assertThat(bind.getSecMode(), is(SELContext.none));
assertThat(bind.getNoCopy(), nullValue());
assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE));
}

@Test
public void parseReadOnlySELForwardSlashWindows() {
Bind bind = Bind.parse("c:/host:/container:ro,z");
assertThat(bind.getPath(), is("c:/host"));
assertThat(bind.getVolume().getPath(), is("/container"));
assertThat(bind.getAccessMode(), is(ro));
assertThat(bind.getSecMode(), is(SELContext.shared));
assertThat(bind.getNoCopy(), nullValue());
assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE));
}

@Test
public void parseReadWriteNoCopyWindows() {
Bind bind = Bind.parse("C:\\host:/container:rw,nocopy");
Expand Down