From 4b98d89ab09c067a8f87eecd8e77b72936ef0ef7 Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Tue, 30 Sep 2025 15:40:15 +0300 Subject: [PATCH] Remove deprecated DOWNLOAD_REPOSITORY_ARTIFACT permission (#2709) use READ_SOFTWARE_MODULE_DOWNLOAD Signed-off-by: Avgustin Marinov --- .../hawkbit/repository/jpa/ql/QLSupport.java | 2 +- .../repository/jpa/ql/utils/HibernateUtils.java | 2 +- .../jpa/management/ArtifactManagementTest.java | 2 +- .../hawkbit/im/authentication/SpPermission.java | 13 +------------ 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/ql/QLSupport.java b/hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/ql/QLSupport.java index b8cb6374b..0a181a4bd 100644 --- a/hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/ql/QLSupport.java +++ b/hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/ql/QLSupport.java @@ -174,7 +174,7 @@ public class QLSupport implements ApplicationListener { } } - @SuppressWarnings({ "java:S1117" }) // it is again ignoreCase + @SuppressWarnings("java:S1117") // it is again ignoreCase public & QueryField> EntityMatcher entityMatcher(final String query, final Class queryFieldType) { final boolean ignoreCase = this.ignoreCase || caseInsensitiveDB; // sync with DB and case sensitivity requirements return EntityMatcher.of(parseAndTransform(query, queryFieldType, ignoreCase), ignoreCase); diff --git a/hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/ql/utils/HibernateUtils.java b/hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/ql/utils/HibernateUtils.java index 476e7f882..cc3734491 100644 --- a/hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/ql/utils/HibernateUtils.java +++ b/hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/ql/utils/HibernateUtils.java @@ -50,7 +50,7 @@ public class HibernateUtils { try { method = QueryEngine.class.getMethod("getSqmTranslatorFactory"); } catch (final NoSuchMethodException e) { - log.warn("Can't resolve getSqmTranslatorFactory method (Utils.toString won't work)", e); + log.warn("Can't resolve getSqmTranslatorFactory method (HibernateUtils.toString won't work)", e); } getSqmTranslatorFactory = method; } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/ArtifactManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/ArtifactManagementTest.java index 28c12b08f..465150515 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/ArtifactManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/ArtifactManagementTest.java @@ -400,7 +400,7 @@ class ArtifactManagementTest extends AbstractJpaIntegrationTest { */ @Test @WithUser(allSpPermissions = true, removeFromAllPermission = { - SpPermission.DOWNLOAD_REPOSITORY_ARTIFACT, SpPermission.READ_SOFTWARE_MODULE_DOWNLOAD, + SpPermission.READ_SOFTWARE_MODULE_DOWNLOAD, SpRole.CONTROLLER_ROLE, SpRole.CONTROLLER_ROLE_ANONYMOUS }) void getArtifactBinaryWithoutDownloadArtifactThrowsPermissionDenied() { assertThatExceptionOfType(InsufficientPermissionException.class) diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java index 0d87cbe97..29ff29383 100644 --- a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java +++ b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java @@ -67,13 +67,6 @@ public final class SpPermission { public static final String READ_DISTRIBUTION_SET = READ_PREFIX + DISTRIBUTION_SET; public static final String UPDATE_DISTRIBUTION_SET = UPDATE_PREFIX + DISTRIBUTION_SET; - /** - * Deprecated since 0.10.0, use {@link #READ_SOFTWARE_MODULE_DOWNLOAD} instead - * - * @deprecated since 0.10.0, use {@link #READ_SOFTWARE_MODULE_DOWNLOAD} instead - */ - @Deprecated(since = "0.10.0", forRemoval = true) - public static final String DOWNLOAD_REPOSITORY_ARTIFACT = "DOWNLOAD_REPOSITORY_ARTIFACT"; public static final String READ_SOFTWARE_MODULE_DOWNLOAD = READ_PREFIX + SOFTWARE_MODULE + "_DOWNLOAD"; /** @@ -117,8 +110,7 @@ public final class SpPermission { CREATE_PREFIX + SOFTWARE_MODULE + IMPLY_READ + SOFTWARE_MODULE_TYPE + LINE_BREAK + READ_PREFIX + SOFTWARE_MODULE + IMPLY_READ + SOFTWARE_MODULE_TYPE + LINE_BREAK + UPDATE_PREFIX + SOFTWARE_MODULE + IMPLY_READ + SOFTWARE_MODULE_TYPE + LINE_BREAK + - DELETE_PREFIX + SOFTWARE_MODULE + IMPLY_READ + SOFTWARE_MODULE_TYPE + LINE_BREAK + - DOWNLOAD_REPOSITORY_ARTIFACT + IMPLY + READ_SOFTWARE_MODULE_DOWNLOAD + LINE_BREAK; + DELETE_PREFIX + SOFTWARE_MODULE + IMPLY_READ + SOFTWARE_MODULE_TYPE + LINE_BREAK; public static final String DISTRIBUTION_SET_HIERARCHY = CREATE_PREFIX + DISTRIBUTION_SET + IMPLY_READ + DISTRIBUTION_SET_TYPE + LINE_BREAK + READ_PREFIX + DISTRIBUTION_SET + IMPLY_READ + DISTRIBUTION_SET_TYPE + LINE_BREAK + @@ -161,9 +153,6 @@ public final class SpPermission { // system permission, (!) take care with allPermissions.add(SYSTEM_ADMIN); - // add deprecated permissions - allPermissions.add(DOWNLOAD_REPOSITORY_ARTIFACT); - return Collections.unmodifiableList(allPermissions); });