Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B12E1200B62 for ; Thu, 7 Jul 2016 08:41:52 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id AE44A160A72; Thu, 7 Jul 2016 06:41:52 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C8BEC160A86 for ; Thu, 7 Jul 2016 08:41:51 +0200 (CEST) Received: (qmail 71718 invoked by uid 500); 7 Jul 2016 06:41:51 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 69741 invoked by uid 99); 7 Jul 2016 06:41:47 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jul 2016 06:41:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1883AE05D9; Thu, 7 Jul 2016 06:41:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: plusplusjiajia@apache.org To: commits@directory.apache.org Date: Thu, 07 Jul 2016 06:42:12 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [27/27] directory-kerby git commit: Merge remote-tracking branch 'asf/trunk' into kpasswd archived-at: Thu, 07 Jul 2016 06:41:52 -0000 Merge remote-tracking branch 'asf/trunk' into kpasswd Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/dcbfcbe2 Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/dcbfcbe2 Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/dcbfcbe2 Branch: refs/heads/kpasswd Commit: dcbfcbe2d29f4616002d8a9167e62b179d0c1f6b Parents: 70fd3d0 ff14ab7 Author: plusplusjiajia Authored: Thu Jul 7 14:47:22 2016 +0800 Committer: plusplusjiajia Committed: Thu Jul 7 14:47:22 2016 +0800 ---------------------------------------------------------------------- .../identitybackend/LdapIdentityBackend.java | 2 + kerby-common/kerby-asn1/pom.xml | 3 - .../java/org/apache/kerby/asn1/EnumType.java | 2 +- kerby-common/kerby-xdr/pom.xml | 29 ++ .../java/org/apache/kerby/xdr/EnumType.java | 37 ++ .../java/org/apache/kerby/xdr/XdrDataType.java | 55 +++ .../java/org/apache/kerby/xdr/XdrFieldInfo.java | 53 +++ .../apache/kerby/xdr/type/AbstractXdrType.java | 100 +++++ .../org/apache/kerby/xdr/type/XdrBoolean.java | 94 +++++ .../org/apache/kerby/xdr/type/XdrBytes.java | 45 ++ .../apache/kerby/xdr/type/XdrEnumerated.java | 66 +++ .../org/apache/kerby/xdr/type/XdrInteger.java | 85 ++++ .../org/apache/kerby/xdr/type/XdrSimple.java | 132 ++++++ .../org/apache/kerby/xdr/type/XdrString.java | 346 ++++++++++++++++ .../apache/kerby/xdr/type/XdrStructType.java | 99 +++++ .../java/org/apache/kerby/xdr/type/XdrType.java | 62 +++ .../org/apache/kerby/xdr/type/XdrUnion.java | 131 ++++++ .../kerby/xdr/type/XdrUnsignedInteger.java | 100 +++++ .../java/org/apache/kerby/xdr/util/HexUtil.java | 113 +++++ .../java/org/apache/kerby/xdr/util/IOUtil.java | 109 +++++ .../java/org/apache/kerby/xdr/util/Utf8.java | 34 ++ .../java/org/apache/kerby/xdr/util/XdrUtil.java | 26 ++ .../java/org/apache/kerby/xdr/TestUtil.java | 47 +++ .../org/apache/kerby/xdr/XdrBooleanTest.java | 60 +++ .../apache/kerby/xdr/XdrEnumeratedInstance.java | 56 +++ .../org/apache/kerby/xdr/XdrEnumeratedTest.java | 58 +++ .../org/apache/kerby/xdr/XdrIntegerTest.java | 80 ++++ .../org/apache/kerby/xdr/XdrStringTest.java | 59 +++ .../apache/kerby/xdr/XdrStructTypeInstance.java | 111 +++++ .../org/apache/kerby/xdr/XdrStructTypeTest.java | 83 ++++ .../org/apache/kerby/xdr/XdrUnionInstance.java | 170 ++++++++ .../java/org/apache/kerby/xdr/XdrUnionTest.java | 67 +++ .../kerby/xdr/XdrUnsignedIntegerTest.java | 69 ++++ kerby-common/pom.xml | 1 + kerby-dist/README.md | 50 +++ kerby-dist/kdc-dist/bin/admin-server.cmd | 32 ++ kerby-dist/kdc-dist/bin/admin-server.sh | 32 ++ kerby-dist/kdc-dist/bin/remote-admin-client.cmd | 32 ++ kerby-dist/kdc-dist/bin/remote-admin-client.sh | 32 ++ kerby-dist/kdc-dist/conf/adminClient.conf | 23 ++ kerby-dist/kdc-dist/conf/adminServer.conf | 23 ++ kerby-dist/kdc-dist/pom.xml | 10 + .../kerby/kerberos/kdc/KerbyKdcServer.java | 4 +- .../test/jaas/TokenAuthLoginModule.java | 146 +++++-- .../integration/test/TokenLoginTestBase.java | 10 +- .../TokenLoginWithTokenPreauthEnabledTest.java | 72 ++++ kerby-kerb/kerb-admin-server/pom.xml | 56 +++ .../kerb/admin/server/KerbyAdminServer.java | 80 ++++ .../kerb/admin/server/kadmin/AdminServer.java | 266 ++++++++++++ .../admin/server/kadmin/AdminServerConfig.java | 105 +++++ .../server/kadmin/AdminServerConfigKey.java | 59 +++ .../admin/server/kadmin/AdminServerContext.java | 52 +++ .../admin/server/kadmin/AdminServerHandler.java | 238 +++++++++++ .../admin/server/kadmin/AdminServerOption.java | 52 +++ .../admin/server/kadmin/AdminServerSetting.java | 212 ++++++++++ .../admin/server/kadmin/AdminServerUtil.java | 165 ++++++++ .../impl/AbstractInternalAdminServer.java | 116 ++++++ .../kadmin/impl/DefaultAdminServerHandler.java | 199 +++++++++ .../impl/DefaultInternalAdminServerImpl.java | 80 ++++ .../server/kadmin/impl/InternalAdminServer.java | 60 +++ .../src/main/resources/adminServer.conf | 20 + kerby-kerb/kerb-admin/pom.xml | 5 + .../kerby/kerberos/kerb/admin/AdminHelper.java | 308 -------------- .../kerby/kerberos/kerb/admin/AuthUtil.java | 141 +++++++ .../kerby/kerberos/kerb/admin/Kadmin.java | 207 ---------- .../kerby/kerberos/kerb/admin/KadminOption.java | 76 ---- .../kerby/kerberos/kerb/admin/KadminServer.java | 144 ------- .../kerby/kerberos/kerb/admin/Krb5Conf.java | 86 ++++ .../kerby/kerberos/kerb/admin/LocalKadmin.java | 87 ---- .../kerberos/kerb/admin/LocalKadminImpl.java | 400 ------------------ .../kerb/admin/RemoteAdminClientTool.java | 263 ++++++++++++ .../kerberos/kerb/admin/RemoteKadminImpl.java | 144 ------- .../kerberos/kerb/admin/kadmin/Kadmin.java | 207 ++++++++++ .../kerb/admin/kadmin/KadminOption.java | 76 ++++ .../kerb/admin/kadmin/local/AdminHelper.java | 309 ++++++++++++++ .../kerb/admin/kadmin/local/LocalKadmin.java | 88 ++++ .../admin/kadmin/local/LocalKadminImpl.java | 407 +++++++++++++++++++ .../kerb/admin/kadmin/remote/AdminClient.java | 204 ++++++++++ .../kerb/admin/kadmin/remote/AdminConfig.java | 132 ++++++ .../admin/kadmin/remote/AdminConfigKey.java | 58 +++ .../kerb/admin/kadmin/remote/AdminContext.java | 49 +++ .../kerb/admin/kadmin/remote/AdminHandler.java | 162 ++++++++ .../kerb/admin/kadmin/remote/AdminOption.java | 102 +++++ .../kerb/admin/kadmin/remote/AdminSetting.java | 129 ++++++ .../kerb/admin/kadmin/remote/AdminUtil.java | 127 ++++++ .../admin/kadmin/remote/RemoteKadminImpl.java | 207 ++++++++++ .../command/RemoteAddPrincipalCommand.java | 65 +++ .../kadmin/remote/command/RemoteCommand.java | 41 ++ .../command/RemoteDeletePrincipalCommand.java | 83 ++++ .../remote/command/RemoteGetprincsCommand.java | 65 +++ .../remote/command/RemotePrintUsageCommand.java | 42 ++ .../command/RemoteRenamePrincipalCommand.java | 85 ++++ .../impl/AbstractInternalAdminClient.java | 71 ++++ .../kadmin/remote/impl/DefaultAdminHandler.java | 79 ++++ .../remote/impl/DefaultInternalAdminClient.java | 71 ++++ .../kadmin/remote/impl/InternalAdminClient.java | 41 ++ .../remote/request/AddPrincipalRequest.java | 114 ++++++ .../kadmin/remote/request/AdminRequest.java | 63 +++ .../remote/request/DeletePrincipalRequest.java | 70 ++++ .../kadmin/remote/request/GetprincsRequest.java | 70 ++++ .../remote/request/RenamePrincipalRequest.java | 74 ++++ .../kerb/admin/message/AddPrincipalRep.java | 30 ++ .../kerb/admin/message/AddPrincipalReq.java | 30 ++ .../kerb/admin/message/AdminMessage.java | 56 +++ .../kerb/admin/message/AdminMessageCode.java | 90 ++++ .../kerb/admin/message/AdminMessageEnum.java | 41 ++ .../kerb/admin/message/AdminMessageType.java | 73 ++++ .../kerberos/kerb/admin/message/AdminRep.java | 33 ++ .../kerberos/kerb/admin/message/AdminReq.java | 34 ++ .../kerb/admin/message/DeletePrincipalRep.java | 30 ++ .../kerb/admin/message/DeletePrincipalReq.java | 30 ++ .../kerb/admin/message/GetprincsRep.java | 26 ++ .../kerb/admin/message/GetprincsReq.java | 26 ++ .../kerberos/kerb/admin/message/KadminCode.java | 63 +++ .../kerb/admin/message/RenamePrincipalRep.java | 29 ++ .../kerb/admin/message/RenamePrincipalReq.java | 29 ++ .../kerby/kerberos/kerb/admin/KadminTest.java | 24 -- .../client/preauth/pkinit/PkinitPreauth.java | 21 +- .../kerb/preauth/pkinit/CertificateHelper.java | 16 +- .../kerb/preauth/pkinit/PkinitCrypto.java | 68 ++-- .../kerberos/kerb/transport/KdcNetwork.java | 1 - .../apache/kerby/kerberos/kerb/CryptoTest.java | 52 +++ .../src/test/resources/kdccerttest.pem | 25 ++ .../kerberos/kerb/server/GssInteropTest.java | 15 +- .../kerby/kerberos/kerb/server/KdcSetting.java | 2 +- .../kerberos/kerb/server/ServerSetting.java | 35 ++ .../server/preauth/pkinit/PkinitPreauth.java | 61 ++- .../kerberos/kerb/server/request/AsRequest.java | 8 +- .../kerberos/kerb/server/SimpleKdcServer.java | 4 +- kerby-kerb/pom.xml | 1 + .../kerberos/provider/token/JwtAuthToken.java | 6 +- kerby-tool/kdc-tool/pom.xml | 6 + .../kerby/kerberos/tool/kadmin/KadminTool.java | 6 +- .../kerby/kerberos/tool/kadmin/ToolUtil.java | 2 +- .../kadmin/command/AddPrincipalCommand.java | 4 +- .../kadmin/command/AddPrincipalsCommand.java | 4 +- .../kadmin/command/ChangePasswordCommand.java | 4 +- .../kadmin/command/DeletePrincipalCommand.java | 4 +- .../kadmin/command/GetPrincipalCommand.java | 2 +- .../tool/kadmin/command/KadminCommand.java | 2 +- .../tool/kadmin/command/KeytabAddCommand.java | 2 +- .../kadmin/command/KeytabRemoveCommand.java | 4 +- .../kadmin/command/ListPrincipalCommand.java | 2 +- .../kadmin/command/ModifyPrincipalCommand.java | 4 +- .../kadmin/command/RenamePrincipalCommand.java | 7 +- .../kerberos/tool/kdcinit/KdcInitTool.java | 19 +- pom.xml | 4 +- 147 files changed, 9444 insertions(+), 1553 deletions(-) ----------------------------------------------------------------------