You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pl...@apache.org on 2017/11/01 07:33:47 UTC
[1/2] directory-kerby git commit: Print the server principal in
Exception of TokenPreauth.
Repository: directory-kerby
Updated Branches:
refs/heads/trunk 59c12f887 -> 45bbe2afe
Print the server principal in Exception of TokenPreauth.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/f9283ca2
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/f9283ca2
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/f9283ca2
Branch: refs/heads/trunk
Commit: f9283ca23a2d4fa2b61be272a4e1caf37580c235
Parents: 19c903e
Author: plusplusjiajia <ji...@intel.com>
Authored: Wed Nov 1 15:32:27 2017 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Wed Nov 1 15:32:27 2017 +0800
----------------------------------------------------------------------
.../kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/f9283ca2/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java
index 2b703bb..8809399 100644
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java
@@ -113,7 +113,9 @@ public class TokenPreauth extends AbstractPreauthPlugin {
serverPrincipal.setRealm(kdcRequest.getKdcReq().getReqBody().getRealm());
kdcRequest.setServerPrincipal(serverPrincipal);
if (audiences == null || !audiences.contains(serverPrincipal.getName())) {
- throw new KrbException("The token audience does not match with the target server principal!");
+ throw new KrbException(
+ "The token audience does not match with the target server principal!"
+ + "Server principal is: " + serverPrincipal);
}
kdcRequest.setToken(authToken);
return true;
[2/2] directory-kerby git commit: Merge remote-tracking branch
'asf/trunk' into trunk
Posted by pl...@apache.org.
Merge remote-tracking branch 'asf/trunk' into trunk
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/45bbe2af
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/45bbe2af
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/45bbe2af
Branch: refs/heads/trunk
Commit: 45bbe2afed3e5eaf8b7d8d05520cd20f64cc3e7f
Parents: f9283ca 59c12f8
Author: plusplusjiajia <ji...@intel.com>
Authored: Wed Nov 1 15:33:30 2017 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Wed Nov 1 15:33:30 2017 +0800
----------------------------------------------------------------------
.../kerby/kerberos/kdc/TokenKdcTestBase.java | 5 ++
.../kerberos/provider/token/JwtAuthToken.java | 63 ++++++++++++--------
.../provider/token/JwtTokenDecoder.java | 11 ++--
.../provider/token/JwtTokenEncoder.java | 27 ++++++---
.../kerby/kerberos/provider/token/JwtUtil.java | 42 -------------
.../kerberos/provider/token/TokenTest.java | 22 +++++++
pom.xml | 22 +------
7 files changed, 90 insertions(+), 102 deletions(-)
----------------------------------------------------------------------