This is an automated email from the ASF dual-hosted git repository.
mattyb149 pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 22008c2331 NIFI-11696 Upgraded Bouncy Castle from 1.71 to 1.74
22008c2331 is described below
commit 22008c23319fdd6bc494bdf8f2c9723957e7bb02
Author: exceptionfactory <[email protected]>
AuthorDate: Wed Jun 14 15:59:25 2023 -0500
NIFI-11696 Upgraded Bouncy Castle from 1.71 to 1.74
- Adjusted nifi-repository-encryption to remove dependency on Bouncy Castle
Provider
- Updated Google Cloud Provider dependencies to remove exclusions and
dependencies on Bouncy Castle that no longer apply to current versions
Signed-off-by: Matt Burgess <[email protected]>
---
nifi-commons/nifi-property-protection-gcp/pom.xml | 16 -----------
nifi-commons/nifi-repository-encryption/pom.xml | 4 +--
.../AesGcmByteArrayRepositoryEncryptor.java | 11 ++++++--
.../kms/StandardRepositoryKeyProviderFactory.java | 6 ++--
.../nifi-gcp-parameter-providers/pom.xml | 16 -----------
.../nifi-gcp-bundle/nifi-gcp-processors/pom.xml | 32 ----------------------
.../nifi-registry-properties/pom.xml | 1 -
.../nifi-registry-security-utils/pom.xml | 2 --
pom.xml | 2 +-
9 files changed, 15 insertions(+), 75 deletions(-)
diff --git a/nifi-commons/nifi-property-protection-gcp/pom.xml
b/nifi-commons/nifi-property-protection-gcp/pom.xml
index 44310c180b..beeec5d0ca 100644
--- a/nifi-commons/nifi-property-protection-gcp/pom.xml
+++ b/nifi-commons/nifi-property-protection-gcp/pom.xml
@@ -65,23 +65,7 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- </exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk18on</artifactId>
- </dependency>
</dependencies>
</project>
diff --git a/nifi-commons/nifi-repository-encryption/pom.xml
b/nifi-commons/nifi-repository-encryption/pom.xml
index b67353ad53..43ea72163b 100644
--- a/nifi-commons/nifi-repository-encryption/pom.xml
+++ b/nifi-commons/nifi-repository-encryption/pom.xml
@@ -38,8 +38,8 @@
<version>1.23.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
</dependency>
</dependencies>
</project>
diff --git
a/nifi-commons/nifi-repository-encryption/src/main/java/org/apache/nifi/repository/encryption/AesGcmByteArrayRepositoryEncryptor.java
b/nifi-commons/nifi-repository-encryption/src/main/java/org/apache/nifi/repository/encryption/AesGcmByteArrayRepositoryEncryptor.java
index f12f3a657d..edd97fb1d3 100644
---
a/nifi-commons/nifi-repository-encryption/src/main/java/org/apache/nifi/repository/encryption/AesGcmByteArrayRepositoryEncryptor.java
+++
b/nifi-commons/nifi-repository-encryption/src/main/java/org/apache/nifi/repository/encryption/AesGcmByteArrayRepositoryEncryptor.java
@@ -20,7 +20,6 @@ import
org.apache.nifi.repository.encryption.configuration.EncryptionMetadataHea
import
org.apache.nifi.repository.encryption.configuration.RepositoryEncryptionMethod;
import org.apache.nifi.repository.encryption.metadata.RecordMetadata;
import org.apache.nifi.security.kms.KeyProvider;
-import org.bouncycastle.util.Arrays;
import javax.crypto.Cipher;
import java.io.ByteArrayInputStream;
@@ -74,9 +73,17 @@ public class AesGcmByteArrayRepositoryEncryptor extends
AesSecretKeyRepositoryEn
try {
final byte[] encryptedRecord = cipher.doFinal(record);
final byte[] serializedMetadata = getMetadata(keyId,
cipher.getIV(), encryptedRecord.length);
- return Arrays.concatenate(serializedMetadata, encryptedRecord);
+ return concatenate(serializedMetadata, encryptedRecord);
} catch (final GeneralSecurityException e) {
throw new RepositoryEncryptionException(String.format("Encryption
Failed for Record ID [%s]", recordId), e);
}
}
+
+ private byte[] concatenate(final byte[] serializedMetadata, final byte[]
encryptedRecord) {
+ final int concatenatedLength = serializedMetadata.length +
encryptedRecord.length;
+ final byte[] concatenated = new byte[concatenatedLength];
+ System.arraycopy(serializedMetadata, 0, concatenated, 0,
serializedMetadata.length);
+ System.arraycopy(encryptedRecord, 0, concatenated,
serializedMetadata.length, encryptedRecord.length);
+ return concatenated;
+ }
}
diff --git
a/nifi-commons/nifi-repository-encryption/src/main/java/org/apache/nifi/repository/encryption/configuration/kms/StandardRepositoryKeyProviderFactory.java
b/nifi-commons/nifi-repository-encryption/src/main/java/org/apache/nifi/repository/encryption/configuration/kms/StandardRepositoryKeyProviderFactory.java
index 4e66894be1..a6775241bc 100644
---
a/nifi-commons/nifi-repository-encryption/src/main/java/org/apache/nifi/repository/encryption/configuration/kms/StandardRepositoryKeyProviderFactory.java
+++
b/nifi-commons/nifi-repository-encryption/src/main/java/org/apache/nifi/repository/encryption/configuration/kms/StandardRepositoryKeyProviderFactory.java
@@ -16,6 +16,8 @@
*/
package org.apache.nifi.repository.encryption.configuration.kms;
+import org.apache.commons.codec.DecoderException;
+import org.apache.commons.codec.binary.Hex;
import
org.apache.nifi.repository.encryption.configuration.EncryptedRepositoryType;
import org.apache.nifi.security.kms.KeyProvider;
import org.apache.nifi.security.kms.KeyProviderFactory;
@@ -29,8 +31,6 @@ import org.apache.nifi.security.util.TlsException;
import org.apache.nifi.util.NiFiBootstrapUtils;
import org.apache.nifi.util.NiFiProperties;
import org.apache.nifi.util.StringUtils;
-import org.bouncycastle.util.encoders.DecoderException;
-import org.bouncycastle.util.encoders.Hex;
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
@@ -140,7 +140,7 @@ public class StandardRepositoryKeyProviderFactory
implements RepositoryKeyProvid
private static SecretKey getRootKey() {
try {
String rootKeyHex =
NiFiBootstrapUtils.extractKeyFromBootstrapFile();
- return new SecretKeySpec(Hex.decode(rootKeyHex),
ROOT_KEY_ALGORITHM);
+ return new SecretKeySpec(Hex.decodeHex(rootKeyHex),
ROOT_KEY_ALGORITHM);
} catch (final IOException | DecoderException e) {
throw new EncryptedConfigurationException("Read Root Key from
Bootstrap Failed", e);
}
diff --git
a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-parameter-providers/pom.xml
b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-parameter-providers/pom.xml
index 578d0122c0..6a3a6a28e1 100644
--- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-parameter-providers/pom.xml
+++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-parameter-providers/pom.xml
@@ -52,24 +52,8 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- </exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk18on</artifactId>
- </dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-oauth2-http</artifactId>
diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml
b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml
index 9dc5ebbb51..39f012e0a1 100644
--- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml
@@ -125,24 +125,8 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- </exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk18on</artifactId>
- </dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-pubsublite</artifactId>
@@ -151,14 +135,6 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -208,14 +184,6 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- </exclusion>
</exclusions>
</dependency>
</dependencies>
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-properties/pom.xml
b/nifi-registry/nifi-registry-core/nifi-registry-properties/pom.xml
index 3b1679d10e..5825c60472 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-properties/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-properties/pom.xml
@@ -35,7 +35,6 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
- <version>${org.bouncycastle.version}</version>
</dependency>
</dependencies>
</project>
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-security-utils/pom.xml
b/nifi-registry/nifi-registry-core/nifi-registry-security-utils/pom.xml
index 13fd557ab9..5c5a2a6739 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-security-utils/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-security-utils/pom.xml
@@ -26,12 +26,10 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
- <version>${org.bouncycastle.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
- <version>${org.bouncycastle.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/pom.xml b/pom.xml
index 57444c9598..d7b7dcb4df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,7 +116,7 @@
<org.apache.commons.text.version>1.10.0</org.apache.commons.text.version>
<org.apache.httpcomponents.httpclient.version>4.5.14</org.apache.httpcomponents.httpclient.version>
<org.apache.httpcomponents.httpcore.version>4.4.16</org.apache.httpcomponents.httpcore.version>
- <org.bouncycastle.version>1.71</org.bouncycastle.version>
+ <org.bouncycastle.version>1.74</org.bouncycastle.version>
<testcontainers.version>1.18.3</testcontainers.version>
<org.slf4j.version>2.0.7</org.slf4j.version>
<ranger.version>2.4.0</ranger.version>
