Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bugfix-proxy-not-work #273

Merged
merged 1 commit into from
Nov 11, 2022
Merged

bugfix-proxy-not-work #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/main/java/jenkins/plugins/publish_over_ssh/BapSshHostConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/jenkins/plugins/publish_over_ssh/BapSshHostConfiguration/config.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>