Skip to content

add utest for Strings cleanPath #20852

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

Closed
wants to merge 1 commit into from
Closed

add utest for Strings cleanPath #20852

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
62 changes: 41 additions & 21 deletions core/src/main/java/org/elasticsearch/common/Strings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ public class Strings {

private static final String WINDOWS_FOLDER_SEPARATOR = "\\";

private static final String TOP_PATH = "src/test";

private static final String CURRENT_PATH = ".";

private static final String PARENT_PATH = "..";

public static void spaceify(int spaces, String from, StringBuilder to) throws Exception {
try (BufferedReader reader = new BufferedReader(new FastStringReader(from))) {
String line;
Expand Down Expand Up @@ -458,32 +458,52 @@ public static String cleanPath(String path) {

String[] pathArray = delimitedListToStringArray(pathToUse, FOLDER_SEPARATOR);
List<String> pathElements = new LinkedList<>();
int tops = 0;

mergeSubPath(pathArray, pathElements);
simplifyParentPath(pathToUse, pathArray, pathElements);

return prefix + collectionToDelimitedString(pathElements, FOLDER_SEPARATOR);
}

private static void mergeSubPath(String[] pathArray, List<String> pathElements) {
for (int i = pathArray.length - 1; i >= 0; i--) {
String element = pathArray[i];
if (CURRENT_PATH.equals(element)) {
// Points to current directory - drop it.
} else if (TOP_PATH.equals(element)) {
// Registering top path found.
tops++;
} else {
if (tops > 0) {
// Merging path element with element corresponding to top path.
tops--;
} else {
// Normal path element found.
pathElements.add(0, element);
}
// Points to current directory - drop it.
if (!CURRENT_PATH.equals(element) && !"".equals(element)) {
pathElements.add(0, element);
}
}
}

// Remaining top paths need to be retained.
for (int i = 0; i < tops; i++) {
pathElements.add(0, TOP_PATH);
}
private static void simplifyParentPath(String pathToUse, String[] pathArray, List<String> pathElements) {
if (pathToUse.contains(PARENT_PATH)) {
int lastParentPathIndex = 0;
int nonNullElementNumBeforeFirstParentPath = 0;

return prefix + collectionToDelimitedString(pathElements, FOLDER_SEPARATOR);
for (int index = pathArray.length - 1; index >= 0; index--) {
String subPath = pathArray[index];
if (PARENT_PATH.equals(subPath)) {
break;
}
if (!"".equals(subPath) && !CURRENT_PATH.equals(subPath)) {
lastParentPathIndex = index;
}
}

for (int i = 0; i < lastParentPathIndex; i++) {
String element = pathArray[i];
if (!CURRENT_PATH.equals(element) && !"".equals(element)) {
if (!PARENT_PATH.equals(element)) {
nonNullElementNumBeforeFirstParentPath += 1;
}
}
}

//remove pairs of subPath and double dots to simplify path
for (int count2Remove = nonNullElementNumBeforeFirstParentPath * 2; count2Remove > 0; count2Remove--) {
pathElements.remove(0);
}
}
}

/**
Expand Down
17 changes: 17 additions & 0 deletions core/src/test/java/org/elasticsearch/common/StringsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,21 @@ public void testSplitStringToSet() {
assertEquals(Strings.splitStringToSet("aa ", ' '), Sets.newHashSet("aa"));
assertEquals(Strings.splitStringToSet(" ", ' '), Sets.newHashSet());
}

public void testCleanPath() {
assertEquals("/root/home", Strings.cleanPath("/root//home"));
assertEquals("/root/home", Strings.cleanPath("\\root\\home"));

assertEquals("/home", Strings.cleanPath("/root/../home"));
assertEquals("home", Strings.cleanPath("./root/../home"));
assertEquals("home", Strings.cleanPath(".\\root\\..\\home"));

assertEquals("file:/home/elk", Strings.cleanPath("file:/root/../home/elk"));
assertEquals("file:home/elk", Strings.cleanPath("file:./root/../home/elk"));

assertEquals("file:../home/elk", Strings.cleanPath("file:./root/../../home/elk"));
assertEquals("file:/../home/elk", Strings.cleanPath("file:/root/../../home/elk"));

assertEquals("file:../../home/elk", Strings.cleanPath("file:./root/../../../home/elk"));
}
}