Return-Path: X-Original-To: apmail-zookeeper-dev-archive@www.apache.org Delivered-To: apmail-zookeeper-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3AE6FDFDD for ; Wed, 1 Aug 2012 18:20:54 +0000 (UTC) Received: (qmail 27731 invoked by uid 500); 1 Aug 2012 18:20:54 -0000 Delivered-To: apmail-zookeeper-dev-archive@zookeeper.apache.org Received: (qmail 27695 invoked by uid 500); 1 Aug 2012 18:20:53 -0000 Mailing-List: contact dev-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 dev@zookeeper.apache.org Received: (qmail 27679 invoked by uid 99); 1 Aug 2012 18:20:53 -0000 Received: from reviews-vm.apache.org (HELO reviews.apache.org) (140.211.11.40) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Aug 2012 18:20:53 +0000 Received: from reviews.apache.org (localhost [127.0.0.1]) by reviews.apache.org (Postfix) with ESMTP id 0EE271C1924; Wed, 1 Aug 2012 18:20:53 +0000 (UTC) Content-Type: multipart/alternative; boundary="===============7215416620831004521==" MIME-Version: 1.0 Subject: Review Request: Allow server-side SASL login with JAAS configuration to be programmatically set (rather than only by reading JAAS configuration file) From: "Matteo Bertozzi" To: "Eugene Koontz" , "Patrick Hunt" Cc: "Matteo Bertozzi" , "zookeeper" Date: Wed, 01 Aug 2012 18:20:53 -0000 Message-ID: <20120801182053.22301.7497@reviews.apache.org> X-ReviewBoard-URL: https://reviews.apache.org Auto-Submitted: auto-generated Sender: "Matteo Bertozzi" X-ReviewGroup: zookeeper X-ReviewRequest-URL: https://reviews.apache.org/r/6290/ X-Sender: "Matteo Bertozzi" Reply-To: "Matteo Bertozzi" --===============7215416620831004521== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/6290/ ----------------------------------------------------------- Review request for zookeeper, Patrick Hunt and Eugene Koontz. Description ------- Currently the CnxnFactory checks for "java.security.auth.login.config" to d= ecide whether or not enable SASL. - zookeeper/server/NIOServerCnxnFactory.java = - zookeeper/server/NettyServerCnxnFactory.java - configure() checks for "java.security.auth.login.config" - If present start the new Login("Server", SaslServerCallbackHandler(co= nf)) But since the SaslServerCallbackHandler does the right thing just checking = if getAppConfigurationEntry() is empty, we can allow SASL with JAAS configu= ration to be programmatically just checking weather or not a configuration = entry is present instead of "java.security.auth.login.config". (Something quite similar was done for the SaslClient in ZOOKEEPER-1373) This addresses bug ZOOKEEPER-1497. https://issues.apache.org/jira/browse/ZOOKEEPER-1497 Diffs ----- /src/java/main/org/apache/zookeeper/server/NIOServerCnxnFactory.java 1360= 369 = /src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java 13= 60369 = /src/java/main/org/apache/zookeeper/server/ServerCnxnFactory.java 1360369 = /src/java/main/org/apache/zookeeper/server/ZooKeeperSaslServer.java 13603= 69 = /src/java/main/org/apache/zookeeper/server/auth/SaslServerCallbackHandler= .java 1360369 = /src/java/test/org/apache/zookeeper/JaasConfiguration.java PRE-CREATION = /src/java/test/org/apache/zookeeper/test/SaslAuthDesignatedServerTest.jav= a PRE-CREATION = Diff: https://reviews.apache.org/r/6290/diff/ Testing ------- New testcase added SaslAuthDesignatedServerTest to check if ZooKeeperSaslSe= rver.LOGIN_CONTEXT_NAME_KEY is used. (A new JaasConfiguration class was added to wrap the jaas.conf) +Manual testing for HBASE-4791 Thanks, Matteo Bertozzi --===============7215416620831004521==--