You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by bb...@apache.org on 2020/09/17 16:56:40 UTC

[nifi] branch main updated (6246784 -> 9370571)

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 6246784  NIFI-7580-Add documentation around autoloading NARs
     add 9370571  NIFI-7804 Split nifi-security-utils into sub-module for nifi-security… (#4533)

No new revisions were added by this update.

Summary of changes:
 .../main/java/org/apache/nifi/action/Action.java   |   5 +-
 .../nifi/annotation/behavior/DynamicProperty.java  |   1 -
 .../annotation/behavior/DynamicRelationship.java   |   1 -
 .../nifi/annotation/behavior/Restriction.java      |   3 +-
 .../apache/nifi/annotation/behavior/Stateful.java  |   1 -
 .../annotation/configuration/DefaultSchedule.java  |   9 +-
 .../annotation/configuration/DefaultSettings.java  |   6 +-
 .../documentation/DeprecationNotice.java           |   3 +-
 .../nifi/annotation/documentation/SeeAlso.java     |   1 -
 .../nifi/annotation/lifecycle/OnDisabled.java      |   1 -
 .../nifi/annotation/lifecycle/OnRemoved.java       |   1 -
 .../nifi/annotation/lifecycle/OnShutdown.java      |   1 -
 .../nifi/annotation/lifecycle/OnStopped.java       |   1 -
 .../nifi/components/ConfigurableComponent.java     |   1 -
 .../apache/nifi/components/PropertyDescriptor.java |   1 -
 .../org/apache/nifi/components/PropertyValue.java  |   3 +-
 .../apache/nifi/components/ValidationContext.java  |   5 +-
 .../apache/nifi/components/state/StateManager.java |   1 -
 .../state/exception/StateTooLargeException.java    |   3 +-
 .../org/apache/nifi/context/PropertyContext.java   |   3 +-
 .../nifi/controller/ConfigurationContext.java      |   5 +-
 .../nifi/controller/status/ProcessGroupStatus.java |   3 +-
 .../nifi/controller/status/ProcessorStatus.java    |   3 +-
 .../documentation/AbstractDocumentationWriter.java |  17 +-
 .../ExtensionDocumentationWriter.java              |   3 +-
 ...tionControllerServiceInitializationContext.java |   5 +-
 ...ocumentationProcessorInitializationContext.java |   5 +-
 ...ocumentationReportingInitializationContext.java |   7 +-
 .../init/EmptyControllerServiceLookup.java         |   3 +-
 .../nifi/documentation/init/NopStateManager.java   |   3 +-
 .../documentation/xml/XmlDocumentationWriter.java  |  29 ++-
 .../processor/AbstractSessionFactoryProcessor.java |   1 -
 .../org/apache/nifi/processor/ProcessContext.java  |   1 -
 .../org/apache/nifi/processor/ProcessSession.java  |   1 -
 .../java/org/apache/nifi/processor/Processor.java  |   1 -
 .../exception/TerminatedTaskException.java         |   1 -
 .../nifi/provenance/ProvenanceEventBuilder.java    |   1 -
 .../apache/nifi/provenance/ProvenanceReporter.java |   3 +-
 .../nifi/reporting/AbstractReportingTask.java      |   1 -
 .../org/apache/nifi/reporting/EventAccess.java     |   5 +-
 .../apache/nifi/reporting/ReportingContext.java    |   3 +-
 .../reporting/ReportingInitializationContext.java  |   1 -
 .../org/apache/nifi/processor/TestDataUnit.java    |   4 +-
 .../apache/nifi/registry/TestVariableRegistry.java |   3 +-
 .../notification/http/HttpNotificationService.java |   3 +-
 .../http/TestHttpNotificationServiceSSL.java       |   9 +-
 .../pom.xml                                        |  18 +-
 .../org/apache/nifi/security/util/ClientAuth.java} |  29 ++-
 .../apache/nifi/security/util/KeystoreType.java    |   3 +-
 .../nifi/security/util/TlsConfiguration.java       | 219 +++++++++++++++++++++
 .../apache/nifi/security/util/TlsException.java    |   0
 .../nifi/security/util/TlsConfigurationTest.groovy | 102 ++++++++++
 nifi-commons/nifi-security-utils/pom.xml           |  10 +
 .../nifi/security/util/CertificateUtils.java       |  78 +-------
 .../nifi/security/util/SslContextFactory.java      |  45 +----
 ...guration.java => StandardTlsConfiguration.java} | 135 +++++++------
 .../nifi/security/xml/SafeXMLConfiguration.java    |  13 +-
 .../nifi/security/util/CertificateUtilsTest.groovy |  64 +-----
 .../security/util/SslContextFactoryTest.groovy     |  34 ++--
 ....groovy => StandardTlsConfigurationTest.groovy} |  34 ++--
 nifi-commons/nifi-security-xml-config/pom.xml      |  78 --------
 .../nifi/remote/client/SiteToSiteClient.java       |   4 +-
 .../nifi/remote/client/http/TestHttpClient.java    |   6 +-
 .../nifi/io/socket/ServerSocketConfiguration.java  |   3 +-
 .../apache/nifi/io/socket/SocketConfiguration.java |   3 +-
 .../org/apache/nifi/io/socket/SocketUtils.java     |   6 +-
 .../apache/nifi/io/socket/SocketUtilsTest.groovy   |  17 +-
 .../util/file/classloader/ClassLoaderUtils.java    |  13 +-
 nifi-commons/pom.xml                               |   2 +-
 .../src/main/asciidoc/images/s2s-rproxy-http.svg   |   3 +-
 .../main/asciidoc/images/s2s-rproxy-portnumber.svg |   3 +-
 .../main/asciidoc/images/s2s-rproxy-servername.svg |   3 +-
 .../nifi/provenance/MockProvenanceRepository.java  |   1 -
 .../org/apache/nifi/state/MockStateManager.java    |   3 +-
 .../java/org/apache/nifi/state/MockStateMap.java   |   3 +-
 .../java/org/apache/nifi/util/CapturingLogger.java |  11 +-
 .../nifi/util/ControllerServiceConfiguration.java  |   1 -
 .../apache/nifi/util/MockBulletinRepository.java   |   3 +-
 .../org/apache/nifi/util/MockComponentLog.java     |   1 -
 .../apache/nifi/util/MockConfigurationContext.java |   1 -
 ...MockControllerServiceInitializationContext.java |   3 +-
 .../nifi/util/MockControllerServiceLookup.java     |   1 -
 .../java/org/apache/nifi/util/MockEventAccess.java |   1 -
 .../org/apache/nifi/util/MockFlowFileQueue.java    |   1 -
 .../org/apache/nifi/util/MockKerberosContext.java  |   3 +-
 .../org/apache/nifi/util/MockProcessContext.java   |  25 ++-
 .../org/apache/nifi/util/MockProcessSession.java   |  37 ++--
 .../util/MockProcessorInitializationContext.java   |   1 -
 .../org/apache/nifi/util/MockPropertyContext.java  |   5 +-
 .../org/apache/nifi/util/MockPropertyValue.java    |  11 +-
 .../apache/nifi/util/MockProvenanceReporter.java   |   1 -
 .../org/apache/nifi/util/MockReportingContext.java |   1 -
 .../util/MockReportingInitializationContext.java   |   1 -
 .../org/apache/nifi/util/MockSessionFactory.java   |   1 -
 .../apache/nifi/util/MockValidationContext.java    |  21 +-
 .../org/apache/nifi/util/MockVariableRegistry.java |   1 -
 .../org/apache/nifi/util/SharedSessionState.java   |   1 -
 .../nifi/util/StandardProcessorTestRunner.java     |  57 +++---
 .../main/java/org/apache/nifi/util/TestRunner.java |  17 +-
 .../apache/nifi/util/TestMockProcessContext.java   |   1 -
 .../apache/nifi/util/TestMockProcessSession.java   |   1 -
 .../amqp/processors/AbstractAMQPProcessor.java     |   9 +-
 .../nifi/processors/aws/AbstractAWSProcessor.java  |   4 +-
 .../apache/nifi/processors/beats/ListenBeats.java  |  12 +-
 .../cassandra/AbstractCassandraProcessor.java      |  12 +-
 .../nifi/service/CassandraSessionProvider.java     |  14 +-
 .../schemaregistry/ConfluentSchemaRegistry.java    |   2 +-
 .../ElasticSearchClientServiceImpl.java            |   6 +-
 .../apache/nifi/processors/email/ListenSMTP.java   |   8 +-
 .../nifi/processors/email/TestListenSMTP.java      |   7 +-
 .../listen/dispatcher/SocketChannelDispatcher.java |  25 ++-
 .../SocketChannelRecordReaderDispatcher.java       |  17 +-
 .../nifi-framework-nar/pom.xml                     |   8 +-
 .../nifi-framework/nifi-file-authorizer/pom.xml    |   2 +-
 .../ServerSocketConfigurationFactoryBean.java      |   4 +-
 .../spring/SocketConfigurationFactoryBean.java     |   4 +-
 .../okhttp/OkHttpReplicationClient.java            |   5 +-
 .../org/apache/nifi/controller/FlowController.java |  70 +++----
 .../server/ConnectionLoadBalanceServer.java        |   4 +-
 .../manager/StandardStateManagerProvider.java      |   6 +-
 .../registry/flow/StandardFlowRegistryClient.java  |   9 +-
 .../server/ConnectionLoadBalanceServerTest.groovy  |  13 +-
 .../queue/clustered/LoadBalancedQueueIT.java       |   9 +-
 .../nifi/remote/SocketRemoteSiteListener.java      |   5 +-
 .../remote/SocketRemoteSiteListenerTest.groovy     |  14 +-
 .../apache/nifi/stateless/core/StatelessFlow.java  |   9 +-
 .../org/apache/nifi/web/server/JettyServer.java    |   4 +-
 .../nifi/web/server/JettyServerGroovyTest.groovy   |  18 +-
 .../OneWaySslAccessControlHelper.java              |   9 +-
 .../nifi/integration/util/NiFiTestServer.java      |   4 +-
 .../x509/ocsp/OcspCertificateValidator.java        |   3 +-
 nifi-nar-bundles/nifi-framework-bundle/pom.xml     |   5 +
 .../apache/nifi/processors/grpc/InvokeGRPC.java    |   4 +-
 .../apache/nifi/processors/grpc/ListenGRPC.java    |   8 +-
 .../nifi/jms/cf/JMSConnectionFactoryHandler.java   |   2 +-
 .../nifi-kerberos-iaa-providers-nar/pom.xml        |   6 +
 .../nifi-ldap-iaa-providers-nar/pom.xml            |   6 +
 .../java/org/apache/nifi/ldap/LdapProvider.java    |  19 +-
 .../nifi/ldap/tenants/LdapUserGroupProvider.java   |   8 +-
 .../processors/lumberjack/ListenLumberjack.java    |   4 +-
 .../nifi-mongodb-client-service-api/pom.xml        |   1 -
 .../apache/nifi/mongodb/MongoDBClientService.java  |   4 +-
 .../processors/mongodb/AbstractMongoProcessor.java |  12 +-
 .../mongodb/AbstractMongoProcessorTest.java        |   2 +-
 .../nifi/mongodb/MongoDBControllerService.java     |  11 +-
 .../apache/nifi/reporting/s2s/SiteToSiteUtils.java |   4 +-
 .../org/apache/nifi/processors/solr/SolrUtils.java |   6 +-
 .../processors/solr/MockSSLContextService.java     |   9 +-
 .../controller/livy/LivySessionController.java     |   6 +-
 .../apache/nifi/processors/splunk/PutSplunk.java   |   4 +-
 .../apache/nifi/processors/standard/GetHTTP.java   |   4 +-
 .../nifi/processors/standard/ListenRELP.java       |  12 +-
 .../nifi/processors/standard/ListenSyslog.java     |  14 +-
 .../apache/nifi/processors/standard/ListenTCP.java |  12 +-
 .../nifi/processors/standard/ListenTCPRecord.java  |  14 +-
 .../apache/nifi/processors/standard/PutSyslog.java |   4 +-
 .../apache/nifi/processors/standard/PutTCP.java    |   4 +-
 .../processors/standard/TestGetHTTPGroovy.groovy   |   2 +-
 .../processors/standard/TestPostHTTPGroovy.groovy  |   2 +-
 .../standard/ITestHandleHttpRequest.java           |  17 +-
 .../nifi/processors/standard/TestListenHTTP.java   |  28 +--
 .../nifi/processors/standard/TestListenRELP.java   |   8 +-
 .../nifi/processors/standard/TestListenTCP.java    |  16 +-
 .../processors/standard/TestListenTCPRecord.java   |  14 +-
 .../processors/standard/util/TCPTestServer.java    |   9 +-
 .../client/DistributedMapCacheClientService.java   |   2 +-
 .../client/DistributedSetCacheClientService.java   |   2 +-
 .../cache/server/DistributedSetCacheServer.java    |   2 +-
 .../server/map/DistributedMapCacheServer.java      |   2 +-
 .../nifi-lookup-services/pom.xml                   |   2 +-
 .../nifi/oauth2/OAuth2TokenProviderImpl.java       |  21 +-
 .../ssl/StandardRestrictedSSLContextService.java   |  25 ++-
 .../apache/nifi/ssl/StandardSSLContextService.java |  28 ++-
 .../nifi/ssl/StandardSSLContextServiceTest.groovy  |  34 +++-
 .../nifi/ssl/RestrictedSSLContextServiceTest.java  |   6 +-
 .../org/apache/nifi/ssl/SSLContextServiceTest.java |   2 +-
 .../nifi-ssl-context-service-api/pom.xml           |   2 +-
 .../nifi/ssl/RestrictedSSLContextService.java      |  40 ----
 .../org/apache/nifi/ssl/SSLContextService.java     |  62 +++++-
 .../nifi-standard-services-api-nar/pom.xml         |   5 +
 nifi-nar-bundles/pom.xml                           |   6 +
 .../cli/impl/client/nifi/NiFiClientConfig.java     |   4 +-
 .../TlsCertificateSigningRequestPerformer.java     |   3 +-
 .../server/TlsCertificateAuthorityService.java     |   4 +-
 .../tls/status/TlsToolkitGetStatusCommandLine.java |   6 +-
 185 files changed, 1177 insertions(+), 990 deletions(-)
 copy nifi-commons/{nifi-schema-utils => nifi-security-utils-api}/pom.xml (74%)
 copy nifi-commons/{nifi-security-utils/src/main/java/org/apache/nifi/security/util/KeystoreType.java => nifi-security-utils-api/src/main/java/org/apache/nifi/security/util/ClientAuth.java} (55%)
 rename nifi-commons/{nifi-security-utils => nifi-security-utils-api}/src/main/java/org/apache/nifi/security/util/KeystoreType.java (95%)
 create mode 100644 nifi-commons/nifi-security-utils-api/src/main/java/org/apache/nifi/security/util/TlsConfiguration.java
 rename nifi-commons/{nifi-security-utils => nifi-security-utils-api}/src/main/java/org/apache/nifi/security/util/TlsException.java (100%)
 create mode 100644 nifi-commons/nifi-security-utils-api/src/test/groovy/org/apache/nifi/security/util/TlsConfigurationTest.groovy
 rename nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/{TlsConfiguration.java => StandardTlsConfiguration.java} (79%)
 rename nifi-commons/{nifi-security-xml-config => nifi-security-utils}/src/main/java/org/apache/nifi/security/xml/SafeXMLConfiguration.java (99%)
 rename nifi-commons/nifi-security-utils/src/test/groovy/org/apache/nifi/security/util/{TlsConfigurationTest.groovy => StandardTlsConfigurationTest.groovy} (74%)
 delete mode 100644 nifi-commons/nifi-security-xml-config/pom.xml