This is an automated email from the ASF dual-hosted git repository.
bbende pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
from 6f941bd622 NIFI-13905 CLI - Support Setting Properties for new
Registry Clients (#9472)
add e33cbe6df5 NIFI-14001 Added Framework Support for PEM Keys and
Certificates (#9517)
No new revisions were added by this update.
Summary of changes:
.../java/org/apache/nifi/util/NiFiProperties.java | 3 +
...uilder.java => InputStreamKeyStoreBuilder.java} | 13 +-
.../ssl/PemCertificateKeyStoreBuilder.java | 92 ++++++++
...agerListener.java => PemCertificateReader.java} | 15 +-
.../PemPrivateKeyCertificateKeyStoreBuilder.java | 108 +++++++++
.../nifi/security/ssl/PemPrivateKeyReader.java | 13 +-
...tionException.java => ReadEntityException.java} | 12 +-
.../nifi/security/ssl/StandardKeyStoreBuilder.java | 3 +-
.../security/ssl/StandardPemCertificateReader.java | 115 +++++++++
.../security/ssl/StandardPemPrivateKeyReader.java | 260 +++++++++++++++++++++
.../ssl/PemCertificateKeyStoreBuilderTest.java | 72 ++++++
...emPrivateKeyCertificateKeyStoreBuilderTest.java | 87 +++++++
.../ssl/StandardPemCertificateReaderTest.java | 173 ++++++++++++++
.../ssl/StandardPemPrivateKeyReaderTest.java | 213 +++++++++++++++++
.../src/main/asciidoc/administration-guide.adoc | 26 ++-
.../configuration/SslContextConfiguration.java | 99 ++++++--
.../framework/ssl/FrameworkKeyManagerBuilder.java | 53 ++++-
.../framework/ssl/FrameworkSslContextProvider.java | 44 ++--
.../ssl/FrameworkTrustManagerBuilder.java | 8 +-
.../nifi-framework/nifi-resources/pom.xml | 3 +
.../src/main/resources/conf/nifi.properties | 4 +
21 files changed, 1337 insertions(+), 79 deletions(-)
copy
nifi-commons/nifi-security-ssl/src/main/java/org/apache/nifi/security/ssl/{KeyStoreBuilder.java
=> InputStreamKeyStoreBuilder.java} (71%)
create mode 100644
nifi-commons/nifi-security-ssl/src/main/java/org/apache/nifi/security/ssl/PemCertificateKeyStoreBuilder.java
copy
nifi-commons/nifi-security-ssl/src/main/java/org/apache/nifi/security/ssl/{TrustManagerListener.java
=> PemCertificateReader.java} (66%)
create mode 100644
nifi-commons/nifi-security-ssl/src/main/java/org/apache/nifi/security/ssl/PemPrivateKeyCertificateKeyStoreBuilder.java
copy
nifi-extension-bundles/nifi-standard-services/nifi-key-service-bundle/nifi-key-service/src/main/java/org/apache/nifi/key/service/reader/PrivateKeyReader.java
=>
nifi-commons/nifi-security-ssl/src/main/java/org/apache/nifi/security/ssl/PemPrivateKeyReader.java
(73%)
copy
nifi-commons/nifi-security-ssl/src/main/java/org/apache/nifi/security/ssl/{BuilderConfigurationException.java
=> ReadEntityException.java} (70%)
create mode 100644
nifi-commons/nifi-security-ssl/src/main/java/org/apache/nifi/security/ssl/StandardPemCertificateReader.java
create mode 100644
nifi-commons/nifi-security-ssl/src/main/java/org/apache/nifi/security/ssl/StandardPemPrivateKeyReader.java
create mode 100644
nifi-commons/nifi-security-ssl/src/test/java/org/apache/nifi/security/ssl/PemCertificateKeyStoreBuilderTest.java
create mode 100644
nifi-commons/nifi-security-ssl/src/test/java/org/apache/nifi/security/ssl/PemPrivateKeyCertificateKeyStoreBuilderTest.java
create mode 100644
nifi-commons/nifi-security-ssl/src/test/java/org/apache/nifi/security/ssl/StandardPemCertificateReaderTest.java
create mode 100644
nifi-commons/nifi-security-ssl/src/test/java/org/apache/nifi/security/ssl/StandardPemPrivateKeyReaderTest.java
