From abe599cb7e69722e3d415fc3b3e355c3626f309f Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Sat, 18 Feb 2017 13:30:18 +0100 Subject: [PATCH] Avoid implicit use of the platform default charset Change-Id: Ib4e8e1681ce5c075514b5348b6a865aa6711263a --- .../main/java/com/google/gerrit/httpd/raw/BuildSystem.java | 2 +- .../java/com/google/gerrit/server/change/ChangeResource.java | 2 +- .../com/google/gerrit/server/patch/PatchScriptBuilder.java | 4 +++- .../gerrit/server/plugins/AbstractPreloadedPluginScanner.java | 3 ++- .../main/java/com/google/gerrit/sshd/commands/ScpCommand.java | 2 +- .../com/google/gerrit/sshd/commands/SetAccountCommand.java | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/BuildSystem.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/BuildSystem.java index 4c9bc9211a..6e74f7197f 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/BuildSystem.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/BuildSystem.java @@ -76,7 +76,7 @@ public abstract class BuildSystem { throw new InterruptedIOException("interrupted waiting for " + proc.toString()); } if (status != 0) { - log.warn("build failed: " + new String(out)); + log.warn("build failed: " + new String(out, UTF_8)); throw new BuildFailureException(out); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeResource.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeResource.java index 236ecadf5a..b06f05f914 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeResource.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeResource.java @@ -96,7 +96,7 @@ public class ChangeResource implements RestResource, HasETag { if (user.isIdentifiedUser()) { for (AccountGroup.UUID uuid : user.getEffectiveGroups().getKnownGroups()) { - h.putBytes(uuid.get().getBytes()); + h.putBytes(uuid.get().getBytes(UTF_8)); } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java index db495b8ef9..2dd5af7363 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java @@ -14,6 +14,8 @@ package com.google.gerrit.server.patch; +import static java.nio.charset.StandardCharsets.UTF_8; + import com.google.gerrit.common.data.CommentDetail; import com.google.gerrit.common.data.PatchScript; import com.google.gerrit.common.data.PatchScript.DisplayMethod; @@ -501,7 +503,7 @@ class PatchScriptBuilder { } else if (mode.getObjectType() == Constants.OBJ_COMMIT) { String strContent = "Subproject commit " + ObjectId.toString(id); - srcContent = strContent.getBytes(); + srcContent = strContent.getBytes(UTF_8); } else { srcContent = Text.NO_BYTES; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/AbstractPreloadedPluginScanner.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/AbstractPreloadedPluginScanner.java index a578eccd4b..bf30d014da 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/AbstractPreloadedPluginScanner.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/AbstractPreloadedPluginScanner.java @@ -15,6 +15,7 @@ package com.google.gerrit.server.plugins; import static com.google.common.base.Preconditions.checkState; +import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.collect.ImmutableMap; import com.google.gerrit.extensions.annotations.Export; @@ -80,7 +81,7 @@ public abstract class AbstractPreloadedPluginScanner implements PluginContentSca appendIfNotNull(manifestString, "Gerrit-SshModule: ", sshModuleClass); appendIfNotNull(manifestString, "Gerrit-HttpModule: ", httpModuleClass); appendIfNotNull(manifestString, "Gerrit-Module: ", sysModuleClass); - return new Manifest(new ByteArrayInputStream(manifestString.toString().getBytes())); + return new Manifest(new ByteArrayInputStream(manifestString.toString().getBytes(UTF_8))); } @Override diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ScpCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ScpCommand.java index 5bc19d5061..1ed0bb0425 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ScpCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ScpCommand.java @@ -137,7 +137,7 @@ final class ScpCommand extends BaseCommand { try { out.write(2); - out.write(e.getMessage().getBytes()); + out.write(e.getMessage().getBytes(UTF_8)); out.write('\n'); out.flush(); } catch (IOException e2) { diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java index 7baaeb6655..5fccb81b5b 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java @@ -230,7 +230,7 @@ final class SetAccountCommand extends SshCommand { throws RestApiException, OrmException, IOException, ConfigInvalidException { for (final String sshKey : sshKeys) { AddSshKey.Input in = new AddSshKey.Input(); - in.raw = RawInputUtil.create(sshKey.getBytes(), "plain/text"); + in.raw = RawInputUtil.create(sshKey.getBytes(UTF_8), "plain/text"); addSshKey.apply(rsrc, in); } }