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/08/10 07:16:07 UTC
[26/26] directory-kerby git commit: Merge remote-tracking branch
'asf/master' into pkinit-support
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/3976c5ab
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/3976c5ab
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/3976c5ab
Branch: refs/heads/pkinit-support
Commit: 3976c5ab0450833cd2764efe2ce52a9405828219
Parents: 1508c88 1aa6988
Author: plusplusjiajia <ji...@intel.com>
Authored: Mon Aug 10 13:20:50 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Mon Aug 10 13:20:50 2015 +0800
----------------------------------------------------------------------
.gitignore | 1 +
BUILDING.txt | 31 ++
README.md | 23 +-
benchmark/pom.xml | 170 +++++-----
.../kerby/benchmark/JsonBackendBenchmark.java | 90 ++++++
.../kerby/benchmark/KrbCodecBenchmark.java | 12 +-
docs/kerby-formatting.xml | 18 ++
kerby-asn1/README.md | 18 ++
kerby-backend/README.md | 18 ++
.../identitybackend/JsonIdentityBackend.java | 80 ++---
.../kerb/identity/backend/JsonBackendTest.java | 3 +-
kerby-backend/ldap-backend/pom.xml | 14 +-
.../identitybackend/LdapIdentityBackend.java | 1 +
.../identitybackend/LdapIdentityGetHelper.java | 27 ++
kerby-backend/mavibot-backend/pom.xml | 18 ++
kerby-backend/pom.xml | 1 -
.../identitybackend/IdentityZNodeHelper.java | 51 +++
.../ZookeeperIdentityBackend.java | 31 +-
kerby-config/README | 19 ++
kerby-dist/README.md | 57 +++-
kerby-dist/kdc-dist/assembly.xml | 13 +
kerby-dist/kdc-dist/bin/kadmin.cmd | 21 +-
kerby-dist/kdc-dist/bin/kadmin.sh | 19 +-
kerby-dist/kdc-dist/bin/kdcinit.cmd | 21 +-
kerby-dist/kdc-dist/bin/kdcinit.sh | 19 +-
kerby-dist/kdc-dist/bin/start-kdc.cmd | 19 ++
kerby-dist/kdc-dist/bin/start-kdc.sh | 17 +
kerby-dist/kdc-dist/log4j.properties | 2 +-
kerby-dist/kdc-dist/pom.xml | 2 +-
kerby-dist/tool-dist/assembly.xml | 13 +
kerby-dist/tool-dist/bin/kinit.cmd | 23 +-
kerby-dist/tool-dist/bin/kinit.sh | 19 +-
kerby-dist/tool-dist/bin/klist.cmd | 21 +-
kerby-dist/tool-dist/bin/klist.sh | 19 +-
kerby-dist/tool-dist/log4j.properties | 2 +-
kerby-dist/tool-dist/pom.xml | 2 +-
.../kerberos/kdc/WithTokenKdcTestBase.java | 13 -
kerby-kdc/README.md | 18 ++
.../kerby/kerberos/kdc/KerbyKdcServer.java | 14 +-
kerby-kerb/README.md | 19 ++
kerby-kerb/integration-test/run/login.conf | 22 +-
kerby-kerb/integration-test/run/rungssclient.sh | 18 ++
kerby-kerb/integration-test/run/rungssserver.sh | 18 ++
.../integration-test/run/runsaslclient.sh | 18 ++
.../integration-test/run/runsaslserver.sh | 18 ++
.../kerberos/kerb/integration/test/AppUtil.java | 19 ++
.../integration/test/sasl/SaslAppClient.java | 19 ++
.../integration/test/sasl/SaslAppServer.java | 19 ++
kerby-kerb/kerb-admin/README.md | 19 ++
.../kerby/kerberos/kerb/admin/AdminHelper.java | 95 ++++++
.../kerby/kerberos/kerb/admin/Kadmin.java | 308 +++++++++++++++++--
.../kerby/kerberos/kerb/admin/KadminOption.java | 27 ++
kerby-kerb/kerb-client/README.md | 19 ++
.../kerby/kerberos/kerb/client/KrbConfig.java | 76 +++++
.../kerby/kerberos/kerb/client/KrbContext.java | 24 +-
.../kerby/kerberos/kerb/client/KrbHandler.java | 31 +-
.../kerby/kerberos/kerb/client/KrbOption.java | 38 ++-
.../client/impl/AbstractInternalKrbClient.java | 20 +-
.../client/impl/DefaultInternalKrbClient.java | 15 +-
.../kerb/client/impl/DefaultKrbHandler.java | 6 +
.../client/preauth/AbstractPreauthPlugin.java | 46 ++-
.../client/preauth/builtin/EncTsPreauth.java | 25 +-
.../kerb/client/preauth/builtin/TgtPreauth.java | 25 +-
.../client/preauth/pkinit/PkinitPreauth.java | 55 +++-
.../kerb/client/preauth/token/TokenPreauth.java | 51 ++-
.../kerb/client/KrbClientSettingTest.java | 2 +-
.../kerby/kerberos/kerb/spec/base/KrbToken.java | 115 ++++++-
.../kerberos/kerb/crypto/DesKeyMakerTest.java | 19 ++
.../kerb/identity/backend/BackendTestUtil.java | 23 ++
.../backend/AbstractIdentityBackend.java | 18 +-
.../kerb/server/MultiRequestsKdcTest.java | 14 +-
kerby-kerb/kerb-server/README.md | 19 ++
.../kerby/kerberos/kerb/server/KdcHandler.java | 20 ++
.../kerby/kerberos/kerb/server/KdcServer.java | 13 +-
.../kerberos/kerb/server/KdcServerOption.java | 35 ++-
.../kerberos/kerb/server/request/AsRequest.java | 12 +
.../kerb/server/request/KdcRequest.java | 203 +++++++++++-
.../kerb/server/request/TgsRequest.java | 44 ++-
kerby-kerb/kerb-simplekdc/README.md | 19 ++
.../kerby/kerberos/kerb/client/JaasKrbUtil.java | 2 +-
.../kerby/kerberos/kerb/client/Krb5Conf.java | 19 ++
.../kerberos/kerb/server/SimpleKdcServer.java | 68 +++-
.../kerb-simplekdc/src/main/resources/krb5.conf | 18 ++
.../src/main/resources/krb5_udp.conf | 18 ++
.../kerby/kerberos/kerb/keytab/Keytab.java | 5 -
kerby-provider/README.md | 19 ++
kerby-provider/pom.xml | 13 +
kerby-provider/token-provider/pom.xml | 15 +-
.../kerberos/provider/token/JwtAuthToken.java | 66 +++-
.../provider/token/JwtTokenDecoder.java | 6 +
.../provider/token/JwtTokenEncoder.java | 16 +-
.../provider/token/JwtTokenProvider.java | 9 +
.../kerby/kerberos/provider/token/JwtUtil.java | 25 ++
kerby-tool/README.md | 19 ++
.../kerby/kerberos/tool/kinit/KinitOption.java | 36 ++-
.../kerby/kerberos/tool/kinit/KinitTool.java | 108 ++++---
.../kerby/kerberos/tool/klist/KlistOption.java | 27 ++
.../kerby/kerberos/tool/klist/KlistTool.java | 42 +--
.../kerby/kerberos/tool/kadmin/AuthUtil.java | 2 +-
.../kerby/kerberos/tool/kadmin/KadminTool.java | 53 ++--
.../kerby/kerberos/tool/kadmin/Krb5Conf.java | 83 +++++
.../kadmin/command/AddPrincipalCommand.java | 2 +-
.../kadmin/command/ChangePasswordCommand.java | 4 +-
.../kadmin/command/DeletePrincipalCommand.java | 2 +-
.../kadmin/command/GetPrincipalCommand.java | 2 +-
.../tool/kadmin/command/KeytabAddCommand.java | 20 +-
.../kadmin/command/ListPrincipalCommand.java | 20 +-
.../kadmin/command/ModifyPrincipalCommand.java | 2 +-
.../kadmin/command/RenamePrincipalCommand.java | 2 +-
.../kerberos/tool/kdcinit/KdcInitTool.java | 45 ++-
.../kdc-tool/src/main/resources/krb5.conf | 29 ++
.../kdc-tool/src/main/resources/krb5_udp.conf | 29 ++
.../src/main/java/org/apache/kerby/KOption.java | 55 +++-
pom.xml | 7 +-
114 files changed, 2985 insertions(+), 469 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/3976c5ab/kerby-provider/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/3976c5ab/pom.xml
----------------------------------------------------------------------