directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From plusplusjia...@apache.org
Subject [36/36] directory-kerby git commit: Merge remote-tracking branch 'asf/trunk' into kadmin-remote
Date Mon, 15 Feb 2016 02:43:00 GMT
Merge remote-tracking branch 'asf/trunk' into kadmin-remote


Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/1765f828
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/1765f828
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/1765f828

Branch: refs/heads/kadmin-remote
Commit: 1765f8281ff763177bb2d3bf4376bd977571cc42
Parents: a3d540d 9271204
Author: plusplusjiajia <jiajia.li@intel.com>
Authored: Mon Feb 15 10:48:43 2016 +0800
Committer: plusplusjiajia <jiajia.li@intel.com>
Committed: Mon Feb 15 10:48:43 2016 +0800

----------------------------------------------------------------------
 README.md                                       |   86 +-
 benchmark/pom.xml                               |   18 +-
 build-tools/kerby-checkstyle.xml                |  150 ++
 build-tools/kerby-pmd-ruleset.xml               |   39 +
 build-tools/pom.xml                             |   39 -
 .../src/main/resources/kerby-checkstyle.xml     |  150 --
 .../src/main/resources/kerby-pmd-ruleset.xml    |   39 -
 docs/1.0.0-rc1/1.0.0-RC1-release-note.md        |   67 +
 docs/1.0.0-rc1/kadmin.md                        |   77 +
 docs/1.0.0-rc1/kdcserver.md                     |   71 +
 docs/1.0.0-rc1/kerby-asn1.md                    |  302 ++++
 docs/1.0.0-rc1/krbclient.md                     |   51 +
 docs/1.0.0-rc1/simplekdc.md                     |   84 +
 docs/1.0.0-rc2/1.0.0-RC2-release-note.md        |   42 +
 docs/1.0.0-rc2/kadmin.md                        |   81 +
 docs/1.0.0-rc2/kdcserver.md                     |   71 +
 docs/1.0.0-rc2/kerby-asn1.md                    |  391 +++++
 docs/1.0.0-rc2/krbclient.md                     |  106 ++
 docs/1.0.0-rc2/simplekdc.md                     |   85 +
 docs/asn1hierarchy.graphml                      | 1563 ------------------
 docs/asn1hierarchy.png                          |  Bin 122731 -> 0 bytes
 docs/logo.png                                   |  Bin 0 -> 12999 bytes
 docs/logo/logo.png                              |  Bin 12999 -> 0 bytes
 .../identitybackend/LdapIdentityBackend.java    |    2 +-
 .../DirectoryLdapIdentityBackendTest.java       |    2 +-
 .../backend/LdapIdentityBackendTest.java        |    4 +-
 .../kerberos/kdc/identitybackend/ZKConfKey.java |    4 +-
 kerby-common/kerby-asn1/README.md               |  389 -----
 kerby-common/kerby-asn1/docs/hierarchy.graphml  | 1563 ++++++++++++++++++
 kerby-common/kerby-asn1/docs/hierarchy.png      |  Bin 0 -> 122731 bytes
 .../main/java/org/apache/kerby/asn1/Asn1.java   |   12 +-
 .../java/org/apache/kerby/asn1/TagClass.java    |    2 +-
 .../org/apache/kerby/asn1/UniversalTag.java     |    6 +-
 .../kerby/asn1/type/Asn1GeneralizedTime.java    |    3 +
 .../kerby/asn1/type/Asn1ObjectIdentifier.java   |    2 +
 .../org/apache/kerby/asn1/type/Asn1UtcTime.java |    3 +
 .../org/apache/kerby/asn1/Asn1FlagsTest.java    |    2 +-
 .../main/java/org/apache/kerby/config/Conf.java |    2 +-
 .../org/apache/kerby/config/ConfigObject.java   |    2 +-
 .../java/org/apache/kerby/config/Resource.java  |    6 +-
 .../java/org/apache/kerby/config/ConfTest.java  |    4 +-
 .../java/org/apache/kerby/util/CryptoUtil.java  |   46 +
 .../org/apache/kerby/util/EncryptoUtil.java     |   46 -
 kerby-dist/README.md                            |   92 +-
 kerby-dist/kdc-dist/conf/kdc.conf               |    1 +
 kerby-dist/tool-dist/pom.xml                    |    2 +-
 .../kerby/kerberos/kdc/LdapBackendKdcTest.java  |    4 +-
 .../kdc/TokenWithAnonymousPkinitKdcTest.java    |   96 ++
 .../kerberos/kdc/impl/NettyKdcHandler.java      |    2 +-
 .../kerberos/kdc/impl/NettyKdcNetwork.java      |    2 +-
 .../integration/test/jaas/TokenJaasKrbUtil.java |    4 +-
 kerby-kerb/kerb-admin/README.md                 |   81 -
 kerby-kerb/kerb-client-api-all/pom.xml          |    2 +-
 kerby-kerb/kerb-client/README.md                |  106 --
 .../kerberos/kerb/client/KrbConfigKey.java      |    4 +-
 .../kerby/kerberos/kerb/client/KrbOption.java   |    1 +
 .../kerberos/kerb/client/KrbTokenClient.java    |   20 +-
 .../client/preauth/pkinit/PkinitContext.java    |    3 +
 .../kerb/client/request/ArmoredRequest.java     |   28 +-
 .../kerby/kerberos/kerb/preauth/PaFlag.java     |    2 +-
 .../kerb/preauth/pkinit/CmsMessageType.java     |    5 +-
 .../kerb/preauth/pkinit/IdentityOpts.java       |    4 +-
 .../kerb/preauth/pkinit/PkinitCrypto.java       |   11 +-
 .../preauth/pkinit/PkinitPlgCryptoContext.java  |    3 +
 .../kerb/preauth/pkinit/PluginOpts.java         |    5 +-
 .../kerby/kerberos/kerb/KrbErrorCode.java       |    2 +-
 .../kerb/type/ad/AuthorizationType.java         |    2 +-
 .../kerby/kerberos/kerb/type/ap/ApOption.java   |    4 +-
 .../kerberos/kerb/type/base/CheckSumType.java   |    2 +-
 .../kerberos/kerb/type/base/EncryptionType.java |    2 +-
 .../kerberos/kerb/type/base/HostAddrType.java   |    2 +-
 .../kerby/kerberos/kerb/type/base/KeyUsage.java |    2 +-
 .../kerberos/kerb/type/base/KrbMessageType.java |    2 +-
 .../kerberos/kerb/type/base/LastReqType.java    |    2 +-
 .../kerby/kerberos/kerb/type/base/NameType.java |    2 +-
 .../kerby/kerberos/kerb/type/base/SamType.java  |    2 +-
 .../kerberos/kerb/type/base/TokenFormat.java    |    2 +-
 .../kerb/type/base/TransitedEncodingType.java   |    2 +-
 .../kerberos/kerb/type/fast/ArmorType.java      |    2 +-
 .../kerberos/kerb/type/fast/FastOption.java     |    2 +-
 .../kerby/kerberos/kerb/type/pa/PaDataType.java |    2 +-
 .../kerberos/kerb/type/pa/token/TokenFlag.java  |    2 +-
 .../kerberos/kerb/type/ticket/TicketFlag.java   |    2 +-
 .../kerberos/kerb/crypto/CheckSumHandler.java   |    3 +
 .../kerberos/kerb/crypto/EncryptionHandler.java |    3 +
 .../kerby/kerberos/kerb/crypto/dh/DhGroup.java  |    1 -
 .../kerb/crypto/dh/DiffieHellmanClient.java     |    1 -
 .../kerb/crypto/dh/DiffieHellmanServer.java     |    1 -
 .../kerb/crypto/enc/Des3CbcSha1Enc.java         |    3 +-
 .../kerberos/kerb/crypto/enc/DesCbcEnc.java     |    2 +-
 .../kerb/crypto/enc/KeKiHmacSha1Enc.java        |    3 +-
 .../kerberos/kerb/crypto/fast/FastUtil.java     |    1 -
 .../kerberos/kerb/crypto/CamelliaEncTest.java   |    5 +-
 .../kerberos/kerb/crypto/CheckSumTest.java      |    2 +
 .../kerberos/kerb/crypto/CheckSumsTest.java     |    6 +-
 .../kerby/kerberos/kerb/crypto/CmacTest.java    |    3 +
 .../kerby/kerberos/kerb/crypto/Crc32Test.java   |    5 +-
 .../kerberos/kerb/crypto/DecryptionTest.java    |   14 +-
 .../kerberos/kerb/crypto/FastUtilTest.java      |    8 +-
 .../kerberos/kerb/crypto/KeyDeriveTest.java     |   10 +-
 .../kerby/kerberos/kerb/crypto/PrfTest.java     |    7 +-
 .../kerberos/kerb/crypto/String2keyTest.java    |   18 +-
 .../kerb/identity/backend/BackendTestBase.java  |    2 +-
 .../kerberos/kerb/server/GssInteropTest.java    |    6 +-
 kerby-kerb/kerb-server-api-all/pom.xml          |    2 +-
 kerby-kerb/kerb-server/README.md                |   71 -
 .../kerberos/kerb/server/KdcConfigKey.java      |    4 +-
 kerby-kerb/kerb-simplekdc/README.md             |   85 -
 .../kerby/kerberos/kerb/client/JaasKrbUtil.java |    8 +-
 .../kerberos/kerb/util/EncryptionTest.java      |    4 +-
 .../kerberos/kerb/util/NewEncryptionTest.java   |    4 +-
 kerby-pkix/pom.xml                              |    2 +-
 .../apache/kerby/cms/CompressedDataTest.java    |    3 +
 .../org/apache/kerby/cms/EnvelopedDataTest.java |    3 +
 .../org/apache/kerby/cms/GeneralNameTest.java   |    3 +
 .../org/apache/kerby/cms/SignedDataTest.java    |    3 +
 kerby-provider/token-provider/pom.xml           |    2 +-
 .../provider/token/JwtTokenDecoder.java         |   12 +-
 .../provider/token/JwtTokenEncoder.java         |   12 +-
 .../kerberos/provider/token/TokenTest.java      |    4 +-
 .../kerby/kerberos/tool/kinit/KinitTool.java    |    2 +
 .../kerby/kerberos/tool/klist/KlistTool.java    |    2 +
 .../kerby/kerberos/tool/kadmin/AuthUtil.java    |    4 +-
 .../kerby/kerberos/tool/kadmin/KadminTool.java  |    3 +
 pom.xml                                         |   61 +-
 125 files changed, 3758 insertions(+), 2768 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/1765f828/docs/1.0.0-rc2/krbclient.md
