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/06/16 21:50:38 UTC
[sling-org-apache-sling-commons-crypto] branch master updated
(e0f0842 -> 3aaa5b9)
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 e0f0842 SLING-10500 Provide a secret key provider for password-based encryption
new fec1ee7 suppress warnings for rule java:S1149
new 3aaa5b9 do not deconstruct component, keep it in an usable state
The 2 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:
.../sling/commons/crypto/internal/FilePasswordProvider.java | 3 ++-
.../jasypt/internal/JasyptRandomIvGeneratorRegistrar.java | 1 +
.../jasypt/internal/JasyptRandomSaltGeneratorRegistrar.java | 1 +
.../commons/crypto/internal/FilePasswordProviderTest.java | 12 ++++++++++++
4 files changed, 16 insertions(+), 1 deletion(-)
[sling-org-apache-sling-commons-crypto] 01/02: suppress warnings
for rule java:S1149
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 fec1ee7e79f85d880602376858267bbb4b6ab92a
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Jun 16 23:40:45 2021 +0200
suppress warnings for rule java:S1149
---
.../commons/crypto/jasypt/internal/JasyptRandomIvGeneratorRegistrar.java | 1 +
.../crypto/jasypt/internal/JasyptRandomSaltGeneratorRegistrar.java | 1 +
2 files changed, 2 insertions(+)
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 dd61934..c761191 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
@@ -58,6 +58,7 @@ public class JasyptRandomIvGeneratorRegistrar {
logger.debug("activating");
final String algorithm = configuration.algorithm();
final RandomIvGenerator ivGenerator = new RandomIvGenerator(algorithm);
+ @SuppressWarnings("java:S1149")
final Dictionary<String, String> properties = new Hashtable<>();
properties.put("algorithm", algorithm);
logger.debug("registering Random IV Generator with algorithm {}", algorithm);
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 66b35b9..be04ee0 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
@@ -58,6 +58,7 @@ public class JasyptRandomSaltGeneratorRegistrar {
logger.debug("activating");
final String algorithm = configuration.algorithm();
final RandomSaltGenerator saltGenerator = new RandomSaltGenerator(algorithm);
+ @SuppressWarnings("java:S1149")
final Dictionary<String, String> properties = new Hashtable<>();
properties.put("algorithm", algorithm);
logger.debug("registering Random Salt Generator with algorithm {}", algorithm);
[sling-org-apache-sling-commons-crypto] 02/02: do not deconstruct
component, keep it in an usable state
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 3aaa5b95db563693b21de684edaefdc8fa4287e3
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Jun 16 23:50:27 2021 +0200
do not deconstruct component, keep it in an usable state
---
.../sling/commons/crypto/internal/FilePasswordProvider.java | 3 ++-
.../commons/crypto/internal/FilePasswordProviderTest.java | 12 ++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
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 022e44d..f34b4ac 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
@@ -24,6 +24,7 @@ import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.Arrays;
+import java.util.Objects;
import org.apache.sling.commons.crypto.PasswordProvider;
import org.jetbrains.annotations.NotNull;
@@ -74,7 +75,6 @@ public class FilePasswordProvider implements PasswordProvider {
@Deactivate
protected void deactivate() {
logger.debug("deactivating");
- this.configuration = null;
}
private char[] readPassword(final String path, final boolean fixPosixNewline) throws IOException {
@@ -106,6 +106,7 @@ public class FilePasswordProvider implements PasswordProvider {
@Override
public char @NotNull [] getPassword() {
+ Objects.requireNonNull(configuration, "Configuration must not be null");
try {
return readPassword(configuration.path(), configuration.fix_posixNewline());
} catch (IOException e) {
diff --git a/src/test/java/org/apache/sling/commons/crypto/internal/FilePasswordProviderTest.java b/src/test/java/org/apache/sling/commons/crypto/internal/FilePasswordProviderTest.java
index 5510451..bf38ed2 100644
--- a/src/test/java/org/apache/sling/commons/crypto/internal/FilePasswordProviderTest.java
+++ b/src/test/java/org/apache/sling/commons/crypto/internal/FilePasswordProviderTest.java
@@ -43,6 +43,14 @@ public class FilePasswordProviderTest {
public ExpectedException exception = ExpectedException.none();
@Test
+ public void testMissingConfiguration() {
+ final FilePasswordProvider provider = new FilePasswordProvider();
+ exception.expect(NullPointerException.class);
+ exception.expectMessage("Configuration must not be null");
+ provider.getPassword();
+ }
+
+ @Test
public void testComponentLifecycle() throws IOException {
final FilePasswordProvider provider = new FilePasswordProvider();
{ // activate
@@ -59,6 +67,10 @@ public class FilePasswordProviderTest {
provider.modified(configuration);
assertThat(provider.getPassword()).isEqualTo(PASSWORD_UTF8);
}
+ { // deactivate
+ provider.deactivate();
+ assertThat(provider.getPassword()).isEqualTo(PASSWORD_UTF8);
+ }
}
@Test