[
https://issues.apache.org/jira/browse/ZOOKEEPER-1525?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15618270#comment-15618270
]
ASF GitHub Bot commented on ZOOKEEPER-1525:
-------------------------------------------
Github user fpj commented on a diff in the pull request:
https://github.com/apache/zookeeper/pull/84#discussion_r85642186
--- Diff: src/java/test/org/apache/zookeeper/test/KeyAuthClientTest.java ---
@@ -0,0 +1,131 @@
+/**
+ * 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.
+ */
+
+package org.apache.zookeeper.test;
+
+import org.apache.zookeeper.CreateMode;
+import org.apache.zookeeper.KeeperException;
+import org.apache.zookeeper.ZooDefs.Ids;
+import org.apache.zookeeper.ZooKeeper;
+import org.apache.zookeeper.data.ACL;
+import org.junit.Assert;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+public class KeyAuthClientTest extends ClientBase {
+ private static final Logger LOG =
LoggerFactory.getLogger(KeyAuthClientTest.class);
+ static {
+
System.setProperty("zookeeper.authProvider.1","org.apache.zookeeper.server.auth.KeyAuthenticationProvider");
+ }
+
+ public void createNodePrintAcl(ZooKeeper zk, String path, String
testName) {
+ try {
+ LOG.debug("KeyAuthenticationProvider Creating Test
Node:"+path+".\n");
+ zk.create(path, null, Ids.CREATOR_ALL_ACL, CreateMode.PERSISTENT);
+ List<ACL> acls = zk.getACL(path, null);
+ LOG.debug("Node: "+path+" Test:"+testName+" ACLs:");
+ for (ACL acl : acls) {
+ LOG.debug(" "+acl.toString());
+ }
+ } catch (Exception e) {
+ LOG.debug(" EXCEPTION THROWN", e);
+ }
+ }
+
+ public void testPreAuth() throws Exception {
+ ZooKeeper zk = createClient();
+ zk.addAuthInfo("key", "25".getBytes());
+ try {
+ createNodePrintAcl(zk, "/pre", "testPreAuth");
+ zk.setACL("/", Ids.CREATOR_ALL_ACL, -1);
+ zk.getChildren("/", false);
+ zk.create("/abc", null, Ids.CREATOR_ALL_ACL,
CreateMode.PERSISTENT);
+ zk.setData("/abc", "testData1".getBytes(), -1);
+ zk.create("/key", null, Ids.CREATOR_ALL_ACL,
CreateMode.PERSISTENT);
+ zk.setData("/key", "5".getBytes(), -1);
+ Thread.sleep(1000);
+ } catch (KeeperException e) {
+ Assert.fail("test failed :" + e);
+ }
+ finally {
+ zk.close();
+ }
+ }
+
+ public void testMissingAuth() throws Exception {
+ ZooKeeper zk = createClient();
+ try {
+ zk.getData("/abc", false, null);
+ Assert.fail("Should not be able to get data");
+ } catch (KeeperException correct) {
+ // correct
+ }
+ try {
+ zk.setData("/abc", "testData2".getBytes(), -1);
+ Assert.fail("Should not be able to set data");
+ } catch (KeeperException correct) {
+ // correct
+ } finally {
+ zk.close();
+ }
+ }
+
+ public void testValidAuth() throws Exception {
+ ZooKeeper zk = createClient();
+ // any multiple of 5 will do...
+ zk.addAuthInfo("key", "25".getBytes());
+ try {
+ createNodePrintAcl(zk, "/valid", "testValidAuth");
+ zk.getData("/abc", false, null);
+ zk.setData("/abc", "testData3".getBytes(), -1);
+ } catch (KeeperException.AuthFailedException e) {
+ Assert.fail("test failed :" + e);
+ } finally {
+ zk.close();
+ }
+ }
+
+ public void testValidAuth2() throws Exception {
+ ZooKeeper zk = createClient();
+ // any multiple of 5 will do...
+ zk.addAuthInfo("key", "125".getBytes());
+ try {
+ createNodePrintAcl(zk, "/valid2", "testValidAuth2");
+ zk.getData("/abc", false, null);
+ zk.setData("/abc", "testData3".getBytes(), -1);
+ } catch (KeeperException.AuthFailedException e) {
+ Assert.fail("test failed :" + e);
+ } finally {
+ zk.close();
+ }
+ }
+
+ @Test
+ public void testAuth() throws Exception {
+ // NOTE: the tests need to run in-order, and older versions of
--- End diff --
I think it is fine if you have a sequence of steps in your test case, but I
really see this as a single test case with multiple steps. I suggest we remove
the `test` prefix from the methods to make clear that they aren't independent
test cases.
> Plumb ZooKeeperServer object into auth plugins
> ----------------------------------------------
>
> Key: ZOOKEEPER-1525
> URL: https://issues.apache.org/jira/browse/ZOOKEEPER-1525
> Project: ZooKeeper
> Issue Type: Improvement
> Affects Versions: 3.5.0
> Reporter: Warren Turkal
> Assignee: Jordan Zimmerman
> Fix For: 3.5.3, 3.6.0
>
> Attachments: ZOOKEEPER-1525.patch, ZOOKEEPER-1525.patch,
> ZOOKEEPER-1525.patch, ZOOKEEPER-1525.patch, ZOOKEEPER-1525.patch,
> ZOOKEEPER-1525.patch, ZOOKEEPER-1525.patch
>
>
> I want to plumb the ZooKeeperServer object into the auth plugins so that I
> can store authentication data in zookeeper itself. With access to the
> ZooKeeperServer object, I also have access to the ZKDatabase and can look up
> entries in the local copy of the zookeeper data.
> In order to implement this, I make sure that a ZooKeeperServer instance is
> passed in to the ProviderRegistry.initialize() method. Then initialize() will
> try to find a constructor for the AuthenticationProvider that takes a
> ZooKeeperServer instance. If the constructor is found, it will be used.
> Otherwise, initialize() will look for a constructor that takes no arguments
> and use that instead.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
