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 2015/11/14 14:13:15 UTC
[2/2] directory-kerby git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/directory-kerby
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/directory-kerby
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/cae0be35
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/cae0be35
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/cae0be35
Branch: refs/heads/master
Commit: cae0be35df54b4cdd810c01bcac60fe8e627d12a
Parents: 5ffd0a2 9f4c1fe
Author: Kai Zheng <ka...@intel.com>
Authored: Sat Nov 14 21:12:34 2015 +0800
Committer: Kai Zheng <ka...@intel.com>
Committed: Sat Nov 14 21:12:34 2015 +0800
----------------------------------------------------------------------
benchmark/pom.xml | 6 +-
kerby-backend/json-backend/pom.xml | 2 +-
.../identitybackend/JsonIdentityBackend.java | 1 +
kerby-config/pom.xml | 6 +
kerby-dist/kdc-dist/bin/kadmin.sh | 2 +-
kerby-dist/kdc-dist/bin/kdcinit.sh | 2 +-
kerby-dist/kdc-dist/bin/start-kdc.sh | 2 +-
kerby-dist/kdc-dist/pom.xml | 2 +-
kerby-dist/tool-dist/bin/kinit.sh | 2 +-
kerby-dist/tool-dist/bin/klist.sh | 2 +-
.../kerberos/kdc/WithAccessTokenKdcTest.java | 118 ++++++++-
.../kerberos/kdc/WithIdentityTokenKdcTest.java | 115 ++++++++-
.../kerberos/kdc/WithTokenKdcTestBase.java | 69 ++++-
.../test/resources/oauth2.com_public_key.pem | 6 +
.../src/test/resources/private_key.pem | 16 ++
.../test/jaas/TokenAuthLoginModule.java | 36 +++
.../integration/test/jaas/TokenJaasKrbUtil.java | 26 +-
.../integration/test/TokenLoginTestBase.java | 29 ++-
.../TokenLoginTestWithTokenPreauthDisabled.java | 48 ----
.../TokenLoginTestWithTokenPreauthEnabled.java | 43 ----
.../TokenLoginWithTokenPreauthDisabledTest.java | 48 ++++
.../TokenLoginWithTokenPreauthEnabledTest.java | 43 ++++
.../src/test/resources/private_key.pem | 16 ++
.../test/resources/token-service-public_key.pem | 6 +
.../kerby/kerberos/kerb/admin/Kadmin.java | 5 +-
kerby-kerb/kerb-client-api-all/pom.xml | 1 +
.../kerby/kerberos/kerb/client/KrbClient.java | 2 +-
.../client/impl/AbstractInternalKrbClient.java | 19 +-
.../kerb/client/preauth/token/TokenPreauth.java | 2 +-
.../kerberos/kerb/common/PrivateKeyReader.java | 73 ++++++
.../kerberos/kerb/common/PublicKeyReader.java | 74 ++++++
.../kerberos/kerb/provider/TokenDecoder.java | 37 +++
.../kerberos/kerb/provider/TokenEncoder.java | 30 +++
.../kerby/kerberos/kerb/spec/base/KrbToken.java | 6 +-
.../kerberos/kerb/spec/base/PrincipalName.java | 3 +
.../kerb/spec/pa/token/PaTokenRequest.java | 4 +-
.../src/main/resources/log4j.properties | 23 ++
kerby-kerb/kerb-server-api-all/pom.xml | 1 +
.../kerby/kerberos/kerb/server/KdcConfig.java | 13 +
.../kerberos/kerb/server/KdcConfigKey.java | 5 +-
.../kerb/server/preauth/token/TokenPreauth.java | 96 ++++++-
.../kerberos/kerb/server/request/AsRequest.java | 2 +-
.../server/request/ServiceTickertIssuer.java | 59 -----
.../server/request/ServiceTicketIssuer.java | 59 +++++
.../kerb/server/request/TgsRequest.java | 2 +-
.../kerb/server/request/TgtTickertIssuer.java | 43 ----
.../kerb/server/request/TgtTicketIssuer.java | 43 ++++
.../kerb/server/request/TickertIssuer.java | 249 -------------------
.../kerb/server/request/TicketIssuer.java | 249 +++++++++++++++++++
kerby-provider/token-provider/pom.xml | 2 +-
.../provider/token/JwtTokenDecoder.java | 91 +++++--
.../provider/token/JwtTokenEncoder.java | 116 +++++++--
.../kerberos/provider/token/TokenTest.java | 113 ++++++++-
.../kerby/kerberos/tool/kinit/KinitTool.java | 11 +-
.../main/java/org/apache/kerby/util/IOUtil.java | 2 +
pom.xml | 4 +-
56 files changed, 1536 insertions(+), 549 deletions(-)
----------------------------------------------------------------------