diff options
author | Shawn O. Pearce <sop@google.com> | 2010-11-05 17:16:07 -0700 |
---|---|---|
committer | Shawn O. Pearce <sop@google.com> | 2010-11-05 17:16:07 -0700 |
commit | 7f9e1e1326e3ff941c8029b5578ced2312f85666 (patch) | |
tree | c976e52b6b3c30cf11e7986ab825a5515131883d | |
parent | 54880b5b5bf43dea00ea999c1c810ecc5a81523b (diff) |
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>
-rw-r--r-- | gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java | 17 | ||||
-rw-r--r-- | pom.xml | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java index 2636ff2597..69dd170b79 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java @@ -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; + }}; + } + }); + } } @@ -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> |