Merge pull request #273 from yutaolian/fix-proxy-not-work

bugfix-proxy-not-work
jenkinsci · Nov 11, 2022 · f54d7f7 · f54d7f7
2 parents c293542 + 21c02e7
commit f54d7f7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/main/java/jenkins/plugins/publish_over_ssh/BapSshHostConfiguration.java b/src/main/java/jenkins/plugins/publish_over_ssh/BapSshHostConfiguration.java
@@ -94,14 +94,21 @@ public BapSshHostConfiguration() {
     @DataBoundConstructor
     public BapSshHostConfiguration(final String name, final String hostname, final String username, final String encryptedPassword,
                                    final String remoteRootDir, final int port, final int timeout, final boolean overrideKey, final String keyPath,
-                                   final String key, final boolean disableExec, final boolean avoidSameFileUploads) {
+                                   final String key, final boolean disableExec, final boolean avoidSameFileUploads,
+                                   final String proxyHost, final int proxyPort, final String proxyUser, final String secretProxyPassword, final String proxyType) {
         // CSON: ParameterNumberCheck
         super(name, hostname, username, null, remoteRootDir, port);
         this.timeout = timeout;
         this.overrideKey = overrideKey;
         this.keyInfo = new BapSshKeyInfo(encryptedPassword, key, keyPath);
         this.disableExec = disableExec;
         this.avoidSameFileUploads = avoidSameFileUploads;
+        this.proxyHost = proxyHost;
+        this.proxyPort = proxyPort;
+        this.proxyUser = proxyUser;
+        this.proxyType = proxyType;
+        this.secretProxyPassword = Secret.fromString(secretProxyPassword);
+        this.proxyPassword = secretProxyPassword;
     }
 
     @DataBoundSetter

diff --git a/src/main/resources/jenkins/plugins/publish_over_ssh/BapSshHostConfiguration/config.jelly b/src/main/resources/jenkins/plugins/publish_over_ssh/BapSshHostConfiguration/config.jelly
@@ -96,5 +96,5 @@
     </f:advanced>
 
     <f:validateButton title="${m.test_title()}" progress="${m.test_progress()}" method="testConnection"
-                      with="name,hostname,username,encryptedPassword,remoteRootDir,jumpHost,port,timeout,keyPath,key,overrideKey,common.encryptedPassphrase,common.key,common.keyPath,proxyType,proxyHost,proxyPort,proxyUser,proxyPassword"/>
+                      with="name,hostname,username,encryptedPassword,remoteRootDir,jumpHost,port,timeout,keyPath,key,overrideKey,common.encryptedPassphrase,common.key,common.keyPath,proxyType,proxyHost,proxyPort,proxyUser,secretProxyPassword"/>
 </j:jelly>