Merge branch '2.3.x'

Closes gh-24043
pull/24076/head
Scott Frederick 4 years ago
commit 8f39ebf781

@ -554,7 +554,7 @@ public class ConfigFileApplicationListener implements EnvironmentPostProcessor,
private boolean hasHiddenPathElement(Resource resource) throws IOException { private boolean hasHiddenPathElement(Resource resource) throws IOException {
String cleanPath = StringUtils.cleanPath(resource.getFile().getAbsolutePath()); String cleanPath = StringUtils.cleanPath(resource.getFile().getAbsolutePath());
for (Path value : Paths.get(cleanPath)) { for (Path value : Paths.get(cleanPath)) {
if (value.toString().startsWith(".")) { if (value.toString().startsWith("..")) {
return true; return true;
} }
} }

@ -144,7 +144,7 @@ class LocationResourceLoader {
} }
private boolean isVisibleDirectory(File file) { 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) { private static boolean hasHiddenPathElement(Path path) {
Iterator<Path> iterator = path.iterator(); Iterator<Path> iterator = path.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
if (iterator.next().toString().startsWith(".")) { if (iterator.next().toString().startsWith("..")) {
return true; return true;
} }
} }

@ -129,7 +129,7 @@ class LocationResourceLoaderTests {
@Test @Test
void getResourcesWhenHasHiddenDirectoriesFiltersResults() throws IOException { void getResourcesWhenHasHiddenDirectoriesFiltersResults() throws IOException {
createTree(); createTree();
File hiddenDirectory = new File(this.temp, ".a"); File hiddenDirectory = new File(this.temp, "..a");
hiddenDirectory.mkdirs(); hiddenDirectory.mkdirs();
FileCopyUtils.copy("h".getBytes(), new File(hiddenDirectory, "file")); FileCopyUtils.copy("h".getBytes(), new File(hiddenDirectory, "file"));
Resource[] resources = this.loader.getResources(this.temp.getAbsolutePath() + "/*/file", ResourceType.FILE); Resource[] resources = this.loader.getResources(this.temp.getAbsolutePath() + "/*/file", ResourceType.FILE);

Loading…
Cancel
Save