----------------------------------------------------------------------
diff --cc docs/1.0.0-rc2/krbclient.md
index 0000000,ab5a48c..c7f450f
mode 000000,100644..100644
--- a/docs/1.0.0-rc2/krbclient.md
+++ b/docs/1.0.0-rc2/krbclient.md
@@@ -1,0 -1,106 +1,106 @@@
+ <!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+ -->
+ 
+ kerb-client
+ ============
+ 
+ ## 1. KrbClient
+ ### Initiate a KrbClient
+ * Initiate a KrbClient with prepared KrbConfig.
+ <pre>
 -KrbClient krbClient = new KrbClient(krbConfig);
++KrbClient krbClient = new KrbClient(adminConfig);
+ </pre>
+ * Initiate a KrbClient with conf dir.
+ <pre>
+ KrbClient krbClient = new KrbClient(confDir);
+ </pre>
+ 
+ ### Request a TGT
+ * Request a TGT with using well prepared requestOptions.
+ <pre>
+ requestTgt(requestOptions);
+ </pre>
+ * Request a TGT with user plain password credential
+ <pre>
+ requestTgt(principal, password);
+ </pre>
+ * Request a TGT with user plain keytab credential
+ <pre>
+ requestTgt(principal, keytabFile);
+ </pre>
+ 
+ ### Request a service ticket
+ * Request a service ticket with a TGT targeting for a server
+ <pre>
+ requestSgt(tgt, serverPrincipal);
+ </pre>
+ * Request a service ticket provided request options
+ <pre>
+ requestSgt(requestOptions);
+ </pre>
+ 
+ ## 2. KrbTokenClient
+ ### Initiate a KrbTokenClient
+ * Initiate a KrbTokenClient with prepared KrbConfig.
+ <pre>
 -KrbTokenClient krbTokenClient = new KrbTokenClient(krbConfig);
