You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by th...@apache.org on 2021/07/09 16:14:34 UTC
[nifi] branch main updated (2025999 -> aedbd0d)
This is an automated email from the ASF dual-hosted git repository.
thenatog pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git.
from 2025999 NIFI-8771: This closes #5205. Ensure that we consider root process group level Controller Services when determining whether or not the dataflow is empty
add aedbd0d NIFI-8511 Added KeyStore implementation of KeyProvider
No new revisions were added by this update.
Summary of changes:
.../java/org/apache/nifi/util/NiFiProperties.java | 12 +-
nifi-commons/nifi-security-kms/pom.xml | 31 +++
.../nifi/security/kms/FileBasedKeyProvider.java | 34 +++
.../org/apache/nifi/security/kms/KeyProvider.java | 15 --
.../nifi/security/kms/KeyProviderFactory.java | 85 ++++++++
.../nifi/security/kms/KeyStoreKeyProvider.java | 64 ++++++
.../nifi/security/kms/StaticKeyProvider.java | 54 ++---
.../FileBasedKeyProviderConfiguration.java | 48 +++++
.../configuration/KeyProviderConfiguration.java | 31 +++
.../KeyStoreKeyProviderConfiguration.java | 49 +++++
.../StaticKeyProviderConfiguration.java | 42 ++++
.../security/kms/reader/FileBasedKeyReader.java | 35 ++++
.../security/kms/reader/KeyReaderException.java | 32 +++
.../kms/reader/StandardFileBasedKeyReader.java | 115 +++++++++++
.../security/kms/FileBasedKeyProviderTest.java | 67 ++++++
.../nifi/security/kms/KeyProviderFactoryTest.java | 85 ++++++++
.../nifi/security/kms/KeyStoreKeyProviderTest.java | 86 ++++++++
.../nifi/security/kms/StaticKeyProviderTest.java | 65 ++++++
.../kms/reader/StandardFileBasedKeyReaderTest.java | 62 ++++++
.../nifi/security/kms/util/SecretKeyUtils.java | 102 +++++++++
nifi-commons/nifi-security-utils/pom.xml | 5 +
.../org/apache/nifi/security/kms/CryptoUtils.java | 157 ++------------
.../nifi/security/kms/FileBasedKeyProvider.java | 48 -----
.../nifi/security/kms/KeyProviderFactory.java | 109 ----------
.../repository/RepositoryEncryptorUtils.java | 127 +++++-------
.../ContentRepositoryEncryptionConfiguration.java | 22 +-
.../FlowFileRepositoryEncryptionConfiguration.java | 22 +-
...rovenanceRepositoryEncryptionConfiguration.java | 22 +-
.../config/RepositoryEncryptionConfiguration.java | 23 ++-
.../apache/nifi/security/util/KeyStoreUtils.java | 119 ++++++++---
.../nifi/security/kms/CryptoUtilsTest.groovy | 171 ---------------
.../security/kms/KeyProviderFactoryTest.groovy | 229 ---------------------
.../nifi/security/util/KeyStoreUtilsTest.java | 46 +++++
nifi-commons/pom.xml | 1 +
.../src/main/asciidoc/administration-guide.adoc | 9 +-
nifi-docs/src/main/asciidoc/user-guide.adoc | 84 ++++++++
...EncryptedSchemaRepositoryRecordSerdeTest.groovy | 2 +-
...cryptedSequentialAccessWriteAheadLogTest.groovy | 2 +-
.../nifi/properties/ProtectedNiFiProperties.java | 12 +-
.../ProtectedNiFiPropertiesGroovyTest.groovy | 5 +-
.../src/main/resources/conf/nifi.properties | 3 +
.../nifi-persistent-provenance-repository/pom.xml | 15 ++
.../EncryptedWriteAheadProvenanceRepository.java | 42 ++--
.../nifi/provenance/RepositoryConfiguration.java | 9 +
.../nifi-provenance-repository-nar/pom.xml | 6 +
45 files changed, 1488 insertions(+), 916 deletions(-)
create mode 100644 nifi-commons/nifi-security-kms/pom.xml
create mode 100644 nifi-commons/nifi-security-kms/src/main/java/org/apache/nifi/security/kms/FileBasedKeyProvider.java
rename nifi-commons/{nifi-security-utils => nifi-security-kms}/src/main/java/org/apache/nifi/security/kms/KeyProvider.java (73%)
create mode 100644 nifi-commons/nifi-security-kms/src/main/java/org/apache/nifi/security/kms/KeyProviderFactory.java
create mode 100644 nifi-commons/nifi-security-kms/src/main/java/org/apache/nifi/security/kms/KeyStoreKeyProvider.java
rename nifi-commons/{nifi-security-utils => nifi-security-kms}/src/main/java/org/apache/nifi/security/kms/StaticKeyProvider.java (51%)
create mode 100644 nifi-commons/nifi-security-kms/src/main/java/org/apache/nifi/security/kms/configuration/FileBasedKeyProviderConfiguration.java
create mode 100644 nifi-commons/nifi-security-kms/src/main/java/org/apache/nifi/security/kms/configuration/KeyProviderConfiguration.java
create mode 100644 nifi-commons/nifi-security-kms/src/main/java/org/apache/nifi/security/kms/configuration/KeyStoreKeyProviderConfiguration.java
create mode 100644 nifi-commons/nifi-security-kms/src/main/java/org/apache/nifi/security/kms/configuration/StaticKeyProviderConfiguration.java
create mode 100644 nifi-commons/nifi-security-kms/src/main/java/org/apache/nifi/security/kms/reader/FileBasedKeyReader.java
create mode 100644 nifi-commons/nifi-security-kms/src/main/java/org/apache/nifi/security/kms/reader/KeyReaderException.java
create mode 100644 nifi-commons/nifi-security-kms/src/main/java/org/apache/nifi/security/kms/reader/StandardFileBasedKeyReader.java
create mode 100644 nifi-commons/nifi-security-kms/src/test/java/org/apache/nifi/security/kms/FileBasedKeyProviderTest.java
create mode 100644 nifi-commons/nifi-security-kms/src/test/java/org/apache/nifi/security/kms/KeyProviderFactoryTest.java
create mode 100644 nifi-commons/nifi-security-kms/src/test/java/org/apache/nifi/security/kms/KeyStoreKeyProviderTest.java
create mode 100644 nifi-commons/nifi-security-kms/src/test/java/org/apache/nifi/security/kms/StaticKeyProviderTest.java
create mode 100644 nifi-commons/nifi-security-kms/src/test/java/org/apache/nifi/security/kms/reader/StandardFileBasedKeyReaderTest.java
create mode 100644 nifi-commons/nifi-security-kms/src/test/java/org/apache/nifi/security/kms/util/SecretKeyUtils.java
delete mode 100644 nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/kms/FileBasedKeyProvider.java
delete mode 100644 nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/kms/KeyProviderFactory.java
delete mode 100644 nifi-commons/nifi-security-utils/src/test/groovy/org/apache/nifi/security/kms/KeyProviderFactoryTest.groovy