opendev
/
gerrit
Code Issues Proposed changes

Update MINA SSHD to 0.5.1-r1031886 

The new version contains a work-around for failed sftp connections,
resolving a common NullPointerException error in server error logs.

Change-Id: Iebe667e8cd81cb79848833e2a5de68447fcd42fa
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce 2010-11-05 17:16:07 -07:00
parent 54880b5b5b
commit 7f9e1e1326
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java
View File

@ -58,8 +58,11 @@ import org.apache.sshd.common.util.Buffer;
import org.apache.sshd.common.util.SecurityUtils;
import org.apache.sshd.server.Command;
import org.apache.sshd.server.CommandFactory;
import org.apache.sshd.server.FileSystemFactory;
import org.apache.sshd.server.FileSystemView;
import org.apache.sshd.server.ForwardingFilter;
import org.apache.sshd.server.PublickeyAuthenticator;
import org.apache.sshd.server.SshFile;
import org.apache.sshd.server.UserAuth;
import org.apache.sshd.server.auth.UserAuthPublicKey;
import org.apache.sshd.server.channel.ChannelDirectTcpip;
@ -136,6 +139,7 @@ public class SshDaemon extends SshServer implements SshInfo, LifecycleListener {
initSignatures();
initChannels();
initForwardingFilter();
initFileSystemFactory();
initSubsystems();
initCompression();
initUserAuth(userAuth);
@ -485,4 +489,17 @@ public class SshDaemon extends SshServer implements SshInfo, LifecycleListener {
}
});
}
private void initFileSystemFactory() {
setFileSystemFactory(new FileSystemFactory() {
@Override
public FileSystemView createFileSystemView(String userName) {
return new FileSystemView() {
@Override
public SshFile getFile(String file) {
return null;
}};
}
});
}
}

2
pom.xml
View File

@ -478,7 +478,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
<version>0.4.0-r897374</version>
<version>0.5.1-r1031886</version>
</dependency>
<dependency>