nifi-minifi-cpp git commit: MINIFICPP-405: RPG bind to local interface
Repository: nifi-minifi-cpp Updated Branches: refs/heads/master c99b3fa49 -> 8e153bed7 MINIFICPP-405: RPG bind to local interface This closes #272. Signed-off-by: Bin QiuProject: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/commit/8e153bed Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/8e153bed Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/8e153bed Branch: refs/heads/master Commit: 8e153bed7fc782e1de1e782543016ebda3579d66 Parents: c99b3fa Author: Bin Qiu Authored: Mon Feb 26 07:21:24 2018 -0800 Committer: Bin Qiu Committed: Mon Mar 5 20:17:08 2018 -0800 -- extensions/http-curl/client/HTTPClient.h| 4 +++ extensions/http-curl/sitetosite/HTTPProtocol.h | 4 +++ libminifi/include/RemoteProcessorGroupPort.h| 9 + libminifi/include/core/ProcessGroup.h | 9 + libminifi/include/io/ClientSocket.h | 5 +++ libminifi/include/io/DataStream.h | 4 +++ libminifi/include/sitetosite/Peer.h | 20 +-- libminifi/include/sitetosite/SiteToSite.h | 13 +++- .../include/sitetosite/SiteToSiteFactory.h | 6 ++-- libminifi/src/RemoteProcessorGroupPort.cpp | 9 ++--- libminifi/src/core/yaml/YamlConfiguration.cpp | 8 + libminifi/src/io/ClientSocket.cpp | 35 libminifi/src/sitetosite/Peer.cpp | 3 ++ libminifi/test/unit/Site2SiteTests.cpp | 8 ++--- 14 files changed, 123 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/8e153bed/extensions/http-curl/client/HTTPClient.h -- diff --git a/extensions/http-curl/client/HTTPClient.h b/extensions/http-curl/client/HTTPClient.h index e5545c3..eabd7c2 100644 --- a/extensions/http-curl/client/HTTPClient.h +++ b/extensions/http-curl/client/HTTPClient.h @@ -131,6 +131,10 @@ class HTTPClient : public BaseHTTPClient, public core::Connectable { return url_; } + void setInterface(const std::string ) { +curl_easy_setopt(http_session_, CURLOPT_INTERFACE, interface.c_str()); + } + const std::vector () override { return header_response_.header_tokens_; http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/8e153bed/extensions/http-curl/sitetosite/HTTPProtocol.h -- diff --git a/extensions/http-curl/sitetosite/HTTPProtocol.h b/extensions/http-curl/sitetosite/HTTPProtocol.h index 32074f0..7ac4893 100644 --- a/extensions/http-curl/sitetosite/HTTPProtocol.h +++ b/extensions/http-curl/sitetosite/HTTPProtocol.h @@ -182,6 +182,10 @@ class HttpSiteToSiteClient : public sitetosite::SiteToSiteClient { // batch count, size, and duratin don't appear to be set through the interfaces. } } +if (!this->peer_->getInterface().empty()) { + logger_->log_info("HTTP Site2Site bind local network interface", this->peer_->getInterface()); + http_client_->setInterface(this->peer_->getInterface()); +} return http_client_; } http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/8e153bed/libminifi/include/RemoteProcessorGroupPort.h -- diff --git a/libminifi/include/RemoteProcessorGroupPort.h b/libminifi/include/RemoteProcessorGroupPort.h index c1dfea1..14200ee 100644 --- a/libminifi/include/RemoteProcessorGroupPort.h +++ b/libminifi/include/RemoteProcessorGroupPort.h @@ -129,6 +129,13 @@ class RemoteProcessorGroupPort : public core::Processor { void setTransmitting(bool val) { transmitting_ = val; } + // setInterface + void setInterface(const std::string ) { +local_network_interface_ = interface; + } + std::string getInterface() { +return local_network_interface_; + } // setURL void setURL(std::string val) { url_ = val; @@ -165,6 +172,8 @@ class RemoteProcessorGroupPort : public core::Processor { std::atomic transmitting_; // timeout uint64_t timeout_; + // local network interface + std::string local_network_interface_; uuid_t protocol_uuid_; http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/8e153bed/libminifi/include/core/ProcessGroup.h -- diff --git a/libminifi/include/core/ProcessGroup.h b/libminifi/include/core/ProcessGroup.h index 93caab9..d6b7510 100644 --- a/libminifi/include/core/ProcessGroup.h +++ b/libminifi/include/core/ProcessGroup.h @@ -90,6 +90,13 @@ class ProcessGroup { uint64_t getTimeOut() { return timeOut_; } + // setInterface + void
nifi-registry git commit: [NIFIREG-100] create and leverage FDS SASS theming mixin
Repository: nifi-registry Updated Branches: refs/heads/master 1b02b37cd -> e195632ce [NIFIREG-100] create and leverage FDS SASS theming mixin This closes #101. Signed-off-by: Kevin DoranProject: http://git-wip-us.apache.org/repos/asf/nifi-registry/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-registry/commit/e195632c Tree: http://git-wip-us.apache.org/repos/asf/nifi-registry/tree/e195632c Diff: http://git-wip-us.apache.org/repos/asf/nifi-registry/diff/e195632c Branch: refs/heads/master Commit: e195632ce0cfab366d8dd9a0511fb61a32415297 Parents: 1b02b37 Author: Scott Aslan Authored: Wed Feb 14 15:44:46 2018 -0500 Committer: Kevin Doran Committed: Mon Mar 5 18:21:10 2018 -0500 -- .../src/main/frontend/karma.conf.js | 2 +- .../platform/core/common/styles/_buttons.scss | 379 ++- .../core/common/styles/_expansionPanels.scss| 77 ++-- .../core/common/styles/_globalVars.scss | 18 +- .../platform/core/common/styles/_menus.scss | 194 +- .../core/common/styles/fluid-design-system.scss | 22 -- .../main/platform/core/theming/_all-theme.scss | 36 ++ .../src/main/webapp/theming/nf-registry.scss| 24 ++ 8 files changed, 398 insertions(+), 354 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/e195632c/nifi-registry-web-ui/src/main/frontend/karma.conf.js -- diff --git a/nifi-registry-web-ui/src/main/frontend/karma.conf.js b/nifi-registry-web-ui/src/main/frontend/karma.conf.js index 27a521d..ca61a89 100644 --- a/nifi-registry-web-ui/src/main/frontend/karma.conf.js +++ b/nifi-registry-web-ui/src/main/frontend/karma.conf.js @@ -140,7 +140,7 @@ module.exports = function (config) { exclude: [], preprocessors: { -'webapp/**/!(*spec|*mock|*stub|*config|*extras|*fds-demo).js': 'coverage' +'webapp/**/!(*spec|*mock|*stub|*config|*extras).js': 'coverage' }, reporters: ['kjhtml', 'spec', 'coverage'], coverageReporter: { http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/e195632c/nifi-registry-web-ui/src/main/platform/core/common/styles/_buttons.scss -- diff --git a/nifi-registry-web-ui/src/main/platform/core/common/styles/_buttons.scss b/nifi-registry-web-ui/src/main/platform/core/common/styles/_buttons.scss index 8b316ea..a9c9627 100644 --- a/nifi-registry-web-ui/src/main/platform/core/common/styles/_buttons.scss +++ b/nifi-registry-web-ui/src/main/platform/core/common/styles/_buttons.scss @@ -17,187 +17,198 @@ /* Buttons */ -$buttonFontColor: #FF; -$buttonFontColorDisabled: #D1E8D1; -$buttonBgColorPrimary: $primaryColor; -$buttonBgColorPrimaryHover: $primaryColorHover; -$buttonBgColorPrimaryDisabled: $primaryColor; -$buttonBgColorPrimarySelected: $primaryColor; -$buttonBgColorSecondary: #FF; -$buttonBgColorSecondaryHover: $primaryColorHover; -$buttonBgColorSecondarySelected: #FF; -$buttonBgColorRegular: #FF; -$buttonBgColorRegularHover: #808793; -$buttonBgColorRegularDisabled: #808793; -$buttonBgColorRegularSelected: #FF; -$buttonBorderColorSecondary: $primaryColor; -$buttonBorderColorSecondaryHover: $buttonBgColorSecondaryHover; -$buttonBorderColorSecondaryDisabled: $buttonBgColorSecondaryHover; -$buttonBorderColorSecondarySelected: $primaryColor; -$buttonBorderColorRegular: #CFD3D7; -$buttonBorderColorRegularHover: $buttonBgColorRegularHover; -$buttonBorderColorRegularDisabled: $buttonBgColorRegularHover; -$buttonBorderColorRegularSelected: #CFD3D7; -$buttonFontPrimaryColor: $buttonFontColor; -$buttonFontPrimaryColorHover: $buttonFontColor; -$buttonFontPrimaryColorDisabled: $buttonFontColorDisabled; -$buttonFontPrimaryColorSelected: $buttonFontColor; -$buttonFontSecondaryColor: $primaryColorHover; -$buttonFontSecondaryColorHover: $buttonFontColor; -$buttonFontSecondaryColorDisabled: $buttonFontColorDisabled; -$buttonFontSecondaryColorSelected: $primaryColorHover; -$buttonFontRegularColor: $descriptionTextColor; -$buttonFontRegularColorHover: $buttonFontColor; -$buttonFontRegularColorDisabled: $buttonFontColorDisabled; -$buttonFontRegularColorSelected: $bodyTextColor; -$buttonFontWarnColor: $buttonFontColor; -$buttonFontWarnColorHover: $buttonFontColor; -$buttonFontWarnColorDisabled: $buttonFontColorDisabled; -$buttonFontWarnColorSelected: $buttonFontColor; -$buttonFontCriticalColor: $buttonFontColor; -$buttonFontCriticalColorHover: $buttonFontColor; -$buttonFontCriticalColorDisabled: $buttonFontColorDisabled; -$buttonFontCriticalColorSelected: $buttonFontColor; - -body[fds] .mat-raised-button { - height: 34px; - font-family: $fontPrimary; - font-weight: normal; - font-size:
nifi-registry git commit: [NIFIREG-149] directs user to login page for LDAP
Repository: nifi-registry Updated Branches: refs/heads/master 24039e63d -> 1b02b37cd [NIFIREG-149] directs user to login page for LDAP This closes #104. Signed-off-by: Kevin DoranProject: http://git-wip-us.apache.org/repos/asf/nifi-registry/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-registry/commit/1b02b37c Tree: http://git-wip-us.apache.org/repos/asf/nifi-registry/tree/1b02b37c Diff: http://git-wip-us.apache.org/repos/asf/nifi-registry/diff/1b02b37c Branch: refs/heads/master Commit: 1b02b37cd9f18e9d75b402fd5551038b81d91678 Parents: 24039e6 Author: Scott Aslan Authored: Mon Mar 5 15:57:12 2018 -0500 Committer: Kevin Doran Committed: Mon Mar 5 16:25:50 2018 -0500 -- nifi-registry-web-ui/src/main/locale/messages.es.xlf | 8 +--- .../main/webapp/services/nf-registry.auth-guard.service.js | 1 + 2 files changed, 2 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/1b02b37c/nifi-registry-web-ui/src/main/locale/messages.es.xlf -- diff --git a/nifi-registry-web-ui/src/main/locale/messages.es.xlf b/nifi-registry-web-ui/src/main/locale/messages.es.xlf index 1839516..2bfe354 100644 --- a/nifi-registry-web-ui/src/main/locale/messages.es.xlf +++ b/nifi-registry-web-ui/src/main/locale/messages.es.xlf @@ -53,12 +53,6 @@ View the policies grated this user. User policy tab, user management sidenav - - Create - Crear -A button for creating a new bucket in the registry. -Create new bucket button - Add añadir @@ -133,4 +127,4 @@ - \ No newline at end of file + http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/1b02b37c/nifi-registry-web-ui/src/main/webapp/services/nf-registry.auth-guard.service.js -- diff --git a/nifi-registry-web-ui/src/main/webapp/services/nf-registry.auth-guard.service.js b/nifi-registry-web-ui/src/main/webapp/services/nf-registry.auth-guard.service.js index 39a2289..12221c2 100644 --- a/nifi-registry-web-ui/src/main/webapp/services/nf-registry.auth-guard.service.js +++ b/nifi-registry-web-ui/src/main/webapp/services/nf-registry.auth-guard.service.js @@ -268,6 +268,7 @@ NfRegistryLoginAuthGuard.prototype = { if(self.nfRegistryService.currentUser.anonymous){ self.router.navigateByUrl('/nifi-registry'); } else { +self.nfRegistryService.currentUser.anonymous = true; self.router.navigateByUrl(url); } }
nifi git commit: NIFI-4925: - Addressing memory leak from lingering authorization results that did not represent actual access attempts. This closes #2511.
Repository: nifi Updated Branches: refs/heads/master e916594b6 -> 91f40febe NIFI-4925: - Addressing memory leak from lingering authorization results that did not represent actual access attempts. This closes #2511. Signed-off-by: Mark PayneProject: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/91f40feb Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/91f40feb Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/91f40feb Branch: refs/heads/master Commit: 91f40febebe7c199272375b02299bf2f678b123b Parents: e916594 Author: Matt Gilman Authored: Fri Mar 2 16:24:34 2018 -0500 Committer: Mark Payne Committed: Mon Mar 5 15:37:31 2018 -0500 -- .../AuthorizationAuditorInvocationHandler.java | 47 .../nifi/authorization/AuthorizerFactory.java | 20 +++-- .../authorization/AuthorizerFactoryBean.java| 4 +- .../authorization/AuthorizerFactoryTest.java| 2 + .../authorization/RangerNiFiAuthorizer.java | 24 +- 5 files changed, 83 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/91f40feb/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-authorizer/src/main/java/org/apache/nifi/authorization/AuthorizationAuditorInvocationHandler.java -- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-authorizer/src/main/java/org/apache/nifi/authorization/AuthorizationAuditorInvocationHandler.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-authorizer/src/main/java/org/apache/nifi/authorization/AuthorizationAuditorInvocationHandler.java new file mode 100644 index 000..7f8d76c --- /dev/null +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-authorizer/src/main/java/org/apache/nifi/authorization/AuthorizationAuditorInvocationHandler.java @@ -0,0 +1,47 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.authorization; + +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +public class AuthorizationAuditorInvocationHandler implements InvocationHandler { + +private final Authorizer authorizer; +private final AuthorizationAuditor auditor; + +public AuthorizationAuditorInvocationHandler(final Authorizer authorizer, final AuthorizationAuditor auditor) { +this.authorizer = authorizer; +this.auditor = auditor; +} + +@Override +public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable { +try { +if (AuthorizationAuditor.class.getMethod("auditAccessAttempt", AuthorizationRequest.class, AuthorizationResult.class).equals(method)) { +return method.invoke(auditor, args); +} else { +return method.invoke(authorizer, args); +} +} catch (final InvocationTargetException e) { +// If the proxied instance throws an Exception, it'll be wrapped in an InvocationTargetException. We want +// to instead re-throw what the proxied instance threw, so we pull it out of the InvocationTargetException. +throw e.getCause(); +} +} +} http://git-wip-us.apache.org/repos/asf/nifi/blob/91f40feb/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-authorizer/src/main/java/org/apache/nifi/authorization/AuthorizerFactory.java -- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-authorizer/src/main/java/org/apache/nifi/authorization/AuthorizerFactory.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-authorizer/src/main/java/org/apache/nifi/authorization/AuthorizerFactory.java index 915bff0..812ea17 100644 ---
nifi git commit: NIFI-4872 Added annotation for specifying scenarios in which components can cause high usage of system resources. - Initial set of components marked with the HighResourceUsageScenario
Repository: nifi Updated Branches: refs/heads/master c5c508114 -> e916594b6 NIFI-4872 Added annotation for specifying scenarios in which components can cause high usage of system resources. - Initial set of components marked with the HighResourceUsageScenario annotation. - Added customized descriptions to SystemResourceConsideration annotations for MergeContent, SplitContent, SplitJson, SplitText, and SplitXml. This closes #2475. Signed-off-by: Mark PayneProject: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/e916594b Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/e916594b Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/e916594b Branch: refs/heads/master Commit: e916594b69601bce58e045ba8ae2acf6af66eb46 Parents: c5c5081 Author: Jeff Storck Authored: Thu Feb 15 13:12:49 2018 -0500 Committer: Mark Payne Committed: Mon Mar 5 15:32:23 2018 -0500 -- .../annotation/behavior/SystemResource.java | 26 ++ .../behavior/SystemResourceConsideration.java | 51 .../behavior/SystemResourceConsiderations.java | 37 ++ .../nifi/amqp/processors/PublishAMQP.java | 3 ++ .../apache/nifi/processors/avro/SplitAvro.java | 3 ++ .../processors/aws/dynamodb/PutDynamoDB.java| 3 ++ .../azure/eventhub/PutAzureEventHub.java| 3 ++ .../processors/cassandra/PutCassandraQL.java| 3 ++ .../processors/couchbase/GetCouchbaseKey.java | 3 ++ .../processors/couchbase/PutCouchbaseKey.java | 3 ++ .../elasticsearch/PutElasticsearch5.java| 3 ++ .../elasticsearch/PutElasticsearch.java | 3 ++ .../elasticsearch/PutElasticsearchHttp.java | 3 ++ .../html/HtmlDocumentationWriter.java | 36 ++ .../FullyDocumentedControllerService.java | 5 ++ .../example/FullyDocumentedProcessor.java | 5 ++ .../example/FullyDocumentedReportingTask.java | 5 ++ .../html/HtmlDocumentationWriterTest.java | 18 +++ .../html/ProcessorDocumentationWriterTest.java | 10 .../org/apache/nifi/hbase/PutHBaseCell.java | 3 ++ .../processors/ignite/cache/PutIgniteCache.java | 3 ++ .../apache/nifi/jms/processors/PublishJMS.java | 3 ++ .../nifi/processors/mongodb/PutMongo.java | 3 ++ .../nifi/processors/mqtt/PublishMQTT.java | 3 ++ .../processors/standard/CompressContent.java| 3 ++ .../processors/standard/EncryptContent.java | 3 ++ .../nifi/processors/standard/MergeContent.java | 5 ++ .../nifi/processors/standard/ReplaceText.java | 3 ++ .../nifi/processors/standard/SplitContent.java | 4 ++ .../nifi/processors/standard/SplitJson.java | 6 ++- .../nifi/processors/standard/SplitText.java | 4 ++ .../nifi/processors/standard/SplitXml.java | 6 +++ .../nifi/processors/websocket/PutWebSocket.java | 3 ++ 33 files changed, 274 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/nifi/blob/e916594b/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/SystemResource.java -- diff --git a/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/SystemResource.java b/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/SystemResource.java new file mode 100644 index 000..cea3c70 --- /dev/null +++ b/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/SystemResource.java @@ -0,0 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.annotation.behavior; + +/** + * Represents a system resource. + */ +public enum SystemResource { + +CPU, DISK, MEMORY, NETWORK + +} http://git-wip-us.apache.org/repos/asf/nifi/blob/e916594b/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/SystemResourceConsideration.java -- diff --git a/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/SystemResourceConsideration.java