This is an automated email from the ASF dual-hosted git repository. olli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-crypto.git
commit 148bf466b0286b0e686b4021e5b89b57830bd05c Author: Oliver Lietz <[email protected]> AuthorDate: Tue Jul 13 22:06:24 2021 +0200 [checkstyle] (design) VisibilityModifier --- pom.xml | 7 +++++++ .../crypto/internal/PBESecretKeyProvider.java | 4 ++-- .../JasyptStandardPBEStringCryptoService.java | 8 ++++---- .../crypto/internal/PBESecretKeyProviderTest.java | 13 +++++++------ .../JasyptStandardPBEStringCryptoServiceTest.java | 21 +++++++++++---------- 5 files changed, 31 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index 536c859..6c40c71 100644 --- a/pom.xml +++ b/pom.xml @@ -199,6 +199,13 @@ <artifactId>org.osgi.service.metatype.annotations</artifactId> <scope>provided</scope> </dependency> + <!-- Apache Commons --> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.12.0</version> + <scope>test</scope> + </dependency> <!-- Apache Felix --> <dependency> <groupId>org.apache.felix</groupId> diff --git a/src/main/java/org/apache/sling/commons/crypto/internal/PBESecretKeyProvider.java b/src/main/java/org/apache/sling/commons/crypto/internal/PBESecretKeyProvider.java index 278a398..001bb68 100644 --- a/src/main/java/org/apache/sling/commons/crypto/internal/PBESecretKeyProvider.java +++ b/src/main/java/org/apache/sling/commons/crypto/internal/PBESecretKeyProvider.java @@ -55,10 +55,10 @@ import org.slf4j.LoggerFactory; public final class PBESecretKeyProvider implements SecretKeyProvider { @Reference - protected volatile PasswordProvider passwordProvider; + private volatile PasswordProvider passwordProvider; @Reference - protected volatile SaltProvider saltProvider; + private volatile SaltProvider saltProvider; private PBESecretKeyProviderConfiguration configuration; diff --git a/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPBEStringCryptoService.java b/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPBEStringCryptoService.java index bf2757c..2bbf3a9 100644 --- a/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPBEStringCryptoService.java +++ b/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPBEStringCryptoService.java @@ -55,20 +55,20 @@ import org.slf4j.LoggerFactory; public final class JasyptStandardPBEStringCryptoService implements CryptoService { @Reference - protected volatile PasswordProvider passwordProvider; + private volatile PasswordProvider passwordProvider; @Reference - protected volatile IvGenerator ivGenerator; + private volatile IvGenerator ivGenerator; @Reference( cardinality = ReferenceCardinality.OPTIONAL ) - protected volatile Provider securityProvider; + private volatile Provider securityProvider; @Reference( cardinality = ReferenceCardinality.OPTIONAL ) - protected volatile SaltGenerator saltGenerator; + private volatile SaltGenerator saltGenerator; private StandardPBEStringEncryptor encryptor; diff --git a/src/test/java/org/apache/sling/commons/crypto/internal/PBESecretKeyProviderTest.java b/src/test/java/org/apache/sling/commons/crypto/internal/PBESecretKeyProviderTest.java index bcc2a5f..b3d4263 100644 --- a/src/test/java/org/apache/sling/commons/crypto/internal/PBESecretKeyProviderTest.java +++ b/src/test/java/org/apache/sling/commons/crypto/internal/PBESecretKeyProviderTest.java @@ -21,6 +21,7 @@ package org.apache.sling.commons.crypto.internal; import java.nio.charset.StandardCharsets; import java.security.NoSuchAlgorithmException; +import org.apache.commons.lang3.reflect.FieldUtils; import org.apache.sling.commons.crypto.PasswordProvider; import org.apache.sling.commons.crypto.SaltProvider; import org.junit.Rule; @@ -54,14 +55,14 @@ public class PBESecretKeyProviderTest { } @Test - public void testInvalidKeySpec() throws NoSuchAlgorithmException { + public void testInvalidKeySpec() throws NoSuchAlgorithmException, IllegalAccessException { final PasswordProvider passwordProvider = mock(PasswordProvider.class); when(passwordProvider.getPassword()).thenReturn("+AQ?aDes!'DBMkrCi:FE6q\\sOn=Pbmn=PK8n=PK?".toCharArray()); final SaltProvider saltProvider = mock(SaltProvider.class); when(saltProvider.getSalt()).thenReturn("CAFEBABECAFEDEAD".getBytes(StandardCharsets.UTF_8)); final PBESecretKeyProvider provider = new PBESecretKeyProvider(); - provider.passwordProvider = passwordProvider; - provider.saltProvider = saltProvider; + FieldUtils.writeDeclaredField(provider, "passwordProvider", passwordProvider, true); + FieldUtils.writeDeclaredField(provider, "saltProvider", saltProvider, true); final PBESecretKeyProviderConfiguration configuration = mock(PBESecretKeyProviderConfiguration.class); when(configuration.algorithm()).thenReturn("PBKDF2WithHmacSHA1"); @@ -74,14 +75,14 @@ public class PBESecretKeyProviderTest { } @Test - public void testComponentLifecycle() throws NoSuchAlgorithmException { + public void testComponentLifecycle() throws NoSuchAlgorithmException, IllegalAccessException { final PasswordProvider passwordProvider = mock(PasswordProvider.class); when(passwordProvider.getPassword()).thenReturn("+AQ?aDes!'DBMkrCi:FE6q\\sOn=Pbmn=PK8n=PK?".toCharArray()); final SaltProvider saltProvider = mock(SaltProvider.class); when(saltProvider.getSalt()).thenReturn("CAFEBABECAFEDEAD".getBytes(StandardCharsets.UTF_8)); final PBESecretKeyProvider provider = new PBESecretKeyProvider(); - provider.passwordProvider = passwordProvider; - provider.saltProvider = saltProvider; + FieldUtils.writeDeclaredField(provider, "passwordProvider", passwordProvider, true); + FieldUtils.writeDeclaredField(provider, "saltProvider", saltProvider, true); { // activate final PBESecretKeyProviderConfiguration configuration = mock(PBESecretKeyProviderConfiguration.class); when(configuration.algorithm()).thenReturn("PBKDF2WithHmacSHA1"); diff --git a/src/test/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPBEStringCryptoServiceTest.java b/src/test/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPBEStringCryptoServiceTest.java index e8a62fb..ec9a236 100644 --- a/src/test/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPBEStringCryptoServiceTest.java +++ b/src/test/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPBEStringCryptoServiceTest.java @@ -21,6 +21,7 @@ package org.apache.sling.commons.crypto.jasypt.internal; import java.security.Provider; import java.security.Security; +import org.apache.commons.lang3.reflect.FieldUtils; import org.apache.sling.commons.crypto.PasswordProvider; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.jasypt.iv.RandomIvGenerator; @@ -38,12 +39,12 @@ public class JasyptStandardPBEStringCryptoServiceTest { private static final String MESSAGE = "Rudy, a Message to You"; @Test - public void testComponentLifecycle() { + public void testComponentLifecycle() throws IllegalAccessException { final PasswordProvider passwordProvider = mock(PasswordProvider.class); when(passwordProvider.getPassword()).thenReturn("+AQ?aDes!'DBMkrCi:FE6q\\sOn=Pbmn=PK8n=PK?".toCharArray()); final JasyptStandardPBEStringCryptoService service = new JasyptStandardPBEStringCryptoService(); - service.passwordProvider = passwordProvider; - service.ivGenerator = new RandomIvGenerator(); + FieldUtils.writeDeclaredField(service, "passwordProvider", passwordProvider, true); + FieldUtils.writeDeclaredField(service, "ivGenerator", new RandomIvGenerator(), true); { // activate final JasyptStandardPBEStringCryptoServiceConfiguration configuration = mock(JasyptStandardPBEStringCryptoServiceConfiguration.class); when(configuration.algorithm()).thenReturn("PBEWITHHMACSHA512ANDAES_256"); @@ -75,14 +76,14 @@ public class JasyptStandardPBEStringCryptoServiceTest { } @Test - public void testProviderName() { + public void testProviderName() throws IllegalAccessException { final Provider securityProvider = new BouncyCastleProvider(); Security.addProvider(securityProvider); final PasswordProvider passwordProvider = mock(PasswordProvider.class); when(passwordProvider.getPassword()).thenReturn("+AQ?aDes!'DBMkrCi:FE6q\\sOn=Pbmn=PK8n=PK?".toCharArray()); final JasyptStandardPBEStringCryptoService service = new JasyptStandardPBEStringCryptoService(); - service.passwordProvider = passwordProvider; - service.ivGenerator = new RandomIvGenerator(); + FieldUtils.writeDeclaredField(service, "passwordProvider", passwordProvider, true); + FieldUtils.writeDeclaredField(service, "ivGenerator", new RandomIvGenerator(), true); final JasyptStandardPBEStringCryptoServiceConfiguration configuration = mock(JasyptStandardPBEStringCryptoServiceConfiguration.class); when(configuration.algorithm()).thenReturn("PBEWITHSHA256AND128BITAES-CBC-BC"); @@ -96,14 +97,14 @@ public class JasyptStandardPBEStringCryptoServiceTest { } @Test - public void testProvider() { + public void testProvider() throws IllegalAccessException { final Provider securityProvider = new BouncyCastleProvider(); final PasswordProvider passwordProvider = mock(PasswordProvider.class); when(passwordProvider.getPassword()).thenReturn("+AQ?aDes!'DBMkrCi:FE6q\\sOn=Pbmn=PK8n=PK?".toCharArray()); final JasyptStandardPBEStringCryptoService service = new JasyptStandardPBEStringCryptoService(); - service.passwordProvider = passwordProvider; - service.ivGenerator = new RandomIvGenerator(); - service.securityProvider = securityProvider; + FieldUtils.writeDeclaredField(service, "passwordProvider", passwordProvider, true); + FieldUtils.writeDeclaredField(service, "ivGenerator", new RandomIvGenerator(), true); + FieldUtils.writeDeclaredField(service, "securityProvider", securityProvider, true); final JasyptStandardPBEStringCryptoServiceConfiguration configuration = mock(JasyptStandardPBEStringCryptoServiceConfiguration.class); when(configuration.algorithm()).thenReturn("PBEWITHSHA256AND128BITAES-CBC-BC");
