You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2021/07/13 20:29:11 UTC
[sling-org-apache-sling-commons-crypto] branch master updated
(6687bd2 -> e7cad71)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-crypto.git.
from 6687bd2 [spotbugs] exclude SE_BAD_FIELD
new 1c476ef SLING-10544 Enable code checks with Checkstyle
new 6d47502 [checkstyle] (javadoc) MissingJavadocPackage
new 8d2faf2 [checkstyle] (javadoc) MissingJavadocType
new d713649 [checkstyle] (javadoc) MissingJavadocMethod
new 1ccd3d2 [checkstyle] (javadoc) SummaryJavadoc
new 15de186 [checkstyle] (design) DesignForExtension
new 148bf46 [checkstyle] (design) VisibilityModifier
new 18f11d2 [checkstyle] (modifier) InterfaceMemberImpliedModifier
new 3dd5f65 [checkstyle] (coding) MagicNumber
new dafae51 [checkstyle] (coding) DeclarationOrder
new 0352ea3 [checkstyle] (coding) MultipleStringLiterals
new b51367e [checkstyle] (coding) ReturnCount
new e7cad71 [checkstyle] (naming) AbbreviationAsWordInName
The 13 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
...bugs-exclude.xml => checkstyle-suppressions.xml | 14 ++++----
pmd-exclude.properties | 22 +++++++++++++
pom.xml | 38 ++++++++++++++++++++++
.../apache/sling/commons/crypto/CryptoService.java | 11 +++++--
.../sling/commons/crypto/PasswordProvider.java | 12 ++++++-
.../apache/sling/commons/crypto/SaltProvider.java | 12 ++++++-
.../sling/commons/crypto/SecretKeyProvider.java | 12 ++++++-
.../EnvironmentVariablePasswordProvider.java | 2 +-
.../crypto/internal/FilePasswordProvider.java | 6 ++--
...tKeyProvider.java => PbeSecretKeyProvider.java} | 18 +++++-----
...java => PbeSecretKeyProviderConfiguration.java} | 2 +-
.../crypto/internal/SecureRandomSaltProvider.java | 2 +-
.../commons/crypto/internal/package-info.java | 7 ++--
.../internal/JasyptRandomIvGeneratorRegistrar.java | 2 +-
.../JasyptRandomSaltGeneratorRegistrar.java | 2 +-
...a => JasyptStandardPbeStringCryptoService.java} | 22 ++++++-------
...andardPbeStringCryptoServiceConfiguration.java} | 2 +-
.../crypto/jasypt/internal/package-info.java | 7 ++--
.../sling/commons/crypto/jasypt/package-info.java | 7 ++--
.../apache/sling/commons/crypto/package-info.java | 4 +++
.../internal/EncryptWebConsolePlugin.java | 14 ++++----
.../crypto/webconsole/internal/package-info.java | 7 ++--
.../commons/crypto/webconsole/package-info.java | 7 ++--
...iderTest.java => PbeSecretKeyProviderTest.java} | 31 +++++++++---------
...ProviderIT.java => PbeSecretKeyProviderIT.java} | 4 +--
...=> JasyptStandardPbeStringCryptoServiceIT.java} | 4 +--
... JasyptStandardPbeStringCryptoServiceTest.java} | 37 +++++++++++----------
27 files changed, 213 insertions(+), 95 deletions(-)
copy spotbugs-exclude.xml => checkstyle-suppressions.xml (63%)
create mode 100644 pmd-exclude.properties
rename src/main/java/org/apache/sling/commons/crypto/internal/{PBESecretKeyProvider.java => PbeSecretKeyProvider.java} (86%)
rename src/main/java/org/apache/sling/commons/crypto/internal/{PBESecretKeyProviderConfiguration.java => PbeSecretKeyProviderConfiguration.java} (98%)
copy Jenkinsfile => src/main/java/org/apache/sling/commons/crypto/internal/package-info.java (85%)
rename src/main/java/org/apache/sling/commons/crypto/jasypt/internal/{JasyptStandardPBEStringCryptoService.java => JasyptStandardPbeStringCryptoService.java} (88%)
rename src/main/java/org/apache/sling/commons/crypto/jasypt/internal/{JasyptStandardPBEStringCryptoServiceConfiguration.java => JasyptStandardPbeStringCryptoServiceConfiguration.java} (98%)
copy Jenkinsfile => src/main/java/org/apache/sling/commons/crypto/jasypt/internal/package-info.java (82%)
copy Jenkinsfile => src/main/java/org/apache/sling/commons/crypto/jasypt/package-info.java (87%)
copy Jenkinsfile => src/main/java/org/apache/sling/commons/crypto/webconsole/internal/package-info.java (83%)
copy Jenkinsfile => src/main/java/org/apache/sling/commons/crypto/webconsole/package-info.java (87%)
rename src/test/java/org/apache/sling/commons/crypto/internal/{PBESecretKeyProviderTest.java => PbeSecretKeyProviderTest.java} (76%)
rename src/test/java/org/apache/sling/commons/crypto/it/tests/{PBESecretKeyProviderIT.java => PbeSecretKeyProviderIT.java} (96%)
rename src/test/java/org/apache/sling/commons/crypto/it/tests/jasypt/{JasyptStandardPBEStringCryptoServiceIT.java => JasyptStandardPbeStringCryptoServiceIT.java} (96%)
rename src/test/java/org/apache/sling/commons/crypto/jasypt/internal/{JasyptStandardPBEStringCryptoServiceTest.java => JasyptStandardPbeStringCryptoServiceTest.java} (73%)
[sling-org-apache-sling-commons-crypto] 08/13: [checkstyle]
(modifier) InterfaceMemberImpliedModifier
Posted by ol...@apache.org.
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 18f11d2eb767b52bfb683028ca18913c8ef1633a
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jul 13 22:12:27 2021 +0200
[checkstyle] (modifier) InterfaceMemberImpliedModifier
---
pmd-exclude.properties | 22 ++++++++++++++++++++++
pom.xml | 1 +
.../apache/sling/commons/crypto/CryptoService.java | 4 ++--
.../sling/commons/crypto/PasswordProvider.java | 2 +-
.../apache/sling/commons/crypto/SaltProvider.java | 2 +-
.../sling/commons/crypto/SecretKeyProvider.java | 2 +-
6 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/pmd-exclude.properties b/pmd-exclude.properties
new file mode 100644
index 0000000..2168b31
--- /dev/null
+++ b/pmd-exclude.properties
@@ -0,0 +1,22 @@
+################################################################################
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+org.apache.sling.commons.crypto.CryptoService=UnnecessaryModifier
+org.apache.sling.commons.crypto.PasswordProvider=UnnecessaryModifier
+org.apache.sling.commons.crypto.SaltProvider=UnnecessaryModifier
+org.apache.sling.commons.crypto.SecretKeyProvider=UnnecessaryModifier
diff --git a/pom.xml b/pom.xml
index 6c40c71..e7d2c51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,6 +126,7 @@
<version>3.14.0</version>
<configuration>
<targetJdk>${sling.java.version}</targetJdk>
+ <excludeFromFailureFile>pmd-exclude.properties</excludeFromFailureFile>
</configuration>
<executions>
<execution>
diff --git a/src/main/java/org/apache/sling/commons/crypto/CryptoService.java b/src/main/java/org/apache/sling/commons/crypto/CryptoService.java
index fb300de..6cc54e7 100644
--- a/src/main/java/org/apache/sling/commons/crypto/CryptoService.java
+++ b/src/main/java/org/apache/sling/commons/crypto/CryptoService.java
@@ -33,7 +33,7 @@ public interface CryptoService {
* @param message The message to encrypt
* @return The encrypted message, the ciphertext
*/
- @NotNull String encrypt(@NotNull final String message);
+ public abstract @NotNull String encrypt(@NotNull final String message);
/**
* Decrypts the given ciphertext.
@@ -41,6 +41,6 @@ public interface CryptoService {
* @param ciphertext The encrypted message, the ciphertext to decrypt
* @return The decrypted message
*/
- @NotNull String decrypt(@NotNull final String ciphertext);
+ public abstract @NotNull String decrypt(@NotNull final String ciphertext);
}
diff --git a/src/main/java/org/apache/sling/commons/crypto/PasswordProvider.java b/src/main/java/org/apache/sling/commons/crypto/PasswordProvider.java
index ad7aa8b..efa89dc 100644
--- a/src/main/java/org/apache/sling/commons/crypto/PasswordProvider.java
+++ b/src/main/java/org/apache/sling/commons/crypto/PasswordProvider.java
@@ -34,6 +34,6 @@ public interface PasswordProvider {
*
* @return The password
*/
- char @NotNull [] getPassword();
+ public abstract char @NotNull [] getPassword();
}
diff --git a/src/main/java/org/apache/sling/commons/crypto/SaltProvider.java b/src/main/java/org/apache/sling/commons/crypto/SaltProvider.java
index 0899aba..039350e 100644
--- a/src/main/java/org/apache/sling/commons/crypto/SaltProvider.java
+++ b/src/main/java/org/apache/sling/commons/crypto/SaltProvider.java
@@ -34,6 +34,6 @@ public interface SaltProvider {
*
* @return The salt
*/
- byte @NotNull [] getSalt();
+ public abstract byte @NotNull [] getSalt();
}
diff --git a/src/main/java/org/apache/sling/commons/crypto/SecretKeyProvider.java b/src/main/java/org/apache/sling/commons/crypto/SecretKeyProvider.java
index 9a0251f..d84aee4 100644
--- a/src/main/java/org/apache/sling/commons/crypto/SecretKeyProvider.java
+++ b/src/main/java/org/apache/sling/commons/crypto/SecretKeyProvider.java
@@ -36,6 +36,6 @@ public interface SecretKeyProvider {
*
* @return The secret key
*/
- @NotNull SecretKey getSecretKey();
+ public abstract @NotNull SecretKey getSecretKey();
}
[sling-org-apache-sling-commons-crypto] 13/13: [checkstyle]
(naming) AbbreviationAsWordInName
Posted by ol...@apache.org.
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 e7cad7181edd3bacd85ed240d03a3700f75df6d1
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jul 13 22:28:26 2021 +0200
[checkstyle] (naming) AbbreviationAsWordInName
---
...ecretKeyProvider.java => PbeSecretKeyProvider.java} | 14 +++++++-------
...ion.java => PbeSecretKeyProviderConfiguration.java} | 2 +-
....java => JasyptStandardPbeStringCryptoService.java} | 14 +++++++-------
...ptStandardPbeStringCryptoServiceConfiguration.java} | 2 +-
...ProviderTest.java => PbeSecretKeyProviderTest.java} | 18 +++++++++---------
...tKeyProviderIT.java => PbeSecretKeyProviderIT.java} | 4 ++--
...ava => JasyptStandardPbeStringCryptoServiceIT.java} | 4 ++--
...a => JasyptStandardPbeStringCryptoServiceTest.java} | 16 ++++++++--------
8 files changed, 37 insertions(+), 37 deletions(-)
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
similarity index 89%
rename from src/main/java/org/apache/sling/commons/crypto/internal/PBESecretKeyProvider.java
rename to src/main/java/org/apache/sling/commons/crypto/internal/PbeSecretKeyProvider.java
index 001bb68..2f9af7a 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
@@ -48,11 +48,11 @@ import org.slf4j.LoggerFactory;
}
)
@Designate(
- ocd = PBESecretKeyProviderConfiguration.class,
+ ocd = PbeSecretKeyProviderConfiguration.class,
factory = true
)
@SuppressWarnings({"java:S1117", "java:S3077"})
-public final class PBESecretKeyProvider implements SecretKeyProvider {
+public final class PbeSecretKeyProvider implements SecretKeyProvider {
@Reference
private volatile PasswordProvider passwordProvider;
@@ -60,24 +60,24 @@ public final class PBESecretKeyProvider implements SecretKeyProvider {
@Reference
private volatile SaltProvider saltProvider;
- private PBESecretKeyProviderConfiguration configuration;
+ private PbeSecretKeyProviderConfiguration configuration;
private SecretKeyFactory factory;
- private final Logger logger = LoggerFactory.getLogger(PBESecretKeyProvider.class);
+ private final Logger logger = LoggerFactory.getLogger(PbeSecretKeyProvider.class);
- public PBESecretKeyProvider() { //
+ public PbeSecretKeyProvider() { //
}
@Activate
- protected void activate(final PBESecretKeyProviderConfiguration configuration) throws NoSuchAlgorithmException {
+ protected void activate(final PbeSecretKeyProviderConfiguration configuration) throws NoSuchAlgorithmException {
logger.debug("activating");
this.configuration = configuration;
factory = SecretKeyFactory.getInstance(configuration.algorithm());
}
@Modified
- protected void modified(final PBESecretKeyProviderConfiguration configuration) throws NoSuchAlgorithmException {
+ protected void modified(final PbeSecretKeyProviderConfiguration configuration) throws NoSuchAlgorithmException {
logger.debug("modifying");
this.configuration = configuration;
factory = SecretKeyFactory.getInstance(configuration.algorithm());
diff --git a/src/main/java/org/apache/sling/commons/crypto/internal/PBESecretKeyProviderConfiguration.java b/src/main/java/org/apache/sling/commons/crypto/internal/PbeSecretKeyProviderConfiguration.java
similarity index 98%
rename from src/main/java/org/apache/sling/commons/crypto/internal/PBESecretKeyProviderConfiguration.java
rename to src/main/java/org/apache/sling/commons/crypto/internal/PbeSecretKeyProviderConfiguration.java
index 5562b6c..f4ea18f 100644
--- a/src/main/java/org/apache/sling/commons/crypto/internal/PBESecretKeyProviderConfiguration.java
+++ b/src/main/java/org/apache/sling/commons/crypto/internal/PbeSecretKeyProviderConfiguration.java
@@ -26,7 +26,7 @@ import org.osgi.service.metatype.annotations.ObjectClassDefinition;
description = "Provides secret keys for password-based encryption (PBE)"
)
@SuppressWarnings("java:S100")
-@interface PBESecretKeyProviderConfiguration {
+@interface PbeSecretKeyProviderConfiguration {
@AttributeDefinition(
name = "Names",
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
similarity index 92%
rename from src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPBEStringCryptoService.java
rename to src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPbeStringCryptoService.java
index 2bbf3a9..2f0a8f7 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
@@ -48,11 +48,11 @@ import org.slf4j.LoggerFactory;
}
)
@Designate(
- ocd = JasyptStandardPBEStringCryptoServiceConfiguration.class,
+ ocd = JasyptStandardPbeStringCryptoServiceConfiguration.class,
factory = true
)
@SuppressWarnings({"java:S1117", "java:S3077", "java:S6212"})
-public final class JasyptStandardPBEStringCryptoService implements CryptoService {
+public final class JasyptStandardPbeStringCryptoService implements CryptoService {
@Reference
private volatile PasswordProvider passwordProvider;
@@ -72,19 +72,19 @@ public final class JasyptStandardPBEStringCryptoService implements CryptoService
private StandardPBEStringEncryptor encryptor;
- private final Logger logger = LoggerFactory.getLogger(JasyptStandardPBEStringCryptoService.class);
+ private final Logger logger = LoggerFactory.getLogger(JasyptStandardPbeStringCryptoService.class);
- public JasyptStandardPBEStringCryptoService() { //
+ public JasyptStandardPbeStringCryptoService() { //
}
@Activate
- protected void activate(final JasyptStandardPBEStringCryptoServiceConfiguration configuration) {
+ protected void activate(final JasyptStandardPbeStringCryptoServiceConfiguration configuration) {
logger.debug("activating");
setupEncryptor(configuration);
}
@Modified
- protected void modified(final JasyptStandardPBEStringCryptoServiceConfiguration configuration) {
+ protected void modified(final JasyptStandardPbeStringCryptoServiceConfiguration configuration) {
logger.debug("modifying");
setupEncryptor(configuration);
}
@@ -94,7 +94,7 @@ public final class JasyptStandardPBEStringCryptoService implements CryptoService
logger.debug("deactivating");
}
- private void setupEncryptor(final JasyptStandardPBEStringCryptoServiceConfiguration configuration) {
+ private void setupEncryptor(final JasyptStandardPbeStringCryptoServiceConfiguration configuration) {
final String algorithm = configuration.algorithm();
final Set<?> algorithms = AlgorithmRegistry.getAllPBEAlgorithms();
if (!algorithms.contains(algorithm)) {
diff --git a/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPBEStringCryptoServiceConfiguration.java b/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPbeStringCryptoServiceConfiguration.java
similarity index 98%
rename from src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPBEStringCryptoServiceConfiguration.java
rename to src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPbeStringCryptoServiceConfiguration.java
index 1f0b0fd..c6f70c4 100644
--- a/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPBEStringCryptoServiceConfiguration.java
+++ b/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPbeStringCryptoServiceConfiguration.java
@@ -31,7 +31,7 @@ import static org.jasypt.encryption.pbe.StandardPBEByteEncryptor.DEFAULT_KEY_OBT
description = "Crypto service which uses Jasypt StandardPBEStringEncryptor for encryption and decryption"
)
@SuppressWarnings("java:S100")
-@interface JasyptStandardPBEStringCryptoServiceConfiguration {
+@interface JasyptStandardPbeStringCryptoServiceConfiguration {
@AttributeDefinition(
name = "Names",
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
similarity index 85%
rename from src/test/java/org/apache/sling/commons/crypto/internal/PBESecretKeyProviderTest.java
rename to src/test/java/org/apache/sling/commons/crypto/internal/PbeSecretKeyProviderTest.java
index b3d4263..7d5522c 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
@@ -32,14 +32,14 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public class PBESecretKeyProviderTest {
+public class PbeSecretKeyProviderTest {
@Rule
public ExpectedException exception = ExpectedException.none();
@Test
public void testMissingConfiguration() {
- final PBESecretKeyProvider provider = new PBESecretKeyProvider();
+ final PbeSecretKeyProvider provider = new PbeSecretKeyProvider();
exception.expect(NullPointerException.class);
exception.expectMessage("Configuration must not be null");
provider.getSecretKey();
@@ -47,8 +47,8 @@ public class PBESecretKeyProviderTest {
@Test
public void testInvalidAlgorithm() throws NoSuchAlgorithmException {
- final PBESecretKeyProvider provider = new PBESecretKeyProvider();
- final PBESecretKeyProviderConfiguration configuration = mock(PBESecretKeyProviderConfiguration.class);
+ final PbeSecretKeyProvider provider = new PbeSecretKeyProvider();
+ final PbeSecretKeyProviderConfiguration configuration = mock(PbeSecretKeyProviderConfiguration.class);
when(configuration.algorithm()).thenReturn("Invalid");
exception.expect(NoSuchAlgorithmException.class);
provider.activate(configuration);
@@ -60,11 +60,11 @@ public class PBESecretKeyProviderTest {
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();
+ final PbeSecretKeyProvider provider = new PbeSecretKeyProvider();
FieldUtils.writeDeclaredField(provider, "passwordProvider", passwordProvider, true);
FieldUtils.writeDeclaredField(provider, "saltProvider", saltProvider, true);
- final PBESecretKeyProviderConfiguration configuration = mock(PBESecretKeyProviderConfiguration.class);
+ final PbeSecretKeyProviderConfiguration configuration = mock(PbeSecretKeyProviderConfiguration.class);
when(configuration.algorithm()).thenReturn("PBKDF2WithHmacSHA1");
when(configuration.iterationCount()).thenReturn(-1);
when(configuration.keyLength()).thenReturn(-1);
@@ -80,11 +80,11 @@ public class PBESecretKeyProviderTest {
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();
+ final PbeSecretKeyProvider provider = new PbeSecretKeyProvider();
FieldUtils.writeDeclaredField(provider, "passwordProvider", passwordProvider, true);
FieldUtils.writeDeclaredField(provider, "saltProvider", saltProvider, true);
{ // activate
- final PBESecretKeyProviderConfiguration configuration = mock(PBESecretKeyProviderConfiguration.class);
+ final PbeSecretKeyProviderConfiguration configuration = mock(PbeSecretKeyProviderConfiguration.class);
when(configuration.algorithm()).thenReturn("PBKDF2WithHmacSHA1");
when(configuration.iterationCount()).thenReturn(1024);
when(configuration.keyLength()).thenReturn(128);
@@ -92,7 +92,7 @@ public class PBESecretKeyProviderTest {
assertThat(provider.getSecretKey().getAlgorithm()).isEqualTo("PBKDF2WithHmacSHA1");
}
{ // modified
- final PBESecretKeyProviderConfiguration configuration = mock(PBESecretKeyProviderConfiguration.class);
+ final PbeSecretKeyProviderConfiguration configuration = mock(PbeSecretKeyProviderConfiguration.class);
when(configuration.algorithm()).thenReturn("PBKDF2WithHmacSHA256");
when(configuration.iterationCount()).thenReturn(2048);
when(configuration.keyLength()).thenReturn(256);
diff --git a/src/test/java/org/apache/sling/commons/crypto/it/tests/PBESecretKeyProviderIT.java b/src/test/java/org/apache/sling/commons/crypto/it/tests/PbeSecretKeyProviderIT.java
similarity index 96%
rename from src/test/java/org/apache/sling/commons/crypto/it/tests/PBESecretKeyProviderIT.java
rename to src/test/java/org/apache/sling/commons/crypto/it/tests/PbeSecretKeyProviderIT.java
index 66d3583..e50ffb2 100644
--- a/src/test/java/org/apache/sling/commons/crypto/it/tests/PBESecretKeyProviderIT.java
+++ b/src/test/java/org/apache/sling/commons/crypto/it/tests/PbeSecretKeyProviderIT.java
@@ -38,7 +38,7 @@ import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfigurati
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
-public class PBESecretKeyProviderIT extends CryptoTestSupport {
+public class PbeSecretKeyProviderIT extends CryptoTestSupport {
@Inject
@Filter(value = "(names=messaging)")
@@ -55,7 +55,7 @@ public class PBESecretKeyProviderIT extends CryptoTestSupport {
factoryConfiguration("org.apache.sling.commons.crypto.internal.SecureRandomSaltProvider")
.put("keyLength", 16)
.asOption(),
- factoryConfiguration("org.apache.sling.commons.crypto.internal.PBESecretKeyProvider")
+ factoryConfiguration("org.apache.sling.commons.crypto.internal.PbeSecretKeyProvider")
.put("names", "messaging")
.put("algorithm", "PBKDF2WithHmacSHA256")
.asOption()
diff --git a/src/test/java/org/apache/sling/commons/crypto/it/tests/jasypt/JasyptStandardPBEStringCryptoServiceIT.java b/src/test/java/org/apache/sling/commons/crypto/it/tests/jasypt/JasyptStandardPbeStringCryptoServiceIT.java
similarity index 96%
rename from src/test/java/org/apache/sling/commons/crypto/it/tests/jasypt/JasyptStandardPBEStringCryptoServiceIT.java
rename to src/test/java/org/apache/sling/commons/crypto/it/tests/jasypt/JasyptStandardPbeStringCryptoServiceIT.java
index 1f7bda5..9d00365 100644
--- a/src/test/java/org/apache/sling/commons/crypto/it/tests/jasypt/JasyptStandardPBEStringCryptoServiceIT.java
+++ b/src/test/java/org/apache/sling/commons/crypto/it/tests/jasypt/JasyptStandardPbeStringCryptoServiceIT.java
@@ -36,7 +36,7 @@ import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfigurati
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
-public class JasyptStandardPBEStringCryptoServiceIT extends JasyptCryptoTestSupport {
+public class JasyptStandardPbeStringCryptoServiceIT extends JasyptCryptoTestSupport {
@Inject
private CryptoService cryptoService;
@@ -46,7 +46,7 @@ public class JasyptStandardPBEStringCryptoServiceIT extends JasyptCryptoTestSupp
final String path = String.format("%s/src/test/resources/password.ascii85", PathUtils.getBaseDir());
return options(
baseConfiguration(),
- factoryConfiguration("org.apache.sling.commons.crypto.jasypt.internal.JasyptStandardPBEStringCryptoService")
+ factoryConfiguration("org.apache.sling.commons.crypto.jasypt.internal.JasyptStandardPbeStringCryptoService")
.put("algorithm", "PBEWITHHMACSHA512ANDAES_256")
.asOption(),
factoryConfiguration("org.apache.sling.commons.crypto.jasypt.internal.JasyptRandomIvGeneratorRegistrar")
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
similarity index 87%
rename from src/test/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPBEStringCryptoServiceTest.java
rename to src/test/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptStandardPbeStringCryptoServiceTest.java
index ec9a236..b3f89eb 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
@@ -34,7 +34,7 @@ import static org.jasypt.encryption.pbe.StandardPBEByteEncryptor.DEFAULT_KEY_OBT
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public class JasyptStandardPBEStringCryptoServiceTest {
+public class JasyptStandardPbeStringCryptoServiceTest {
private static final String MESSAGE = "Rudy, a Message to You";
@@ -42,11 +42,11 @@ public class JasyptStandardPBEStringCryptoServiceTest {
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();
+ final JasyptStandardPbeStringCryptoService service = new JasyptStandardPbeStringCryptoService();
FieldUtils.writeDeclaredField(service, "passwordProvider", passwordProvider, true);
FieldUtils.writeDeclaredField(service, "ivGenerator", new RandomIvGenerator(), true);
{ // activate
- final JasyptStandardPBEStringCryptoServiceConfiguration configuration = mock(JasyptStandardPBEStringCryptoServiceConfiguration.class);
+ final JasyptStandardPbeStringCryptoServiceConfiguration configuration = mock(JasyptStandardPbeStringCryptoServiceConfiguration.class);
when(configuration.algorithm()).thenReturn("PBEWITHHMACSHA512ANDAES_256");
when(configuration.keyObtentionIterations()).thenReturn(DEFAULT_KEY_OBTENTION_ITERATIONS);
when(configuration.securityProviderName()).thenReturn(null);
@@ -57,7 +57,7 @@ public class JasyptStandardPBEStringCryptoServiceTest {
assertThat(message).isEqualTo(MESSAGE);
}
{ // modified
- final JasyptStandardPBEStringCryptoServiceConfiguration configuration = mock(JasyptStandardPBEStringCryptoServiceConfiguration.class);
+ final JasyptStandardPbeStringCryptoServiceConfiguration configuration = mock(JasyptStandardPbeStringCryptoServiceConfiguration.class);
when(configuration.algorithm()).thenReturn("PBEWITHHMACSHA512ANDAES_256");
when(configuration.keyObtentionIterations()).thenReturn(1);
when(configuration.securityProviderName()).thenReturn("");
@@ -81,11 +81,11 @@ public class JasyptStandardPBEStringCryptoServiceTest {
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();
+ final JasyptStandardPbeStringCryptoService service = new JasyptStandardPbeStringCryptoService();
FieldUtils.writeDeclaredField(service, "passwordProvider", passwordProvider, true);
FieldUtils.writeDeclaredField(service, "ivGenerator", new RandomIvGenerator(), true);
- final JasyptStandardPBEStringCryptoServiceConfiguration configuration = mock(JasyptStandardPBEStringCryptoServiceConfiguration.class);
+ final JasyptStandardPbeStringCryptoServiceConfiguration configuration = mock(JasyptStandardPbeStringCryptoServiceConfiguration.class);
when(configuration.algorithm()).thenReturn("PBEWITHSHA256AND128BITAES-CBC-BC");
when(configuration.keyObtentionIterations()).thenReturn(DEFAULT_KEY_OBTENTION_ITERATIONS);
when(configuration.securityProviderName()).thenReturn("BC");
@@ -101,12 +101,12 @@ public class JasyptStandardPBEStringCryptoServiceTest {
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();
+ final JasyptStandardPbeStringCryptoService service = new JasyptStandardPbeStringCryptoService();
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);
+ final JasyptStandardPbeStringCryptoServiceConfiguration configuration = mock(JasyptStandardPbeStringCryptoServiceConfiguration.class);
when(configuration.algorithm()).thenReturn("PBEWITHSHA256AND128BITAES-CBC-BC");
when(configuration.keyObtentionIterations()).thenReturn(DEFAULT_KEY_OBTENTION_ITERATIONS);
when(configuration.securityProviderName()).thenReturn(null);
[sling-org-apache-sling-commons-crypto] 10/13: [checkstyle]
(coding) DeclarationOrder
Posted by ol...@apache.org.
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 dafae513d8c90d40edc9a072395328b10c2cb640
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jul 13 22:20:28 2021 +0200
[checkstyle] (coding) DeclarationOrder
---
.../sling/commons/crypto/internal/FilePasswordProvider.java | 4 ++--
.../crypto/webconsole/internal/EncryptWebConsolePlugin.java | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/apache/sling/commons/crypto/internal/FilePasswordProvider.java b/src/main/java/org/apache/sling/commons/crypto/internal/FilePasswordProvider.java
index bd21725..2d5d136 100644
--- a/src/main/java/org/apache/sling/commons/crypto/internal/FilePasswordProvider.java
+++ b/src/main/java/org/apache/sling/commons/crypto/internal/FilePasswordProvider.java
@@ -50,10 +50,10 @@ import org.slf4j.LoggerFactory;
@SuppressWarnings({"java:S1117", "java:S6212"})
public final class FilePasswordProvider implements PasswordProvider {
- private FilePasswordProviderConfiguration configuration;
-
private static final char NEWLINE_CHARACTER = '\n';
+ private FilePasswordProviderConfiguration configuration;
+
private final Logger logger = LoggerFactory.getLogger(FilePasswordProvider.class);
public FilePasswordProvider() { //
diff --git a/src/main/java/org/apache/sling/commons/crypto/webconsole/internal/EncryptWebConsolePlugin.java b/src/main/java/org/apache/sling/commons/crypto/webconsole/internal/EncryptWebConsolePlugin.java
index 5b89e64..0bb94fb 100644
--- a/src/main/java/org/apache/sling/commons/crypto/webconsole/internal/EncryptWebConsolePlugin.java
+++ b/src/main/java/org/apache/sling/commons/crypto/webconsole/internal/EncryptWebConsolePlugin.java
@@ -53,16 +53,16 @@ import org.osgi.util.tracker.ServiceTracker;
@SuppressWarnings({"java:S1989", "java:S2226", "java:S6212"})
public final class EncryptWebConsolePlugin extends HttpServlet {
- private BundleContext bundleContext;
-
- private ServiceTracker<CryptoService, CryptoService> tracker;
-
private static final String PARAMETER_SERVICE_ID = "service-id";
private static final String PARAMETER_MESSAGE = "message";
private static final String ATTRIBUTE_CIPHERTEXT = "org.apache.sling.commons.crypto.webconsole.internal.EncryptWebConsolePlugin.ciphertext";
+ private BundleContext bundleContext;
+
+ private ServiceTracker<CryptoService, CryptoService> tracker;
+
public EncryptWebConsolePlugin() { //
}
[sling-org-apache-sling-commons-crypto] 06/13: [checkstyle]
(design) DesignForExtension
Posted by ol...@apache.org.
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 15de186b728ded061f4132cbd515afbfe9ea8df1
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jul 13 21:48:47 2021 +0200
[checkstyle] (design) DesignForExtension
---
.../commons/crypto/internal/EnvironmentVariablePasswordProvider.java | 2 +-
.../org/apache/sling/commons/crypto/internal/FilePasswordProvider.java | 2 +-
.../org/apache/sling/commons/crypto/internal/PBESecretKeyProvider.java | 2 +-
.../apache/sling/commons/crypto/internal/SecureRandomSaltProvider.java | 2 +-
.../crypto/jasypt/internal/JasyptRandomIvGeneratorRegistrar.java | 2 +-
.../crypto/jasypt/internal/JasyptRandomSaltGeneratorRegistrar.java | 2 +-
.../crypto/jasypt/internal/JasyptStandardPBEStringCryptoService.java | 2 +-
.../commons/crypto/webconsole/internal/EncryptWebConsolePlugin.java | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/apache/sling/commons/crypto/internal/EnvironmentVariablePasswordProvider.java b/src/main/java/org/apache/sling/commons/crypto/internal/EnvironmentVariablePasswordProvider.java
index 6791112..2ed7d23 100644
--- a/src/main/java/org/apache/sling/commons/crypto/internal/EnvironmentVariablePasswordProvider.java
+++ b/src/main/java/org/apache/sling/commons/crypto/internal/EnvironmentVariablePasswordProvider.java
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
factory = true
)
@SuppressWarnings({"java:S1117", "java:S6212"})
-public class EnvironmentVariablePasswordProvider implements PasswordProvider {
+public final class EnvironmentVariablePasswordProvider implements PasswordProvider {
private EnvironmentVariablePasswordProviderConfiguration configuration;
diff --git a/src/main/java/org/apache/sling/commons/crypto/internal/FilePasswordProvider.java b/src/main/java/org/apache/sling/commons/crypto/internal/FilePasswordProvider.java
index b2297d3..bd21725 100644
--- a/src/main/java/org/apache/sling/commons/crypto/internal/FilePasswordProvider.java
+++ b/src/main/java/org/apache/sling/commons/crypto/internal/FilePasswordProvider.java
@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
factory = true
)
@SuppressWarnings({"java:S1117", "java:S6212"})
-public class FilePasswordProvider implements PasswordProvider {
+public final class FilePasswordProvider implements PasswordProvider {
private FilePasswordProviderConfiguration configuration;
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 061aa36..278a398 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
@@ -52,7 +52,7 @@ import org.slf4j.LoggerFactory;
factory = true
)
@SuppressWarnings({"java:S1117", "java:S3077"})
-public class PBESecretKeyProvider implements SecretKeyProvider {
+public final class PBESecretKeyProvider implements SecretKeyProvider {
@Reference
protected volatile PasswordProvider passwordProvider;
diff --git a/src/main/java/org/apache/sling/commons/crypto/internal/SecureRandomSaltProvider.java b/src/main/java/org/apache/sling/commons/crypto/internal/SecureRandomSaltProvider.java
index 63a5a32..000a963 100644
--- a/src/main/java/org/apache/sling/commons/crypto/internal/SecureRandomSaltProvider.java
+++ b/src/main/java/org/apache/sling/commons/crypto/internal/SecureRandomSaltProvider.java
@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
factory = true
)
@SuppressWarnings({"java:S1117", "java:S6212"})
-public class SecureRandomSaltProvider implements SaltProvider {
+public final class SecureRandomSaltProvider implements SaltProvider {
private SecureRandom secureRandom;
diff --git a/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptRandomIvGeneratorRegistrar.java b/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptRandomIvGeneratorRegistrar.java
index cd46bfc..7933a17 100644
--- a/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptRandomIvGeneratorRegistrar.java
+++ b/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptRandomIvGeneratorRegistrar.java
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
factory = true
)
@SuppressWarnings("java:S6212")
-public class JasyptRandomIvGeneratorRegistrar {
+public final class JasyptRandomIvGeneratorRegistrar {
private ServiceRegistration<IvGenerator> serviceRegistration;
diff --git a/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptRandomSaltGeneratorRegistrar.java b/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptRandomSaltGeneratorRegistrar.java
index d876b97..c33cf10 100644
--- a/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptRandomSaltGeneratorRegistrar.java
+++ b/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/JasyptRandomSaltGeneratorRegistrar.java
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
factory = true
)
@SuppressWarnings("java:S6212")
-public class JasyptRandomSaltGeneratorRegistrar {
+public final class JasyptRandomSaltGeneratorRegistrar {
private ServiceRegistration<SaltGenerator> serviceRegistration;
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 a887b25..bf2757c 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
@@ -52,7 +52,7 @@ import org.slf4j.LoggerFactory;
factory = true
)
@SuppressWarnings({"java:S1117", "java:S3077", "java:S6212"})
-public class JasyptStandardPBEStringCryptoService implements CryptoService {
+public final class JasyptStandardPBEStringCryptoService implements CryptoService {
@Reference
protected volatile PasswordProvider passwordProvider;
diff --git a/src/main/java/org/apache/sling/commons/crypto/webconsole/internal/EncryptWebConsolePlugin.java b/src/main/java/org/apache/sling/commons/crypto/webconsole/internal/EncryptWebConsolePlugin.java
index bbd6bdc..ce1e151 100644
--- a/src/main/java/org/apache/sling/commons/crypto/webconsole/internal/EncryptWebConsolePlugin.java
+++ b/src/main/java/org/apache/sling/commons/crypto/webconsole/internal/EncryptWebConsolePlugin.java
@@ -51,7 +51,7 @@ import org.osgi.util.tracker.ServiceTracker;
}
)
@SuppressWarnings({"java:S1989", "java:S2226", "java:S6212"})
-public class EncryptWebConsolePlugin extends HttpServlet {
+public final class EncryptWebConsolePlugin extends HttpServlet {
private BundleContext bundleContext;
[sling-org-apache-sling-commons-crypto] 04/13: [checkstyle]
(javadoc) MissingJavadocMethod
Posted by ol...@apache.org.
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 d713649bfada3676ec613fbd77d79dbe5e1f5e3e
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jul 13 21:35:50 2021 +0200
[checkstyle] (javadoc) MissingJavadocMethod
---
checkstyle-suppressions.xml | 1 +
src/main/java/org/apache/sling/commons/crypto/PasswordProvider.java | 5 +++++
src/main/java/org/apache/sling/commons/crypto/SaltProvider.java | 5 +++++
src/main/java/org/apache/sling/commons/crypto/SecretKeyProvider.java | 5 +++++
4 files changed, 16 insertions(+)
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
index df53a17..ce15414 100644
--- a/checkstyle-suppressions.xml
+++ b/checkstyle-suppressions.xml
@@ -20,4 +20,5 @@
<!DOCTYPE suppressions PUBLIC "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN" "https://checkstyle.org/dtds/suppressions_1_2.dtd">
<suppressions>
<suppress checks="MissingJavadocType" files=".*\/internal\/.*\.java"/>
+ <suppress checks="MissingJavadocMethod" files=".*\/internal\/.*\.java"/>
</suppressions>
diff --git a/src/main/java/org/apache/sling/commons/crypto/PasswordProvider.java b/src/main/java/org/apache/sling/commons/crypto/PasswordProvider.java
index 999aaf0..ad7aa8b 100644
--- a/src/main/java/org/apache/sling/commons/crypto/PasswordProvider.java
+++ b/src/main/java/org/apache/sling/commons/crypto/PasswordProvider.java
@@ -29,6 +29,11 @@ import org.osgi.annotation.versioning.ProviderType;
@ProviderType
public interface PasswordProvider {
+ /**
+ * Provides the password.
+ *
+ * @return The password
+ */
char @NotNull [] getPassword();
}
diff --git a/src/main/java/org/apache/sling/commons/crypto/SaltProvider.java b/src/main/java/org/apache/sling/commons/crypto/SaltProvider.java
index 835cdbc..0899aba 100644
--- a/src/main/java/org/apache/sling/commons/crypto/SaltProvider.java
+++ b/src/main/java/org/apache/sling/commons/crypto/SaltProvider.java
@@ -29,6 +29,11 @@ import org.osgi.annotation.versioning.ProviderType;
@ProviderType
public interface SaltProvider {
+ /**
+ * Provides the salt.
+ *
+ * @return The salt
+ */
byte @NotNull [] getSalt();
}
diff --git a/src/main/java/org/apache/sling/commons/crypto/SecretKeyProvider.java b/src/main/java/org/apache/sling/commons/crypto/SecretKeyProvider.java
index b6acba0..9a0251f 100644
--- a/src/main/java/org/apache/sling/commons/crypto/SecretKeyProvider.java
+++ b/src/main/java/org/apache/sling/commons/crypto/SecretKeyProvider.java
@@ -31,6 +31,11 @@ import org.osgi.annotation.versioning.ProviderType;
@ProviderType
public interface SecretKeyProvider {
+ /**
+ * Provides the secret key.
+ *
+ * @return The secret key
+ */
@NotNull SecretKey getSecretKey();
}
[sling-org-apache-sling-commons-crypto] 12/13: [checkstyle]
(coding) ReturnCount
Posted by ol...@apache.org.
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 b51367e75321b3eeee6441a9e843873e415e9f1f
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jul 13 22:22:59 2021 +0200
[checkstyle] (coding) ReturnCount
---
checkstyle-suppressions.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
index 6d59ebf..e509a28 100644
--- a/checkstyle-suppressions.xml
+++ b/checkstyle-suppressions.xml
@@ -22,4 +22,5 @@
<suppress checks="MissingJavadocType" files=".*\/internal\/.*\.java"/>
<suppress checks="MissingJavadocMethod" files=".*\/internal\/.*\.java"/>
<suppress checks="MultipleStringLiterals" files=".*\/EncryptWebConsolePlugin\.java"/>
+ <suppress checks="ReturnCount" files=".*\/EncryptWebConsolePlugin\.java"/>
</suppressions>
[sling-org-apache-sling-commons-crypto] 11/13: [checkstyle]
(coding) MultipleStringLiterals
Posted by ol...@apache.org.
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 0352ea39a2d918494053bd2f05cde7f707c52165
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jul 13 22:22:16 2021 +0200
[checkstyle] (coding) MultipleStringLiterals
---
checkstyle-suppressions.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
index ce15414..6d59ebf 100644
--- a/checkstyle-suppressions.xml
+++ b/checkstyle-suppressions.xml
@@ -21,4 +21,5 @@
<suppressions>
<suppress checks="MissingJavadocType" files=".*\/internal\/.*\.java"/>
<suppress checks="MissingJavadocMethod" files=".*\/internal\/.*\.java"/>
+ <suppress checks="MultipleStringLiterals" files=".*\/EncryptWebConsolePlugin\.java"/>
</suppressions>
[sling-org-apache-sling-commons-crypto] 01/13: SLING-10544 Enable
code checks with Checkstyle
Posted by ol...@apache.org.
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 1c476ef8e03f52bdf0086ae8763c7e70a404bfd3
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jul 13 21:08:26 2021 +0200
SLING-10544 Enable code checks with Checkstyle
---
checkstyle-suppressions.xml | 22 ++++++++++++++++++++++
pom.xml | 30 ++++++++++++++++++++++++++++++
2 files changed, 52 insertions(+)
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
new file mode 100644
index 0000000..d6277ee
--- /dev/null
+++ b/checkstyle-suppressions.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!DOCTYPE suppressions PUBLIC "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN" "https://checkstyle.org/dtds/suppressions_1_2.dtd">
+<suppressions>
+</suppressions>
diff --git a/pom.xml b/pom.xml
index bd80a1c..536c859 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,6 +92,36 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>3.1.2</version>
+ <dependencies>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>8.44</version>
+ </dependency>
+ <dependency>
+ <groupId>de.bildschirmarbeiter</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>1</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <configLocation>checks.xml</configLocation>
+ <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
+ <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.14.0</version>
<configuration>
[sling-org-apache-sling-commons-crypto] 09/13: [checkstyle]
(coding) MagicNumber
Posted by ol...@apache.org.
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 3dd5f65bec5675bc1f2156c24a42948100a6b2df
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jul 13 22:16:14 2021 +0200
[checkstyle] (coding) MagicNumber
---
.../commons/crypto/webconsole/internal/EncryptWebConsolePlugin.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/commons/crypto/webconsole/internal/EncryptWebConsolePlugin.java b/src/main/java/org/apache/sling/commons/crypto/webconsole/internal/EncryptWebConsolePlugin.java
index ce1e151..5b89e64 100644
--- a/src/main/java/org/apache/sling/commons/crypto/webconsole/internal/EncryptWebConsolePlugin.java
+++ b/src/main/java/org/apache/sling/commons/crypto/webconsole/internal/EncryptWebConsolePlugin.java
@@ -129,12 +129,12 @@ public final class EncryptWebConsolePlugin extends HttpServlet {
private void handleParameterMissing(final HttpServletResponse response, final String parameter) throws IOException {
final String message = String.format("Parameter %s is missing", parameter);
- response.sendError(400, message);
+ response.sendError(HttpServletResponse.SC_BAD_REQUEST, message);
}
private void handleCryptoServiceNotFound(final HttpServletResponse response, final String id) throws IOException {
final String message = String.format("Crypto service with service id %s not found", id);
- response.sendError(404, message);
+ response.sendError(HttpServletResponse.SC_NOT_FOUND, message);
}
private @NotNull String buildForm(final ServiceReference<CryptoService>[] references) {
[sling-org-apache-sling-commons-crypto] 03/13: [checkstyle]
(javadoc) MissingJavadocType
Posted by ol...@apache.org.
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 8d2faf20b9e5ea3334c96ecdf6c8409a778573d0
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jul 13 21:30:50 2021 +0200
[checkstyle] (javadoc) MissingJavadocType
---
checkstyle-suppressions.xml | 1 +
src/main/java/org/apache/sling/commons/crypto/CryptoService.java | 3 +++
src/main/java/org/apache/sling/commons/crypto/PasswordProvider.java | 5 +++++
src/main/java/org/apache/sling/commons/crypto/SaltProvider.java | 5 +++++
src/main/java/org/apache/sling/commons/crypto/SecretKeyProvider.java | 5 +++++
5 files changed, 19 insertions(+)
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
index d6277ee..df53a17 100644
--- a/checkstyle-suppressions.xml
+++ b/checkstyle-suppressions.xml
@@ -19,4 +19,5 @@
-->
<!DOCTYPE suppressions PUBLIC "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN" "https://checkstyle.org/dtds/suppressions_1_2.dtd">
<suppressions>
+ <suppress checks="MissingJavadocType" files=".*\/internal\/.*\.java"/>
</suppressions>
diff --git a/src/main/java/org/apache/sling/commons/crypto/CryptoService.java b/src/main/java/org/apache/sling/commons/crypto/CryptoService.java
index aa4b424..e16ebe7 100644
--- a/src/main/java/org/apache/sling/commons/crypto/CryptoService.java
+++ b/src/main/java/org/apache/sling/commons/crypto/CryptoService.java
@@ -21,6 +21,9 @@ package org.apache.sling.commons.crypto;
import org.jetbrains.annotations.NotNull;
import org.osgi.annotation.versioning.ProviderType;
+/**
+ * Service for encrypting messages and decrypting ciphertexts.
+ */
@ProviderType
public interface CryptoService {
diff --git a/src/main/java/org/apache/sling/commons/crypto/PasswordProvider.java b/src/main/java/org/apache/sling/commons/crypto/PasswordProvider.java
index 095ce31..999aaf0 100644
--- a/src/main/java/org/apache/sling/commons/crypto/PasswordProvider.java
+++ b/src/main/java/org/apache/sling/commons/crypto/PasswordProvider.java
@@ -21,6 +21,11 @@ package org.apache.sling.commons.crypto;
import org.jetbrains.annotations.NotNull;
import org.osgi.annotation.versioning.ProviderType;
+/**
+ * Provider of passwords to use for example with password-based encryption (PBE).
+ *
+ * @see javax.crypto.spec.PBEKeySpec
+ */
@ProviderType
public interface PasswordProvider {
diff --git a/src/main/java/org/apache/sling/commons/crypto/SaltProvider.java b/src/main/java/org/apache/sling/commons/crypto/SaltProvider.java
index 5b63b8e..835cdbc 100644
--- a/src/main/java/org/apache/sling/commons/crypto/SaltProvider.java
+++ b/src/main/java/org/apache/sling/commons/crypto/SaltProvider.java
@@ -21,6 +21,11 @@ package org.apache.sling.commons.crypto;
import org.jetbrains.annotations.NotNull;
import org.osgi.annotation.versioning.ProviderType;
+/**
+ * Provider of salts to use for example with password-based encryption (PBE).
+ *
+ * @see javax.crypto.spec.PBEKeySpec
+ */
@ProviderType
public interface SaltProvider {
diff --git a/src/main/java/org/apache/sling/commons/crypto/SecretKeyProvider.java b/src/main/java/org/apache/sling/commons/crypto/SecretKeyProvider.java
index e8f6a02..b6acba0 100644
--- a/src/main/java/org/apache/sling/commons/crypto/SecretKeyProvider.java
+++ b/src/main/java/org/apache/sling/commons/crypto/SecretKeyProvider.java
@@ -23,6 +23,11 @@ import javax.crypto.SecretKey;
import org.jetbrains.annotations.NotNull;
import org.osgi.annotation.versioning.ProviderType;
+/**
+ * Provider of secret keys for encryption and decryption.
+ *
+ * @see javax.crypto.SecretKey
+ */
@ProviderType
public interface SecretKeyProvider {
[sling-org-apache-sling-commons-crypto] 02/13: [checkstyle]
(javadoc) MissingJavadocPackage
Posted by ol...@apache.org.
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 6d475024ebbaf83d0f8f49f31ab90f94b4a00312
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jul 13 21:20:26 2021 +0200
[checkstyle] (javadoc) MissingJavadocPackage
---
.../apache/sling/commons/crypto/{ => internal}/package-info.java | 7 ++++---
.../sling/commons/crypto/{ => jasypt/internal}/package-info.java | 7 ++++---
.../org/apache/sling/commons/crypto/{ => jasypt}/package-info.java | 7 ++++---
src/main/java/org/apache/sling/commons/crypto/package-info.java | 4 ++++
.../commons/crypto/{ => webconsole/internal}/package-info.java | 7 ++++---
.../apache/sling/commons/crypto/{ => webconsole}/package-info.java | 7 ++++---
6 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/apache/sling/commons/crypto/package-info.java b/src/main/java/org/apache/sling/commons/crypto/internal/package-info.java
similarity index 85%
copy from src/main/java/org/apache/sling/commons/crypto/package-info.java
copy to src/main/java/org/apache/sling/commons/crypto/internal/package-info.java
index 82d2999..9d62594 100644
--- a/src/main/java/org/apache/sling/commons/crypto/package-info.java
+++ b/src/main/java/org/apache/sling/commons/crypto/internal/package-info.java
@@ -16,7 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-@Version("1.1.0")
-package org.apache.sling.commons.crypto;
-import org.osgi.annotation.versioning.Version;
+/**
+ * Provides provider implementations of the Apache Sling Commons Crypto API.
+ */
+package org.apache.sling.commons.crypto.internal;
diff --git a/src/main/java/org/apache/sling/commons/crypto/package-info.java b/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/package-info.java
similarity index 82%
copy from src/main/java/org/apache/sling/commons/crypto/package-info.java
copy to src/main/java/org/apache/sling/commons/crypto/jasypt/internal/package-info.java
index 82d2999..55be25b 100644
--- a/src/main/java/org/apache/sling/commons/crypto/package-info.java
+++ b/src/main/java/org/apache/sling/commons/crypto/jasypt/internal/package-info.java
@@ -16,7 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-@Version("1.1.0")
-package org.apache.sling.commons.crypto;
-import org.osgi.annotation.versioning.Version;
+/**
+ * Provides an implementation of the Apache Sling Commons Crypto API (Crypto Service) based on Jasypt.
+ */
+package org.apache.sling.commons.crypto.jasypt.internal;
diff --git a/src/main/java/org/apache/sling/commons/crypto/package-info.java b/src/main/java/org/apache/sling/commons/crypto/jasypt/package-info.java
similarity index 87%
copy from src/main/java/org/apache/sling/commons/crypto/package-info.java
copy to src/main/java/org/apache/sling/commons/crypto/jasypt/package-info.java
index 82d2999..22d3f25 100644
--- a/src/main/java/org/apache/sling/commons/crypto/package-info.java
+++ b/src/main/java/org/apache/sling/commons/crypto/jasypt/package-info.java
@@ -16,7 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-@Version("1.1.0")
-package org.apache.sling.commons.crypto;
-import org.osgi.annotation.versioning.Version;
+/**
+ * The Apache Sling Commons Crypto Jasypt root package.
+ */
+package org.apache.sling.commons.crypto.jasypt;
diff --git a/src/main/java/org/apache/sling/commons/crypto/package-info.java b/src/main/java/org/apache/sling/commons/crypto/package-info.java
index 82d2999..25bccb7 100644
--- a/src/main/java/org/apache/sling/commons/crypto/package-info.java
+++ b/src/main/java/org/apache/sling/commons/crypto/package-info.java
@@ -16,6 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
+
+/**
+ * Provides the Apache Sling Commons Crypto API.
+ */
@Version("1.1.0")
package org.apache.sling.commons.crypto;
diff --git a/src/main/java/org/apache/sling/commons/crypto/package-info.java b/src/main/java/org/apache/sling/commons/crypto/webconsole/internal/package-info.java
similarity index 83%
copy from src/main/java/org/apache/sling/commons/crypto/package-info.java
copy to src/main/java/org/apache/sling/commons/crypto/webconsole/internal/package-info.java
index 82d2999..86b7e57 100644
--- a/src/main/java/org/apache/sling/commons/crypto/package-info.java
+++ b/src/main/java/org/apache/sling/commons/crypto/webconsole/internal/package-info.java
@@ -16,7 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-@Version("1.1.0")
-package org.apache.sling.commons.crypto;
-import org.osgi.annotation.versioning.Version;
+/**
+ * Provides a plugin for Felix Web Console to encrypt messages with available crypto services.
+ */
+package org.apache.sling.commons.crypto.webconsole.internal;
diff --git a/src/main/java/org/apache/sling/commons/crypto/package-info.java b/src/main/java/org/apache/sling/commons/crypto/webconsole/package-info.java
similarity index 86%
copy from src/main/java/org/apache/sling/commons/crypto/package-info.java
copy to src/main/java/org/apache/sling/commons/crypto/webconsole/package-info.java
index 82d2999..563978b 100644
--- a/src/main/java/org/apache/sling/commons/crypto/package-info.java
+++ b/src/main/java/org/apache/sling/commons/crypto/webconsole/package-info.java
@@ -16,7 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-@Version("1.1.0")
-package org.apache.sling.commons.crypto;
-import org.osgi.annotation.versioning.Version;
+/**
+ * The Apache Sling Commons Crypto Web Console root package.
+ */
+package org.apache.sling.commons.crypto.webconsole;
[sling-org-apache-sling-commons-crypto] 05/13: [checkstyle]
(javadoc) SummaryJavadoc
Posted by ol...@apache.org.
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 1ccd3d2de16165aa636e95d1223624652cd3d781
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jul 13 21:40:36 2021 +0200
[checkstyle] (javadoc) SummaryJavadoc
---
src/main/java/org/apache/sling/commons/crypto/CryptoService.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/main/java/org/apache/sling/commons/crypto/CryptoService.java b/src/main/java/org/apache/sling/commons/crypto/CryptoService.java
index e16ebe7..fb300de 100644
--- a/src/main/java/org/apache/sling/commons/crypto/CryptoService.java
+++ b/src/main/java/org/apache/sling/commons/crypto/CryptoService.java
@@ -28,12 +28,16 @@ import org.osgi.annotation.versioning.ProviderType;
public interface CryptoService {
/**
+ * Encrypts the given message.
+ *
* @param message The message to encrypt
* @return The encrypted message, the ciphertext
*/
@NotNull String encrypt(@NotNull final String message);
/**
+ * Decrypts the given ciphertext.
+ *
* @param ciphertext The encrypted message, the ciphertext to decrypt
* @return The decrypted message
*/
[sling-org-apache-sling-commons-crypto] 07/13: [checkstyle]
(design) VisibilityModifier
Posted by ol...@apache.org.
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 <ol...@apache.org>
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");