opendev/gerrit
Code Issues Proposed changes

Merge changes Iba3a674f,I8ed3f12e,Id6617817 into stable-2.14

Browse Source 
* changes:
  InitSshd: Use correct flag to set empty passphrase
  SshSession: Specify charset in constructor of Scanner
  Specify charset in constructors of InputStreamReader
This commit is contained in:
Dave Borowitz
2018-08-31 17:43:28 +00:00
committed by Gerrit Code Review
parent b8695a315d 625965f800
commit 8c9f93493a
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/HttpResponse.java
View File

@@ -14,6 +14,8 @@
package com.google.gerrit.acceptance; package com.google.gerrit.acceptance;
import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
@@ -34,7 +36,7 @@ public class HttpResponse {
public Reader getReader() throws IllegalStateException, IOException { public Reader getReader() throws IllegalStateException, IOException {
if (reader == null && response.getEntity() != null) { if (reader == null && response.getEntity() != null) {
reader = new InputStreamReader(response.getEntity().getContent()); reader = new InputStreamReader(response.getEntity().getContent(), UTF_8);
} }
return reader; return reader;
} }

5
gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/SshSession.java
View File

@@ -17,6 +17,7 @@ package com.google.gerrit.acceptance;
import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Preconditions.checkState;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assert_; import static com.google.common.truth.Truth.assert_;
import static java.nio.charset.StandardCharsets.UTF_8;
import com.jcraft.jsch.ChannelExec; import com.jcraft.jsch.ChannelExec;
import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSch;
@@ -52,10 +53,10 @@ public class SshSession {
InputStream err = channel.getErrStream(); InputStream err = channel.getErrStream();
channel.connect(); channel.connect();
Scanner s = new Scanner(err).useDelimiter("\\A"); Scanner s = new Scanner(err, UTF_8.name()).useDelimiter("\\A");
error = s.hasNext() ? s.next() : null; error = s.hasNext() ? s.next() : null;
s = new Scanner(in).useDelimiter("\\A"); s = new Scanner(in, UTF_8.name()).useDelimiter("\\A");
return s.hasNext() ? s.next() : ""; return s.hasNext() ? s.next() : "";
} finally { } finally {
channel.disconnect(); channel.disconnect();

2
gerrit-gpg/src/test/java/com/google/gerrit/gpg/PushCertificateCheckerTest.java
View File

@@ -184,7 +184,7 @@ public class PushCertificateCheckerTest {
} }
String cert = payload + new String(bout.toByteArray(), UTF_8); String cert = payload + new String(bout.toByteArray(), UTF_8);
Reader reader = new InputStreamReader(new ByteArrayInputStream(cert.getBytes(UTF_8))); Reader reader = new InputStreamReader(new ByteArrayInputStream(cert.getBytes(UTF_8)), UTF_8);
PushCertificateParser parser = new PushCertificateParser(repo, signedPushConfig); PushCertificateParser parser = new PushCertificateParser(repo, signedPushConfig);
return parser.parse(reader); return parser.parse(reader);
} }

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

@@ -104,7 +104,7 @@ class InitSshd implements InitStep {
"-q" /* quiet */, "-q" /* quiet */,
"-t", "-t",
"rsa", "rsa",
"-P", "-N",
emptyPassphraseArg, emptyPassphraseArg,
"-C", "-C",
comment, comment,

3
gerrit-server/src/test/java/com/google/gerrit/server/mail/send/ValidatorTest.java
View File

@@ -16,6 +16,7 @@ package com.google.gerrit.server.mail.send;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assert_; import static com.google.common.truth.Truth.assert_;
import static java.nio.charset.StandardCharsets.UTF_8;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.InputStream; import java.io.InputStream;
@@ -36,7 +37,7 @@ public class ValidatorTest {
if (in == null) { if (in == null) {
throw new Exception("TLD list not found"); throw new Exception("TLD list not found");
} }
BufferedReader r = new BufferedReader(new InputStreamReader(in)); BufferedReader r = new BufferedReader(new InputStreamReader(in, UTF_8));
String tld; String tld;
while ((tld = r.readLine()) != null) { while ((tld = r.readLine()) != null) {
if (tld.startsWith("# ") || tld.startsWith("XN--")) { if (tld.startsWith("# ") || tld.startsWith("XN--")) {