[marketplace] avoid collisions with multiple AddonProviders (openhab#…

…2564) * [marketplace] avoid collisions with multiple AddonProviders The current implementation could result in collision of file-path and failed in determining the installation status if other AddonProviders re-use the marketplace addon handlers. Signed-off-by: Jan N. Klug <[email protected]>
ConnectorIO · Nov 23, 2021 · 3e8b664 · 3e8b664
1 parent 66c391a
commit 3e8b664
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/...g/openhab/core/addon/marketplace/karaf/internal/community/CommunityKarafAddonHandler.java b/...g/openhab/core/addon/marketplace/karaf/internal/community/CommunityKarafAddonHandler.java
@@ -33,6 +33,7 @@
 import org.openhab.core.addon.Addon;
 import org.openhab.core.addon.marketplace.MarketplaceAddonHandler;
 import org.openhab.core.addon.marketplace.MarketplaceHandlerException;
+import org.openhab.core.util.UIDUtils;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
@@ -169,7 +170,7 @@ private void installFromCache(String addonId) throws MarketplaceHandlerException
     private void ensureCachedKarsAreInstalled() {
         try {
             if (Files.isDirectory(KAR_CACHE_PATH)) {
-                Files.list(KAR_CACHE_PATH).filter(Files::isDirectory).map(p -> "marketplace:" + p.getFileName())
+                Files.list(KAR_CACHE_PATH).filter(Files::isDirectory).map(this::addonIdFromPath)
                         .filter(addonId -> !isInstalled(addonId)).forEach(addonId -> {
                             logger.info("Reinstalling missing marketplace KAR: {}", addonId);
                             try {
@@ -184,7 +185,14 @@ private void ensureCachedKarsAreInstalled() {
         }
     }
 
+    private String addonIdFromPath(Path path) {
+        String pathName = UIDUtils.decode(path.getFileName().toString());
+        return pathName.contains(":") ? pathName : "marketplace:";
+    }
+
     private Path getAddonCacheDirectory(String addonId) {
-        return KAR_CACHE_PATH.resolve(addonId.replace("marketplace:", ""));
+        String dir = addonId.startsWith("marketplace:") ? addonId.replace("marketplace:", "")
+                : UIDUtils.encode(addonId);
+        return KAR_CACHE_PATH.resolve(dir);
     }
 }
diff --git a/...ketplace/src/main/java/org/openhab/core/addon/marketplace/MarketplaceBundleInstaller.java b/...ketplace/src/main/java/org/openhab/core/addon/marketplace/MarketplaceBundleInstaller.java
@@ -26,6 +26,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.core.OpenHAB;
+import org.openhab.core.util.UIDUtils;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
@@ -148,7 +149,7 @@ protected void uninstallBundle(BundleContext bundleContext, String addonId) thro
     protected void ensureCachedBundlesAreInstalled(BundleContext bundleContext) {
         try {
             if (Files.isDirectory(BUNDLE_CACHE_PATH)) {
-                Files.list(BUNDLE_CACHE_PATH).filter(Files::isDirectory).map(p -> "marketplace:" + p.getFileName())
+                Files.list(BUNDLE_CACHE_PATH).filter(Files::isDirectory).map(this::addonIdFromPath)
                         .filter(addonId -> !isBundleInstalled(bundleContext, addonId)).forEach(addonId -> {
                             logger.info("Reinstalling missing marketplace bundle: {}", addonId);
                             try {
@@ -163,7 +164,14 @@ protected void ensureCachedBundlesAreInstalled(BundleContext bundleContext) {
         }
     }
 
+    private String addonIdFromPath(Path path) {
+        String pathName = UIDUtils.decode(path.getFileName().toString());
+        return pathName.contains(":") ? pathName : "marketplace:";
+    }
+
     private Path getAddonCacheDirectory(String addonId) {
-        return BUNDLE_CACHE_PATH.resolve(addonId.replace("marketplace:", ""));
+        String dir = addonId.startsWith("marketplace:") ? addonId.replace("marketplace:", "")
+                : UIDUtils.encode(addonId);
+        return BUNDLE_CACHE_PATH.resolve(dir);
     }
 }