You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2022/10/21 15:44:24 UTC
[nifi] branch main updated: NIFI-10668 Persist proxy password in remote process group (#6557)
This is an automated email from the ASF dual-hosted git repository.
markap14 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 2049268372 NIFI-10668 Persist proxy password in remote process group (#6557)
2049268372 is described below
commit 2049268372733bfa0ab0b85da40ae34c46028b41
Author: Nandor Soma Abonyi <ab...@gmail.com>
AuthorDate: Fri Oct 21 17:44:12 2022 +0200
NIFI-10668 Persist proxy password in remote process group (#6557)
* NIFI-10668 Persist proxy password in remote process group
---
.../main/java/org/apache/nifi/flow/VersionedProcessGroup.java | 2 +-
.../java/org/apache/nifi/flow/VersionedRemoteProcessGroup.java | 9 +++++++++
.../synchronization/StandardVersionedComponentSynchronizer.java | 1 +
.../nifi/registry/flow/mapping/NiFiRegistryFlowMapper.java | 3 +++
4 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/nifi-api/src/main/java/org/apache/nifi/flow/VersionedProcessGroup.java b/nifi-api/src/main/java/org/apache/nifi/flow/VersionedProcessGroup.java
index 0b1f42008e..ea4edf22ca 100644
--- a/nifi-api/src/main/java/org/apache/nifi/flow/VersionedProcessGroup.java
+++ b/nifi-api/src/main/java/org/apache/nifi/flow/VersionedProcessGroup.java
@@ -24,7 +24,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-public class VersionedProcessGroup extends VersionedComponent {
+public class VersionedProcessGroup extends VersionedComponent {
private Set<VersionedProcessGroup> processGroups = new HashSet<>();
private Set<VersionedRemoteProcessGroup> remoteProcessGroups = new HashSet<>();
diff --git a/nifi-api/src/main/java/org/apache/nifi/flow/VersionedRemoteProcessGroup.java b/nifi-api/src/main/java/org/apache/nifi/flow/VersionedRemoteProcessGroup.java
index a9d2c5905e..7e350fe6d7 100644
--- a/nifi-api/src/main/java/org/apache/nifi/flow/VersionedRemoteProcessGroup.java
+++ b/nifi-api/src/main/java/org/apache/nifi/flow/VersionedRemoteProcessGroup.java
@@ -32,6 +32,7 @@ public class VersionedRemoteProcessGroup extends VersionedComponent {
private String proxyHost;
private Integer proxyPort;
private String proxyUser;
+ private String proxyPassword;
private Set<VersionedRemoteGroupPort> inputPorts;
private Set<VersionedRemoteGroupPort> outputPorts;
@@ -157,6 +158,14 @@ public class VersionedRemoteProcessGroup extends VersionedComponent {
this.proxyUser = proxyUser;
}
+ public String getProxyPassword() {
+ return proxyPassword;
+ }
+
+ public void setProxyPassword(String proxyPassword) {
+ this.proxyPassword = proxyPassword;
+ }
+
@Override
public ComponentType getComponentType() {
return ComponentType.REMOTE_PROCESS_GROUP;
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java
index f1f6f12231..cff8a304cf 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java
@@ -2918,6 +2918,7 @@ public class StandardVersionedComponentSynchronizer implements VersionedComponen
rpg.setProxyHost(proposed.getProxyHost());
rpg.setProxyPort(proposed.getProxyPort());
rpg.setProxyUser(proposed.getProxyUser());
+ rpg.setProxyPassword(decrypt(proposed.getProxyPassword(), syncOptions.getPropertyDecryptor()));
rpg.setTransportProtocol(SiteToSiteTransportProtocol.valueOf(proposed.getTransportProtocol()));
rpg.setYieldDuration(proposed.getYieldDuration());
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/mapping/NiFiRegistryFlowMapper.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/mapping/NiFiRegistryFlowMapper.java
index 74c8464fc4..f5b2a754c0 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/mapping/NiFiRegistryFlowMapper.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/mapping/NiFiRegistryFlowMapper.java
@@ -782,6 +782,9 @@ public class NiFiRegistryFlowMapper {
rpg.setProxyHost(remoteGroup.getProxyHost());
rpg.setProxyPort(remoteGroup.getProxyPort());
rpg.setProxyUser(remoteGroup.getProxyUser());
+ if (flowMappingOptions.isMapSensitiveConfiguration()) {
+ rpg.setProxyPassword(encrypt(remoteGroup.getProxyPassword()));
+ }
rpg.setTargetUri(remoteGroup.getTargetUri());
rpg.setTargetUris(remoteGroup.getTargetUris());
rpg.setTransportProtocol(remoteGroup.getTransportProtocol().name());