Upgrade to Spring Security 5.7.0

Also moved HonoPasswordEncoder related classes from core module to service-base module because password encoding/decoding is only relevant in service/adapter components. Signed-off-by: Kai Hudalla <[email protected]>
eclipse-hono · May 18, 2022 · d041579 · d041579
1 parent af2ccb9
commit d041579
Show file tree

Hide file tree

Showing 23 changed files with 31 additions and 29 deletions.
diff --git a/...base/src/main/java/org/eclipse/hono/adapter/auth/device/UsernamePasswordAuthProvider.java b/...base/src/main/java/org/eclipse/hono/adapter/auth/device/UsernamePasswordAuthProvider.java
@@ -18,10 +18,10 @@
 import java.util.Objects;
 
 import org.eclipse.hono.auth.Device;
-import org.eclipse.hono.auth.HonoPasswordEncoder;
-import org.eclipse.hono.auth.SpringBasedHonoPasswordEncoder;
 import org.eclipse.hono.client.ClientErrorException;
 import org.eclipse.hono.client.registry.CredentialsClient;
+import org.eclipse.hono.service.auth.HonoPasswordEncoder;
+import org.eclipse.hono.service.auth.SpringBasedHonoPasswordEncoder;
 import org.eclipse.hono.util.CredentialsConstants;
 import org.eclipse.hono.util.CredentialsObject;
 import org.eclipse.hono.util.JsonHelper;

diff --git a/.../src/test/java/org/eclipse/hono/adapter/auth/device/UsernamePasswordAuthProviderTest.java b/.../src/test/java/org/eclipse/hono/adapter/auth/device/UsernamePasswordAuthProviderTest.java
@@ -29,10 +29,10 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import org.eclipse.hono.auth.HonoPasswordEncoder;
 import org.eclipse.hono.client.ClientErrorException;
 import org.eclipse.hono.client.registry.CredentialsClient;
 import org.eclipse.hono.service.auth.DeviceUser;
+import org.eclipse.hono.service.auth.HonoPasswordEncoder;
 import org.eclipse.hono.util.Constants;
 import org.eclipse.hono.util.CredentialsConstants;
 import org.eclipse.hono.util.CredentialsObject;

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -71,7 +71,7 @@
     <qpid-jms.version>1.4.1</qpid-jms.version>
     <quarkus.platform.version>2.8.3.Final</quarkus.platform.version>
     <slf4j.version>1.7.36</slf4j.version>
-    <spring-security-crypto.version>5.5.5</spring-security-crypto.version>
+    <spring-security-crypto.version>5.7.0</spring-security-crypto.version>
     <truth.version>1.1.3</truth.version>
     <vertx.version>4.2.7</vertx.version>
     <zookeeper.image.name>confluentinc/cp-zookeeper:6.2.4</zookeeper.image.name>

diff --git a/core/pom.xml b/core/pom.xml
@@ -57,11 +57,6 @@
       <groupId>io.smallrye.common</groupId>
       <artifactId>smallrye-common-vertx-context</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-crypto</artifactId>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>io.jsonwebtoken</groupId>
       <artifactId>jjwt-api</artifactId>

diff --git a/service-base/pom.xml b/service-base/pom.xml
@@ -42,6 +42,11 @@
       <groupId>org.eclipse.hono</groupId>
       <artifactId>hono-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-crypto</artifactId>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>io.jsonwebtoken</groupId>
       <artifactId>jjwt-api</artifactId>

diff --git a/...a/org/eclipse/hono/auth/BCryptHelper.java → ...lipse/hono/service/auth/BCryptHelper.java b/...a/org/eclipse/hono/auth/BCryptHelper.java → ...lipse/hono/service/auth/BCryptHelper.java
@@ -12,7 +12,7 @@
  */
 
 
-package org.eclipse.hono.auth;
+package org.eclipse.hono.service.auth;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

diff --git a/...rg/eclipse/hono/auth/EncodedPassword.java → ...se/hono/service/auth/EncodedPassword.java b/...rg/eclipse/hono/auth/EncodedPassword.java → ...se/hono/service/auth/EncodedPassword.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package org.eclipse.hono.auth;
+package org.eclipse.hono.service.auth;
 
 import java.util.Base64;
 import java.util.Objects;

diff --git a/...clipse/hono/auth/HonoPasswordEncoder.java → ...ono/service/auth/HonoPasswordEncoder.java b/...clipse/hono/auth/HonoPasswordEncoder.java → ...ono/service/auth/HonoPasswordEncoder.java
@@ -12,7 +12,7 @@
  */
 
 
