From commits-return-8485-archive-asf-public=cust-asf.ponee.io@zookeeper.apache.org Mon Aug 24 07:50:59 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mailroute1-lw-us.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with ESMTPS id 7F3E418037A for ; Mon, 24 Aug 2020 09:50:59 +0200 (CEST) Received: from mail.apache.org (localhost [127.0.0.1]) by mailroute1-lw-us.apache.org (ASF Mail Server at mailroute1-lw-us.apache.org) with SMTP id 97E7F124296 for ; Mon, 24 Aug 2020 07:50:58 +0000 (UTC) Received: (qmail 61524 invoked by uid 500); 24 Aug 2020 07:50:58 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zookeeper.apache.org Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 61511 invoked by uid 99); 24 Aug 2020 07:50:58 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Aug 2020 07:50:58 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id D2FBB85A68; Mon, 24 Aug 2020 07:50:57 +0000 (UTC) Date: Mon, 24 Aug 2020 07:50:57 +0000 To: "commits@zookeeper.apache.org" Subject: [zookeeper] branch branch-3.6 updated: ZOOKEEPER-3893: Enhance documentation for property ssl.clientAuth MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <159825545751.11467.4445450499966530500@gitbox.apache.org> From: symat@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: zookeeper X-Git-Refname: refs/heads/branch-3.6 X-Git-Reftype: branch X-Git-Oldrev: ec272f376af86b1e24f2cd2392a03e21ceb3acd2 X-Git-Newrev: b42d76cd14618e7119c0d39150407405b7e87731 X-Git-Rev: b42d76cd14618e7119c0d39150407405b7e87731 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. symat pushed a commit to branch branch-3.6 in repository https://gitbox.apache.org/repos/asf/zookeeper.git The following commit(s) were added to refs/heads/branch-3.6 by this push: new b42d76c ZOOKEEPER-3893: Enhance documentation for property ssl.clientAuth b42d76c is described below commit b42d76cd14618e7119c0d39150407405b7e87731 Author: Sankalp Bhatia AuthorDate: Mon Aug 24 07:47:38 2020 +0000 ZOOKEEPER-3893: Enhance documentation for property ssl.clientAuth Currently, the documentation for this property just mentions TBD (check https://zookeeper.apache.org/doc/r3.5.7/zookeeperAdmin.html). I believe this was ignored until versions 3.5.7 (https://issues.apache.org/jira/browse/ZOOKEEPER-3674) and a fix was made. It will be good to add some documentation around it. Author: Sankalp Bhatia Author: Sankalp Reviewers: Christopher Tubbs , Enrico Olivelli , Mate Szalay-Beko Closes #1405 from sankalpbhatia/master (cherry picked from commit fa846cbb70c031bdc126977d453dae1812b0012a) Signed-off-by: Mate Szalay-Beko --- zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md b/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md index bc16647..db56d6e 100644 --- a/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md +++ b/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md @@ -1471,8 +1471,14 @@ and [SASL authentication for ZooKeeper](https://cwiki.apache.org/confluence/disp * *ssl.clientAuth* and *ssl.quorum.clientAuth* : (Java system properties: **zookeeper.ssl.clientAuth** and **zookeeper.ssl.quorum.clientAuth**) - **New in 3.5.5:** - TBD + **Added in 3.5.5, but broken until 3.5.7:** + Specifies options to authenticate ssl connections from clients. Valid values are + + * "none": server will not request client authentication + * "want": server will "request" client authentication + * "need": server will "require" client authentication + + Default: "need" * *ssl.handshakeDetectionTimeoutMillis* and *ssl.quorum.handshakeDetectionTimeoutMillis* : (Java system properties: **zookeeper.ssl.handshakeDetectionTimeoutMillis** and **zookeeper.ssl.quorum.handshakeDetectionTimeoutMillis**)