Ensure the files stream is correctly closed

uyuni-project · Oct 23, 2024 · 3449e0a · 3449e0a
1 parent 6daa902
commit 3449e0a
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 11 deletions.
diff --git a/...yuni-java-common/src/main/java/com/suse/common/configuration/FileConfigurationSource.java b/...yuni-java-common/src/main/java/com/suse/common/configuration/FileConfigurationSource.java
@@ -23,6 +23,7 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.PathMatcher;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -80,8 +81,7 @@ public FileConfigurationSource(List<Path> fileSourcesIn, String filePrefixIn, Li
         commonFilePrefix = filePrefixIn;
         fallbackNamespaces = fallbackNamespacesIn;
 
-        fileSourcesIn.stream()
-            .flatMap(path -> getConfigurationFiles(path))
+        getConfigurationStream(fileSourcesIn)
             .sorted(CONFIG_PATH_COMPARATOR)
             .map(file -> loadProperties(file))
             .forEach(props -> configValues.putAll(props));
@@ -143,19 +143,34 @@ public Set<String> getPropertyNames() {
             .collect(Collectors.toUnmodifiableSet());
     }
 
-    private static Stream<Path> getConfigurationFiles(Path path) {
-        if (Files.isDirectory(path)) {
-            try {
-                return Files.list(path)
-                    .filter(file -> file.getFileName().toString().endsWith(".conf"));
+    private static Stream<Path> getConfigurationStream(List<Path> locationsList) {
+        if (locationsList == null || locationsList.isEmpty()) {
+            return Stream.empty();
+        }
+
+        Stream.Builder<Path> streamBuilder = Stream.builder();
+        for (Path path : locationsList) {
+            if (Files.isDirectory(path) && Files.isReadable(path)) {
+                try (Stream<Path> filesInDirectory = Files.list(path)) {
+                    PathMatcher configMatcher = path.getFileSystem().getPathMatcher("glob:*.conf");
+                    filesInDirectory
+                        .filter(file -> Files.isRegularFile(file) && Files.isReadable(file))
+                        .filter(file -> configMatcher.matches(file.getFileName()))
+                        .forEach(file -> streamBuilder.add(file));
+                }
+                catch (IOException ex) {
+                    LOGGER.error("Unable to list file in directory {}", path);
+                }
+            }
+            else if (Files.isRegularFile(path) && Files.isReadable(path)) {
+                streamBuilder.add(path);
             }
-            catch (IOException ex) {
-                LOGGER.error("Unable to list file in directory {}", path);
-                return Stream.empty();
+            else {
+                LOGGER.warn("Ignoring path {} since it's not accessible", path);
             }
         }
 
-        return Stream.of(path);
+        return streamBuilder.build();
     }
 
     private Properties loadProperties(Path file) {

diff --git a/microservices/uyuni-java-common/uyuni-java-common.changes.mackdk.avoid-config-exception b/microservices/uyuni-java-common/uyuni-java-common.changes.mackdk.avoid-config-exception
@@ -0,0 +1 @@
+- Ensure the files stream is correctly closed