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/04 09:26:14 UTC
[48/48] 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/7500d4d6
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/7500d4d6
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/7500d4d6
Branch: refs/heads/pkinit-support
Commit: 7500d4d6f308e60772ff80850f0898be158990b1
Parents: 4327298 ed68699
Author: plusplusjiajia <ji...@intel.com>
Authored: Wed Nov 4 16:29:17 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Wed Nov 4 16:29:17 2015 +0800
----------------------------------------------------------------------
benchmark/pom.xml | 8 +-
docs/kerby-checkstyle.xml | 3 +
kerby-backend/json-backend/pom.xml | 2 +-
.../identitybackend/JsonIdentityBackend.java | 214 +++++++++++-----
kerby-config/pom.xml | 6 +
kerby-dist/kdc-dist/pom.xml | 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 ++
.../kerby/kerberos/kdc/KerbyKdcServer.java | 9 +-
.../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/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/transport/KdcNetwork.java | 8 +-
.../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 +-
.../kerberos/kerb/identity/BatchTrans.java | 65 +++++
.../kerb/identity/CacheableIdentityService.java | 16 ++
.../kerberos/kerb/identity/IdentityService.java | 12 +
.../backend/AbstractIdentityBackend.java | 17 ++
.../identity/backend/MemoryIdentityBackend.java | 5 +-
.../src/main/resources/log4j.properties | 23 ++
.../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 +-
.../kerb/server/request/KdcRequest.java | 5 -
.../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 | 15 +-
.../kerby/kerberos/tool/klist/KlistTool.java | 4 +-
.../kerby/kerberos/tool/kadmin/KadminTool.java | 9 +-
.../kerberos/tool/kdcinit/KdcInitTool.java | 12 +-
pom.xml | 27 +-
60 files changed, 1852 insertions(+), 626 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/7500d4d6/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/kinit/KinitTool.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/7500d4d6/pom.xml
----------------------------------------------------------------------