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 99fe548  NIFI-8113: Minor updates to admin guide to clarify 
documentation of some new properties
     add 5608f43  NIFI-7668 Implemented support for additional AEAD property 
encryption methods

No new revisions were added by this update.

Summary of changes:
 .../org/apache/nifi/security/kms/CryptoUtils.java  |   3 +-
 .../security/util/crypto/BcryptCipherProvider.java |  34 +-
 .../nifi/security/util/crypto/CipherUtility.java   |  71 +--
 .../crypto/KeyDerivationBcryptSecureHasher.java    |  95 +++
 .../security/util/crypto/PBKDF2SecureHasher.java   |   9 +
 .../security/util/crypto/ScryptSecureHasher.java   |   8 +
 .../src/main/asciidoc/administration-guide.adoc    |  51 +-
 .../flow/PopularVoteFlowElectionFactoryBean.java   |   9 +-
 .../PopularVoteFlowElectionFactoryBeanTest.groovy  |  22 +-
 .../flow/TestPopularVoteFlowElection.java          |  40 +-
 .../apache/nifi/cluster/integration/Cluster.java   |   8 +-
 .../org/apache/nifi/cluster/integration/Node.java  |  19 +-
 .../scheduling/ConnectableProcessContext.java      |   6 +-
 .../nifi/encrypt/CipherPropertyEncryptor.java      | 120 ++++
 .../apache/nifi/encrypt/EncryptionException.java   |   4 -
 .../nifi/encrypt/KeyedCipherPropertyEncryptor.java | 162 +++++
 .../PasswordBasedCipherPropertyEncryptor.java      | 169 +++++
 .../nifi/encrypt/PropertyEncryptionMethod.java     |  76 +++
 .../org/apache/nifi/encrypt/PropertyEncryptor.java |  32 +-
 .../nifi/encrypt/PropertyEncryptorFactory.java     | 112 ++++
 .../nifi/encrypt/PropertySecretKeyProvider.java    |  18 +-
 .../encrypt/StandardPropertySecretKeyProvider.java |  91 +++
 .../org/apache/nifi/encrypt/StringEncryptor.java   | 656 -------------------
 .../apache/nifi/groups/StandardProcessGroup.java   |   6 +-
 .../nifi/processor/StandardProcessContext.java     |   6 +-
 .../apache/nifi/encrypt/StringEncryptorIT.groovy   | 112 ----
 .../apache/nifi/encrypt/StringEncryptorTest.groovy | 695 ---------------------
 .../encrypt/KeyedCipherPropertyEncryptorTest.java  | 103 +++
 .../PasswordBasedCipherPropertyEncryptorTest.java  |  87 +++
 .../nifi/encrypt/PropertyEncryptorFactoryTest.java |  68 ++
 .../StandardPropertySecretKeyProviderTest.java     |  53 ++
 .../org/apache/nifi/controller/FlowController.java |  14 +-
 .../nifi/controller/StandardFlowService.java       |   8 +-
 .../nifi/controller/StandardFlowSynchronizer.java  |  12 +-
 .../inheritance/FlowFingerprintCheck.java          |   4 +-
 .../AbstractTimeBasedSchedulingAgent.java          |   6 +-
 .../scheduling/EventDrivenSchedulingAgent.java     |   6 +-
 .../scheduling/QuartzSchedulingAgent.java          |   6 +-
 .../scheduling/StandardProcessScheduler.java       |   6 +-
 .../scheduling/TimerDrivenSchedulingAgent.java     |   4 +-
 .../serialization/FlowFromDOMFactory.java          |  18 +-
 .../controller/serialization/FlowSynchronizer.java |   4 +-
 .../serialization/StandardFlowSerializer.java      |  10 +-
 .../service/ControllerServiceLoader.java           |  12 +-
 .../nifi/controller/tasks/ConnectableTask.java     |   4 +-
 .../nifi/fingerprint/FingerprintFactory.java       |   8 +-
 .../StandardXMLFlowConfigurationDAO.java           |   6 +-
 .../nifi/spring/FlowControllerFactoryBean.java     |   6 +-
 .../spring/StandardFlowServiceFactoryBean.java     |   6 +-
 .../src/main/resources/nifi-context.xml            |   6 +-
 .../serialization/FlowFromDOMFactoryTest.groovy    | 106 ++--
 .../fingerprint/FingerprintFactoryGroovyIT.groovy  |  16 +-
 .../FingerprintFactoryGroovyTest.groovy            |   6 +-
 .../nifi/controller/StandardFlowServiceTest.java   |   4 +-
 .../apache/nifi/controller/TestFlowController.java |  49 +-
 .../reporting/TestStandardReportingContext.java    |  15 +-
 .../serialization/StandardFlowSerializerTest.java  |   8 +-
 .../nifi/controller/tasks/TestConnectableTask.java |   4 +-
 .../nifi/fingerprint/FingerprintFactoryTest.java   |  22 +-
 .../nifi/integration/FrameworkIntegrationTest.java |  18 +-
 .../apache/nifi/headless/HeadlessNiFiServer.java   |  11 +-
 .../stateless/engine/StandardStatelessEngine.java  |  10 +-
 .../nifi/stateless/engine/StatelessEngine.java     |   4 +-
 .../engine/StatelessProcessContextFactory.java     |   6 +-
 .../flow/StandardStatelessDataflowFactory.java     |  21 +-
 .../clustering/JoinClusterWithDifferentFlow.java   |  13 +-
 .../nifi/properties/ConfigEncryptionTool.groovy    |  13 +-
 .../properties/ConfigEncryptionToolTest.groovy     |  49 +-
 68 files changed, 1520 insertions(+), 1946 deletions(-)
 create mode 100644 
nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/crypto/KeyDerivationBcryptSecureHasher.java
 create mode 100644 
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/encrypt/CipherPropertyEncryptor.java
 create mode 100644 
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/encrypt/KeyedCipherPropertyEncryptor.java
 create mode 100644 
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/encrypt/PasswordBasedCipherPropertyEncryptor.java
 create mode 100644 
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/encrypt/PropertyEncryptionMethod.java
 copy 
nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/protocol/DataPacket.java
 => 
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/encrypt/PropertyEncryptor.java
 (57%)
 create mode 100644 
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/encrypt/PropertyEncryptorFactory.java
 copy 
nifi-framework-api/src/main/java/org/apache/nifi/authorization/AccessPolicyProviderLookup.java
 => 
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/encrypt/PropertySecretKeyProvider.java
 (63%)
 create mode 100644 
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/encrypt/StandardPropertySecretKeyProvider.java
 delete mode 100644 
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/encrypt/StringEncryptor.java
 delete mode 100644 
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/groovy/org/apache/nifi/encrypt/StringEncryptorIT.groovy
 delete mode 100644 
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/groovy/org/apache/nifi/encrypt/StringEncryptorTest.groovy
 create mode 100644 
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/encrypt/KeyedCipherPropertyEncryptorTest.java
 create mode 100644 
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/encrypt/PasswordBasedCipherPropertyEncryptorTest.java
 create mode 100644 
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/encrypt/PropertyEncryptorFactoryTest.java
 create mode 100644 
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/encrypt/StandardPropertySecretKeyProviderTest.java

Reply via email to