You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2022/04/19 16:05:01 UTC
[nifi] branch NIFI-9428 updated (876e16f6a8 -> 18a4182cb0)
This is an automated email from the ASF dual-hosted git repository.
mattyb149 pushed a change to branch NIFI-9428
in repository https://gitbox.apache.org/repos/asf/nifi.git
from 876e16f6a8 NIFI-9933 Upgraded Apache Ant to 1.10.12
add 18a4182cb0 NIFI-9883 Refactor Property Protection using Isolated ClassLoader (#5972)
No new revisions were added by this update.
Summary of changes:
nifi-assembly/pom.xml | 15 +
nifi-assembly/src/main/assembly/common.xml | 14 +
nifi-assembly/src/main/assembly/dependencies.xml | 2 +
.../SensitivePropertyProviderFactoryAware.java | 55 --
.../StandardSensitivePropertyProviderFactory.java | 13 +-
...ifi.properties.SensitivePropertyProviderFactory | 1 +
...nifi.properties.scheme.ProtectionSchemeResolver | 1 +
.../nifi-property-protection-loader}/pom.xml | 35 +-
.../properties/ApplicationPropertiesProtector.java | 13 +-
.../loader/PropertyProtectionURLClassLoader.java | 65 ++
.../loader/PropertyProviderFactoryLoader.java | 45 +
.../loader/ProtectionSchemeResolverLoader.java | 45 +
nifi-commons/pom.xml | 1 +
.../nifi-framework/nifi-authorizer/pom.xml | 13 +
.../nifi/authorization/AuthorizerFactoryBean.java | 240 +++--
.../authorization/AuthorizerFactoryBeanSpec.groovy | 72 --
.../authorization/AuthorizerFactoryBeanTest.groovy | 105 --
.../authorization/AuthorizerFactoryBeanTest.java | 107 ++
.../mock/MockAccessPolicyProvider.java | 66 ++
.../nifi/authorization/mock/MockAuthorizer.java | 48 +
.../authorization/mock/MockUserGroupProvider.java | 76 ++
.../src/test/resources/authorizers.xml | 31 +
.../nifi/integration/versioned/ImportFlowIT.java | 4 -
.../nifi-framework/nifi-properties-loader/pom.xml | 45 +-
.../nifi/properties/NiFiPropertiesLoader.java | 115 ++-
.../properties/NiFiPropertiesGroovyTest.groovy | 1029 --------------------
.../NiFiPropertiesLoaderGroovyTest.groovy | 491 ----------
.../nifi/properties/NiFiPropertiesLoaderTest.java | 138 +++
.../resources/bootstrap_tests/conf/bootstrap.conf | 74 --
...h_sensitive_properties_protected_aes.properties | 126 ---
.../bootstrap_tests/missing_key/bootstrap.conf | 74 --
.../missing_key_line/bootstrap.conf | 71 --
.../unreadable_bootstrap/bootstrap.conf | 74 --
.../src/test/resources/conf/nifi.blank.properties | 121 ---
.../conf/nifi.cluster.without.key.properties | 94 --
.../test/resources/conf/nifi.missing.properties | 119 ---
.../src/test/resources/conf/nifi.properties | 121 ---
.../resources/conf/nifi.without.key.properties | 94 --
.../resources/conf/nifi_no_permissions.properties | 14 -
.../nifi_with_additional_sensitive_keys.properties | 122 ---
...l_sensitive_properties_protected_aes.properties | 126 ---
..._recursive_additional_sensitive_keys.properties | 122 ---
...h_sensitive_properties_protected_aes.properties | 125 ---
...nsitive_properties_protected_aes_128.properties | 125 ---
...roperties_protected_aes_128_password.properties | 125 ---
...otected_aes_improper_delimiter_value.properties | 125 ---
...ies_protected_aes_multiple_malformed.properties | 125 ---
...rties_protected_aes_single_malformed.properties | 125 ---
...nsitive_properties_protected_unknown.properties | 125 ---
...ith_sensitive_properties_unprotected.properties | 122 ---
...ve_properties_unprotected_extra_line.properties | 123 ---
.../resources/conf/nifi_with_whitespace.properties | 24 -
.../conf/empty.nifi.properties} | 0
.../conf/flow.nifi.properties} | 3 +
.../conf/protected.nifi.properties} | 6 +
.../nifi-framework/nifi-runtime/pom.xml | 15 +
.../resources/NiFiProperties/conf/bootstrap.conf} | 2 +
.../nifi-web/nifi-web-security/pom.xml | 13 +
.../spring/LoginIdentityProviderFactoryBean.java | 97 +-
.../LoginIdentityProviderFactoryBeanTest.groovy | 107 --
.../LoginIdentityProviderFactoryBeanTest.java | 93 ++
.../spring/mock/MockLoginIdentityProvider.java | 49 +
.../test/resources/login-identity-providers.xml | 22 +
nifi-nar-bundles/nifi-framework-bundle/pom.xml | 5 +
.../nifi-registry-properties-loader/pom.xml | 4 +
.../apache/nifi/registry/web/api/SecureLdapIT.java | 813 ----------------
nifi-registry/pom.xml | 5 +
nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml | 5 +
.../nifi/properties/ConfigEncryptionTool.groovy | 12 +-
.../properties/ConfigEncryptionToolTest.groovy | 30 +-
.../encryptconfig/EncryptConfigMainTest.groovy | 4 +-
71 files changed, 1222 insertions(+), 5444 deletions(-)
delete mode 100644 nifi-commons/nifi-property-protection-factory/src/main/java/org/apache/nifi/properties/SensitivePropertyProviderFactoryAware.java
rename nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/resources/bootstrap_tests/missing_key_line/nifi.properties => nifi-commons/nifi-property-protection-factory/src/main/resources/META-INF/services/org.apache.nifi.properties.SensitivePropertyProviderFactory (91%)
rename nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/resources/bootstrap_tests/missing_key/nifi.properties => nifi-commons/nifi-property-protection-factory/src/main/resources/META-INF/services/org.apache.nifi.properties.scheme.ProtectionSchemeResolver (92%)
copy {nifi-registry/nifi-registry-core/nifi-registry-properties-loader => nifi-commons/nifi-property-protection-loader}/pom.xml (54%)
rename nifi-commons/{nifi-property-protection-factory => nifi-property-protection-loader}/src/main/java/org/apache/nifi/properties/ApplicationPropertiesProtector.java (96%)
create mode 100644 nifi-commons/nifi-property-protection-loader/src/main/java/org/apache/nifi/property/protection/loader/PropertyProtectionURLClassLoader.java
create mode 100644 nifi-commons/nifi-property-protection-loader/src/main/java/org/apache/nifi/property/protection/loader/PropertyProviderFactoryLoader.java
create mode 100644 nifi-commons/nifi-property-protection-loader/src/main/java/org/apache/nifi/property/protection/loader/ProtectionSchemeResolverLoader.java
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-authorizer/src/test/groovy/org/apache/nifi/authorization/AuthorizerFactoryBeanSpec.groovy
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-authorizer/src/test/groovy/org/apache/nifi/authorization/AuthorizerFactoryBeanTest.groovy
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-authorizer/src/test/java/org/apache/nifi/authorization/AuthorizerFactoryBeanTest.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-authorizer/src/test/java/org/apache/nifi/authorization/mock/MockAccessPolicyProvider.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-authorizer/src/test/java/org/apache/nifi/authorization/mock/MockAuthorizer.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-authorizer/src/test/java/org/apache/nifi/authorization/mock/MockUserGroupProvider.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-authorizer/src/test/resources/authorizers.xml
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/groovy/org/apache/nifi/properties/NiFiPropertiesGroovyTest.groovy
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/groovy/org/apache/nifi/properties/NiFiPropertiesLoaderGroovyTest.groovy
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/java/org/apache/nifi/properties/NiFiPropertiesLoaderTest.java
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/resources/bootstrap_tests/conf/bootstrap.conf
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/resources/bootstrap_tests/conf/nifi_with_sensitive_properties_protected_aes.properties
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/resources/bootstrap_tests/missing_key/bootstrap.conf
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/resources/bootstrap_tests/missing_key_line/bootstrap.conf
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/resources/bootstrap_tests/unreadable_bootstrap/bootstrap.conf
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/resources/conf/nifi.blank.properties
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/resources/conf/nifi.cluster.without.key.properties
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/resources/conf/nifi.missing.properties
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/resources/conf/nifi.properties
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/resources/conf/nifi.without.key.properties
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/resources/conf/nifi_no_permissions.properties
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/resources/conf/nifi_with_additional_sensitive_keys.properties
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/resources/conf/nifi_with_all_sensitive_properties_protected_aes.properties
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/resources/conf/nifi_with_recursive_additional_sensitive_keys.properties
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/resources/conf/nifi_with_sensitive_properties_protected_aes.properties
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/resources/conf/nifi_with_sensitive_properties_protected_aes_128.properties
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/resources/conf/nifi_with_sensitive_properties_protected_aes_128_password.properties
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/resources/conf/nifi_with_sensitive_properties_protected_aes_improper_delimiter_value.properties
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/resources/conf/nifi_with_sensitive_properties_protected_aes_multiple_malformed.properties
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/resources/conf/nifi_with_sensitive_properties_protected_aes_single_malformed.properties
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/resources/conf/nifi_with_sensitive_properties_protected_unknown.properties
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/resources/conf/nifi_with_sensitive_properties_unprotected.properties
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/resources/conf/nifi_with_sensitive_properties_unprotected_extra_line.properties
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/resources/conf/nifi_with_whitespace.properties
copy nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/resources/{bootstrap_tests/missing_bootstrap/nifi.properties => properties/conf/empty.nifi.properties} (100%)
copy nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/resources/{bootstrap_tests/missing_bootstrap/nifi.properties => properties/conf/flow.nifi.properties} (88%)
rename nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/src/test/resources/{bootstrap_tests/missing_bootstrap/nifi.properties => properties/conf/protected.nifi.properties} (76%)
rename nifi-nar-bundles/nifi-framework-bundle/nifi-framework/{nifi-properties-loader/src/test/resources/bootstrap_tests/unreadable_bootstrap/nifi.properties => nifi-runtime/src/test/resources/NiFiProperties/conf/bootstrap.conf} (89%)
delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/test/groovy/org/apache/nifi/web/security/spring/LoginIdentityProviderFactoryBeanTest.groovy
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/test/java/org/apache/nifi/web/security/spring/LoginIdentityProviderFactoryBeanTest.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/test/java/org/apache/nifi/web/security/spring/mock/MockLoginIdentityProvider.java
create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/test/resources/login-identity-providers.xml
delete mode 100644 nifi-registry/nifi-registry-core/nifi-registry-web-api/src/test/java/org/apache/nifi/registry/web/api/SecureLdapIT.java