You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by dr...@apache.org on 2016/06/30 08:54:31 UTC
[44/44] directory-kerby git commit: Sync up with trunk
Sync up with 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/e6626fef
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/e6626fef
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/e6626fef
Branch: refs/heads/gssapi
Commit: e6626fef14bcf6471d50ace6a5e483773cae615f
Parents: 03a4040 b0d7554
Author: Drankye <dr...@gmail.com>
Authored: Fri Jul 1 16:51:08 2016 +0800
Committer: Drankye <dr...@gmail.com>
Committed: Fri Jul 1 16:51:08 2016 +0800
----------------------------------------------------------------------
.gitignore | 1 -
NOTICE | 6 +
benchmark/pom.xml | 6 +-
kerby-backend/json-backend/pom.xml | 6 +
.../identitybackend/JsonIdentityBackend.java | 1 +
kerby-backend/ldap-backend/pom.xml | 6 +
.../identitybackend/LdapIdentityBackend.java | 2 +
kerby-backend/mavibot-backend/pom.xml | 7 +
.../kerberos/kdc/identitybackend/ZKConfKey.java | 6 +-
.../ZookeeperIdentityBackend.java | 36 +-
.../identity/backend/ZookeeperBackendTest.java | 26 +-
.../org/apache/kerby/asn1/Asn1FieldInfo.java | 12 +-
.../kerby/asn1/type/AbstractAsn1Type.java | 4 +
.../kerby/asn1/type/Asn1CollectionType.java | 53 ++-
.../apache/kerby/asn1/type/Asn1Constructed.java | 5 +
.../apache/kerby/asn1/type/Asn1Encodeable.java | 12 +-
.../org/apache/kerby/asn1/type/Asn1Simple.java | 1 +
kerby-common/kerby-config/pom.xml | 3 +-
kerby-dist/kdc-dist/conf/backend.conf | 6 +-
kerby-dist/tool-dist/bin/kinitConcurrent.cmd | 33 ++
kerby-dist/tool-dist/bin/kinitConcurrent.sh | 33 ++
kerby-dist/tool-dist/conf/krb5.conf | 5 +
.../kerby/kerberos/kdc/JsonBackendKdcTest.java | 2 +-
.../kerby/kerberos/kdc/LdapBackendKdcTest.java | 2 +-
.../kerby/kerberos/kdc/MultiKdcsTest.java | 50 +++
.../kerberos/kdc/ZookeeperBackendKdcTest.java | 31 +-
kerby-kdc-test/src/test/resources/kdc.conf | 29 ++
.../src/test/resources/krb5-multikdc.conf | 29 ++
.../kerberos/kdc/impl/NettyKdcHandler.java | 14 +
.../kerberos/kdc/impl/NettyKdcNetwork.java | 14 +-
.../kerberos/kdc/impl/NettyKdcServerImpl.java | 14 +-
.../kdc/impl/NettyKdcUdpServerHandler.java | 14 +
kerby-kerb/integration-test/pom.xml | 6 +
.../kerb/integration/test/SaslAppTest.java | 5 +-
.../kerby/kerberos/kerb/admin/KadminOption.java | 1 +
.../kerby/kerberos/kerb/admin/LocalKadmin.java | 2 +
.../kerberos/kerb/admin/LocalKadminImpl.java | 8 +
kerby-kerb/kerb-client-api-all/pom.xml | 3 +-
kerby-kerb/kerb-client/pom.xml | 6 +
.../kerby/kerberos/kerb/client/ClientUtil.java | 108 +++++-
.../kerby/kerberos/kerb/client/KrbConfig.java | 32 ++
.../kerby/kerberos/kerb/client/KrbHandler.java | 12 +-
.../client/impl/DefaultInternalKrbClient.java | 55 +++-
.../kerb/client/impl/DefaultKrbHandler.java | 4 +-
.../client/preauth/pkinit/PkinitPreauth.java | 29 +-
.../kerb/client/preauth/token/TokenPreauth.java | 4 +-
.../kerberos/kerb/client/KrbConfigLoadTest.java | 4 +-
kerby-kerb/kerb-common/pom.xml | 6 +
.../kerby/kerberos/kerb/common/Krb5Conf.java | 20 +-
.../kerby/kerberos/kerb/common/Krb5Parser.java | 35 +-
.../kerberos/kerb/common/PublicKeyReader.java | 60 ++--
.../kerberos/kerb/transport/KdcNetwork.java | 6 +
.../kerberos/kerb/transport/KrbNetwork.java | 18 +-
.../kerby/kerberos/kerb/Krb5ParserTest.java | 10 +-
.../kerby/kerberos/kerb/KrbErrorCode.java | 4 +-
.../kerby/kerberos/kerb/KrbException.java | 8 +
.../apache/kerby/kerberos/kerb/KrbRuntime.java | 2 +-
.../kerberos/kerb/type/EncKrbPrivPart.java | 122 +++++++
.../kerby/kerberos/kerb/type/KrbPriv.java | 94 ++++++
.../kerby/kerberos/kerb/type/ad/ADAndOr.java | 78 +++++
.../kerb/type/ad/ADAuthenticationIndicator.java | 82 +++++
.../kerby/kerberos/kerb/type/ad/ADCamMac.java | 187 +++++++++++
.../kerb/type/ad/ADEnctypeNegotiation.java | 83 +++++
.../type/ad/ADIntendedForApplicationClass.java | 179 ++++++++++
.../kerb/type/ad/ADIntendedForServer.java | 162 +++++++++
.../kerberos/kerb/type/ad/ADKdcIssued.java | 169 ++++++++++
.../kerby/kerberos/kerb/type/ad/AndOr.java | 87 +++++
.../kerb/type/ad/AuthorizationData.java | 10 +
.../kerb/type/ad/AuthorizationDataEntry.java | 49 ++-
.../kerb/type/ad/AuthorizationDataWrapper.java | 118 +++++++
.../kerb/type/ad/AuthorizationType.java | 210 +++++++++++-
.../kerb/type/ad/CamMacOtherVerifiers.java | 30 ++
.../kerb/type/ad/CamMacVerifierChoice.java | 67 ++++
.../kerb/type/ad/CamMacVerifierMac.java | 107 ++++++
.../kerberos/kerb/type/ad/PrincipalList.java | 31 ++
.../kerberos/kerb/type/base/EncryptionType.java | 2 +-
.../kerberos/kerb/type/base/HostAddrType.java | 4 +-
.../kerby/kerberos/kerb/type/base/KeyUsage.java | 3 +-
.../kerby/kerberos/kerb/type/base/KrbError.java | 18 +-
.../kerby/kerberos/kerb/type/base/KrbToken.java | 64 +---
.../kerberos/kerb/type/base/KrbTokenBase.java | 97 ++++++
.../kerb/type/pa/token/PaTokenRequest.java | 10 +-
.../kerby/kerberos/kerb/codec/ADTest.java | 143 ++++++++
.../codec/PkinitAnonymousAsRepCodecTest.java | 2 +-
.../codec/PkinitAnonymousAsReqCodecTest.java | 22 +-
.../kerb/identity/CacheableIdentityService.java | 13 +
.../kerberos/kerb/identity/IdentityService.java | 12 +
.../backend/AbstractIdentityBackend.java | 34 ++
.../src/main/resources/log4j.properties | 23 --
kerby-kerb/kerb-kdc-test/pom.xml | 14 +-
.../kerberos/kerb/server/GssInteropTest.java | 52 ++-
.../kerby/kerberos/kerb/server/KdcTestBase.java | 21 +-
.../RepeatLoginWithDefaultKdcNetworkTest.java | 34 ++
.../RepeatLoginWithNettyKdcNetworkTest.java | 43 +++
.../kerberos/kerb/server/TestKdcServer.java | 13 +-
kerby-kerb/kerb-server-api-all/pom.xml | 3 +-
kerby-kerb/kerb-server/pom.xml | 6 +
.../kerby/kerberos/kerb/server/KdcHandler.java | 30 +-
.../impl/DefaultInternalKdcServerImpl.java | 19 +-
.../kerb/server/preauth/PreauthHandler.java | 16 +-
.../server/preauth/pkinit/PkinitPreauth.java | 10 +-
.../kerb/server/preauth/token/TokenPreauth.java | 68 ++--
.../kerberos/kerb/server/request/AsRequest.java | 4 +
.../kerb/server/request/KdcRequest.java | 67 ++--
.../kerb/server/request/TgsRequest.java | 8 +-
.../kerb/server/request/TicketIssuer.java | 13 +
.../kerby/kerberos/kerb/client/Krb5Conf.java | 2 +-
.../kerberos/kerb/server/SimpleKdcServer.java | 13 +-
.../src/main/resources/krb5-template.conf | 29 ++
.../kerb-simplekdc/src/main/resources/krb5.conf | 29 --
.../src/main/resources/krb5_udp-template.conf | 29 ++
.../src/main/resources/krb5_udp.conf | 29 --
.../kerby/kerberos/kerb/KrbInputStream.java | 24 +-
.../kerb/ccache/CredCacheInputStream.java | 17 +-
.../kerby/kerberos/kerb/ccache/Credential.java | 1 -
.../kerberos/kerb/keytab/KeytabInputStream.java | 18 -
kerby-pkix/pom.xml | 6 +
.../provider/token/JwtTokenDecoder.java | 10 +-
.../kerberos/provider/token/TokenTest.java | 4 +-
.../tool/kinit/KinitToolWithConcurrence.java | 329 +++++++++++++++++++
.../kerby/kerberos/tool/kadmin/KadminTool.java | 6 +
.../kadmin/command/AddPrincipalsCommand.java | 112 +++++++
pom.xml | 17 +-
123 files changed, 3820 insertions(+), 505 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/e6626fef/kerby-kerb/integration-test/pom.xml
----------------------------------------------------------------------
diff --cc kerby-kerb/integration-test/pom.xml
index b438184,efc11aa..c41d6a0
--- a/kerby-kerb/integration-test/pom.xml
+++ b/kerby-kerb/integration-test/pom.xml
@@@ -50,9 -50,10 +50,15 @@@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.kerby</groupId>
+ <artifactId>kerb-gssapi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
++ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/e6626fef/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/ClientUtil.java
----------------------------------------------------------------------