[AddonInfoAddonsXmlProvider] fix issue openhab#3901

Signed-off-by: Andrew Fiddian-Green <[email protected]>
andrewfg · Dec 6, 2023 · 5ffd0c2 · 5ffd0c2
1 parent 44b92db
commit 5ffd0c2
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/...e.addon/src/main/java/org/openhab/core/addon/internal/xml/AddonInfoAddonsXmlProvider.java b/...e.addon/src/main/java/org/openhab/core/addon/internal/xml/AddonInfoAddonsXmlProvider.java
@@ -79,8 +79,18 @@ public Set<AddonInfo> getAddonInfos(@Nullable Locale locale) {
     }
 
     private void initialize() {
+        File fileFolder = new File(folder);
+        try {
+            if (!fileFolder.isDirectory()) {
+                logger.warn("Folder '{}' does not exist", folder);
+                return;
+            }
+        } catch (SecurityException e) {
+            logger.warn("Folder '{}' security exception", folder);
+            return;
+        }
         AddonInfoListReader reader = new AddonInfoListReader();
-        Stream.of(new File(folder).listFiles()).filter(f -> f.isFile() && f.getName().endsWith(".xml")).forEach(f -> {
+        Stream.of(fileFolder.listFiles()).filter(f -> f.isFile() && f.getName().endsWith(".xml")).forEach(f -> {
             try {
                 String xml = Files.readString(f.toPath());
                 if (xml != null && !xml.isBlank()) {
@@ -94,6 +104,8 @@ private void initialize() {
                 logger.warn("File '{}' has invalid content", f.getName());
             } catch (XStreamException e) {
                 logger.warn("File '{}' could not be deserialized", f.getName());
+            } catch (SecurityException e) {
+                logger.warn("File '{}' security exception", f.getName());
             }
         });
     }