Skip to content
This repository was archived by the owner on May 12, 2025. It is now read-only.

Bump sshd-core from 2.6.0 to 2.7.0 #148

Merged
merged 2 commits into from
Jul 26, 2021
Merged

Bump sshd-core from 2.6.0 to 2.7.0 #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ed892e
Bump sshd-core from 2.6.0 to 2.7.0
dependabot[bot] Jun 1, 2021
f80f4fa
Fix sshd compilation issue
fonimus Jul 26, 2021
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<!--dependencies-->
<spring-boot.version>2.5.0</spring-boot.version>
<spring-shell.version>2.0.1.RELEASE</spring-shell.version>
<sshd.version>2.6.0</sshd.version>
<sshd.version>2.7.0</sshd.version>
<junit-jupiter.version>5.7.2</junit-jupiter.version>
<!--sonar-->
<sonar.projectKey>fonimus_ssh-shell-spring-boot</sonar.projectKey>
Expand Down
32 changes: 16 additions & 16 deletions starter/src/main/java/com/github/fonimus/ssh/shell/SshShellRunnable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import com.github.fonimus.ssh.shell.listeners.SshShellListenerService;
import lombok.extern.slf4j.Slf4j;
import org.apache.sshd.common.Factory;
import org.apache.sshd.server.ChannelSessionAware;
import org.apache.sshd.server.channel.ChannelSessionAware;
import org.apache.sshd.server.ExitCallback;
import org.apache.sshd.server.Signal;
import org.apache.sshd.server.channel.ChannelSession;
Expand Down Expand Up @@ -71,33 +71,33 @@ public class SshShellRunnable

private static final String SSH_ENV_TERM = "TERM";

private SshShellProperties properties;
private final SshShellProperties properties;

private ChannelSession session;

private SshShellListenerService shellListenerService;
private final SshShellListenerService shellListenerService;

private Banner shellBanner;
private final Banner shellBanner;

private PromptProvider promptProvider;
private final PromptProvider promptProvider;

private Shell shell;
private final Shell shell;

private JLineShellAutoConfiguration.CompleterAdapter completerAdapter;
private final JLineShellAutoConfiguration.CompleterAdapter completerAdapter;

private Parser parser;
private final Parser parser;

private Environment environment;
private final Environment environment;

private org.apache.sshd.server.Environment sshEnv;
private final org.apache.sshd.server.Environment sshEnv;

private SshShellCommandFactory sshShellCommandFactory;
private final SshShellCommandFactory sshShellCommandFactory;

private InputStream is;
private final InputStream is;

private OutputStream os;
private final OutputStream os;

private ExitCallback ec;
private final ExitCallback ec;

public SshShellRunnable(SshShellProperties properties, ChannelSession session,
SshShellListenerService shellListenerService, Banner shellBanner,
Expand Down Expand Up @@ -221,11 +221,11 @@ public void run() {
shellListenerService.onSessionStarted(session);
shell.run(new SshShellInputProvider(reader, promptProvider));
shellListenerService.onSessionStopped(session);
LOGGER.debug("{}: closing", session.toString());
LOGGER.debug("{}: closing", session);
quit(0);
} catch (Throwable e) {
shellListenerService.onSessionError(session);
LOGGER.error("{}: unexpected exception", session.toString(), e);
LOGGER.error("{}: unexpected exception", session, e);
quit(1);
}
} catch (IOException e) {
Expand Down