You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2014/07/30 18:16:41 UTC
[5/9] git commit: STORM-348: Netty SASL Authentication
STORM-348: Netty SASL Authentication
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/19ad1351
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/19ad1351
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/19ad1351
Branch: refs/heads/security
Commit: 19ad13510cb42963f868fd8bd785b4937dd348ab
Parents: 3bce04c
Author: Raghavendra Nandagopal <sp...@gmail.com>
Authored: Mon Jul 28 17:42:05 2014 -0700
Committer: Raghavendra Nandagopal <sp...@gmail.com>
Committed: Mon Jul 28 17:42:05 2014 -0700
----------------------------------------------------------------------
.../src/jvm/backtype/storm/messaging/netty/SaslUtils.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/19ad1351/storm-core/src/jvm/backtype/storm/messaging/netty/SaslUtils.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/messaging/netty/SaslUtils.java b/storm-core/src/jvm/backtype/storm/messaging/netty/SaslUtils.java
index a4cc0ba..a2d0b26 100644
--- a/storm-core/src/jvm/backtype/storm/messaging/netty/SaslUtils.java
+++ b/storm-core/src/jvm/backtype/storm/messaging/netty/SaslUtils.java
@@ -24,6 +24,7 @@ import java.util.Map;
import javax.security.sasl.Sasl;
import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.io.Charsets;
import backtype.storm.Config;
@@ -45,8 +46,8 @@ class SaslUtils {
* @return password as a char array.
*/
static char[] encodePassword(byte[] password) {
- return new String(Base64.encodeBase64(password),
- Charset.defaultCharset()).toCharArray();
+ return new String(Base64.encodeBase64(password), Charsets.UTF_8)
+ .toCharArray();
}
/**
@@ -57,8 +58,7 @@ class SaslUtils {
* @return identifier as a char array.
*/
static String encodeIdentifier(byte[] identifier) {
- return new String(Base64.encodeBase64(identifier),
- Charset.defaultCharset());
+ return new String(Base64.encodeBase64(identifier), Charsets.UTF_8);
}
static String getSecretKey(Map conf) {