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/25 02:50:06 UTC
[1/4] directory-kerby git commit: Fix the KrbFlag issue.
Repository: directory-kerby
Updated Branches:
refs/heads/pkinit-support 40c3b1a8b -> 8ba54fcf4
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/pkinit-support
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");
}
[4/4] directory-kerby git commit: Merge remote-tracking branch
'asf/master' into pkinit-support
Posted by pl...@apache.org.
Merge remote-tracking branch 'asf/master' into pkinit-support
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/8ba54fcf
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/8ba54fcf
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/8ba54fcf
Branch: refs/heads/pkinit-support
Commit: 8ba54fcf4515820b102e240905e866e5bb358a7d
Parents: 40c3b1a eeff107
Author: plusplusjiajia <ji...@intel.com>
Authored: Wed Nov 25 09:56:24 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Wed Nov 25 09:56:24 2015 +0800
----------------------------------------------------------------------
.../kerby/kerberos/kerb/codec/TestAsReqCodec.java | 3 +--
.../kerby/kerberos/kerb/codec/TestTgsReqCodec.java | 5 ++---
.../kerby/kerberos/kerb/spec/base/KrbFlags.java | 2 ++
.../kerberos/kerb/spec/base/KrbFlagsTest.java | 17 +++++++++--------
4 files changed, 14 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8ba54fcf/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbFlags.java
----------------------------------------------------------------------
[3/4] directory-kerby git commit: Fix the failure of KrbFlagsTest.
Posted by pl...@apache.org.
Fix the failure of KrbFlagsTest.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/eeff107c
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/eeff107c
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/eeff107c
Branch: refs/heads/pkinit-support
Commit: eeff107cc44c6011cc9108febd64852cb98d51e3
Parents: 1fbaebc
Author: plusplusjiajia <ji...@intel.com>
Authored: Wed Nov 25 09:54:00 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Wed Nov 25 09:54:00 2015 +0800
----------------------------------------------------------------------
.../kerberos/kerb/spec/base/KrbFlagsTest.java | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/eeff107c/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/spec/base/KrbFlagsTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/spec/base/KrbFlagsTest.java b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/spec/base/KrbFlagsTest.java
index 69e52ec..bcfe1b5 100644
--- a/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/spec/base/KrbFlagsTest.java
+++ b/kerby-kerb/kerb-core/src/test/java/org/apache/kerby/kerberos/kerb/spec/base/KrbFlagsTest.java
@@ -32,14 +32,14 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
public class KrbFlagsTest {
-
+
public static final int FLAG_0 = 0b00000000000000000000000000000001;
public static final int FLAG_1 = 0b00000000000000000000000000000010;
public static final int FLAG_2 = 0x00000004;
public static final int FLAG_3 = 0x00000008;
public static final int FLAG_4 = 16;
public static final int FLAG_5 = 32;
-
+
public enum TestEnum implements KrbEnum {
FLAG_0(0x00000001),
FLAG_1(0x00000002),
@@ -47,9 +47,9 @@ public class KrbFlagsTest {
FLAG_3(0x00000008),
FLAG_4(0x00000010),
FLAG_5(0x00000020);
-
+
private int value;
-
+
private TestEnum(int value) {
this.value = value;
}
@@ -58,14 +58,14 @@ public class KrbFlagsTest {
public int getValue() {
return value;
}
-
+
}
-
+
@Rule
public ExpectedException thrown = ExpectedException.none();
-
+
private KrbFlags krbFlags;
-
+
@Before
public void setUp() {
krbFlags = new KrbFlags(FLAG_5 | FLAG_3 | FLAG_1);
@@ -75,6 +75,7 @@ public class KrbFlagsTest {
public void testToValue() throws IOException {
byte[] value = {(byte) 0xDE, (byte) 0xAD, (byte) 0xBE, (byte) 0xEF};
krbFlags.setValue(value);
+ krbFlags.encode();
krbFlags.toValue();
assertEquals(0b11011110101011011011111011101111, krbFlags.getFlags());
}
[2/4] 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/pkinit-support
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(-)
----------------------------------------------------------------------