-package org.eclipse.hono.auth;
+package org.eclipse.hono.service.auth;
 
 import io.vertx.core.json.JsonObject;
 

diff --git a/...no/auth/MessageDigestPasswordEncoder.java → ...ce/auth/MessageDigestPasswordEncoder.java b/...no/auth/MessageDigestPasswordEncoder.java → ...ce/auth/MessageDigestPasswordEncoder.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package org.eclipse.hono.auth;
+package org.eclipse.hono.service.auth;
 
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;

diff --git a/.../auth/SpringBasedHonoPasswordEncoder.java → .../auth/SpringBasedHonoPasswordEncoder.java b/.../auth/SpringBasedHonoPasswordEncoder.java → .../auth/SpringBasedHonoPasswordEncoder.java
@@ -11,7 +11,7 @@
  * SPDX-License-Identifier: EPL-2.0
  */
 
-package org.eclipse.hono.auth;
+package org.eclipse.hono.service.auth;
 
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;

diff --git a/...g/eclipse/hono/auth/BCryptHelperTest.java → ...e/hono/service/auth/BCryptHelperTest.java b/...g/eclipse/hono/auth/BCryptHelperTest.java → ...e/hono/service/auth/BCryptHelperTest.java
@@ -12,12 +12,13 @@
  */
 
 
-package org.eclipse.hono.auth;
+package org.eclipse.hono.service.auth;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import org.eclipse.hono.service.auth.BCryptHelper;
 import org.junit.jupiter.api.Test;
 
 

diff --git a/...h/SpringBasedHonoPasswordEncoderTest.java → ...h/SpringBasedHonoPasswordEncoderTest.java b/...h/SpringBasedHonoPasswordEncoderTest.java → ...h/SpringBasedHonoPasswordEncoderTest.java
@@ -12,7 +12,7 @@
  */
 
 
-package org.eclipse.hono.auth;
+package org.eclipse.hono.service.auth;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -24,6 +24,7 @@
 import java.time.Instant;
 import java.util.Base64;
 
+import org.eclipse.hono.service.auth.SpringBasedHonoPasswordEncoder;
 import org.eclipse.hono.util.CredentialsConstants;
 import org.eclipse.hono.util.CredentialsObject;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/...eclipse/hono/deviceregistry/service/credentials/AbstractCredentialsManagementService.java b/...eclipse/hono/deviceregistry/service/credentials/AbstractCredentialsManagementService.java
@@ -21,7 +21,6 @@
 import java.util.Optional;
 import java.util.Set;
 
-import org.eclipse.hono.auth.HonoPasswordEncoder;
 import org.eclipse.hono.client.ClientErrorException;
 import org.eclipse.hono.client.util.StatusCodeMapper;
 import org.eclipse.hono.deviceregistry.service.device.DeviceKey;
@@ -30,6 +29,7 @@
 import org.eclipse.hono.deviceregistry.util.DeviceRegistryUtils;
 import org.eclipse.hono.notification.NotificationEventBusSupport;
 import org.eclipse.hono.notification.deviceregistry.CredentialsChangeNotification;
+import org.eclipse.hono.service.auth.HonoPasswordEncoder;
 import org.eclipse.hono.service.management.OperationResult;
 import org.eclipse.hono.service.management.credentials.CommonCredential;
 import org.eclipse.hono.service.management.credentials.CredentialsManagementService;

diff --git a/...registry-base/src/main/java/org/eclipse/hono/deviceregistry/util/DeviceRegistryUtils.java b/...registry-base/src/main/java/org/eclipse/hono/deviceregistry/util/DeviceRegistryUtils.java
@@ -28,8 +28,8 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import org.eclipse.hono.auth.HonoPasswordEncoder;
 import org.eclipse.hono.client.ClientErrorException;
+import org.eclipse.hono.service.auth.HonoPasswordEncoder;
 import org.eclipse.hono.service.management.credentials.CommonCredential;
 import org.eclipse.hono.service.management.credentials.PasswordCredential;
 import org.eclipse.hono.service.management.credentials.PasswordSecret;

diff --git a/...istry-base/src/main/java/org/eclipse/hono/service/management/credentials/Credentials.java b/...istry-base/src/main/java/org/eclipse/hono/service/management/credentials/Credentials.java
@@ -17,8 +17,8 @@
 import java.util.List;
 import java.util.OptionalInt;
 
