NIFI-14282 Enforced that pasted property descriptor is sensitive befo…

…re applying a sensitive property value (#9734) Signed-off-by: David Handermann <[email protected]>
apache · Feb 20, 2025 · a51f1d4 · a51f1d4
1 parent a93b494
commit a51f1d4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/...rk/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java b/...rk/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
@@ -6170,7 +6170,10 @@ private void copySensitiveProcessorProperties(final Set<VersionedProcessor> proc
                     copiedInstance.getProperties().keySet().stream()
                             .filter(PropertyDescriptor::isSensitive)
                             .forEach(pd -> {
-                                p.getProperties().put(pd.getName(), copiedInstance.getRawPropertyValue(pd));
+                                final VersionedPropertyDescriptor vpd = p.getPropertyDescriptors().get(pd.getName());
+                                if (vpd != null && vpd.isSensitive()) {
+                                    p.getProperties().put(pd.getName(), copiedInstance.getRawPropertyValue(pd));
+                                }
                             });
                 }
             }
@@ -6193,7 +6196,10 @@ private void copySensitiveServiceProperties(final Set<VersionedControllerService
                     copiedInstance.getProperties().keySet().stream()
                             .filter(PropertyDescriptor::isSensitive)
                             .forEach(pd -> {
-                                s.getProperties().put(pd.getName(), copiedInstance.getRawPropertyValue(pd));
+                                final VersionedPropertyDescriptor vpd = s.getPropertyDescriptors().get(pd.getName());
+                                if (vpd != null && vpd.isSensitive()) {
+                                    s.getProperties().put(pd.getName(), copiedInstance.getRawPropertyValue(pd));
+                                }
                             });
                 }
             }

diff --git a/...ifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/StandardNiFiServiceFacadeTest.java b/...ifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/StandardNiFiServiceFacadeTest.java
@@ -497,13 +497,21 @@ public void testPasteComponents() {
         final RevisionManager revisionManager = new NaiveRevisionManager();
         serviceFacade.setRevisionManager(revisionManager);
 
+        final VersionedPropertyDescriptor versionedPropertyDescriptor = new VersionedPropertyDescriptor();
+        versionedPropertyDescriptor.setName(sensitiveProperty);
+        versionedPropertyDescriptor.setSensitive(true);
+
+        final Map<String, VersionedPropertyDescriptor> propertyDescriptors = new HashMap<>();
+        propertyDescriptors.put(sensitiveProperty, versionedPropertyDescriptor);
+
         final Map<String, String> properties = new HashMap<>();
         properties.put(sensitiveProperty, null);
 
         final String instanceId = "67890";
         final VersionedProcessor versionedProcessor = new VersionedProcessor();
         versionedProcessor.setIdentifier("12345");
         versionedProcessor.setInstanceIdentifier(instanceId);
+        versionedProcessor.setPropertyDescriptors(propertyDescriptors);
         versionedProcessor.setProperties(properties);
 
         final PropertyDescriptor propertyDescriptor = mock(PropertyDescriptor.class);