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 2015/11/24 10:51:29 UTC
[1/2] directory-kerby git commit: Fix the KrbFlag issue.
Repository: directory-kerby
Updated Branches:
refs/heads/master 4bc036950 -> 1fbaebc4a
Fix the KrbFlag issue.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/48656795
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/48656795
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/48656795
Branch: refs/heads/master
Commit: 486567955990f9541a9480059a8639cba822b657
Parents: c7b42ba
Author: plusplusjiajia <ji...@intel.com>
Authored: Tue Nov 24 17:56:57 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Tue Nov 24 17:56:57 2015 +0800
----------------------------------------------------------------------
.../org/apache/kerby/kerberos/kerb/codec/TestAsReqCodec.java | 3 +--
.../org/apache/kerby/kerberos/kerb/codec/TestTgsReqCodec.java | 5 ++---
.../java/org/apache/kerby/kerberos/kerb/spec/base/KrbFlags.java | 2 ++
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/48656795/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/TestAsReqCodec.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/TestAsReqCodec.java b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/TestAsReqCodec.java
index ff45e6a..21317a9 100644
--- a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/TestAsReqCodec.java
+++ b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/TestAsReqCodec.java
@@ -70,8 +70,7 @@ public class TestAsReqCodec {
KdcReqBody body = asReq.getReqBody();
assertThat(body.getKdcOptions().getPadding()).isEqualTo(0);
- //TODO
-// assertThat(body.getKdcOptions().getValue()).isEqualTo(Arrays.copyOfRange(bytes, 126, 130));
+ assertThat(body.getKdcOptions().getValue()).isEqualTo(Arrays.copyOfRange(bytes, 126, 130));
PrincipalName cName = body.getCname();
assertThat(cName.getNameType()).isEqualTo(NameType.NT_PRINCIPAL);
assertThat(cName.getName()).isEqualTo("des");
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/48656795/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/TestTgsReqCodec.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/TestTgsReqCodec.java b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/TestTgsReqCodec.java
index 14b74e8..de75355 100644
--- a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/TestTgsReqCodec.java
+++ b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/TestTgsReqCodec.java
@@ -62,9 +62,8 @@ public class TestTgsReqCodec {
//request body
KdcReqBody body = tgsReq.getReqBody();
assertThat(body.getKdcOptions().getPadding()).isEqualTo(0);
- //TODO
-// byte[] kdcOptionsValue = {64, (byte) 128, 0, 0};
-// assertThat(body.getKdcOptions().getValue()).isEqualTo(kdcOptionsValue);
+ byte[] kdcOptionsValue = {64, (byte) 128, 0, 0};
+ assertThat(body.getKdcOptions().getValue()).isEqualTo(kdcOptionsValue);
assertThat(body.getRealm()).isEqualTo("DENYDC.COM");
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/48656795/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbFlags.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbFlags.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbFlags.java
index 60db052..4dfd807 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbFlags.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbFlags.java
@@ -111,6 +111,8 @@ public class KrbFlags extends Asn1BitString {
@Override
protected void toValue() throws IOException {
+ super.toValue();
+
if (getPadding() != 0 || getValue().length != 4) {
throw new IOException("Bad bitstring decoded as invalid krb flags");
}
[2/2] directory-kerby git commit: Merge remote-tracking branch
'asf/master'
Posted by pl...@apache.org.
Merge remote-tracking branch 'asf/master'
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/1fbaebc4
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/1fbaebc4
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/1fbaebc4
Branch: refs/heads/master
Commit: 1fbaebc4a925ca14fc1ce541191c95d11d1e300a
Parents: 4865679 4bc0369
Author: plusplusjiajia <ji...@intel.com>
Authored: Tue Nov 24 17:57:56 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Tue Nov 24 17:57:56 2015 +0800
----------------------------------------------------------------------
.../kerby/kerberos/kerb/client/KrbConfig.java | 10 ++--
.../kerby/kerberos/kerb/client/KrbSetting.java | 4 +-
.../kerb/client/request/ArmoredRequest.java | 29 ++++++++---
.../kerberos/kerb/client/request/AsRequest.java | 2 +-
.../kerb/client/request/KdcRequest.java | 23 ++++-----
.../kerb/client/request/TgsRequest.java | 2 +-
.../kerb/client/request/TgsRequestWithTgt.java | 35 ++++++++++----
.../kerb/client/KrbClientSettingTest.java | 28 ++++++++---
.../client/TestKrbConfigLoadForSpecials.java | 51 ++++++++++++++++++++
.../TestKrbConfigLoadWithDefaultRealm.java | 45 -----------------
.../src/test/resources/krb5-kdcrealm.conf | 19 --------
.../src/test/resources/krb5-specials.conf | 20 ++++++++
.../kerberos/kerb/common/CheckSumUtil.java | 21 +++++++-
.../kerby/kerberos/kerb/common/KrbUtil.java | 3 +-
.../kerberos/kerb/crypto/EncryptionHandler.java | 4 +-
.../kerby/kerberos/kerb/server/KdcConfig.java | 6 ++-
.../kerb/server/request/TgsRequest.java | 1 +
.../kerby/kerberos/tool/kinit/KinitTool.java | 11 +++--
18 files changed, 198 insertions(+), 116 deletions(-)
----------------------------------------------------------------------