Return-Path: X-Original-To: apmail-nifi-commits-archive@minotaur.apache.org Delivered-To: apmail-nifi-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A76A21769B for ; Fri, 23 Jan 2015 14:32:31 +0000 (UTC) Received: (qmail 61118 invoked by uid 500); 23 Jan 2015 14:32:31 -0000 Delivered-To: apmail-nifi-commits-archive@nifi.apache.org Received: (qmail 61072 invoked by uid 500); 23 Jan 2015 14:32:31 -0000 Mailing-List: contact commits-help@nifi.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@nifi.incubator.apache.org Delivered-To: mailing list commits@nifi.incubator.apache.org Received: (qmail 61063 invoked by uid 99); 23 Jan 2015 14:32:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Jan 2015 14:32:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 23 Jan 2015 14:32:30 +0000 Received: (qmail 60403 invoked by uid 99); 23 Jan 2015 14:32:10 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Jan 2015 14:32:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 782FCE04BF; Fri, 23 Jan 2015 14:32:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mcgilman@apache.org To: commits@nifi.incubator.apache.org Date: Fri, 23 Jan 2015 14:32:09 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/4] incubator-nifi git commit: NIFI-294: - Ensuring the sensitive flag is always respected. X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-nifi Updated Branches: refs/heads/NIFI-250 e604cafe7 -> cb4c654c7 NIFI-294: - Ensuring the sensitive flag is always respected. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/2f4727db Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/2f4727db Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/2f4727db Branch: refs/heads/NIFI-250 Commit: 2f4727db5df97fc9bced2ec4c08800ab63abb8c3 Parents: cff8b0d Author: Matt Gilman Authored: Thu Jan 22 15:41:26 2015 -0500 Committer: Matt Gilman Committed: Thu Jan 22 15:41:26 2015 -0500 ---------------------------------------------------------------------- .../apache/nifi/web/controller/ControllerFacade.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2f4727db/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java index dbc4b3c..2a68016 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java @@ -1175,13 +1175,19 @@ public class ControllerFacade implements ControllerServiceProvider { for (final Map.Entry entry : procNode.getProperties().entrySet()) { final PropertyDescriptor descriptor = entry.getKey(); + + addIfAppropriate(searchStr, descriptor.getName(), "Property", matches); + addIfAppropriate(searchStr, descriptor.getDescription(), "Property", matches); + + // never include sensitive properties values in search results + if (descriptor.isSensitive()) { + continue; + } + final String value = entry.getValue(); if (StringUtils.containsIgnoreCase(value, searchStr)) { matches.add("Property: " + descriptor.getName() + " - " + value); } - - addIfAppropriate(searchStr, descriptor.getName(), "Property", matches); - addIfAppropriate(searchStr, descriptor.getDescription(), "Property", matches); } // consider searching the processor directly