Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AD97418CE0 for ; Thu, 30 Jul 2015 06:24:09 +0000 (UTC) Received: (qmail 76346 invoked by uid 500); 30 Jul 2015 06:24:09 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 76184 invoked by uid 500); 30 Jul 2015 06:24:09 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 75644 invoked by uid 99); 30 Jul 2015 06:24:08 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Jul 2015 06:24:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C63CCE6834; Thu, 30 Jul 2015 06:24:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: plusplusjiajia@apache.org To: commits@directory.apache.org Date: Thu, 30 Jul 2015 06:24:20 -0000 Message-Id: <3dcf7f2d4820482580487fa0964c13de@git.apache.org> In-Reply-To: <4712c8cab9e241bbad3c702a6ba0637e@git.apache.org> References: <4712c8cab9e241bbad3c702a6ba0637e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [13/50] [abbrv] directory-kerby git commit: DIRKRB-369 Fix findbugs Problems for kerby-provider module. Contributed by Yaning DIRKRB-369 Fix findbugs Problems for kerby-provider module. Contributed by Yaning Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/bba567d3 Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/bba567d3 Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/bba567d3 Branch: refs/heads/pkinit-support Commit: bba567d37ed5abfb9f63eab2109debdeea2ab7a8 Parents: 2b72ce3 Author: Lin Authored: Wed Jul 15 21:36:05 2015 +0800 Committer: Lin Committed: Wed Jul 15 21:36:05 2015 +0800 ---------------------------------------------------------------------- .../org/apache/kerby/kerberos/provider/token/JwtTokenDecoder.java | 3 ++- .../org/apache/kerby/kerberos/provider/token/JwtTokenEncoder.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/bba567d3/kerby-provider/token-provider/src/main/java/org/apache/kerby/kerberos/provider/token/JwtTokenDecoder.java ---------------------------------------------------------------------- diff --git a/kerby-provider/token-provider/src/main/java/org/apache/kerby/kerberos/provider/token/JwtTokenDecoder.java b/kerby-provider/token-provider/src/main/java/org/apache/kerby/kerberos/provider/token/JwtTokenDecoder.java index 6d64323..c0a6eed 100644 --- a/kerby-provider/token-provider/src/main/java/org/apache/kerby/kerberos/provider/token/JwtTokenDecoder.java +++ b/kerby-provider/token-provider/src/main/java/org/apache/kerby/kerberos/provider/token/JwtTokenDecoder.java @@ -32,6 +32,7 @@ import org.apache.kerby.kerberos.kerb.provider.TokenDecoder; import org.apache.kerby.kerberos.kerb.spec.base.AuthToken; import java.io.IOException; +import java.nio.charset.Charset; import java.security.interfaces.RSAPrivateKey; import java.security.interfaces.RSAPublicKey; import java.text.ParseException; @@ -48,7 +49,7 @@ public class JwtTokenDecoder implements TokenDecoder { @Override public AuthToken decodeFromBytes(byte[] content) throws IOException { - String tokenStr = new String(content); + String tokenStr = new String(content, Charset.forName("UTF-8")); return decodeFromString(tokenStr); } http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/bba567d3/kerby-provider/token-provider/src/main/java/org/apache/kerby/kerberos/provider/token/JwtTokenEncoder.java ---------------------------------------------------------------------- diff --git a/kerby-provider/token-provider/src/main/java/org/apache/kerby/kerberos/provider/token/JwtTokenEncoder.java b/kerby-provider/token-provider/src/main/java/org/apache/kerby/kerberos/provider/token/JwtTokenEncoder.java index e318e95..5970441 100644 --- a/kerby-provider/token-provider/src/main/java/org/apache/kerby/kerberos/provider/token/JwtTokenEncoder.java +++ b/kerby-provider/token-provider/src/main/java/org/apache/kerby/kerberos/provider/token/JwtTokenEncoder.java @@ -37,6 +37,7 @@ import org.apache.kerby.kerberos.kerb.KrbException; import org.apache.kerby.kerberos.kerb.provider.TokenEncoder; import org.apache.kerby.kerberos.kerb.spec.base.AuthToken; +import java.nio.charset.Charset; import java.security.interfaces.RSAPrivateKey; import java.security.interfaces.RSAPublicKey; import java.text.ParseException; @@ -54,7 +55,7 @@ public class JwtTokenEncoder implements TokenEncoder { @Override public byte[] encodeAsBytes(AuthToken token) throws KrbException { String tokenStr = encodeAsString(token); - return tokenStr.getBytes(); + return tokenStr.getBytes(Charset.forName("UTF-8")); } @Override