nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcgil...@apache.org
Subject incubator-nifi git commit: NIFI-294: - Ensuring the sensitive flag is always respected.
Date Thu, 22 Jan 2015 20:56:44 GMT
Repository: incubator-nifi
Updated Branches:
  refs/heads/develop cff8b0de4 -> 2f4727db5


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/develop
Commit: 2f4727db5df97fc9bced2ec4c08800ab63abb8c3
Parents: cff8b0d
Author: Matt Gilman <matt.c.gilman@gmail.com>
Authored: Thu Jan 22 15:41:26 2015 -0500
Committer: Matt Gilman <matt.c.gilman@gmail.com>
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<PropertyDescriptor, String> 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


Mime
View raw message