Skip to content

Cleanup ssh client connections on copy fails #191

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

Open
sideshowcecil wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Cleanup ssh client connections on copy fails #191

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
980dce0
(fix) cleanup ssh client connections on copy fails
sideshowcecil Oct 29, 2026
885cdbe
(fix) variable not assigned for file copy operation
sideshowcecil Oct 29, 2026
e4f765a
(fix) log scp cleanup errors insted of throwing exceptions
sideshowcecil Oct 29, 2026
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
47 changes: 27 additions & 20 deletions src/main/java/com/plugin/sshjplugin/SSHJFileCopierPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,10 +183,10 @@ private String copyFile(
StepFailureReason.ConfigurationFailure, e);
}

final SSHClient client = createSshClient();
scp.connect(client);

SSHClient client = null;
try {
client = createSshClient();
scp.connect(client);
Comment on lines +188 to +189
scp.execute(client);
} catch (Exception e) {
throw new FileCopierException("Configuration error: " + e.getMessage(),
Expand All @@ -200,13 +200,16 @@ private String copyFile(
);
}
}
}

try {
client.disconnect();
client.close();
} catch (IOException iex) {
throw new SSHJBuilder.BuilderException(iex);
if (null != client) {
try {
client.disconnect();
client.close();
} catch (IOException iex) {
// Log cleanup errors instead of throwing to avoid masking original exception
logger.log(Constants.WARN_LEVEL, "[sshj-scp] Error closing SSH connection: " +
iex.getMessage());
}
}
}

return remotefile;
Expand Down Expand Up @@ -237,21 +240,25 @@ private String[] copyMultipleFiles(
StepFailureReason.ConfigurationFailure, e);
}

final SSHClient client = createSshClient();
scp.connect(client);

SSHClient client = null;
try {
client = createSshClient();
scp.connect(client);
scp.execute(client);
} catch (Exception e) {
throw new FileCopierException("Configuration error: " + e.getMessage(),
StepFailureReason.ConfigurationFailure, e);
}

try {
client.disconnect();
client.close();
} catch (IOException iex) {
throw new SSHJBuilder.BuilderException(iex);
} finally {
if (null != client) {
try {
client.disconnect();
client.close();
} catch (IOException iex) {
// Log cleanup errors instead of throwing to avoid masking original exception
logger.log(Constants.WARN_LEVEL, "[sshj-scp] Error closing SSH connection: " +
iex.getMessage());
}
}
}

ArrayList<String> ret = new ArrayList<>();
Expand Down
Loading