opendev/gerrit
Code Issues Proposed changes

Bump Mina core to 2.0.16 and sshd to 1.4

Browse Source 
This release moves to Java 8 and fixes various bugs. See the sshd-core
release notes [1] and mina-project page [2] for details.

[1] https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310849&version=12338322
[2] https://mina.apache.org/mina-project/

Change-Id: I5df8540fa96f91126ccd45446a070f2000436b15
This commit is contained in:
David Ostrovsky
2016-09-29 08:27:30 +02:00
committed by David Pursehouse
parent 11badbbcc1
commit 12c48938cd
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
WORKSPACE
View File

@@ -611,14 +611,14 @@ maven_jar(
maven_jar( maven_jar(
name = "sshd", name = "sshd",
artifact = "org.apache.sshd:sshd-core:1.2.0", artifact = "org.apache.sshd:sshd-core:1.4.0",
sha1 = "4bc24a8228ba83dac832680366cf219da71dae8e", sha1 = "c8f3d7457fc9979d1b9ec319f0229b89793c8e56",
) )
maven_jar( maven_jar(
name = "mina_core", name = "mina_core",
artifact = "org.apache.mina:mina-core:2.0.10", artifact = "org.apache.mina:mina-core:2.0.16",
sha1 = "a1cb1136b104219d6238de886bf5a3ea4554eb58", sha1 = "f720f17643eaa7b0fec07c1d7f6272972c02bba4",
) )
maven_jar( maven_jar(

2
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitSshd.java
View File

@@ -32,7 +32,7 @@ import java.lang.ProcessBuilder.Redirect;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import org.apache.sshd.common.util.SecurityUtils; import org.apache.sshd.common.util.security.SecurityUtils;
import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider; import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
/** Initialize the {@code sshd} configuration section. */ /** Initialize the {@code sshd} configuration section. */

6
gerrit-sshd/src/main/java/com/google/gerrit/sshd/HostKeyProvider.java
View File

@@ -23,9 +23,9 @@ import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.sshd.common.keyprovider.AbstractFileKeyPairProvider; import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
import org.apache.sshd.common.keyprovider.KeyPairProvider; import org.apache.sshd.common.keyprovider.KeyPairProvider;
import org.apache.sshd.common.util.SecurityUtils; import org.apache.sshd.common.util.security.SecurityUtils;
import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider; import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
class HostKeyProvider implements Provider<KeyPairProvider> { class HostKeyProvider implements Provider<KeyPairProvider> {
@@ -72,7 +72,7 @@ class HostKeyProvider implements Provider<KeyPairProvider> {
+ stdKeys + stdKeys
+ ""); + "");
} }
AbstractFileKeyPairProvider kp = SecurityUtils.createFileKeyPairProvider(); FileKeyPairProvider kp = new FileKeyPairProvider();
kp.setFiles(stdKeys); kp.setFiles(stdKeys);
return kp; return kp;
} }

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

@@ -86,10 +86,10 @@ import org.apache.sshd.common.random.Random;
import org.apache.sshd.common.random.SingletonRandomFactory; import org.apache.sshd.common.random.SingletonRandomFactory;
import org.apache.sshd.common.session.ConnectionService; import org.apache.sshd.common.session.ConnectionService;
import org.apache.sshd.common.session.Session; import org.apache.sshd.common.session.Session;
import org.apache.sshd.common.util.SecurityUtils;
import org.apache.sshd.common.util.buffer.Buffer; import org.apache.sshd.common.util.buffer.Buffer;
import org.apache.sshd.common.util.buffer.ByteArrayBuffer; import org.apache.sshd.common.util.buffer.ByteArrayBuffer;
import org.apache.sshd.common.util.net.SshdSocketAddress; import org.apache.sshd.common.util.net.SshdSocketAddress;
import org.apache.sshd.common.util.security.SecurityUtils;
import org.apache.sshd.server.Command; import org.apache.sshd.server.Command;
import org.apache.sshd.server.CommandFactory; import org.apache.sshd.server.CommandFactory;
import org.apache.sshd.server.ServerBuilder; import org.apache.sshd.server.ServerBuilder;
@@ -683,12 +683,12 @@ public class SshDaemon extends SshServer implements SshInfo, LifecycleListener {
setTcpipForwardingFilter( setTcpipForwardingFilter(
new ForwardingFilter() { new ForwardingFilter() {
@Override @Override
public boolean canForwardAgent(Session session) { public boolean canForwardAgent(Session session, String requestType) {
return false; return false;
} }
@Override @Override
public boolean canForwardX11(Session session) { public boolean canForwardX11(Session session, String requestType) {
return false; return false;
} }