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/20 10:12:47 UTC
[sling-org-apache-sling-commons-crypto] 01/02: use local copy of
configuration to be always consistent
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 6ed04f8d1c1673cec2c23e708f5e31df77e21095
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Jun 20 12:06:39 2021 +0200
use local copy of configuration to be always consistent
---
.../commons/crypto/internal/EnvironmentVariablePasswordProvider.java | 1 +
.../org/apache/sling/commons/crypto/internal/FilePasswordProvider.java | 1 +
.../org/apache/sling/commons/crypto/internal/PBESecretKeyProvider.java | 1 +
.../apache/sling/commons/crypto/internal/SecureRandomSaltProvider.java | 1 +
4 files changed, 4 insertions(+)
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 d80c29b..2c22864 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
@@ -70,6 +70,7 @@ public class EnvironmentVariablePasswordProvider implements PasswordProvider {
@Override
public char @NotNull [] getPassword() {
+ final var configuration = this.configuration;
Objects.requireNonNull(configuration, "Configuration must not be null");
final String name = configuration.name();
if (Objects.isNull(System.getenv(name))) {
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 e894344..92d59a6 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
@@ -107,6 +107,7 @@ public class FilePasswordProvider implements PasswordProvider {
@Override
public char @NotNull [] getPassword() {
+ final var configuration = this.configuration;
Objects.requireNonNull(configuration, "Configuration must not be null");
try {
return readPassword(configuration.path(), configuration.fix_posixNewline());
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 2e2729a..ab2c43d 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
@@ -90,6 +90,7 @@ public class PBESecretKeyProvider implements SecretKeyProvider {
@Override
public @NotNull SecretKey getSecretKey() {
+ final var configuration = this.configuration;
Objects.requireNonNull(configuration, "Configuration must not be null");
try {
final KeySpec keySpec = new PBEKeySpec(passwordProvider.getPassword(), saltProvider.getSalt(), configuration.iterationCount(), configuration.keyLength());
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 173858a..7c5b14a 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
@@ -77,6 +77,7 @@ public class SecureRandomSaltProvider implements SaltProvider {
@Override
public byte @NotNull [] getSalt() {
+ final var configuration = this.configuration;
Objects.requireNonNull(configuration, "Configuration must not be null");
final byte[] bytes = new byte[configuration.keyLength()];
secureRandom.nextBytes(bytes);