-import org.eclipse.hono.auth.EncodedPassword;
-import org.eclipse.hono.auth.SpringBasedHonoPasswordEncoder;
+import org.eclipse.hono.service.auth.EncodedPassword;
+import org.eclipse.hono.service.auth.SpringBasedHonoPasswordEncoder;
 
 /**
  * Helper methods for working with credentials.

diff --git a/...ry-base/src/main/java/org/eclipse/hono/service/management/credentials/PasswordSecret.java b/...ry-base/src/main/java/org/eclipse/hono/service/management/credentials/PasswordSecret.java
@@ -15,8 +15,8 @@
 import java.util.Objects;
 import java.util.Set;
 
-import org.eclipse.hono.auth.BCryptHelper;
-import org.eclipse.hono.auth.HonoPasswordEncoder;
+import org.eclipse.hono.service.auth.BCryptHelper;
+import org.eclipse.hono.service.auth.HonoPasswordEncoder;
 import org.eclipse.hono.util.RegistryManagementConstants;
 import org.eclipse.hono.util.Strings;
 

diff --git a/...pse/hono/deviceregistry/service/credentials/AbstractCredentialsManagementServiceTest.java b/...pse/hono/deviceregistry/service/credentials/AbstractCredentialsManagementServiceTest.java
@@ -28,10 +28,10 @@
 import java.util.Optional;
 import java.util.Set;
 
-import org.eclipse.hono.auth.HonoPasswordEncoder;
 import org.eclipse.hono.deviceregistry.service.device.DeviceKey;
 import org.eclipse.hono.notification.NotificationEventBusSupport;
 import org.eclipse.hono.notification.deviceregistry.CredentialsChangeNotification;
+import org.eclipse.hono.service.auth.HonoPasswordEncoder;
 import org.eclipse.hono.service.management.OperationResult;
 import org.eclipse.hono.service.management.credentials.CommonCredential;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/...us/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/ManagementServicesProducer.java b/...us/src/main/java/org/eclipse/hono/deviceregistry/jdbc/app/ManagementServicesProducer.java
@@ -19,13 +19,13 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import org.eclipse.hono.auth.SpringBasedHonoPasswordEncoder;
 import org.eclipse.hono.deviceregistry.jdbc.config.DeviceServiceOptions;
 import org.eclipse.hono.deviceregistry.jdbc.impl.CredentialsManagementServiceImpl;
 import org.eclipse.hono.deviceregistry.jdbc.impl.DeviceManagementServiceImpl;
 import org.eclipse.hono.deviceregistry.jdbc.impl.StoreBasedTenantInformationService;
 import org.eclipse.hono.deviceregistry.jdbc.impl.TenantManagementServiceImpl;
 import org.eclipse.hono.deviceregistry.service.tenant.TenantInformationService;
+import org.eclipse.hono.service.auth.SpringBasedHonoPasswordEncoder;
 import org.eclipse.hono.service.base.jdbc.store.device.TableManagementStore;
 import org.eclipse.hono.service.base.jdbc.store.tenant.AdapterStore;
 import org.eclipse.hono.service.base.jdbc.store.tenant.ManagementStore;

diff --git a/...main/java/org/eclipse/hono/deviceregistry/jdbc/impl/CredentialsManagementServiceImpl.java b/...main/java/org/eclipse/hono/deviceregistry/jdbc/impl/CredentialsManagementServiceImpl.java
@@ -18,11 +18,11 @@
 import java.util.Optional;
 import java.util.Set;
 
-import org.eclipse.hono.auth.HonoPasswordEncoder;
 import org.eclipse.hono.client.ClientErrorException;
 import org.eclipse.hono.deviceregistry.jdbc.config.DeviceServiceOptions;
 import org.eclipse.hono.deviceregistry.service.credentials.AbstractCredentialsManagementService;
 import org.eclipse.hono.deviceregistry.service.device.DeviceKey;
+import org.eclipse.hono.service.auth.HonoPasswordEncoder;
 import org.eclipse.hono.service.base.jdbc.store.OptimisticLockingException;
 import org.eclipse.hono.service.base.jdbc.store.SQL;
 import org.eclipse.hono.service.base.jdbc.store.device.TableManagementStore;

diff --git a/...kus/src/test/java/org/eclipse/hono/deviceregistry/jdbc/impl/AbstractJdbcRegistryTest.java b/...kus/src/test/java/org/eclipse/hono/deviceregistry/jdbc/impl/AbstractJdbcRegistryTest.java
@@ -36,11 +36,11 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.eclipse.hono.auth.SpringBasedHonoPasswordEncoder;
 import org.eclipse.hono.deviceregistry.jdbc.config.DeviceServiceOptions;
 import org.eclipse.hono.deviceregistry.jdbc.config.TenantServiceOptions;
 import org.eclipse.hono.deviceregistry.service.tenant.TenantInformationService;
 import org.eclipse.hono.deviceregistry.service.tenant.TenantKey;
+import org.eclipse.hono.service.auth.SpringBasedHonoPasswordEncoder;
 import org.eclipse.hono.service.base.jdbc.config.JdbcProperties;
 import org.eclipse.hono.service.base.jdbc.store.device.DeviceStores;
 import org.eclipse.hono.service.base.jdbc.store.tenant.Stores;

diff --git a/...src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/ManagementServicesProducer.java b/...src/main/java/org/eclipse/hono/deviceregistry/mongodb/app/ManagementServicesProducer.java
@@ -19,7 +19,6 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import org.eclipse.hono.auth.SpringBasedHonoPasswordEncoder;
 import org.eclipse.hono.deviceregistry.mongodb.config.MongoDbBasedCredentialsConfigProperties;
 import org.eclipse.hono.deviceregistry.mongodb.config.MongoDbBasedRegistrationConfigProperties;
 import org.eclipse.hono.deviceregistry.mongodb.config.MongoDbBasedTenantsConfigProperties;
@@ -31,6 +30,7 @@
 import org.eclipse.hono.deviceregistry.mongodb.service.MongoDbBasedDeviceManagementService;
 import org.eclipse.hono.deviceregistry.mongodb.service.MongoDbBasedTenantManagementService;
 import org.eclipse.hono.deviceregistry.service.tenant.TenantInformationService;
+import org.eclipse.hono.service.auth.SpringBasedHonoPasswordEncoder;
 import org.eclipse.hono.service.management.credentials.CredentialsManagementService;
 import org.eclipse.hono.service.management.device.DeviceManagementService;
 import org.eclipse.hono.service.management.tenant.TenantManagementService;

diff --git a/...eclipse/hono/deviceregistry/mongodb/service/MongoDbBasedCredentialsManagementService.java b/...eclipse/hono/deviceregistry/mongodb/service/MongoDbBasedCredentialsManagementService.java
@@ -17,12 +17,12 @@
 import java.util.Objects;
 import java.util.Optional;
 
-import org.eclipse.hono.auth.HonoPasswordEncoder;
 import org.eclipse.hono.deviceregistry.mongodb.config.MongoDbBasedCredentialsConfigProperties;
 import org.eclipse.hono.deviceregistry.mongodb.model.CredentialsDao;
 import org.eclipse.hono.deviceregistry.service.credentials.AbstractCredentialsManagementService;
 import org.eclipse.hono.deviceregistry.service.device.DeviceKey;
 import org.eclipse.hono.deviceregistry.util.DeviceRegistryUtils;
+import org.eclipse.hono.service.auth.HonoPasswordEncoder;
 import org.eclipse.hono.service.management.OperationResult;
 import org.eclipse.hono.service.management.credentials.CommonCredential;
 import org.eclipse.hono.service.management.credentials.CredentialsDto;

diff --git a/...va/org/eclipse/hono/deviceregistry/mongodb/service/MongoDbBasedCredentialServiceTest.java b/...va/org/eclipse/hono/deviceregistry/mongodb/service/MongoDbBasedCredentialServiceTest.java
@@ -25,7 +25,6 @@
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
-import org.eclipse.hono.auth.SpringBasedHonoPasswordEncoder;
 import org.eclipse.hono.deviceregistry.mongodb.config.MongoDbBasedCredentialsConfigProperties;
 import org.eclipse.hono.deviceregistry.mongodb.config.MongoDbBasedRegistrationConfigProperties;
 import org.eclipse.hono.deviceregistry.mongodb.model.MongoDbBasedCredentialsDao;
@@ -34,6 +33,7 @@
 import org.eclipse.hono.deviceregistry.service.tenant.TenantInformationService;
 import org.eclipse.hono.deviceregistry.service.tenant.TenantKey;
 import org.eclipse.hono.deviceregistry.util.Assertions;
+import org.eclipse.hono.service.auth.SpringBasedHonoPasswordEncoder;
 import org.eclipse.hono.service.credentials.CredentialsService;
 import org.eclipse.hono.service.credentials.CredentialsServiceTestBase;
 import org.eclipse.hono.service.management.OperationResult;
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ @@
      */
-    package org.eclipse.hono.auth;
+    package org.eclipse.hono.service.auth;
     import io.vertx.core.json.JsonObject;
@@ Expand Down @@