Commit 8f39ebf7 authored by Scott Frederick's avatar Scott Frederick

Merge branch '2.3.x'

Closes gh-24043
parents bb5faeaa 62aa1b7a
......@@ -554,7 +554,7 @@ public class ConfigFileApplicationListener implements EnvironmentPostProcessor,
private boolean hasHiddenPathElement(Resource resource) throws IOException {
String cleanPath = StringUtils.cleanPath(resource.getFile().getAbsolutePath());
for (Path value : Paths.get(cleanPath)) {
if (value.toString().startsWith(".")) {
if (value.toString().startsWith("..")) {
return true;
}
}
......
......@@ -144,7 +144,7 @@ class LocationResourceLoader {
}
private boolean isVisibleDirectory(File file) {
return file.isDirectory() && !file.getName().startsWith(".");
return file.isDirectory() && !file.getName().startsWith("..");
}
/**
......
......@@ -226,7 +226,7 @@ public class ConfigTreePropertySource extends EnumerablePropertySource<Path> imp
private static boolean hasHiddenPathElement(Path path) {
Iterator<Path> iterator = path.iterator();
while (iterator.hasNext()) {
if (iterator.next().toString().startsWith(".")) {
if (iterator.next().toString().startsWith("..")) {
return true;
}
}
......
......@@ -129,7 +129,7 @@ class LocationResourceLoaderTests {
@Test
void getResourcesWhenHasHiddenDirectoriesFiltersResults() throws IOException {
createTree();
File hiddenDirectory = new File(this.temp, ".a");
File hiddenDirectory = new File(this.temp, "..a");
hiddenDirectory.mkdirs();
FileCopyUtils.copy("h".getBytes(), new File(hiddenDirectory, "file"));
Resource[] resources = this.loader.getResources(this.temp.getAbsolutePath() + "/*/file", ResourceType.FILE);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment