Respond with 404 if add-on is missing in add-on service (#3989)

* Respond with 404 if add-on is missing in add-on service Signed-off-by: Jan N. Klug <[email protected]>
openhab · Dec 31, 2023 · 2abe4e2 · 2abe4e2
1 parent 8b14d56
commit 2abe4e2
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/....rest.core/src/main/java/org/openhab/core/io/rest/core/internal/addons/AddonResource.java b/....rest.core/src/main/java/org/openhab/core/io/rest/core/internal/addons/AddonResource.java
@@ -253,9 +253,10 @@ public Response getById(
     public Response installAddon(final @PathParam("addonId") @Parameter(description = "addon ID") String addonId,
             @QueryParam("serviceId") @Parameter(description = "service ID") @Nullable String serviceId) {
         AddonService addonService = (serviceId != null) ? getServiceById(serviceId) : getDefaultService();
-        if (addonService == null) {
+        if (addonService == null || addonService.getAddon(addonId, null) == null) {
             return Response.status(HttpStatus.NOT_FOUND_404).build();
         }
+
         ThreadPoolManager.getPool(THREAD_POOL_NAME).submit(() -> {
             try {
                 addonService.install(addonId);
@@ -294,7 +295,7 @@ public Response installAddonByURL(
     public Response uninstallAddon(final @PathParam("addonId") @Parameter(description = "addon ID") String addonId,
             @QueryParam("serviceId") @Parameter(description = "service ID") @Nullable String serviceId) {
         AddonService addonService = (serviceId != null) ? getServiceById(serviceId) : getDefaultService();
-        if (addonService == null) {
+        if (addonService == null || addonService.getAddon(addonId, null) == null) {
             return Response.status(HttpStatus.NOT_FOUND_404).build();
         }
         ThreadPoolManager.getPool(THREAD_POOL_NAME).submit(() -> {