++KrbTokenClient krbTokenClient = new KrbTokenClient(adminConfig);
+ </pre>
+ * Initiate a KrbTokenClient with conf dir.
+ <pre>
+ KrbTokenClient krbTokenClient = new KrbTokenClient(confDir);
+ </pre>
+ * Initiate a KrbTokenClient with prepared KrbClient.
+ <pre>
+ KrbTokenClient krbTokenClient = new KrbTokenClient(krbClient);
+ </pre>
+ 
+ ### Request a TGT
+ * Request a TGT with user token credential
+ <pre>
+ requestTgtWithToken(token, armorCache);
+ </pre>
+ 
+ ### Request a service ticket
+ </pre>
+ * Request a service ticket with user AccessToken credential for a server
+ <pre>
+ requestSgt(accessToken, serverPrincipal, armorCache);
+ </pre>
+ 
+ ## 3. KrbPkinitClient
+ ### Initiate a KrbPkinitClient
+ * Initiate a KrbPkinitClient with prepared KrbConfig.
+ <pre>
 -KrbPkinitClient krbPkinitClient = new KrbPkinitClient(krbConfig);
++KrbPkinitClient krbPkinitClient = new KrbPkinitClient(adminConfig);
+ </pre>
+ * Initiate a KrbPkinitClient with conf dir.
+ <pre>
+ KrbPkinitClient krbPkinitClient = new KrbPkinitClient(confDir);
+ </pre>
+ * Initiate a KrbPkinitClient with prepared KrbClient.
+ <pre>
+ KrbPkinitClient krbPkinitClient = new KrbPkinitClient(krbClient);
+ </pre>
+ 
+ ### Request a TGT
+ * Request a TGT with using Anonymous PKINIT
+ <pre>
+ requestTgt();
+ </pre>
+ 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/1765f828/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kadmin/KadminTool.java
----------------------------------------------------------------------


Mime
View raw message