opendev/gerrit
Code Issues Proposed changes

Merge "Update apache mina sshd to 1.7.0"

Browse Source
This commit is contained in:
David Pursehouse
2018-06-06 03:45:29 +00:00
committed by Gerrit Code Review
parent 925528b840 fba926e56c
commit 04ad9d7ec8
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WORKSPACE
View File

@@ -600,9 +600,9 @@ maven_jar(
# https://issues.apache.org/jira/browse/SSHD-736
maven_jar(
name = "sshd",
artifact = "org.apache.sshd:sshd-core:1.6.0",
artifact = "org.apache.sshd:sshd-core:1.7.0",
exclude = ["META-INF/services/java.nio.file.spi.FileSystemProvider"],
sha1 = "548e2da643e88cda9d313efb2564a74f9943e491",
sha1 = "2e8b14f6d841b098e46bf407b6fdccab4c19fa41",
)
maven_jar(

6
java/com/google/gerrit/sshd/SshDaemon.java
View File

@@ -71,7 +71,7 @@ import org.apache.sshd.common.cipher.Cipher;
import org.apache.sshd.common.compression.BuiltinCompressions;
import org.apache.sshd.common.compression.Compression;
import org.apache.sshd.common.file.FileSystemFactory;
import org.apache.sshd.common.forward.DefaultTcpipForwarderFactory;
import org.apache.sshd.common.forward.DefaultForwarderFactory;
import org.apache.sshd.common.future.CloseFuture;
import org.apache.sshd.common.future.SshFutureListener;
import org.apache.sshd.common.io.AbstractIoServiceFactory;
@@ -694,7 +694,7 @@ public class SshDaemon extends SshServer implements SshInfo, LifecycleListener {
}
private void initForwarding() {
setTcpipForwardingFilter(
setForwardingFilter(
new ForwardingFilter() {
@Override
public boolean canForwardAgent(Session session, String requestType) {
@@ -716,7 +716,7 @@ public class SshDaemon extends SshServer implements SshInfo, LifecycleListener {
return false;
}
});
setTcpipForwarderFactory(new DefaultTcpipForwarderFactory());
setForwarderFactory(new DefaultForwarderFactory());
}
private void initFileSystemFactory() {