You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2016/12/06 00:16:59 UTC
[1/4] zookeeper git commit: ZOOKEEPER-1045: Support Quorum Peer
mutual authentication via SASL (rakeshr via phunt)
Repository: zookeeper
Updated Branches:
refs/heads/branch-3.4 967c3a71b -> 8a06bd1cc
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumAuthUpgradeTest.java
----------------------------------------------------------------------
diff --git a/src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumAuthUpgradeTest.java b/src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumAuthUpgradeTest.java
new file mode 100644
index 0000000..3593245
--- /dev/null
+++ b/src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumAuthUpgradeTest.java
@@ -0,0 +1,239 @@
+/**
+ * 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.server.quorum.auth;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeoutException;
+
+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.server.quorum.QuorumPeerTestBase.MainThread;
+import org.apache.zookeeper.test.ClientBase;
+import org.apache.zookeeper.test.ClientTest;
+import org.apache.zookeeper.test.ClientBase.CountdownWatcher;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Rolling upgrade should do in three steps:
+ *
+ * step-1) Stop the server and set the flags and restart the server.
+ * quorum.auth.enableSasl=true, quorum.auth.learnerRequireSasl=false and quorum.auth.serverRequireSasl=false
+ * Ensure that all the servers should complete this step. Now, move to next step.
+ *
+ * step-2) Stop the server one by one and change the flags and restart the server.
+ * quorum.auth.enableSasl=true, quorum.auth.learnerRequireSasl=true and quorum.auth.serverRequireSasl=false
+ * Ensure that all the servers should complete this step. Now, move to next step.
+ *
+ * step-3) Stop the server one by one and change the flags and restart the server.
+ * quorum.auth.enableSasl=true, quorum.auth.learnerRequireSasl=true and quorum.auth.serverRequireSasl=true
+ * Now, all the servers are fully upgraded and running in secured mode.
+ */
+public class QuorumAuthUpgradeTest extends QuorumAuthTestBase {
+ static {
+ String jaasEntries = new String("" + "QuorumServer {\n"
+ + " org.apache.zookeeper.server.auth.DigestLoginModule required\n"
+ + " user_test=\"mypassword\";\n" + "};\n"
+ + "QuorumLearner {\n"
+ + " org.apache.zookeeper.server.auth.DigestLoginModule required\n"
+ + " username=\"test\"\n"
+ + " password=\"mypassword\";\n" + "};\n");
+ setupJaasConfig(jaasEntries);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ shutdownAll();
+ }
+
+ @AfterClass
+ public static void cleanup() {
+ cleanupJaasConfig();
+ }
+
+ /**
+ * Test to verify that servers are able to start without any authentication.
+ * peer0 -> quorum.auth.enableSasl=false
+ * peer1 -> quorum.auth.enableSasl=false
+ */
+ @Test(timeout = 30000)
+ public void testNullAuthLearnerServer() throws Exception {
+ Map<String, String> authConfigs = new HashMap<String, String>();
+ authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "false");
+
+ String connectStr = startQuorum(2, authConfigs, 0);
+ CountdownWatcher watcher = new CountdownWatcher();
+ ZooKeeper zk = new ZooKeeper(connectStr, ClientBase.CONNECTION_TIMEOUT,
+ watcher);
+ watcher.waitForConnected(ClientBase.CONNECTION_TIMEOUT);
+ zk.create("/foo", new byte[0], Ids.OPEN_ACL_UNSAFE,
+ CreateMode.PERSISTENT);
+ zk.close();
+ }
+
+ /**
+ * Test to verify that servers are able to form quorum.
+ * peer0 -> quorum.auth.enableSasl=true, quorum.auth.learnerRequireSasl=false, quorum.auth.serverRequireSasl=false
+ * peer1 -> quorum.auth.enableSasl=false, quorum.auth.learnerRequireSasl=false, quorum.auth.serverRequireSasl=false
+ */
+ @Test(timeout = 30000)
+ public void testAuthLearnerAgainstNullAuthServer() throws Exception {
+ Map<String, String> authConfigs = new HashMap<String, String>();
+ authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true");
+
+ String connectStr = startQuorum(2, authConfigs, 1);
+ CountdownWatcher watcher = new CountdownWatcher();
+ ZooKeeper zk = new ZooKeeper(connectStr, ClientBase.CONNECTION_TIMEOUT,
+ watcher);
+ watcher.waitForConnected(ClientBase.CONNECTION_TIMEOUT);
+ zk.create("/foo", new byte[0], Ids.OPEN_ACL_UNSAFE,
+ CreateMode.PERSISTENT);
+ zk.close();
+ }
+
+ /**
+ * Test to verify that servers are able to form quorum.
+ * peer0 -> quorum.auth.enableSasl=true, quorum.auth.learnerRequireSasl=false, quorum.auth.serverRequireSasl=false
+ * peer1 -> quorum.auth.enableSasl=true, quorum.auth.learnerRequireSasl=false, quorum.auth.serverRequireSasl=false
+ */
+ @Test(timeout = 30000)
+ public void testAuthLearnerAgainstNoAuthRequiredServer() throws Exception {
+ Map<String, String> authConfigs = new HashMap<String, String>();
+ authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true");
+
+ String connectStr = startQuorum(2, authConfigs, 2);
+ CountdownWatcher watcher = new CountdownWatcher();
+ ZooKeeper zk = new ZooKeeper(connectStr, ClientBase.CONNECTION_TIMEOUT,
+ watcher);
+ watcher.waitForConnected(ClientBase.CONNECTION_TIMEOUT);
+ zk.create("/foo", new byte[0], Ids.OPEN_ACL_UNSAFE,
+ CreateMode.PERSISTENT);
+ zk.close();
+ }
+
+ /**
+ * Test to verify that servers are able to form quorum.
+ * peer0 -> quorum.auth.enableSasl=true, quorum.auth.learnerRequireSasl=true, quorum.auth.serverRequireSasl=true
+ * peer1 -> quorum.auth.enableSasl=true, quorum.auth.learnerRequireSasl=true, quorum.auth.serverRequireSasl=true
+ */
+ @Test(timeout = 30000)
+ public void testAuthLearnerServer() throws Exception {
+ Map<String, String> authConfigs = new HashMap<String, String>();
+ authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true");
+ authConfigs.put(QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED, "true");
+ authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_AUTH_REQUIRED, "true");
+
+ String connectStr = startQuorum(2, authConfigs, 2);
+ CountdownWatcher watcher = new CountdownWatcher();
+ ZooKeeper zk = new ZooKeeper(connectStr, ClientBase.CONNECTION_TIMEOUT,
+ watcher);
+ watcher.waitForConnected(ClientBase.CONNECTION_TIMEOUT);
+ zk.create("/foo", new byte[0], Ids.OPEN_ACL_UNSAFE,
+ CreateMode.PERSISTENT);
+ zk.close();
+ }
+
+ /**
+ * Rolling upgrade should do in three steps:
+ *
+ * step-1) Stop the server and set the flags and restart the server.
+ * quorum.auth.enableSasl=true, quorum.auth.learnerRequireSasl=false and quorum.auth.serverRequireSasl=false
+ * Ensure that all the servers should complete this step. Now, move to next step.
+ *
+ * step-2) Stop the server one by one and change the flags and restart the server.
+ * quorum.auth.enableSasl=true, quorum.auth.learnerRequireSasl=true and quorum.auth.serverRequireSasl=false
+ * Ensure that all the servers should complete this step. Now, move to next step.
+ *
+ * step-3) Stop the server one by one and change the flags and restart the server.
+ * quorum.auth.enableSasl=true, quorum.auth.learnerRequireSasl=true and quorum.auth.serverRequireSasl=true
+ * Now, all the servers are fully upgraded and running in secured mode.
+ */
+ @Test(timeout = 90000)
+ public void testRollingUpgrade() throws Exception {
+ // Start peer0,1,2 servers with quorum.auth.enableSasl=false and
+ // quorum.auth.learnerRequireSasl=false, quorum.auth.serverRequireSasl=false
+ // Assume this is an existing cluster.
+ Map<String, String> authConfigs = new HashMap<String, String>();
+ authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "false");
+
+ String connectStr = startQuorum(3, authConfigs, 0);
+ CountdownWatcher watcher = new CountdownWatcher();
+ ZooKeeper zk = new ZooKeeper(connectStr, ClientBase.CONNECTION_TIMEOUT,
+ watcher);
+ watcher.waitForConnected(ClientBase.CONNECTION_TIMEOUT);
+ zk.create("/foo", new byte[0], Ids.OPEN_ACL_UNSAFE,
+ CreateMode.PERSISTENT_SEQUENTIAL);
+
+ //1. Upgrade peer0,1,2 with quorum.auth.enableSasl=true and
+ // quorum.auth.learnerRequireSasl=false, quorum.auth.serverRequireSasl=false
+ authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true");
+ authConfigs.put(QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED, "false");
+ authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_AUTH_REQUIRED, "false");
+ restartServer(authConfigs, 0, zk, watcher);
+ restartServer(authConfigs, 1, zk, watcher);
+ restartServer(authConfigs, 2, zk, watcher);
+
+ //2. Upgrade peer0,1,2 with quorum.auth.enableSasl=true and
+ // quorum.auth.learnerRequireSasl=true, quorum.auth.serverRequireSasl=false
+ authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true");
+ authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_AUTH_REQUIRED, "true");
+ authConfigs.put(QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED, "false");
+ restartServer(authConfigs, 0, zk, watcher);
+ restartServer(authConfigs, 1, zk, watcher);
+ restartServer(authConfigs, 2, zk, watcher);
+
+ //3. Upgrade peer0,1,2 with quorum.auth.enableSasl=true and
+ // quorum.auth.learnerRequireSasl=true, quorum.auth.serverRequireSasl=true
+ authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true");
+ authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_AUTH_REQUIRED, "true");
+ authConfigs.put(QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED, "true");
+ restartServer(authConfigs, 0, zk, watcher);
+ restartServer(authConfigs, 1, zk, watcher);
+ restartServer(authConfigs, 2, zk, watcher);
+
+ //4. Restart peer2 with quorum.auth.learnerEnableSasl=false and
+ // quorum.auth.serverRequireSasl=false. It should fail to join the
+ // quorum as this needs auth.
+ authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "false");
+ MainThread m = shutdown(2);
+ startServer(m, authConfigs);
+ Assert.assertFalse("waiting for server 2 being up", ClientBase
+ .waitForServerUp("127.0.0.1:" + m.getClientPort(), 5000));
+ }
+
+ private void restartServer(Map<String, String> authConfigs, int index,
+ ZooKeeper zk, CountdownWatcher watcher) throws IOException,
+ KeeperException, InterruptedException, TimeoutException {
+ LOG.info("Restarting server myid=" + index);
+ MainThread m = shutdown(index);
+ startServer(m, authConfigs);
+ Assert.assertTrue("waiting for server" + index + "being up",
+ ClientBase.waitForServerUp("127.0.0.1:" + m.getClientPort(),
+ ClientBase.CONNECTION_TIMEOUT));
+ watcher.waitForConnected(ClientTest.CONNECTION_TIMEOUT);
+ zk.create("/foo", new byte[0], Ids.OPEN_ACL_UNSAFE,
+ CreateMode.PERSISTENT_SEQUENTIAL);
+ }
+}
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumDigestAuthTest.java
----------------------------------------------------------------------
diff --git a/src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumDigestAuthTest.java b/src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumDigestAuthTest.java
new file mode 100644
index 0000000..4d66beb
--- /dev/null
+++ b/src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumDigestAuthTest.java
@@ -0,0 +1,221 @@
+/**
+ * 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.server.quorum.auth;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.zookeeper.CreateMode;
+import org.apache.zookeeper.PortAssignment;
+import org.apache.zookeeper.ZooDefs.Ids;
+import org.apache.zookeeper.ZooKeeper;
+import org.apache.zookeeper.server.quorum.QuorumPeerMain;
+import org.apache.zookeeper.server.quorum.QuorumPeerTestBase;
+import org.apache.zookeeper.server.quorum.QuorumPeerConfig.ConfigException;
+import org.apache.zookeeper.server.quorum.QuorumPeerTestBase.MainThread;
+import org.apache.zookeeper.test.ClientBase;
+import org.apache.zookeeper.test.ClientBase.CountdownWatcher;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class QuorumDigestAuthTest extends QuorumAuthTestBase {
+
+ static {
+ String jaasEntries = new String(""
+ + "QuorumServer {\n"
+ + " org.apache.zookeeper.server.auth.DigestLoginModule required\n"
+ + " user_test=\"mypassword\";\n" + "};\n"
+ + "QuorumLearner {\n"
+ + " org.apache.zookeeper.server.auth.DigestLoginModule required\n"
+ + " username=\"test\"\n"
+ + " password=\"mypassword\";\n" + "};\n"
+ + "QuorumLearnerInvalid {\n"
+ + " org.apache.zookeeper.server.auth.DigestLoginModule required\n"
+ + " username=\"test\"\n"
+ + " password=\"invalid\";\n" + "};" + "\n");
+ setupJaasConfig(jaasEntries);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ for (MainThread mainThread : mt) {
+ mainThread.shutdown();
+ mainThread.deleteBaseDir();
+ }
+ }
+
+ @AfterClass
+ public static void cleanup(){
+ cleanupJaasConfig();
+ }
+
+ /**
+ * Test to verify that server is able to start with valid credentials
+ */
+ @Test(timeout = 30000)
+ public void testValidCredentials() throws Exception {
+ Map<String, String> authConfigs = new HashMap<String, String>();
+ authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true");
+ authConfigs.put(QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED, "true");
+ authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_AUTH_REQUIRED, "true");
+
+ String connectStr = startQuorum(3, authConfigs, 3);
+ CountdownWatcher watcher = new CountdownWatcher();
+ ZooKeeper zk = new ZooKeeper(connectStr, ClientBase.CONNECTION_TIMEOUT,
+ watcher);
+ watcher.waitForConnected(ClientBase.CONNECTION_TIMEOUT);
+ for (int i = 0; i < 10; i++) {
+ zk.create("/" + i, new byte[0], Ids.OPEN_ACL_UNSAFE,
+ CreateMode.PERSISTENT);
+ }
+ zk.close();
+ }
+
+ /**
+ * Test to verify that server is able to start with invalid credentials if
+ * the configuration is set to quorum.auth.serverRequireSasl=false.
+ * Quorum will talk each other even if the authentication is not succeeded
+ */
+ @Test(timeout = 30000)
+ public void testSaslNotRequiredWithInvalidCredentials() throws Exception {
+ Map<String, String> authConfigs = new HashMap<String, String>();
+ authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_LOGIN_CONTEXT, "QuorumLearnerInvalid");
+ authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "false");
+ authConfigs.put(QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED, "false");
+ String connectStr = startQuorum(3, authConfigs, 3);
+ CountdownWatcher watcher = new CountdownWatcher();
+ ZooKeeper zk = new ZooKeeper(connectStr, ClientBase.CONNECTION_TIMEOUT,
+ watcher);
+ watcher.waitForConnected(ClientBase.CONNECTION_TIMEOUT);
+ for (int i = 0; i < 10; i++) {
+ zk.create("/" + i, new byte[0], Ids.OPEN_ACL_UNSAFE,
+ CreateMode.PERSISTENT);
+ }
+ zk.close();
+ }
+
+ /**
+ * Test to verify that server shouldn't start with invalid credentials
+ * if the configuration is set to quorum.auth.serverRequireSasl=true,
+ * quorum.auth.learnerRequireSasl=true
+ */
+ @Test(timeout = 30000)
+ public void testSaslRequiredInvalidCredentials() throws Exception {
+ Map<String, String> authConfigs = new HashMap<String, String>();
+ authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_LOGIN_CONTEXT, "QuorumLearnerInvalid");
+ authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true");
+ authConfigs.put(QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED, "true");
+ authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_AUTH_REQUIRED, "true");
+ int serverCount = 2;
+ final int[] clientPorts = startQuorum(serverCount, new StringBuilder(),
+ authConfigs, serverCount);
+ for (int i = 0; i < serverCount; i++) {
+ boolean waitForServerUp = ClientBase.waitForServerUp(
+ "127.0.0.1:" + clientPorts[i], QuorumPeerTestBase.TIMEOUT);
+ Assert.assertFalse("Shouldn't start server with invalid credentials",
+ waitForServerUp);
+ }
+ }
+
+ /**
+ * If quorumpeer learner is not auth enabled then self won't be able to join
+ * quorum. So this test is ensuring that the quorumpeer learner is also auth
+ * enabled while enabling quorum server require sasl.
+ */
+ @Test(timeout = 10000)
+ public void testEnableQuorumServerRequireSaslWithoutQuorumLearnerRequireSasl()
+ throws Exception {
+ Map<String, String> authConfigs = new HashMap<String, String>();
+ authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_LOGIN_CONTEXT,
+ "QuorumLearner");
+ authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true");
+ authConfigs.put(QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED, "true");
+ authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_AUTH_REQUIRED, "false");
+ MainThread mthread = new MainThread(1, PortAssignment.unique(), "",
+ authConfigs);
+ String args[] = new String[1];
+ args[0] = mthread.getConfFile().toString();
+ try {
+ new QuorumPeerMain() {
+ @Override
+ protected void initializeAndRun(String[] args)
+ throws ConfigException, IOException {
+ super.initializeAndRun(args);
+ }
+ }.initializeAndRun(args);
+ Assert.fail("Must throw exception as quorumpeer learner is not enabled!");
+ } catch (ConfigException e) {
+ // expected
+ }
+ }
+
+
+ /**
+ * If quorumpeer learner is not auth enabled then self won't be able to join
+ * quorum. So this test is ensuring that the quorumpeer learner is also auth
+ * enabled while enabling quorum server require sasl.
+ */
+ @Test(timeout = 10000)
+ public void testEnableQuorumAuthenticationConfigurations()
+ throws Exception {
+ Map<String, String> authConfigs = new HashMap<String, String>();
+ authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_LOGIN_CONTEXT,
+ "QuorumLearner");
+ authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "false");
+
+ // case-1) 'quorum.auth.enableSasl' is off. Tries to enable server sasl.
+ authConfigs.put(QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED, "true");
+ authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_AUTH_REQUIRED, "false");
+ MainThread mthread = new MainThread(1, PortAssignment.unique(), "",
+ authConfigs);
+ String args[] = new String[1];
+ args[0] = mthread.getConfFile().toString();
+ try {
+ new QuorumPeerMain() {
+ @Override
+ protected void initializeAndRun(String[] args)
+ throws ConfigException, IOException {
+ super.initializeAndRun(args);
+ }
+ }.initializeAndRun(args);
+ Assert.fail("Must throw exception as quorum sasl is not enabled!");
+ } catch (ConfigException e) {
+ // expected
+ }
+
+ // case-1) 'quorum.auth.enableSasl' is off. Tries to enable learner sasl.
+ authConfigs.put(QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED, "false");
+ authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_AUTH_REQUIRED, "true");
+ try {
+ new QuorumPeerMain() {
+ @Override
+ protected void initializeAndRun(String[] args)
+ throws ConfigException, IOException {
+ super.initializeAndRun(args);
+ }
+ }.initializeAndRun(args);
+ Assert.fail("Must throw exception as quorum sasl is not enabled!");
+ } catch (ConfigException e) {
+ // expected
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumKerberosAuthTest.java
----------------------------------------------------------------------
diff --git a/src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumKerberosAuthTest.java b/src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumKerberosAuthTest.java
new file mode 100644
index 0000000..2cc56a7
--- /dev/null
+++ b/src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumKerberosAuthTest.java
@@ -0,0 +1,110 @@
+/**
+ * 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.server.quorum.auth;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.zookeeper.CreateMode;
+import org.apache.zookeeper.ZooDefs.Ids;
+import org.apache.zookeeper.ZooKeeper;
+import org.apache.zookeeper.server.quorum.QuorumPeerTestBase.MainThread;
+import org.apache.zookeeper.test.ClientBase;
+import org.apache.zookeeper.test.ClientBase.CountdownWatcher;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.Test;
+
+public class QuorumKerberosAuthTest extends KerberosSecurityTestcase {
+ private static File keytabFile;
+ static {
+ String keytabFilePath = FilenameUtils.normalize(KerberosTestUtils.getKeytabFile(), true);
+ String jaasEntries = new String(""
+ + "QuorumServer {\n"
+ + " com.sun.security.auth.module.Krb5LoginModule required\n"
+ + " useKeyTab=true\n"
+ + " keyTab=\"" + keytabFilePath + "\"\n"
+ + " storeKey=true\n"
+ + " useTicketCache=false\n"
+ + " debug=false\n"
+ + " principal=\"" + KerberosTestUtils.getServerPrincipal() + "\";\n" + "};\n"
+ + "QuorumLearner {\n"
+ + " com.sun.security.auth.module.Krb5LoginModule required\n"
+ + " useKeyTab=true\n"
+ + " keyTab=\"" + keytabFilePath + "\"\n"
+ + " storeKey=true\n"
+ + " useTicketCache=false\n"
+ + " debug=false\n"
+ + " principal=\"" + KerberosTestUtils.getLearnerPrincipal() + "\";\n" + "};\n");
+ setupJaasConfig(jaasEntries);
+ }
+
+ @Before
+ public void setUp() throws Exception {
+ // create keytab
+ keytabFile = new File(KerberosTestUtils.getKeytabFile());
+ String learnerPrincipal = KerberosTestUtils.getLearnerPrincipal();
+ String serverPrincipal = KerberosTestUtils.getServerPrincipal();
+ learnerPrincipal = learnerPrincipal.substring(0, learnerPrincipal.lastIndexOf("@"));
+ serverPrincipal = serverPrincipal.substring(0, serverPrincipal.lastIndexOf("@"));
+ getKdc().createPrincipal(keytabFile, learnerPrincipal, serverPrincipal);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ for (MainThread mainThread : mt) {
+ mainThread.shutdown();
+ mainThread.deleteBaseDir();
+ }
+ }
+
+ @AfterClass
+ public static void cleanup() {
+ if(keytabFile != null){
+ FileUtils.deleteQuietly(keytabFile);
+ }
+ cleanupJaasConfig();
+ }
+
+ /**
+ * Test to verify that server is able to start with valid credentials
+ */
+ @Test(timeout = 120000)
+ public void testValidCredentials() throws Exception {
+ String serverPrincipal = KerberosTestUtils.getServerPrincipal();
+ serverPrincipal = serverPrincipal.substring(0, serverPrincipal.lastIndexOf("@"));
+ Map<String, String> authConfigs = new HashMap<String, String>();
+ authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true");
+ authConfigs.put(QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED, "true");
+ authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_AUTH_REQUIRED, "true");
+ authConfigs.put(QuorumAuth.QUORUM_KERBEROS_SERVICE_PRINCIPAL, serverPrincipal);
+ String connectStr = startQuorum(3, authConfigs, 3);
+ CountdownWatcher watcher = new CountdownWatcher();
+ ZooKeeper zk = new ZooKeeper(connectStr, ClientBase.CONNECTION_TIMEOUT, watcher);
+ watcher.waitForConnected(ClientBase.CONNECTION_TIMEOUT);
+ for (int i = 0; i < 10; i++) {
+ zk.create("/" + i, new byte[0], Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
+ }
+ zk.close();
+ }
+}
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumKerberosHostBasedAuthTest.java
----------------------------------------------------------------------
diff --git a/src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumKerberosHostBasedAuthTest.java b/src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumKerberosHostBasedAuthTest.java
new file mode 100644
index 0000000..fcb7691
--- /dev/null
+++ b/src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumKerberosHostBasedAuthTest.java
@@ -0,0 +1,184 @@
+/**
+ * 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.server.quorum.auth;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeoutException;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.zookeeper.CreateMode;
+import org.apache.zookeeper.PortAssignment;
+import org.apache.zookeeper.ZooDefs.Ids;
+import org.apache.zookeeper.ZooKeeper;
+import org.apache.zookeeper.server.quorum.QuorumPeerTestBase.MainThread;
+import org.apache.zookeeper.test.ClientBase;
+import org.apache.zookeeper.test.ClientBase.CountdownWatcher;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import junit.framework.Assert;
+
+public class QuorumKerberosHostBasedAuthTest extends KerberosSecurityTestcase {
+ private static File keytabFile;
+ private static String hostServerPrincipal = KerberosTestUtils.getHostServerPrincipal();
+ private static String hostLearnerPrincipal = KerberosTestUtils.getHostLearnerPrincipal();
+ private static String hostNamedLearnerPrincipal = KerberosTestUtils.getHostNamedLearnerPrincipal("myHost");
+ static {
+ setupJaasConfigEntries(hostServerPrincipal, hostLearnerPrincipal, hostNamedLearnerPrincipal);
+ }
+
+ private static void setupJaasConfigEntries(String hostServerPrincipal,
+ String hostLearnerPrincipal, String hostNamedLearnerPrincipal) {
+ String keytabFilePath = FilenameUtils.normalize(KerberosTestUtils.getKeytabFile(), true);
+ String jaasEntries = new String(""
+ + "QuorumServer {\n"
+ + " com.sun.security.auth.module.Krb5LoginModule required\n"
+ + " useKeyTab=true\n"
+ + " keyTab=\"" + keytabFilePath + "\"\n"
+ + " storeKey=true\n"
+ + " useTicketCache=false\n"
+ + " debug=false\n"
+ + " principal=\"" + KerberosTestUtils.replaceHostPattern(hostServerPrincipal) + "\";\n" + "};\n"
+ + "QuorumLearner {\n"
+ + " com.sun.security.auth.module.Krb5LoginModule required\n"
+ + " useKeyTab=true\n"
+ + " keyTab=\"" + keytabFilePath + "\"\n"
+ + " storeKey=true\n"
+ + " useTicketCache=false\n"
+ + " debug=false\n"
+ + " principal=\"" + KerberosTestUtils.replaceHostPattern(hostLearnerPrincipal) + "\";\n" + "};\n"
+ + "QuorumLearnerMyHost {\n"
+ + " com.sun.security.auth.module.Krb5LoginModule required\n"
+ + " useKeyTab=true\n"
+ + " keyTab=\"" + keytabFilePath + "\"\n"
+ + " storeKey=true\n"
+ + " useTicketCache=false\n"
+ + " debug=false\n"
+ + " principal=\"" + hostNamedLearnerPrincipal + "\";\n" + "};\n");
+ setupJaasConfig(jaasEntries);
+ }
+
+ @BeforeClass
+ public static void setUp() throws Exception {
+ // create keytab
+ keytabFile = new File(KerberosTestUtils.getKeytabFile());
+
+ // Creates principals in the KDC and adds them to a keytab file.
+ String learnerPrincipal = hostLearnerPrincipal.substring(0, hostLearnerPrincipal.lastIndexOf("@"));
+ learnerPrincipal = KerberosTestUtils.replaceHostPattern(learnerPrincipal);
+ String serverPrincipal = hostServerPrincipal.substring(0, hostServerPrincipal.lastIndexOf("@"));
+ serverPrincipal = KerberosTestUtils.replaceHostPattern(serverPrincipal);
+
+ // learner with ipaddress in principal
+ String learnerPrincipal2 = hostNamedLearnerPrincipal.substring(0, hostNamedLearnerPrincipal.lastIndexOf("@"));
+ getKdc().createPrincipal(keytabFile, learnerPrincipal, learnerPrincipal2, serverPrincipal);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ for (MainThread mainThread : mt) {
+ mainThread.shutdown();
+ mainThread.deleteBaseDir();
+ }
+ }
+
+ @AfterClass
+ public static void cleanup() {
+ if(keytabFile != null){
+ FileUtils.deleteQuietly(keytabFile);
+ }
+ cleanupJaasConfig();
+ }
+
+ /**
+ * Test to verify that server is able to start with valid credentials
+ */
+ @Test(timeout = 120000)
+ public void testValidCredentials() throws Exception {
+ String serverPrincipal = hostServerPrincipal.substring(0, hostServerPrincipal.lastIndexOf("@"));
+ Map<String, String> authConfigs = new HashMap<String, String>();
+ authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true");
+ authConfigs.put(QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED, "true");
+ authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_AUTH_REQUIRED, "true");
+ authConfigs.put(QuorumAuth.QUORUM_KERBEROS_SERVICE_PRINCIPAL, serverPrincipal);
+ String connectStr = startQuorum(3, authConfigs, 3);
+ CountdownWatcher watcher = new CountdownWatcher();
+ ZooKeeper zk = new ZooKeeper(connectStr, ClientBase.CONNECTION_TIMEOUT, watcher);
+ watcher.waitForConnected(ClientBase.CONNECTION_TIMEOUT);
+ for (int i = 0; i < 10; i++) {
+ zk.create("/" + i, new byte[0], Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
+ }
+ zk.close();
+ }
+
+ /**
+ * Test to verify that the bad server connection to the quorum should be rejected.
+ */
+ @Test(timeout = 120000)
+ public void testConnectBadServer() throws Exception {
+ String serverPrincipal = hostServerPrincipal.substring(0, hostServerPrincipal.lastIndexOf("@"));
+ Map<String, String> authConfigs = new HashMap<String, String>();
+ authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true");
+ authConfigs.put(QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED, "true");
+ authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_AUTH_REQUIRED, "true");
+ authConfigs.put(QuorumAuth.QUORUM_KERBEROS_SERVICE_PRINCIPAL, serverPrincipal);
+ String connectStr = startQuorum(3, authConfigs, 3);
+ CountdownWatcher watcher = new CountdownWatcher();
+ ZooKeeper zk = new ZooKeeper(connectStr, ClientBase.CONNECTION_TIMEOUT, watcher);
+ watcher.waitForConnected(ClientBase.CONNECTION_TIMEOUT);
+ for (int i = 0; i < 10; i++) {
+ zk.create("/" + i, new byte[0], Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
+ }
+ zk.close();
+
+ String quorumCfgSection = mt.get(0).getQuorumCfgSection();
+ StringBuilder sb = new StringBuilder();
+ sb.append(quorumCfgSection);
+
+ int myid = mt.size() + 1;
+ final int clientPort = PortAssignment.unique();
+ String server = String.format("server.%d=localhost:%d:%d:participant",
+ myid, PortAssignment.unique(), PortAssignment.unique());
+ sb.append(server + "\n");
+ quorumCfgSection = sb.toString();
+ authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_LOGIN_CONTEXT,
+ "QuorumLearnerMyHost");
+ MainThread badServer = new MainThread(myid, clientPort, quorumCfgSection,
+ authConfigs);
+ badServer.start();
+ watcher = new CountdownWatcher();
+ connectStr = "127.0.0.1:" + clientPort;
+ zk = new ZooKeeper(connectStr, ClientBase.CONNECTION_TIMEOUT, watcher);
+ try{
+ watcher.waitForConnected(ClientBase.CONNECTION_TIMEOUT/3);
+ Assert.fail("Must throw exception as the myHost is not an authorized one!");
+ } catch (TimeoutException e){
+ // expected
+ } finally {
+ zk.close();
+ badServer.shutdown();
+ badServer.deleteBaseDir();
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/test/org/apache/zookeeper/test/FLEPredicateTest.java
----------------------------------------------------------------------
diff --git a/src/java/test/org/apache/zookeeper/test/FLEPredicateTest.java b/src/java/test/org/apache/zookeeper/test/FLEPredicateTest.java
index 8088505..0ecac6e 100644
--- a/src/java/test/org/apache/zookeeper/test/FLEPredicateTest.java
+++ b/src/java/test/org/apache/zookeeper/test/FLEPredicateTest.java
@@ -41,7 +41,7 @@ public class FLEPredicateTest extends ZKTestCase {
class MockFLE extends FastLeaderElection {
MockFLE(QuorumPeer peer){
- super(peer, new QuorumCnxManager(peer));
+ super(peer, peer.createCnxnManager());
}
boolean predicate(long newId, long newZxid, long newEpoch, long curId, long curZxid, long curEpoch){
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/zookeeper.jute
----------------------------------------------------------------------
diff --git a/src/zookeeper.jute b/src/zookeeper.jute
index 6521e54..27a5a7e 100644
--- a/src/zookeeper.jute
+++ b/src/zookeeper.jute
@@ -220,6 +220,11 @@ module org.apache.zookeeper.server.quorum {
buffer data; // Only significant when type is request
vector<org.apache.zookeeper.data.Id> authinfo;
}
+ class QuorumAuthPacket {
+ long magic;
+ int status;
+ buffer token;
+ }
}
module org.apache.zookeeper.server.persistence {
[4/4] zookeeper git commit: ZOOKEEPER-1045: Support Quorum Peer
mutual authentication via SASL (rakeshr via phunt)
Posted by ph...@apache.org.
ZOOKEEPER-1045: Support Quorum Peer mutual authentication via SASL (rakeshr via phunt)
Change-Id: I7ae6bd863d46621bba5b9abc908e1497111e0336
Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/8a06bd1c
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/8a06bd1c
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/8a06bd1c
Branch: refs/heads/branch-3.4
Commit: 8a06bd1ccef382461c7b0a63f2012f4aeac90753
Parents: 967c3a7
Author: Rakesh Radhakrishnan <ra...@apache.org>
Authored: Mon Dec 5 16:15:37 2016 -0800
Committer: Patrick Hunt <ph...@apache.org>
Committed: Mon Dec 5 16:15:37 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 6 +
build.xml | 7 +-
ivy.xml | 28 +
src/java/main/org/apache/zookeeper/Login.java | 7 +-
.../zookeeper/SaslClientCallbackHandler.java | 104 +++
.../zookeeper/client/ZooKeeperSaslClient.java | 161 +---
.../zookeeper/server/ZooKeeperSaslServer.java | 114 +--
.../server/auth/SaslServerCallbackHandler.java | 10 +-
.../server/quorum/FastLeaderElection.java | 2 +
.../zookeeper/server/quorum/Follower.java | 5 +-
.../apache/zookeeper/server/quorum/Leader.java | 12 +-
.../apache/zookeeper/server/quorum/Learner.java | 24 +-
.../zookeeper/server/quorum/LearnerHandler.java | 27 +-
.../zookeeper/server/quorum/Observer.java | 8 +-
.../server/quorum/QuorumCnxManager.java | 347 +++++--
.../zookeeper/server/quorum/QuorumPeer.java | 181 +++-
.../server/quorum/QuorumPeerConfig.java | 48 +-
.../zookeeper/server/quorum/QuorumPeerMain.java | 39 +-
.../quorum/auth/NullQuorumAuthLearner.java | 33 +
.../quorum/auth/NullQuorumAuthServer.java | 34 +
.../server/quorum/auth/QuorumAuth.java | 96 ++
.../server/quorum/auth/QuorumAuthLearner.java | 40 +
.../server/quorum/auth/QuorumAuthServer.java | 41 +
.../quorum/auth/SaslQuorumAuthLearner.java | 230 +++++
.../quorum/auth/SaslQuorumAuthServer.java | 180 ++++
.../auth/SaslQuorumServerCallbackHandler.java | 148 +++
.../apache/zookeeper/util/SecurityUtils.java | 298 ++++++
src/java/test/data/kerberos/minikdc-krb5.conf | 30 +
src/java/test/data/kerberos/minikdc.ldiff | 52 ++
.../zookeeper/server/quorum/CnxManagerTest.java | 15 +-
.../quorum/FLEBackwardElectionRoundTest.java | 4 +-
.../server/quorum/FLECompatibilityTest.java | 4 +-
.../server/quorum/FLEDontCareTest.java | 10 +-
.../server/quorum/FLELostMessageTest.java | 2 +-
.../zookeeper/server/quorum/LearnerTest.java | 4 +-
.../server/quorum/QuorumCnxManagerTest.java | 925 +++++++++++++++++++
.../server/quorum/QuorumPeerTestBase.java | 65 +-
.../zookeeper/server/quorum/Zab1_0Test.java | 44 +-
.../quorum/auth/KerberosSecurityTestcase.java | 120 +++
.../server/quorum/auth/KerberosTestUtils.java | 76 ++
.../zookeeper/server/quorum/auth/MiniKdc.java | 418 +++++++++
.../server/quorum/auth/MiniKdcTest.java | 184 ++++
.../server/quorum/auth/QuorumAuthTestBase.java | 146 +++
.../quorum/auth/QuorumAuthUpgradeTest.java | 239 +++++
.../quorum/auth/QuorumDigestAuthTest.java | 221 +++++
.../quorum/auth/QuorumKerberosAuthTest.java | 110 +++
.../auth/QuorumKerberosHostBasedAuthTest.java | 184 ++++
.../apache/zookeeper/test/FLEPredicateTest.java | 2 +-
src/zookeeper.jute | 5 +
49 files changed, 4655 insertions(+), 435 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2b69758..eb9ef86 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -31,6 +31,12 @@ IMPROVEMENTS:
ZOOKEEPER-2606: SaslServerCallbackHandler#handleAuthorizeCallback() should
log the exception (Ted Yu via fpj)
+NEW FEATURE:
+
+ ZOOKEEPER-1045: Support Quorum Peer mutual authentication via SASL
+ (rakeshr via phunt)
+
+
Release 3.4.9 - 2016-08-23
Backward compatible changes:
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 505597a..5c4fab2 100644
--- a/build.xml
+++ b/build.xml
@@ -75,6 +75,7 @@ xmlns:maven="antlib:org.apache.maven.artifact.ant">
<property name="test.data.upgrade.dir" value="${test.data.dir}/upgrade" />
<property name="test.data.invalid.dir" value="${test.data.dir}/invalidsnap" />
<property name="test.data.buffersize.dir" value="${test.data.dir}/buffersize" />
+ <property name="test.data.kerberos.dir" value="${test.data.dir}/kerberos" />
<property name="test.cppunit.dir" value="${test.java.build.dir}/test-cppunit"/>
<property name="test.tmp.dir" value="${test.java.build.dir}/tmp" />
<property name="test.output" value="no" />
@@ -1242,6 +1243,7 @@ xmlns:maven="antlib:org.apache.maven.artifact.ant">
<delete dir="${test.data.upgrade.dir}" />
<delete dir="${test.data.invalid.dir}" />
<delete dir="${test.data.buffersize.dir}" />
+ <delete dir="${test.data.kerberos.dir}" />
<delete dir="${test.data.dir}" />
<mkdir dir="${test.log.dir}" />
<mkdir dir="${test.tmp.dir}" />
@@ -1258,7 +1260,10 @@ xmlns:maven="antlib:org.apache.maven.artifact.ant">
<copy todir="${test.data.buffersize.dir}">
<fileset dir="${basedir}/src/java/test/data/buffersize"/>
</copy>
-
+ <mkdir dir="${test.data.kerberos.dir}" />
+ <copy todir="${test.data.kerberos.dir}">
+ <fileset dir="${basedir}/src/java/test/data/kerberos"/>
+ </copy>
</target>
<condition property="quicktest">
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/ivy.xml
----------------------------------------------------------------------
diff --git a/ivy.xml b/ivy.xml
index 95b0e5a..437b86b 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -74,6 +74,34 @@
rev="2.4" conf="releaseaudit->default"/>
<dependency org="commons-collections" name="commons-collections"
rev="3.2.2" conf="releaseaudit->default"/>
+
+ <dependency org="commons-io" name="commons-io" rev="2.4"
+ conf="test->default"/>
+
+ <dependency org="org.apache.kerby" name="kerb-simplekdc" rev="1.0.0-RC2"
+ conf="test->default"/>
+ <dependency org="org.apache.kerby" name="kerby-config" rev="1.0.0-RC2"
+ conf="test->default"/>
+ <dependency org="org.apache.kerby" name="kerb-core" rev="1.0.0-RC2"
+ conf="test->default"/>
+ <dependency org="org.apache.kerby" name="kerb-server" rev="1.0.0-RC2"
+ conf="test->default"/>
+ <dependency org="org.apache.kerby" name="kerb-common" rev="1.0.0-RC2"
+ conf="test->default"/>
+ <dependency org="org.apache.kerby" name="kerb-admin" rev="1.0.0-RC2"
+ conf="test->default"/>
+ <dependency org="org.apache.kerby" name="kerb-identity" rev="1.0.0-RC2"
+ conf="test->default"/>
+ <dependency org="org.apache.kerby" name="kerb-client" rev="1.0.0-RC2"
+ conf="test->default"/>
+ <dependency org="org.apache.kerby" name="kerb-util" rev="1.0.0-RC2"
+ conf="test->default"/>
+ <dependency org="org.apache.kerby" name="kerb-crypto" rev="1.0.0-RC2"
+ conf="test->default"/>
+ <dependency org="org.apache.kerby" name="kerby-util" rev="1.0.0-RC2"
+ conf="test->default"/>
+ <dependency org="org.apache.kerby" name="kerby-asn1" rev="1.0.0-RC2"
+ conf="test->default"/>
</dependencies>
</ivy-module>
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/main/org/apache/zookeeper/Login.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/Login.java b/src/java/main/org/apache/zookeeper/Login.java
index aaa220c..3e21aae 100644
--- a/src/java/main/org/apache/zookeeper/Login.java
+++ b/src/java/main/org/apache/zookeeper/Login.java
@@ -32,8 +32,9 @@ import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
import javax.security.auth.callback.CallbackHandler;
-import org.apache.log4j.Logger;
import org.apache.zookeeper.client.ZooKeeperSaslClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.security.auth.kerberos.KerberosTicket;
import javax.security.auth.Subject;
import java.util.Date;
@@ -41,7 +42,7 @@ import java.util.Random;
import java.util.Set;
public class Login {
- Logger LOG = Logger.getLogger(Login.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Login.class);
public CallbackHandler callbackHandler;
// LoginThread will sleep until 80% of time from last refresh to
@@ -291,7 +292,7 @@ public class Login {
}
LoginContext loginContext = new LoginContext(loginContextName,callbackHandler);
loginContext.login();
- LOG.info("successfully logged in.");
+ LOG.info("{} successfully logged in.", loginContextName);
return loginContext;
}
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/main/org/apache/zookeeper/SaslClientCallbackHandler.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/SaslClientCallbackHandler.java b/src/java/main/org/apache/zookeeper/SaslClientCallbackHandler.java
new file mode 100644
index 0000000..d6f5549
--- /dev/null
+++ b/src/java/main/org/apache/zookeeper/SaslClientCallbackHandler.java
@@ -0,0 +1,104 @@
+/**
+ * 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;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.sasl.AuthorizeCallback;
+import javax.security.sasl.RealmCallback;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This is used by the SASL mechanisms to get further information to complete
+ * the authentication. For example, a SASL mechanism might use this callback
+ * handler to do verification operation. The CallbackHandler interface here
+ * refers to javax.security.auth.callback.CallbackHandler. It should not be
+ * confused with ZooKeeper packet callbacks like
+ * org.apache.zookeeper.server.auth.SaslServerCallbackHandler.
+ */
+public class SaslClientCallbackHandler implements CallbackHandler {
+ private String password = null;
+ private static final Logger LOG = LoggerFactory.getLogger(SaslClientCallbackHandler.class);
+ private final String entity;
+ public SaslClientCallbackHandler(String password, String client) {
+ this.password = password;
+ this.entity = client;
+ }
+
+ public void handle(Callback[] callbacks) throws UnsupportedCallbackException {
+ for (Callback callback : callbacks) {
+ if (callback instanceof NameCallback) {
+ NameCallback nc = (NameCallback) callback;
+ nc.setName(nc.getDefaultName());
+ }
+ else {
+ if (callback instanceof PasswordCallback) {
+ PasswordCallback pc = (PasswordCallback)callback;
+ if (password != null) {
+ pc.setPassword(this.password.toCharArray());
+ } else {
+ LOG.warn("Could not login: the {} is being asked for a password, but the ZooKeeper {}" +
+ " code does not currently support obtaining a password from the user." +
+ " Make sure that the {} is configured to use a ticket cache (using" +
+ " the JAAS configuration setting 'useTicketCache=true)' and restart the {}. If" +
+ " you still get this message after that, the TGT in the ticket cache has expired and must" +
+ " be manually refreshed. To do so, first determine if you are using a password or a" +
+ " keytab. If the former, run kinit in a Unix shell in the environment of the user who" +
+ " is running this Zookeeper {} using the command" +
+ " 'kinit <princ>' (where <princ> is the name of the {}'s Kerberos principal)." +
+ " If the latter, do" +
+ " 'kinit -k -t <keytab> <princ>' (where <princ> is the name of the Kerberos principal, and" +
+ " <keytab> is the location of the keytab file). After manually refreshing your cache," +
+ " restart this {}. If you continue to see this message after manually refreshing" +
+ " your cache, ensure that your KDC host's clock is in sync with this host's clock.",
+ new Object[]{entity, entity, entity, entity, entity, entity, entity});
+ }
+ }
+ else {
+ if (callback instanceof RealmCallback) {
+ RealmCallback rc = (RealmCallback) callback;
+ rc.setText(rc.getDefaultText());
+ }
+ else {
+ if (callback instanceof AuthorizeCallback) {
+ AuthorizeCallback ac = (AuthorizeCallback) callback;
+ String authid = ac.getAuthenticationID();
+ String authzid = ac.getAuthorizationID();
+ if (authid.equals(authzid)) {
+ ac.setAuthorized(true);
+ } else {
+ ac.setAuthorized(false);
+ }
+ if (ac.isAuthorized()) {
+ ac.setAuthorizedID(authzid);
+ }
+ }
+ else {
+ throw new UnsupportedCallbackException(callback, "Unrecognized SASL " + entity + "Callback");
+ }
+ }
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/main/org/apache/zookeeper/client/ZooKeeperSaslClient.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/client/ZooKeeperSaslClient.java b/src/java/main/org/apache/zookeeper/client/ZooKeeperSaslClient.java
index 21ef0fa..f3c9d3c 100644
--- a/src/java/main/org/apache/zookeeper/client/ZooKeeperSaslClient.java
+++ b/src/java/main/org/apache/zookeeper/client/ZooKeeperSaslClient.java
@@ -19,22 +19,13 @@
package org.apache.zookeeper.client;
import java.io.IOException;
-import java.security.Principal;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import javax.security.auth.Subject;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
import javax.security.auth.login.AppConfigurationEntry;
import javax.security.auth.login.Configuration;
import javax.security.auth.login.LoginException;
-import javax.security.sasl.AuthorizeCallback;
-import javax.security.sasl.RealmCallback;
-import javax.security.sasl.Sasl;
import javax.security.sasl.SaslClient;
import javax.security.sasl.SaslException;
@@ -42,17 +33,13 @@ import org.apache.zookeeper.AsyncCallback;
import org.apache.zookeeper.ClientCnxn;
import org.apache.zookeeper.Environment;
import org.apache.zookeeper.Login;
+import org.apache.zookeeper.SaslClientCallbackHandler;
import org.apache.zookeeper.Watcher.Event.KeeperState;
import org.apache.zookeeper.ZooDefs;
import org.apache.zookeeper.data.Stat;
import org.apache.zookeeper.proto.GetSASLRequest;
import org.apache.zookeeper.proto.SetSASLResponse;
-import org.apache.zookeeper.server.auth.KerberosName;
-import org.ietf.jgss.GSSContext;
-import org.ietf.jgss.GSSCredential;
-import org.ietf.jgss.GSSException;
-import org.ietf.jgss.GSSManager;
-import org.ietf.jgss.Oid;
+import org.apache.zookeeper.util.SecurityUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -226,83 +213,14 @@ public class ZooKeeperSaslClient {
}
// note that the login object is static: it's shared amongst all zookeeper-related connections.
// in order to ensure the login is initialized only once, it must be synchronized the code snippet.
- login = new Login(loginContext, new ClientCallbackHandler(null));
+ login = new Login(loginContext, new SaslClientCallbackHandler(null, "Client"));
login.startThreadIfNeeded();
initializedLogin = true;
}
}
}
- Subject subject = login.getSubject();
- SaslClient saslClient;
- // Use subject.getPrincipals().isEmpty() as an indication of which SASL mechanism to use:
- // if empty, use DIGEST-MD5; otherwise, use GSSAPI.
- if (subject.getPrincipals().isEmpty()) {
- // no principals: must not be GSSAPI: use DIGEST-MD5 mechanism instead.
- LOG.info("Client will use DIGEST-MD5 as SASL mechanism.");
- String[] mechs = {"DIGEST-MD5"};
- String username = (String)(subject.getPublicCredentials().toArray()[0]);
- String password = (String)(subject.getPrivateCredentials().toArray()[0]);
- // "zk-sasl-md5" is a hard-wired 'domain' parameter shared with zookeeper server code (see ServerCnxnFactory.java)
- saslClient = Sasl.createSaslClient(mechs, username, "zookeeper", "zk-sasl-md5", null, new ClientCallbackHandler(password));
- return saslClient;
- }
- else { // GSSAPI.
- boolean usingNativeJgss =
- Boolean.getBoolean("sun.security.jgss.native");
- if (usingNativeJgss) {
- // http://docs.oracle.com/javase/6/docs/technotes/guides/security/jgss/jgss-features.html
- // """
- // In addition, when performing operations as a particular
- // Subject, e.g. Subject.doAs(...) or Subject.doAsPrivileged(...),
- // the to-be-used GSSCredential should be added to Subject's
- // private credential set. Otherwise, the GSS operations will
- // fail since no credential is found.
- // """
- try {
- GSSManager manager = GSSManager.getInstance();
- Oid krb5Mechanism = new Oid("1.2.840.113554.1.2.2");
- GSSCredential cred = manager.createCredential(null,
- GSSContext.DEFAULT_LIFETIME,
- krb5Mechanism,
- GSSCredential.INITIATE_ONLY);
- subject.getPrivateCredentials().add(cred);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Added private credential to subject: " + cred);
- }
- } catch (GSSException ex) {
- LOG.warn("Cannot add private credential to subject; " +
- "authentication at the server may fail", ex);
- }
- }
- final Object[] principals = subject.getPrincipals().toArray();
- // determine client principal from subject.
- final Principal clientPrincipal = (Principal)principals[0];
- final KerberosName clientKerberosName = new KerberosName(clientPrincipal.getName());
- // assume that server and client are in the same realm (by default; unless the system property
- // "zookeeper.server.realm" is set).
- String serverRealm = System.getProperty("zookeeper.server.realm",clientKerberosName.getRealm());
- KerberosName serviceKerberosName = new KerberosName(servicePrincipal+"@"+serverRealm);
- final String serviceName = serviceKerberosName.getServiceName();
- final String serviceHostname = serviceKerberosName.getHostName();
- final String clientPrincipalName = clientKerberosName.toString();
- try {
- saslClient = Subject.doAs(subject,new PrivilegedExceptionAction<SaslClient>() {
- public SaslClient run() throws SaslException {
- LOG.info("Client will use GSSAPI as SASL mechanism.");
- String[] mechs = {"GSSAPI"};
- LOG.debug("creating sasl client: client="+clientPrincipalName+";service="+serviceName+";serviceHostname="+serviceHostname);
- SaslClient saslClient = Sasl.createSaslClient(mechs,clientPrincipalName,serviceName,serviceHostname,null,new ClientCallbackHandler(null));
- return saslClient;
- }
- });
- return saslClient;
- }
- catch (Exception e) {
- LOG.error("Exception while trying to create SASL client", e);
- e.printStackTrace();
- return null;
- }
- }
+ return SecurityUtils.createSaslClient(login.getSubject(),
+ servicePrincipal, "zookeeper", "zk-sasl-md5", LOG, "Client");
} catch (LoginException e) {
// We throw LoginExceptions...
throw e;
@@ -471,75 +389,6 @@ public class ZooKeeperSaslClient {
}
}
- // The CallbackHandler interface here refers to
- // javax.security.auth.callback.CallbackHandler.
- // It should not be confused with Zookeeper packet callbacks like
- // org.apache.zookeeper.server.auth.SaslServerCallbackHandler.
- public static class ClientCallbackHandler implements CallbackHandler {
- private String password = null;
-
- public ClientCallbackHandler(String password) {
- this.password = password;
- }
-
- public void handle(Callback[] callbacks) throws
- UnsupportedCallbackException {
- for (Callback callback : callbacks) {
- if (callback instanceof NameCallback) {
- NameCallback nc = (NameCallback) callback;
- nc.setName(nc.getDefaultName());
- }
- else {
- if (callback instanceof PasswordCallback) {
- PasswordCallback pc = (PasswordCallback)callback;
- if (password != null) {
- pc.setPassword(this.password.toCharArray());
- } else {
- LOG.warn("Could not login: the client is being asked for a password, but the Zookeeper" +
- " client code does not currently support obtaining a password from the user." +
- " Make sure that the client is configured to use a ticket cache (using" +
- " the JAAS configuration setting 'useTicketCache=true)' and restart the client. If" +
- " you still get this message after that, the TGT in the ticket cache has expired and must" +
- " be manually refreshed. To do so, first determine if you are using a password or a" +
- " keytab. If the former, run kinit in a Unix shell in the environment of the user who" +
- " is running this Zookeeper client using the command" +
- " 'kinit <princ>' (where <princ> is the name of the client's Kerberos principal)." +
- " If the latter, do" +
- " 'kinit -k -t <keytab> <princ>' (where <princ> is the name of the Kerberos principal, and" +
- " <keytab> is the location of the keytab file). After manually refreshing your cache," +
- " restart this client. If you continue to see this message after manually refreshing" +
- " your cache, ensure that your KDC host's clock is in sync with this host's clock.");
- }
- }
- else {
- if (callback instanceof RealmCallback) {
- RealmCallback rc = (RealmCallback) callback;
- rc.setText(rc.getDefaultText());
- }
- else {
- if (callback instanceof AuthorizeCallback) {
- AuthorizeCallback ac = (AuthorizeCallback) callback;
- String authid = ac.getAuthenticationID();
- String authzid = ac.getAuthorizationID();
- if (authid.equals(authzid)) {
- ac.setAuthorized(true);
- } else {
- ac.setAuthorized(false);
- }
- if (ac.isAuthorized()) {
- ac.setAuthorizedID(authzid);
- }
- }
- else {
- throw new UnsupportedCallbackException(callback,"Unrecognized SASL ClientCallback");
- }
- }
- }
- }
- }
- }
- }
-
public boolean clientTunneledAuthenticationInProgress() {
if (!isSASLConfigured) {
return false;
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/main/org/apache/zookeeper/server/ZooKeeperSaslServer.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/ZooKeeperSaslServer.java b/src/java/main/org/apache/zookeeper/server/ZooKeeperSaslServer.java
index 71870ce..dd6ee8f 100644
--- a/src/java/main/org/apache/zookeeper/server/ZooKeeperSaslServer.java
+++ b/src/java/main/org/apache/zookeeper/server/ZooKeeperSaslServer.java
@@ -18,22 +18,12 @@
package org.apache.zookeeper.server;
-import java.security.Principal;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-
import javax.security.auth.Subject;
-import javax.security.sasl.Sasl;
import javax.security.sasl.SaslException;
import javax.security.sasl.SaslServer;
import org.apache.zookeeper.Login;
-import org.ietf.jgss.GSSContext;
-import org.ietf.jgss.GSSCredential;
-import org.ietf.jgss.GSSException;
-import org.ietf.jgss.GSSManager;
-import org.ietf.jgss.GSSName;
-import org.ietf.jgss.Oid;
+import org.apache.zookeeper.util.SecurityUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,107 +41,9 @@ public class ZooKeeperSaslServer {
private SaslServer createSaslServer(final Login login) {
synchronized (login) {
Subject subject = login.getSubject();
- if (subject != null) {
- // server is using a JAAS-authenticated subject: determine service principal name and hostname from zk server's subject.
- if (subject.getPrincipals().size() > 0) {
- try {
- final Object[] principals = subject.getPrincipals().toArray();
- final Principal servicePrincipal = (Principal)principals[0];
-
- // e.g. servicePrincipalNameAndHostname := "zookeeper/myhost.foo.com@FOO.COM"
- final String servicePrincipalNameAndHostname = servicePrincipal.getName();
-
- int indexOf = servicePrincipalNameAndHostname.indexOf("/");
-
- // e.g. servicePrincipalName := "zookeeper"
- final String servicePrincipalName = servicePrincipalNameAndHostname.substring(0, indexOf);
-
- // e.g. serviceHostnameAndKerbDomain := "myhost.foo.com@FOO.COM"
- final String serviceHostnameAndKerbDomain = servicePrincipalNameAndHostname.substring(indexOf+1,servicePrincipalNameAndHostname.length());
-
- indexOf = serviceHostnameAndKerbDomain.indexOf("@");
- // e.g. serviceHostname := "myhost.foo.com"
- final String serviceHostname = serviceHostnameAndKerbDomain.substring(0,indexOf);
-
- final String mech = "GSSAPI"; // TODO: should depend on zoo.cfg specified mechs, but if subject is non-null, it can be assumed to be GSSAPI.
-
- LOG.debug("serviceHostname is '"+ serviceHostname + "'");
- LOG.debug("servicePrincipalName is '"+ servicePrincipalName + "'");
- LOG.debug("SASL mechanism(mech) is '"+ mech +"'");
-
- boolean usingNativeJgss =
- Boolean.getBoolean("sun.security.jgss.native");
- if (usingNativeJgss) {
- // http://docs.oracle.com/javase/6/docs/technotes/guides/security/jgss/jgss-features.html
- // """
- // In addition, when performing operations as a particular
- // Subject, e.g. Subject.doAs(...) or
- // Subject.doAsPrivileged(...), the to-be-used
- // GSSCredential should be added to Subject's
- // private credential set. Otherwise, the GSS operations
- // will fail since no credential is found.
- // """
- try {
- GSSManager manager = GSSManager.getInstance();
- Oid krb5Mechanism = new Oid("1.2.840.113554.1.2.2");
- GSSName gssName = manager.createName(
- servicePrincipalName + "@" + serviceHostname,
- GSSName.NT_HOSTBASED_SERVICE);
- GSSCredential cred = manager.createCredential(gssName,
- GSSContext.DEFAULT_LIFETIME,
- krb5Mechanism,
- GSSCredential.ACCEPT_ONLY);
- subject.getPrivateCredentials().add(cred);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Added private credential to subject: " + cred);
- }
- } catch (GSSException ex) {
- LOG.warn("Cannot add private credential to subject; " +
- "clients authentication may fail", ex);
- }
- }
- try {
- return Subject.doAs(subject,new PrivilegedExceptionAction<SaslServer>() {
- public SaslServer run() {
- try {
- SaslServer saslServer;
- saslServer = Sasl.createSaslServer(mech, servicePrincipalName, serviceHostname, null, login.callbackHandler);
- return saslServer;
- }
- catch (SaslException e) {
- LOG.error("Zookeeper Server failed to create a SaslServer to interact with a client during session initiation: " + e);
- e.printStackTrace();
- return null;
- }
- }
- }
- );
- }
- catch (PrivilegedActionException e) {
- // TODO: exit server at this point(?)
- LOG.error("Zookeeper Quorum member experienced a PrivilegedActionException exception while creating a SaslServer using a JAAS principal context:" + e);
- e.printStackTrace();
- }
- }
- catch (IndexOutOfBoundsException e) {
- LOG.error("server principal name/hostname determination error: ", e);
- }
- }
- else {
- // JAAS non-GSSAPI authentication: assuming and supporting only DIGEST-MD5 mechanism for now.
- // TODO: use 'authMech=' value in zoo.cfg.
- try {
- SaslServer saslServer = Sasl.createSaslServer("DIGEST-MD5","zookeeper","zk-sasl-md5",null, login.callbackHandler);
- return saslServer;
- }
- catch (SaslException e) {
- LOG.error("Zookeeper Quorum member failed to create a SaslServer to interact with a client during session initiation", e);
- }
- }
- }
+ return SecurityUtils.createSaslServer(subject, "zookeeper",
+ "zk-sasl-md5", login.callbackHandler, LOG);
}
- LOG.error("failed to create saslServer object.");
- return null;
}
public byte[] evaluateResponse(byte[] response) throws SaslException {
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/main/org/apache/zookeeper/server/auth/SaslServerCallbackHandler.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/auth/SaslServerCallbackHandler.java b/src/java/main/org/apache/zookeeper/server/auth/SaslServerCallbackHandler.java
index 7fdffde..9f53a4d 100644
--- a/src/java/main/org/apache/zookeeper/server/auth/SaslServerCallbackHandler.java
+++ b/src/java/main/org/apache/zookeeper/server/auth/SaslServerCallbackHandler.java
@@ -46,13 +46,15 @@ public class SaslServerCallbackHandler implements CallbackHandler {
private String userName;
private final Map<String,String> credentials = new HashMap<String,String>();
- public SaslServerCallbackHandler(Configuration configuration) throws IOException {
- String serverSection = System.getProperty(ZooKeeperSaslServer.LOGIN_CONTEXT_NAME_KEY,
- ZooKeeperSaslServer.DEFAULT_LOGIN_CONTEXT_NAME);
+ public SaslServerCallbackHandler(Configuration configuration)
+ throws IOException {
+ String serverSection = System.getProperty(
+ ZooKeeperSaslServer.LOGIN_CONTEXT_NAME_KEY,
+ ZooKeeperSaslServer.DEFAULT_LOGIN_CONTEXT_NAME);
AppConfigurationEntry configurationEntries[] = configuration.getAppConfigurationEntry(serverSection);
if (configurationEntries == null) {
- String errorMessage = "Could not find a 'Server' entry in this configuration: Server cannot start.";
+ String errorMessage = "Could not find a '" + serverSection + "' entry in this configuration: Server cannot start.";
LOG.error(errorMessage);
throw new IOException(errorMessage);
}
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java b/src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java
index 78f3aa6..2a3d4fd 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java
+++ b/src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java
@@ -997,6 +997,8 @@ public class FastLeaderElection implements Election {
LOG.warn("Failed to unregister with JMX", e);
}
self.jmxLeaderElectionBean = null;
+ LOG.debug("Number of connection processing threads: {}",
+ manager.getConnectionThreadCount());
}
}
}
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/main/org/apache/zookeeper/server/quorum/Follower.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/quorum/Follower.java b/src/java/main/org/apache/zookeeper/server/quorum/Follower.java
index 043a522..9aa0d0b 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/Follower.java
+++ b/src/java/main/org/apache/zookeeper/server/quorum/Follower.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.net.InetSocketAddress;
import org.apache.jute.Record;
+import org.apache.zookeeper.server.quorum.QuorumPeer.QuorumServer;
import org.apache.zookeeper.server.util.SerializeUtils;
import org.apache.zookeeper.server.util.ZxidUtils;
import org.apache.zookeeper.txn.TxnHeader;
@@ -64,9 +65,9 @@ public class Follower extends Learner{
self.end_fle = 0;
fzk.registerJMX(new FollowerBean(this, zk), self.jmxLocalPeerBean);
try {
- InetSocketAddress addr = findLeader();
+ QuorumServer leaderServer = findLeader();
try {
- connectToLeader(addr);
+ connectToLeader(leaderServer.addr, leaderServer.hostname);
long newEpochZxid = registerWithLeader(Leader.FOLLOWERINFO);
//check to see if the leader zxid is lower than ours
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/main/org/apache/zookeeper/server/quorum/Leader.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/quorum/Leader.java b/src/java/main/org/apache/zookeeper/server/quorum/Leader.java
index c83d352..710745d 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/Leader.java
+++ b/src/java/main/org/apache/zookeeper/server/quorum/Leader.java
@@ -19,6 +19,7 @@
package org.apache.zookeeper.server.quorum;
import java.io.ByteArrayOutputStream;
+import java.io.BufferedInputStream;
import java.io.IOException;
import java.net.BindException;
import java.net.ServerSocket;
@@ -32,10 +33,12 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicLong;
+
+import javax.security.sasl.SaslException;
import org.apache.jute.BinaryOutputArchive;
import org.apache.zookeeper.server.FinalRequestProcessor;
@@ -318,7 +321,10 @@ public class Leader {
// in LearnerHandler switch to the syncLimit
s.setSoTimeout(self.tickTime * self.initLimit);
s.setTcpNoDelay(nodelay);
- LearnerHandler fh = new LearnerHandler(s, Leader.this);
+
+ BufferedInputStream is = new BufferedInputStream(
+ s.getInputStream());
+ LearnerHandler fh = new LearnerHandler(s, is, Leader.this);
fh.start();
} catch (SocketException e) {
if (stop) {
@@ -332,6 +338,8 @@ public class Leader {
} else {
throw e;
}
+ } catch (SaslException e){
+ LOG.error("Exception while connecting to quorum learner", e);
}
}
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/main/org/apache/zookeeper/server/quorum/Learner.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/quorum/Learner.java b/src/java/main/org/apache/zookeeper/server/quorum/Learner.java
index 647b8a2..749b274 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/Learner.java
+++ b/src/java/main/org/apache/zookeeper/server/quorum/Learner.java
@@ -39,8 +39,6 @@ import org.apache.jute.BinaryOutputArchive;
import org.apache.jute.InputArchive;
import org.apache.jute.OutputArchive;
import org.apache.jute.Record;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.zookeeper.server.Request;
import org.apache.zookeeper.server.ServerCnxn;
import org.apache.zookeeper.server.ZooTrace;
@@ -48,6 +46,8 @@ import org.apache.zookeeper.server.quorum.QuorumPeer.QuorumServer;
import org.apache.zookeeper.server.util.SerializeUtils;
import org.apache.zookeeper.server.util.ZxidUtils;
import org.apache.zookeeper.txn.TxnHeader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class is the superclass of two of the three main actors in a ZK
@@ -191,8 +191,8 @@ public class Learner {
/**
* Returns the address of the node we think is the leader.
*/
- protected InetSocketAddress findLeader() {
- InetSocketAddress addr = null;
+ protected QuorumServer findLeader() {
+ QuorumServer leaderServer = null;
// Find the leader by id
Vote current = self.getCurrentVote();
for (QuorumServer s : self.getView().values()) {
@@ -200,27 +200,28 @@ public class Learner {
// Ensure we have the leader's correct IP address before
// attempting to connect.
s.recreateSocketAddresses();
- addr = s.addr;
+ leaderServer = s;
break;
}
}
- if (addr == null) {
+ if (leaderServer == null) {
LOG.warn("Couldn't find the leader with id = "
+ current.getId());
}
- return addr;
+ return leaderServer;
}
/**
* Establish a connection with the Leader found by findLeader. Retries
* 5 times before giving up.
* @param addr - the address of the Leader to connect to.
- * @throws IOException - if the socket connection fails on the 5th attempt
+ * @throws IOException <li>if the socket connection fails on the 5th attempt</li>
+ * <li>if there is an authentication failure while connecting to leader</li>
* @throws ConnectException
* @throws InterruptedException
*/
- protected void connectToLeader(InetSocketAddress addr)
- throws IOException, ConnectException, InterruptedException {
+ protected void connectToLeader(InetSocketAddress addr, String hostname)
+ throws IOException, ConnectException, InterruptedException {
sock = new Socket();
sock.setSoTimeout(self.tickTime * self.initLimit);
for (int tries = 0; tries < 5; tries++) {
@@ -241,6 +242,9 @@ public class Learner {
}
Thread.sleep(1000);
}
+
+ self.authLearner.authenticate(sock, hostname);
+
leaderIs = BinaryInputArchive.getArchive(new BufferedInputStream(
sock.getInputStream()));
bufferedOutput = new BufferedOutputStream(sock.getOutputStream());
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java b/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java
index 8a748c7..51ed7e7 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java
+++ b/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java
@@ -32,6 +32,8 @@ import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
+import javax.security.sasl.SaslException;
+
import org.apache.jute.BinaryInputArchive;
import org.apache.jute.BinaryOutputArchive;
import org.apache.jute.Record;
@@ -153,15 +155,30 @@ public class LearnerHandler extends ZooKeeperThread {
private BinaryOutputArchive oa;
+ private final BufferedInputStream bufferedInput;
private BufferedOutputStream bufferedOutput;
- LearnerHandler(Socket sock, Leader leader) throws IOException {
+ LearnerHandler(Socket sock, BufferedInputStream bufferedInput,
+ Leader leader) throws IOException {
super("LearnerHandler-" + sock.getRemoteSocketAddress());
this.sock = sock;
this.leader = leader;
- leader.addLearnerHandler(this);
+ this.bufferedInput = bufferedInput;
+ try {
+ leader.self.authServer.authenticate(sock,
+ new DataInputStream(bufferedInput));
+ } catch (IOException e) {
+ LOG.error("Server failed to authenticate quorum learner, addr: {}, closing connection",
+ sock.getRemoteSocketAddress(), e);
+ try {
+ sock.close();
+ } catch (IOException ie) {
+ LOG.error("Exception while closing socket", ie);
+ }
+ throw new SaslException("Authentication failure: " + e.getMessage());
+ }
}
-
+
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
@@ -296,11 +313,11 @@ public class LearnerHandler extends ZooKeeperThread {
@Override
public void run() {
try {
+ leader.addLearnerHandler(this);
tickOfNextAckDeadline = leader.self.tick
+ leader.self.initLimit + leader.self.syncLimit;
- ia = BinaryInputArchive.getArchive(new BufferedInputStream(sock
- .getInputStream()));
+ ia = BinaryInputArchive.getArchive(bufferedInput);
bufferedOutput = new BufferedOutputStream(sock.getOutputStream());
oa = BinaryOutputArchive.getArchive(bufferedOutput);
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/main/org/apache/zookeeper/server/quorum/Observer.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/quorum/Observer.java b/src/java/main/org/apache/zookeeper/server/quorum/Observer.java
index e53f6f2..53f516f 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/Observer.java
+++ b/src/java/main/org/apache/zookeeper/server/quorum/Observer.java
@@ -19,11 +19,11 @@
package org.apache.zookeeper.server.quorum;
import java.io.IOException;
-import java.net.InetSocketAddress;
import org.apache.jute.Record;
import org.apache.zookeeper.server.ObserverBean;
import org.apache.zookeeper.server.Request;
+import org.apache.zookeeper.server.quorum.QuorumPeer.QuorumServer;
import org.apache.zookeeper.server.util.SerializeUtils;
import org.apache.zookeeper.txn.TxnHeader;
@@ -61,10 +61,10 @@ public class Observer extends Learner{
zk.registerJMX(new ObserverBean(this, zk), self.jmxLocalPeerBean);
try {
- InetSocketAddress addr = findLeader();
- LOG.info("Observing " + addr);
+ QuorumServer leaderServer = findLeader();
+ LOG.info("Observing " + leaderServer.addr);
try {
- connectToLeader(addr);
+ connectToLeader(leaderServer.addr, leaderServer.hostname);
long newLeaderZxid = registerWithLeader(Leader.OBSERVERINFO);
syncWithLeader(newLeaderZxid);
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java b/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java
index 20e5f16..74d1c1e 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java
+++ b/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java
@@ -18,6 +18,7 @@
package org.apache.zookeeper.server.quorum;
+import java.io.BufferedInputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -28,20 +29,28 @@ import java.net.SocketException;
import java.nio.BufferUnderflowException;
import java.nio.ByteBuffer;
import java.nio.channels.UnresolvedAddressException;
+import java.util.Collections;
import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import java.util.NoSuchElementException;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.Date;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.apache.zookeeper.server.ZooKeeperThread;
+import org.apache.zookeeper.server.quorum.auth.QuorumAuthLearner;
+import org.apache.zookeeper.server.quorum.auth.QuorumAuthServer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.zookeeper.server.ZooKeeperServer;
-import org.apache.zookeeper.server.ZooKeeperThread;
-
/**
* This class implements a connection manager for leader election using TCP. It
* maintains one connection for every pair of servers. The tricky part is to
@@ -89,7 +98,7 @@ public class QuorumCnxManager {
* Negative counter for observer server ids.
*/
- private long observerCounter = -1;
+ private AtomicLong observerCounter = new AtomicLong(-1);
/*
* Connection time out value in milliseconds
@@ -100,7 +109,20 @@ public class QuorumCnxManager {
/*
* Local IP address
*/
- final QuorumPeer self;
+ final long mySid;
+ final int socketTimeout;
+ final Map<Long, QuorumPeer.QuorumServer> view;
+ final boolean listenOnAllIPs;
+ private ThreadPoolExecutor connectionExecutor;
+ private final Set<Long> inprogressConnections = Collections
+ .synchronizedSet(new HashSet<Long>());
+ private QuorumAuthServer authServer;
+ private QuorumAuthLearner authLearner;
+ private boolean quorumSaslAuthEnabled;
+ /*
+ * Counter to count connection processing threads.
+ */
+ private AtomicInteger connectionThreadCnt = new AtomicInteger(0);
/*
* Mapping from Peer to Thread number
@@ -145,7 +167,14 @@ public class QuorumCnxManager {
long sid;
}
- public QuorumCnxManager(QuorumPeer self) {
+ public QuorumCnxManager(final long mySid,
+ Map<Long,QuorumPeer.QuorumServer> view,
+ QuorumAuthServer authServer,
+ QuorumAuthLearner authLearner,
+ int socketTimeout,
+ boolean listenOnAllIPs,
+ int quorumCnxnThreadsSize,
+ boolean quorumSaslAuthEnabled) {
this.recvQueue = new ArrayBlockingQueue<Message>(RECV_CAPACITY);
this.queueSendMap = new ConcurrentHashMap<Long, ArrayBlockingQueue<ByteBuffer>>();
this.senderWorkerMap = new ConcurrentHashMap<Long, SendWorker>();
@@ -155,13 +184,53 @@ public class QuorumCnxManager {
if(cnxToValue != null){
this.cnxTO = new Integer(cnxToValue);
}
-
- this.self = self;
+
+ this.mySid = mySid;
+ this.socketTimeout = socketTimeout;
+ this.view = view;
+ this.listenOnAllIPs = listenOnAllIPs;
+
+ initializeAuth(mySid, authServer, authLearner, quorumCnxnThreadsSize,
+ quorumSaslAuthEnabled);
// Starts listener thread that waits for connection requests
listener = new Listener();
}
+ private void initializeAuth(final long mySid,
+ final QuorumAuthServer authServer,
+ final QuorumAuthLearner authLearner,
+ final int quorumCnxnThreadsSize,
+ final boolean quorumSaslAuthEnabled) {
+ this.authServer = authServer;
+ this.authLearner = authLearner;
+ this.quorumSaslAuthEnabled = quorumSaslAuthEnabled;
+ if (!this.quorumSaslAuthEnabled) {
+ LOG.debug("Not initializing connection executor as quorum sasl auth is disabled");
+ return;
+ }
+
+ // init connection executors
+ final AtomicInteger threadIndex = new AtomicInteger(1);
+ SecurityManager s = System.getSecurityManager();
+ final ThreadGroup group = (s != null) ? s.getThreadGroup()
+ : Thread.currentThread().getThreadGroup();
+ ThreadFactory daemonThFactory = new ThreadFactory() {
+
+ @Override
+ public Thread newThread(Runnable r) {
+ Thread t = new Thread(group, r, "QuorumConnectionThread-"
+ + "[myid=" + mySid + "]-"
+ + threadIndex.getAndIncrement());
+ return t;
+ }
+ };
+ this.connectionExecutor = new ThreadPoolExecutor(3,
+ quorumCnxnThreadsSize, 60, TimeUnit.SECONDS,
+ new SynchronousQueue<Runnable>(), daemonThFactory);
+ this.connectionExecutor.allowCoreThreadTimeOut(true);
+ }
+
/**
* Invokes initiateConnection for testing purposes
*
@@ -173,7 +242,8 @@ public class QuorumCnxManager {
}
Socket sock = new Socket();
setSockOpts(sock);
- sock.connect(self.getVotingView().get(sid).electionAddr, cnxTO);
+ sock.connect(QuorumPeer.viewToVotingView(view).get(sid).electionAddr,
+ cnxTO);
initiateConnection(sock, sid);
}
@@ -181,28 +251,96 @@ public class QuorumCnxManager {
* If this server has initiated the connection, then it gives up on the
* connection if it loses challenge. Otherwise, it keeps the connection.
*/
- public boolean initiateConnection(Socket sock, Long sid) {
+ public void initiateConnection(final Socket sock, final Long sid) {
+ try {
+ startConnection(sock, sid);
+ } catch (IOException e) {
+ LOG.error("Exception while connecting, id: {}, addr: {}, closing learner connection",
+ new Object[] { sid, sock.getRemoteSocketAddress() }, e);
+ closeSocket(sock);
+ return;
+ }
+ }
+
+ /**
+ * Server will initiate the connection request to its peer server
+ * asynchronously via separate connection thread.
+ */
+ public void initiateConnectionAsync(final Socket sock, final Long sid) {
+ if(!inprogressConnections.add(sid)){
+ // simply return as there is a connection request to
+ // server 'sid' already in progress.
+ LOG.debug("Connection request to server id: {} is already in progress, so skipping this request",
+ sid);
+ closeSocket(sock);
+ return;
+ }
+ try {
+ connectionExecutor.execute(
+ new QuorumConnectionReqThread(sock, sid));
+ connectionThreadCnt.incrementAndGet();
+ } catch (Throwable e) {
+ // Imp: Safer side catching all type of exceptions and remove 'sid'
+ // from inprogress connections. This is to avoid blocking further
+ // connection requests from this 'sid' in case of errors.
+ inprogressConnections.remove(sid);
+ LOG.error("Exception while submitting quorum connection request", e);
+ closeSocket(sock);
+ }
+ }
+
+ /**
+ * Thread to send connection request to peer server.
+ */
+ private class QuorumConnectionReqThread extends ZooKeeperThread {
+ final Socket sock;
+ final Long sid;
+ QuorumConnectionReqThread(final Socket sock, final Long sid) {
+ super("QuorumConnectionReqThread-" + sid);
+ this.sock = sock;
+ this.sid = sid;
+ }
+
+ @Override
+ public void run() {
+ try{
+ initiateConnection(sock, sid);
+ } finally {
+ inprogressConnections.remove(sid);
+ }
+ }
+ }
+
+ private boolean startConnection(Socket sock, Long sid)
+ throws IOException {
DataOutputStream dout = null;
+ DataInputStream din = null;
try {
// Sending id and challenge
dout = new DataOutputStream(sock.getOutputStream());
- dout.writeLong(self.getId());
+ dout.writeLong(this.mySid);
dout.flush();
+
+ din = new DataInputStream(
+ new BufferedInputStream(sock.getInputStream()));
} catch (IOException e) {
LOG.warn("Ignoring exception reading or writing challenge: ", e);
closeSocket(sock);
return false;
}
-
+
+ // authenticate learner
+ authLearner.authenticate(sock, view.get(sid).hostname);
+
// If lost the challenge, then drop the new connection
- if (sid > self.getId()) {
+ if (sid > this.mySid) {
LOG.info("Have smaller server identifier, so dropping the " +
- "connection: (" + sid + ", " + self.getId() + ")");
+ "connection: (" + sid + ", " + this.mySid + ")");
closeSocket(sock);
// Otherwise proceed with the connection
} else {
SendWorker sw = new SendWorker(sock, sid);
- RecvWorker rw = new RecvWorker(sock, sid, sw);
+ RecvWorker rw = new RecvWorker(sock, din, sid, sw);
sw.setRecv(rw);
SendWorker vsw = senderWorkerMap.get(sid);
@@ -225,8 +363,6 @@ public class QuorumCnxManager {
return false;
}
-
-
/**
* If this server receives a connection request, then it gives up on the new
* connection if it wins. Notice that it checks whether it has a connection
@@ -234,12 +370,57 @@ public class QuorumCnxManager {
* possible long value to lose the challenge.
*
*/
- public void receiveConnection(Socket sock) {
+ public void receiveConnection(final Socket sock) {
+ DataInputStream din = null;
+ try {
+ din = new DataInputStream(
+ new BufferedInputStream(sock.getInputStream()));
+
+ handleConnection(sock, din);
+ } catch (IOException e) {
+ LOG.error("Exception handling connection, addr: {}, closing server connection",
+ sock.getRemoteSocketAddress());
+ closeSocket(sock);
+ }
+ }
+
+ /**
+ * Server receives a connection request and handles it asynchronously via
+ * separate thread.
+ */
+ public void receiveConnectionAsync(final Socket sock) {
+ try {
+ connectionExecutor.execute(
+ new QuorumConnectionReceiverThread(sock));
+ connectionThreadCnt.incrementAndGet();
+ } catch (Throwable e) {
+ LOG.error("Exception handling connection, addr: {}, closing server connection",
+ sock.getRemoteSocketAddress());
+ closeSocket(sock);
+ }
+ }
+
+ /**
+ * Thread to receive connection request from peer server.
+ */
+ private class QuorumConnectionReceiverThread extends ZooKeeperThread {
+ private final Socket sock;
+ QuorumConnectionReceiverThread(final Socket sock) {
+ super("QuorumConnectionReceiverThread-" + sock.getRemoteSocketAddress());
+ this.sock = sock;
+ }
+
+ @Override
+ public void run() {
+ receiveConnection(sock);
+ }
+ }
+
+ private void handleConnection(Socket sock, DataInputStream din)
+ throws IOException {
Long sid = null;
-
try {
// Read server id
- DataInputStream din = new DataInputStream(sock.getInputStream());
sid = din.readLong();
if (sid < 0) { // this is not a server id but a protocol version (see ZOOKEEPER-1633)
sid = din.readLong();
@@ -265,8 +446,7 @@ public class QuorumCnxManager {
* Choose identifier at random. We need a value to identify
* the connection.
*/
-
- sid = observerCounter--;
+ sid = observerCounter.getAndDecrement();
LOG.info("Setting arbitrary identifier to observer: " + sid);
}
} catch (IOException e) {
@@ -274,9 +454,12 @@ public class QuorumCnxManager {
LOG.warn("Exception reading or writing challenge: " + e.toString());
return;
}
-
+
+ // do authenticating learner
+ authServer.authenticate(sock, din);
+
//If wins the challenge, then close the new connection.
- if (sid < self.getId()) {
+ if (sid < this.mySid) {
/*
* This replica might still believe that the connection to sid is
* up, so we have to shut down the workers before trying to open a
@@ -297,7 +480,7 @@ public class QuorumCnxManager {
// Otherwise start worker threads to receive data.
} else {
SendWorker sw = new SendWorker(sock, sid);
- RecvWorker rw = new RecvWorker(sock, sid, sw);
+ RecvWorker rw = new RecvWorker(sock, din, sid, sw);
sw.setRecv(rw);
SendWorker vsw = senderWorkerMap.get(sid);
@@ -327,7 +510,7 @@ public class QuorumCnxManager {
/*
* If sending message to myself, then simply enqueue it (loopback).
*/
- if (self.getId() == sid) {
+ if (this.mySid == sid) {
b.position(0);
addToRecvQueue(new Message(b.duplicate(), sid));
/*
@@ -361,28 +544,32 @@ public class QuorumCnxManager {
*
* @param sid server id
*/
-
- synchronized void connectOne(long sid){
- if (senderWorkerMap.get(sid) == null){
+ synchronized public void connectOne(long sid){
+ if (!connectedToPeer(sid)){
InetSocketAddress electionAddr;
- if (self.quorumPeers.containsKey(sid)) {
- electionAddr = self.quorumPeers.get(sid).electionAddr;
+ if (view.containsKey(sid)) {
+ electionAddr = view.get(sid).electionAddr;
} else {
LOG.warn("Invalid server id: " + sid);
return;
}
try {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Opening channel to server " + sid);
- }
+ LOG.debug("Opening channel to server " + sid);
Socket sock = new Socket();
setSockOpts(sock);
- sock.connect(self.getView().get(sid).electionAddr, cnxTO);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Connected to server " + sid);
+ sock.connect(view.get(sid).electionAddr, cnxTO);
+ LOG.debug("Connected to server " + sid);
+
+ // Sends connection request asynchronously if the quorum
+ // sasl authentication is enabled. This is required because
+ // sasl server authentication process may take few seconds to
+ // finish, this may delay next peer connection requests.
+ if (quorumSaslAuthEnabled) {
+ initiateConnectionAsync(sock, sid);
+ } else {
+ initiateConnection(sock, sid);
}
- initiateConnection(sock, sid);
} catch (UnresolvedAddressException e) {
// Sun doesn't include the address that causes this
// exception to be thrown, also UAE cannot be wrapped cleanly
@@ -392,8 +579,8 @@ public class QuorumCnxManager {
+ " at election address " + electionAddr, e);
// Resolve hostname for this server in case the
// underlying ip address has changed.
- if (self.getView().containsKey(sid)) {
- self.getView().get(sid).recreateSocketAddresses();
+ if (view.containsKey(sid)) {
+ view.get(sid).recreateSocketAddresses();
}
throw e;
} catch (IOException e) {
@@ -403,8 +590,8 @@ public class QuorumCnxManager {
// We can't really tell if the server is actually down or it failed
// to connect to the server because the underlying IP address
// changed. Resolve the hostname again just in case.
- if (self.getView().containsKey(sid)) {
- self.getView().get(sid).recreateSocketAddresses();
+ if (view.containsKey(sid)) {
+ view.get(sid).recreateSocketAddresses();
}
}
} else {
@@ -451,6 +638,13 @@ public class QuorumCnxManager {
listener.halt();
softHalt();
+
+ // clear data structures used for auth
+ if (connectionExecutor != null) {
+ connectionExecutor.shutdown();
+ }
+ inprogressConnections.clear();
+ resetConnectionThreadCount();
}
/**
@@ -471,7 +665,7 @@ public class QuorumCnxManager {
*/
private void setSockOpts(Socket sock) throws SocketException {
sock.setTcpNoDelay(true);
- sock.setSoTimeout(self.tickTime * self.syncLimit);
+ sock.setSoTimeout(socketTimeout);
}
/**
@@ -494,11 +688,19 @@ public class QuorumCnxManager {
public long getThreadCount() {
return threadCnt.get();
}
+
+ /**
+ * Return number of connection processing threads.
+ */
+ public long getConnectionThreadCount() {
+ return connectionThreadCnt.get();
+ }
+
/**
- * Return reference to QuorumPeer
+ * Reset the value of connection processing threads count to zero.
*/
- public QuorumPeer getQuorumPeer() {
- return self;
+ private void resetConnectionThreadCount() {
+ connectionThreadCnt.set(0);
}
/**
@@ -525,22 +727,35 @@ public class QuorumCnxManager {
try {
ss = new ServerSocket();
ss.setReuseAddress(true);
- if (self.getQuorumListenOnAllIPs()) {
- int port = self.quorumPeers.get(self.getId()).electionAddr.getPort();
+ if (listenOnAllIPs) {
+ int port = view.get(QuorumCnxManager.this.mySid)
+ .electionAddr.getPort();
addr = new InetSocketAddress(port);
} else {
- addr = self.quorumPeers.get(self.getId()).electionAddr;
+ addr = view.get(QuorumCnxManager.this.mySid)
+ .electionAddr;
}
LOG.info("My election bind port: " + addr.toString());
- setName(self.quorumPeers.get(self.getId()).electionAddr
- .toString());
+ setName(view.get(QuorumCnxManager.this.mySid)
+ .electionAddr.toString());
ss.bind(addr);
while (!shutdown) {
Socket client = ss.accept();
setSockOpts(client);
LOG.info("Received connection request "
+ client.getRemoteSocketAddress());
- receiveConnection(client);
+
+ // Receive and handle the connection request
+ // asynchronously if the quorum sasl authentication is
+ // enabled. This is required because sasl server
+ // authentication process may take few seconds to finish,
+ // this may delay next peer connection requests.
+ if (quorumSaslAuthEnabled) {
+ receiveConnectionAsync(client);
+ } else {
+ receiveConnection(client);
+ }
+
numRetries = 0;
}
} catch (IOException e) {
@@ -562,7 +777,7 @@ public class QuorumCnxManager {
LOG.error("As I'm leaving the listener thread, "
+ "I won't be able to participate in leader "
+ "election any longer: "
- + self.quorumPeers.get(self.getId()).electionAddr);
+ + view.get(QuorumCnxManager.this.mySid).electionAddr);
}
}
@@ -573,7 +788,8 @@ public class QuorumCnxManager {
try{
LOG.debug("Trying to close listener: " + ss);
if(ss != null) {
- LOG.debug("Closing listener: " + self.getId());
+ LOG.debug("Closing listener: "
+ + QuorumCnxManager.this.mySid);
ss.close();
}
} catch (IOException e){
@@ -729,8 +945,9 @@ public class QuorumCnxManager {
}
}
} catch (Exception e) {
- LOG.warn("Exception when using channel: for id " + sid + " my id = " +
- self.getId() + " error = " + e);
+ LOG.warn("Exception when using channel: for id " + sid
+ + " my id = " + QuorumCnxManager.this.mySid
+ + " error = " + e);
}
this.finish();
LOG.warn("Send worker leaving thread");
@@ -745,16 +962,16 @@ public class QuorumCnxManager {
Long sid;
Socket sock;
volatile boolean running = true;
- DataInputStream din;
+ final DataInputStream din;
final SendWorker sw;
- RecvWorker(Socket sock, Long sid, SendWorker sw) {
+ RecvWorker(Socket sock, DataInputStream din, Long sid, SendWorker sw) {
super("RecvWorker:" + sid);
this.sid = sid;
this.sock = sock;
this.sw = sw;
+ this.din = din;
try {
- din = new DataInputStream(sock.getInputStream());
// OK to wait until socket disconnects while reading.
sock.setSoTimeout(0);
} catch (IOException e) {
@@ -807,8 +1024,8 @@ public class QuorumCnxManager {
addToRecvQueue(new Message(message.duplicate(), sid));
}
} catch (Exception e) {
- LOG.warn("Connection broken for id " + sid + ", my id = " +
- self.getId() + ", error = " , e);
+ LOG.warn("Connection broken for id " + sid + ", my id = "
+ + QuorumCnxManager.this.mySid + ", error = " , e);
} finally {
LOG.warn("Interrupting SendWorker");
sw.finish();
@@ -930,4 +1147,8 @@ public class QuorumCnxManager {
throws InterruptedException {
return recvQueue.poll(timeout, unit);
}
+
+ public boolean connectedToPeer(long peerSid) {
+ return senderWorkerMap.get(peerSid) != null;
+ }
}
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java b/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java
index 2f0f21b..2dbedcf 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java
+++ b/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java
@@ -34,8 +34,12 @@ import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
+
+import javax.security.sasl.SaslException;
import org.apache.zookeeper.common.AtomicFileOutputStream;
import org.apache.zookeeper.jmx.MBeanRegistry;
@@ -45,6 +49,13 @@ import org.apache.zookeeper.server.ZKDatabase;
import org.apache.zookeeper.server.ZooKeeperServer;
import org.apache.zookeeper.server.ZooKeeperThread;
import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
+import org.apache.zookeeper.server.quorum.auth.QuorumAuth;
+import org.apache.zookeeper.server.quorum.auth.QuorumAuthLearner;
+import org.apache.zookeeper.server.quorum.auth.QuorumAuthServer;
+import org.apache.zookeeper.server.quorum.auth.SaslQuorumAuthLearner;
+import org.apache.zookeeper.server.quorum.auth.SaslQuorumAuthServer;
+import org.apache.zookeeper.server.quorum.auth.NullQuorumAuthLearner;
+import org.apache.zookeeper.server.quorum.auth.NullQuorumAuthServer;
import org.apache.zookeeper.server.quorum.flexible.QuorumMaj;
import org.apache.zookeeper.server.quorum.flexible.QuorumVerifier;
import org.apache.zookeeper.server.util.ZxidUtils;
@@ -85,6 +96,8 @@ public class QuorumPeer extends ZooKeeperThread implements QuorumStats.Provider
LocalPeerBean jmxLocalPeerBean;
LeaderElectionBean jmxLeaderElectionBean;
QuorumCnxManager qcm;
+ QuorumAuthServer authServer;
+ QuorumAuthLearner authLearner;
/* ZKDatabase is a top level member of quorumpeer
* which will be used in all the zookeeperservers
@@ -102,7 +115,8 @@ public class QuorumPeer extends ZooKeeperThread implements QuorumStats.Provider
this.electionAddr = electionAddr;
}
- private QuorumServer(long id, InetSocketAddress addr) {
+ // VisibleForTesting
+ public QuorumServer(long id, InetSocketAddress addr) {
this.id = id;
this.addr = addr;
this.electionAddr = null;
@@ -338,6 +352,50 @@ public class QuorumPeer extends ZooKeeperThread implements QuorumStats.Provider
protected boolean quorumListenOnAllIPs = false;
/**
+ * Enable/Disables quorum authentication using sasl. Defaulting to false.
+ */
+ protected boolean quorumSaslEnableAuth;
+
+ /**
+ * If this is false, quorum peer server will accept another quorum peer client
+ * connection even if the authentication did not succeed. This can be used while
+ * upgrading ZooKeeper server. Defaulting to false (required).
+ */
+ protected boolean quorumServerSaslAuthRequired;
+
+ /**
+ * If this is false, quorum peer learner will talk to quorum peer server
+ * without authentication. This can be used while upgrading ZooKeeper
+ * server. Defaulting to false (required).
+ */
+ protected boolean quorumLearnerSaslAuthRequired;
+
+ /**
+ * Kerberos quorum service principal. Defaulting to 'zkquorum/localhost'.
+ */
+ protected String quorumServicePrincipal;
+
+ /**
+ * Quorum learner login context name in jaas-conf file to read the kerberos
+ * security details. Defaulting to 'QuorumLearner'.
+ */
+ protected String quorumLearnerLoginContext;
+
+ /**
+ * Quorum server login context name in jaas-conf file to read the kerberos
+ * security details. Defaulting to 'QuorumServer'.
+ */
+ protected String quorumServerLoginContext;
+
+ // TODO: need to tune the default value of thread size
+ private static final int QUORUM_CNXN_THREADS_SIZE_DEFAULT_VALUE = 20;
+ /**
+ * The maximum number of threads to allow in the connectionExecutors thread
+ * pool which will be used to initiate quorum server connections.
+ */
+ protected int quorumCnxnThreadsSize = QUORUM_CNXN_THREADS_SIZE_DEFAULT_VALUE;
+
+ /**
* @deprecated As of release 3.4.0, this class has been deprecated, since
* it is used with one of the udp-based versions of leader election, which
* we are also deprecating.
@@ -449,10 +507,15 @@ public class QuorumPeer extends ZooKeeperThread implements QuorumStats.Provider
private FileTxnSnapLog logFactory = null;
private final QuorumStats quorumStats;
-
- public QuorumPeer() {
+
+ public static QuorumPeer testingQuorumPeer() throws SaslException {
+ return new QuorumPeer();
+ }
+
+ private QuorumPeer() throws SaslException {
super("QuorumPeer");
quorumStats = new QuorumStats(this);
+ initialize();
}
@@ -490,7 +553,24 @@ public class QuorumPeer extends ZooKeeperThread implements QuorumStats.Provider
this.quorumConfig = new QuorumMaj(countParticipants(quorumPeers));
else this.quorumConfig = quorumConfig;
}
-
+
+ public void initialize() throws SaslException {
+ // init quorum auth server & learner
+ if (isQuorumSaslAuthEnabled()) {
+ Set<String> authzHosts = new HashSet<String>();
+ for (QuorumServer qs : getView().values()) {
+ authzHosts.add(qs.hostname);
+ }
+ authServer = new SaslQuorumAuthServer(isQuorumServerSaslAuthRequired(),
+ quorumServerLoginContext, authzHosts);
+ authLearner = new SaslQuorumAuthLearner(isQuorumLearnerSaslAuthRequired(),
+ quorumServicePrincipal, quorumLearnerLoginContext);
+ } else {
+ authServer = new NullQuorumAuthServer();
+ authLearner = new NullQuorumAuthLearner();
+ }
+ }
+
QuorumStats quorumStats() {
return quorumStats;
}
@@ -686,7 +766,7 @@ public class QuorumPeer extends ZooKeeperThread implements QuorumStats.Provider
le = new AuthFastLeaderElection(this, true);
break;
case 3:
- qcm = new QuorumCnxManager(this);
+ qcm = createCnxnManager();
QuorumCnxManager.Listener listener = qcm.listener;
if(listener != null){
listener.start();
@@ -903,33 +983,37 @@ public class QuorumPeer extends ZooKeeperThread implements QuorumStats.Provider
zkDb.close();
} catch (IOException ie) {
LOG.warn("Error closing logs ", ie);
- }
+ }
}
/**
* A 'view' is a node's current opinion of the membership of the entire
- * ensemble.
+ * ensemble.
*/
public Map<Long,QuorumPeer.QuorumServer> getView() {
return Collections.unmodifiableMap(this.quorumPeers);
}
-
+
/**
* Observers are not contained in this view, only nodes with
- * PeerType=PARTICIPANT.
+ * PeerType=PARTICIPANT.
*/
public Map<Long,QuorumPeer.QuorumServer> getVotingView() {
- Map<Long,QuorumPeer.QuorumServer> ret =
+ return QuorumPeer.viewToVotingView(getView());
+ }
+
+ static Map<Long,QuorumPeer.QuorumServer> viewToVotingView(
+ Map<Long,QuorumPeer.QuorumServer> view) {
+ Map<Long,QuorumPeer.QuorumServer> ret =
new HashMap<Long, QuorumPeer.QuorumServer>();
- Map<Long,QuorumPeer.QuorumServer> view = getView();
- for (QuorumServer server : view.values()) {
+ for (QuorumServer server : view.values()) {
if (server.type == LearnerType.PARTICIPANT) {
ret.put(server.id, server);
}
- }
+ }
return ret;
}
-
+
/**
* Returns only observers, no followers.
*/
@@ -1306,4 +1390,73 @@ public class QuorumPeer extends ZooKeeperThread implements QuorumStats.Provider
}
}
+ void setQuorumServerSaslRequired(boolean serverSaslRequired) {
+ quorumServerSaslAuthRequired = serverSaslRequired;
+ LOG.info("{} set to {}", QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED,
+ serverSaslRequired);
+ }
+
+ void setQuorumLearnerSaslRequired(boolean learnerSaslRequired) {
+ quorumLearnerSaslAuthRequired = learnerSaslRequired;
+ LOG.info("{} set to {}", QuorumAuth.QUORUM_LEARNER_SASL_AUTH_REQUIRED,
+ learnerSaslRequired);
+ }
+
+ void setQuorumSaslEnabled(boolean enableAuth) {
+ quorumSaslEnableAuth = enableAuth;
+ if (!quorumSaslEnableAuth) {
+ LOG.info("QuorumPeer communication is not secured!");
+ } else {
+ LOG.info("{} set to {}",
+ QuorumAuth.QUORUM_SASL_AUTH_ENABLED, enableAuth);
+ }
+ }
+
+ void setQuorumServicePrincipal(String servicePrincipal) {
+ quorumServicePrincipal = servicePrincipal;
+ LOG.info("{} set to {}",QuorumAuth.QUORUM_KERBEROS_SERVICE_PRINCIPAL,
+ quorumServicePrincipal);
+ }
+
+ void setQuorumLearnerLoginContext(String learnerContext) {
+ quorumLearnerLoginContext = learnerContext;
+ LOG.info("{} set to {}", QuorumAuth.QUORUM_LEARNER_SASL_LOGIN_CONTEXT,
+ quorumLearnerLoginContext);
+ }
+
+ void setQuorumServerLoginContext(String serverContext) {
+ quorumServerLoginContext = serverContext;
+ LOG.info("{} set to {}", QuorumAuth.QUORUM_SERVER_SASL_LOGIN_CONTEXT,
+ quorumServerLoginContext);
+ }
+
+ void setQuorumCnxnThreadsSize(int qCnxnThreadsSize) {
+ if (qCnxnThreadsSize > QUORUM_CNXN_THREADS_SIZE_DEFAULT_VALUE) {
+ quorumCnxnThreadsSize = qCnxnThreadsSize;
+ }
+ LOG.info("quorum.cnxn.threads.size set to {}", quorumCnxnThreadsSize);
+ }
+
+ boolean isQuorumSaslAuthEnabled() {
+ return quorumSaslEnableAuth;
+ }
+
+ private boolean isQuorumServerSaslAuthRequired() {
+ return quorumServerSaslAuthRequired;
+ }
+
+ private boolean isQuorumLearnerSaslAuthRequired() {
+ return quorumLearnerSaslAuthRequired;
+ }
+
+ public QuorumCnxManager createCnxnManager() {
+ return new QuorumCnxManager(this.getId(),
+ this.getView(),
+ this.authServer,
+ this.authLearner,
+ this.tickTime * this.syncLimit,
+ this.getQuorumListenOnAllIPs(),
+ this.quorumCnxnThreadsSize,
+ this.isQuorumSaslAuthEnabled());
+ }
}
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java b/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java
index 0924ef6..621f830 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java
+++ b/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java
@@ -38,6 +38,7 @@ import org.slf4j.MDC;
import org.apache.zookeeper.server.ZooKeeperServer;
import org.apache.zookeeper.server.quorum.QuorumPeer.LearnerType;
import org.apache.zookeeper.server.quorum.QuorumPeer.QuorumServer;
+import org.apache.zookeeper.server.quorum.auth.QuorumAuth;
import org.apache.zookeeper.server.quorum.flexible.QuorumHierarchical;
import org.apache.zookeeper.server.quorum.flexible.QuorumMaj;
import org.apache.zookeeper.server.quorum.flexible.QuorumVerifier;
@@ -75,7 +76,16 @@ public class QuorumPeerConfig {
protected boolean syncEnabled = true;
protected LearnerType peerType = LearnerType.PARTICIPANT;
-
+
+ /** Configurations for the quorumpeer-to-quorumpeer sasl authentication */
+ protected boolean quorumServerRequireSasl = false;
+ protected boolean quorumLearnerRequireSasl = false;
+ protected boolean quorumEnableSasl = false;
+ protected String quorumServicePrincipal = QuorumAuth.QUORUM_KERBEROS_SERVICE_PRINCIPAL_DEFAULT_VALUE;
+ protected String quorumLearnerLoginContext = QuorumAuth.QUORUM_LEARNER_SASL_LOGIN_CONTEXT_DFAULT_VALUE;
+ protected String quorumServerLoginContext = QuorumAuth.QUORUM_SERVER_SASL_LOGIN_CONTEXT_DFAULT_VALUE;
+ protected int quorumCnxnThreadsSize;
+
/**
* Minimum snapshot retain count.
* @see org.apache.zookeeper.server.PurgeTxnLog#purge(File, File, int)
@@ -246,11 +256,45 @@ public class QuorumPeerConfig {
int dot = key.indexOf('.');
long sid = Long.parseLong(key.substring(dot + 1));
serverWeight.put(sid, Long.parseLong(value));
+ } else if (key.equals(QuorumAuth.QUORUM_SASL_AUTH_ENABLED)) {
+ quorumEnableSasl = Boolean.parseBoolean(value);
+ } else if (key.equals(QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED)) {
+ quorumServerRequireSasl = Boolean.parseBoolean(value);
+ } else if (key.equals(QuorumAuth.QUORUM_LEARNER_SASL_AUTH_REQUIRED)) {
+ quorumLearnerRequireSasl = Boolean.parseBoolean(value);
+ } else if (key.equals(QuorumAuth.QUORUM_LEARNER_SASL_LOGIN_CONTEXT)) {
+ quorumLearnerLoginContext = value;
+ } else if (key.equals(QuorumAuth.QUORUM_SERVER_SASL_LOGIN_CONTEXT)) {
+ quorumServerLoginContext = value;
+ } else if (key.equals(QuorumAuth.QUORUM_KERBEROS_SERVICE_PRINCIPAL)) {
+ quorumServicePrincipal = value;
+ } else if (key.equals("quorum.cnxn.threads.size")) {
+ quorumCnxnThreadsSize = Integer.parseInt(value);
} else {
System.setProperty("zookeeper." + key, value);
}
}
-
+ if (!quorumEnableSasl && quorumServerRequireSasl) {
+ throw new IllegalArgumentException(
+ QuorumAuth.QUORUM_SASL_AUTH_ENABLED
+ + " is disabled, so cannot enable "
+ + QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED);
+ }
+ if (!quorumEnableSasl && quorumLearnerRequireSasl) {
+ throw new IllegalArgumentException(
+ QuorumAuth.QUORUM_SASL_AUTH_ENABLED
+ + " is disabled, so cannot enable "
+ + QuorumAuth.QUORUM_LEARNER_SASL_AUTH_REQUIRED);
+ }
+ // If quorumpeer learner is not auth enabled then self won't be able to
+ // join quorum. So this condition is ensuring that the quorumpeer learner
+ // is also auth enabled while enabling quorum server require sasl.
+ if (!quorumLearnerRequireSasl && quorumServerRequireSasl) {
+ throw new IllegalArgumentException(
+ QuorumAuth.QUORUM_LEARNER_SASL_AUTH_REQUIRED
+ + " is disabled, so cannot enable "
+ + QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED);
+ }
// Reset to MIN_SNAP_RETAIN_COUNT if invalid (less than 3)
// PurgeTxnLog.purge(File, File, int) will not allow to purge less
// than 3.
[2/4] zookeeper git commit: ZOOKEEPER-1045: Support Quorum Peer
mutual authentication via SASL (rakeshr via phunt)
Posted by ph...@apache.org.
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/test/org/apache/zookeeper/server/quorum/QuorumCnxManagerTest.java
----------------------------------------------------------------------
diff --git a/src/java/test/org/apache/zookeeper/server/quorum/QuorumCnxManagerTest.java b/src/java/test/org/apache/zookeeper/server/quorum/QuorumCnxManagerTest.java
new file mode 100644
index 0000000..6b6c0b4
--- /dev/null
+++ b/src/java/test/org/apache/zookeeper/server/quorum/QuorumCnxManagerTest.java
@@ -0,0 +1,925 @@
+/**
+ * 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.server.quorum;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+import javax.security.sasl.SaslException;
+
+import org.apache.jute.BinaryOutputArchive;
+import org.apache.zookeeper.PortAssignment;
+import org.apache.zookeeper.ZKTestCase;
+import org.apache.zookeeper.server.ServerCnxn;
+import org.apache.zookeeper.server.ServerCnxnFactory;
+import org.apache.zookeeper.server.ZKDatabase;
+import org.apache.zookeeper.server.ZooKeeperServer;
+import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
+import org.apache.zookeeper.server.quorum.QuorumPeer.QuorumServer;
+import org.apache.zookeeper.server.quorum.auth.NullQuorumAuthLearner;
+import org.apache.zookeeper.server.quorum.auth.NullQuorumAuthServer;
+import org.apache.zookeeper.server.quorum.auth.QuorumAuth;
+import org.apache.zookeeper.server.quorum.auth.QuorumAuthLearner;
+import org.apache.zookeeper.server.quorum.auth.QuorumAuthServer;
+import org.apache.zookeeper.server.quorum.auth.SaslQuorumAuthLearner;
+import org.apache.zookeeper.server.quorum.auth.SaslQuorumAuthServer;
+import org.apache.zookeeper.server.quorum.flexible.QuorumMaj;
+import org.apache.zookeeper.test.ClientBase;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class QuorumCnxManagerTest extends ZKTestCase {
+ private static final Logger LOG = LoggerFactory.getLogger(QuorumCnxManagerTest.class);
+ private int count;
+ private HashMap<Long,QuorumServer> peers;
+ private int peerQuorumPort[];
+ private int peerClientPort[];
+ private ThreadPoolExecutor executor;
+ /**
+ * The maximum number of threads to allow in the connectionExecutors thread
+ * pool which will be used to initiate quorum server connections. Defaulting to 20.
+ * TODO: Need to tune this param.
+ */
+ private final int quorumCnxnThreadsSize = 20;
+ private Set<String> authzHosts;
+
+ private static File saslConfigFile = null;
+
+ @BeforeClass
+ public static void setupSasl() throws Exception {
+ String jaasEntries = new String(""
+ + "QuorumServer {\n"
+ + " org.apache.zookeeper.server.auth.DigestLoginModule required\n"
+ + " user_test=\"mypassword\";\n"
+ + "};\n"
+ + "QuorumLearner {\n"
+ + " org.apache.zookeeper.server.auth.DigestLoginModule required\n"
+ + " username=\"test\"\n"
+ + " password=\"mypassword\";\n"
+ + "};\n"
+ + "QuorumLearnerInvalid {\n"
+ + " org.apache.zookeeper.server.auth.DigestLoginModule required\n"
+ + " username=\"test\"\n"
+ + " password=\"invalid\";\n"
+ + "};\n");
+
+ saslConfigFile = File.createTempFile("jaas.", ".conf");
+ FileWriter fwriter = new FileWriter(saslConfigFile);
+ fwriter.write(jaasEntries);
+ fwriter.close();
+ System.setProperty("java.security.auth.login.config",
+ saslConfigFile.getAbsolutePath());
+ }
+
+ @AfterClass
+ public static void cleanupSasl() throws Exception {
+ if (saslConfigFile != null) {
+ saslConfigFile.delete();
+ }
+ }
+
+ @Before
+ public void setUp() throws Exception {
+ this.count = 3;
+ this.peers = new HashMap<Long,QuorumServer>(count);
+ peerQuorumPort = new int[count];
+ peerClientPort = new int[count];
+ authzHosts = new HashSet<String>();
+ for(int i = 0; i < count; i++) {
+ peerQuorumPort[i] = PortAssignment.unique();
+ peerClientPort[i] = PortAssignment.unique();
+ QuorumServer qs = new QuorumServer(i, "0.0.0.0",
+ peerQuorumPort[i], PortAssignment.unique(), null);
+ peers.put(Long.valueOf(i), qs);
+ authzHosts.add(qs.hostname);
+ }
+ executor = new ThreadPoolExecutor(3, 10,
+ 60, TimeUnit.SECONDS, new SynchronousQueue<Runnable>());
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ if (executor != null) {
+ executor.shutdownNow();
+ }
+ }
+
+ @Test(timeout = 30000)
+ public void testNoAuthConnection() throws Exception {
+ QuorumCnxManager peer0 = createAndStartManager(0);
+ QuorumCnxManager peer1 = createAndStartManager(1);
+
+ peer0.connectOne(1);
+ assertEventuallyConnected(peer0, 1);
+ }
+
+ @Test(timeout = 30000)
+ public void testAuthConnection() throws Exception {
+ QuorumCnxManager peer0 = createAndStartManager(0, "QuorumServer",
+ "QuorumLearner", true, true);
+ QuorumCnxManager peer1 = createAndStartManager(1, "QuorumServer",
+ "QuorumLearner", true, true);
+ peer0.connectOne(1);
+ assertEventuallyConnected(peer0, 1);
+ }
+
+ /**
+ * Peer0 has no auth configured, Peer1 has auth configured.
+ * Peer1 connects to peer0, because null auth server sees an auth packet and connection succeeds.
+ * Peer0 connects to peer1, but connection isn't initiated because
+ * peer0's sid is lower than peer1's
+ */
+ @Test(timeout = 30000)
+ public void testClientAuthAgainstNoAuthServerWithLowerSid()
+ throws Exception {
+ QuorumCnxManager peer0 = createAndStartManager(0);
+ QuorumCnxManager peer1 = createAndStartManager(1, "QuorumServer",
+ "QuorumLearner", false, false);
+ peer1.connectOne(0);
+ peer0.connectOne(1);
+ assertEventuallyConnected(peer0, 1);
+ }
+
+ /**
+ * Peer0 has auth configured, Peer1 has no auth configured.
+ * Peer1 connects to peer0, but is disconnected, because peer1's sid is
+ * higher than peer0.
+ * Peer0 connects to peer1, but is disconnected, because peer1 cannot
+ * handle auth.
+ */
+ @Test(timeout = 30000)
+ public void testClientAuthAgainstNoAuthServerWithHigherSid()
+ throws Exception {
+ QuorumCnxManager peer0 = createAndStartManager(0, "QuorumServer",
+ "QuorumLearner", false, false);
+ QuorumCnxManager peer1 = createAndStartManager(1);
+ peer0.connectOne(1);
+ peer1.connectOne(0);
+ assertEventuallyConnected(peer0, 1);
+ }
+
+ /**
+ * No auth learner connects to a server that requires auth, when the server
+ * has a higher sid.
+ * The connection should fail in both directions.
+ */
+ @Test(timeout = 30000)
+ public void testNoAuthLearnerConnectToAuthRequiredServerWithLowerSid()
+ throws Exception {
+ QuorumCnxManager peer0 = createAndStartManager(0, "QuorumServer",
+ "QuorumLearner", true, true);
+ QuorumCnxManager peer1 = createAndStartManager(1);
+ peer0.connectOne(1);
+ peer1.connectOne(0);
+ assertEventuallyNotConnected(peer0, 1);
+ }
+
+ /**
+ * No auth learner connects to a server that requires auth, when the server
+ * has a higher sid.
+ * The connection should fail in both directions.
+ */
+ @Test(timeout = 30000)
+ public void testNoAuthLearnerConnectToAuthRequiredServerWithHigherSid()
+ throws Exception {
+ QuorumCnxManager peer0 = createAndStartManager(0);
+ QuorumCnxManager peer1 = createAndStartManager(1, "QuorumServer",
+ "QuorumLearner", true, true);
+ peer0.connectOne(1);
+ peer1.connectOne(0);
+ assertEventuallyNotConnected(peer0, 1);
+ }
+
+ /**
+ * An auth learner connects to a auth server, but the credentials are bad.
+ * The peer with the higher sid has the bad credentials.
+ * The connection will be denied.
+ */
+ @Test(timeout = 30000)
+ public void testAuthLearnerBadCredToAuthRequiredServerWithLowerSid()
+ throws Exception {
+ QuorumCnxManager peer0 = createAndStartManager(0, "QuorumServer",
+ "QuorumLearner", true, true);
+ QuorumCnxManager peer1 = createAndStartManager(1, "QuorumServer",
+ "QuorumLearnerInvalid", true, true);
+ peer0.connectOne(1);
+ peer1.connectOne(0);
+
+ assertEventuallyNotConnected(peer0, 1);
+ }
+
+ /**
+ * An auth learner connects to a auth server, but the credentials are bad.
+ * The peer with the lower sid has the bad credentials.
+ * The connection will work, because peer1 is connecting to peer0.
+ */
+ @Test(timeout = 30000)
+ public void testAuthLearnerBadCredToAuthRequiredServerWithHigherSid()
+ throws Exception {
+ QuorumCnxManager peer0 = createAndStartManager(0, "QuorumServer",
+ "QuorumLearnerInvalid", true, true);
+ QuorumCnxManager peer1 = createAndStartManager(1, "QuorumServer",
+ "QuorumLearner", true, true);
+ peer0.connectOne(1);
+ peer1.connectOne(0);
+ assertEventuallyConnected(peer0, 1);
+ assertEventuallyConnected(peer1, 0);
+ }
+
+ /**
+ * An auth learner connects to a auth server, but the credentials are bad.
+ * The connection should fail in both directions.
+ */
+ @Test(timeout = 30000)
+ public void testAuthLearnerBadCredToNoAuthServerWithHigherSid() throws Exception {
+ QuorumCnxManager peer0 = createAndStartManager(0, "QuorumServer",
+ "QuorumLearner", false, false);
+ QuorumCnxManager peer1 = createAndStartManager(1, "QuorumServer",
+ "QuorumLearnerInvalid", true, true);
+ peer1.connectOne(0);
+ assertEventuallyNotConnected(peer1, 0);
+ }
+
+ /**
+ * An auth learner connects to a auth server, but the credentials are bad.
+ * The peer with the lower sid has the bad credentials.
+ * The connection will work, because peer0 is connecting to peer1 and peer1
+ * server doesn't require sasl
+ */
+ @Test(timeout = 30000)
+ public void testAuthLearnerBadCredToNoAuthServerWithLowerSid() throws Exception {
+ QuorumCnxManager peer0 = createAndStartManager(0, "QuorumServer",
+ "QuorumLearnerInvalid", true, true);
+ QuorumCnxManager peer1 = createAndStartManager(1, "QuorumServer",
+ "QuorumLearner", false, true);
+ peer0.connectOne(1);
+ assertEventuallyConnected(peer0, 1);
+ assertEventuallyConnected(peer1, 0);
+ }
+
+ /**
+ * Test verifies that the LearnerHandler should authenticate the connecting
+ * quorumpeer. Here its simulating authentication failure and it should throw
+ * SaslException
+ */
+ @Test(timeout = 30000)
+ public void testLearnerHandlerAuthFailed() throws Exception {
+ File testData = ClientBase.createTmpDir();
+ Socket leaderSocket = getSocketPair();
+ File tmpDir = File.createTempFile("test", ".dir", testData);
+ tmpDir.delete();
+ tmpDir.mkdir();
+ Leader leader = null;
+ QuorumPeer peer = createQuorumPeer(tmpDir, true, false, true,
+ "QuorumLearner", "QuorumServer",
+ QuorumAuth.QUORUM_KERBEROS_SERVICE_PRINCIPAL_DEFAULT_VALUE);
+ leader = createLeader(tmpDir, peer);
+ peer.leader = leader;
+
+ // authentication failed as qpserver didn't get auth packet from qpclient.
+ try {
+ new LearnerHandler(leaderSocket,
+ new BufferedInputStream(leaderSocket.getInputStream()), leader);
+ Assert.fail("Must throw exception as there is an authentication failure");
+ } catch (SaslException e){
+ Assert.assertEquals("Mistakely added to learners", 0,
+ leader.getLearners().size());
+ }
+ ClientBase.recursiveDelete(testData);
+ }
+
+ /**
+ * Test verifies that the Leader should authenticate the connecting learner
+ * quorumpeer. After the successful authentication it should add this
+ * learner to the learnerHandler list.
+ */
+ @Test(timeout = 30000)
+ public void testAuthLearnerConnectsToServerWithAuthRequired()
+ throws Exception {
+ File testDataLearner = ClientBase.createTmpDir();
+ File tmpDir = File.createTempFile("test", ".dir", testDataLearner);
+ tmpDir.delete();
+ FileTxnSnapLog ftsl = new FileTxnSnapLog(tmpDir, tmpDir);
+ QuorumPeer learnerPeer = createQuorumPeer(tmpDir, true, true, true,
+ "QuorumLearner", "QuorumServer",
+ QuorumAuth.QUORUM_KERBEROS_SERVICE_PRINCIPAL_DEFAULT_VALUE);
+ SimpleLearner sl = new SimpleLearner(ftsl, learnerPeer);
+
+ File testDataLeader = ClientBase.createTmpDir();
+ tmpDir = File.createTempFile("test", ".dir", testDataLeader);
+ tmpDir.delete();
+ tmpDir.mkdir();
+ Leader leader = null;
+ QuorumPeer peer = createQuorumPeer(tmpDir, true, true, true, "QuorumLearner",
+ "QuorumServer",
+ QuorumAuth.QUORUM_KERBEROS_SERVICE_PRINCIPAL_DEFAULT_VALUE);
+ CountDownLatch learnerLatch = new CountDownLatch(1);
+ leader = createSimpleLeader(tmpDir, peer, learnerLatch);
+ peer.leader = leader;
+
+ startLearnerCnxAcceptorThread(leader);
+ LOG.info("Start establishing a connection with the Leader");
+ String hostname = getLeaderHostname(peer);
+ sl.connectToLeader(peer.getQuorumAddress(), hostname);
+ // wait till leader socket soTimeout period
+ Assert.assertTrue("Leader should accept the auth learner connection",
+ learnerLatch.await(leader.self.tickTime * leader.self.initLimit + 1000,
+ TimeUnit.MILLISECONDS));
+ Assert.assertEquals("Failed to added the learner", 1,
+ leader.getLearners().size());
+ ClientBase.recursiveDelete(testDataLearner);
+ ClientBase.recursiveDelete(testDataLeader);
+ }
+
+ private String getLeaderHostname(QuorumPeer peer) {
+ String hostname = null;
+ for (QuorumServer p : peer.getView().values()) {
+ if (p.id == peer.getId()) {
+ hostname = p.hostname;
+ break;
+ }
+ }
+ Assert.assertNotNull("Didn't find leader", hostname);
+ return hostname;
+ }
+
+ /**
+ * Test verifies that the Leader should authenticate the connecting learner
+ * quorumpeer. After the successful authentication it should add this
+ * learner to the learnerHandler list.
+ */
+ @Test(timeout = 30000)
+ public void testAuthLearnerConnectsToServerWithAuthNotRequired()
+ throws Exception {
+ File testDataLearner = ClientBase.createTmpDir();
+ File tmpDir = File.createTempFile("test", ".dir", testDataLearner);
+ tmpDir.delete();
+ FileTxnSnapLog ftsl = new FileTxnSnapLog(tmpDir, tmpDir);
+ QuorumPeer learnerPeer = createQuorumPeer(tmpDir, true, true, true,
+ "QuorumLearner", "QuorumServer",
+ QuorumAuth.QUORUM_KERBEROS_SERVICE_PRINCIPAL_DEFAULT_VALUE);
+ SimpleLearner sl = new SimpleLearner(ftsl, learnerPeer);
+
+ File testDataLeader = ClientBase.createTmpDir();
+ tmpDir = File.createTempFile("test", ".dir", testDataLeader);
+ tmpDir.delete();
+ tmpDir.mkdir();
+ Leader leader = null;
+ QuorumPeer peer = createQuorumPeer(tmpDir, true, true, false, "QuorumLearner",
+ "QuorumServer",
+ QuorumAuth.QUORUM_KERBEROS_SERVICE_PRINCIPAL_DEFAULT_VALUE);
+ CountDownLatch learnerLatch = new CountDownLatch(1);
+ leader = createSimpleLeader(tmpDir, peer, learnerLatch);
+ peer.leader = leader;
+
+ startLearnerCnxAcceptorThread(leader);
+ LOG.info("Start establishing a connection with the Leader");
+ String hostname = getLeaderHostname(peer);
+ sl.connectToLeader(peer.getQuorumAddress(), hostname);
+ // wait till leader socket soTimeout period
+ Assert.assertTrue("Leader should accept the auth learner connection",
+ learnerLatch.await(leader.self.tickTime * leader.self.initLimit + 1000,
+ TimeUnit.MILLISECONDS));
+ Assert.assertEquals("Failed to added the learner", 1,
+ leader.getLearners().size());
+ ClientBase.recursiveDelete(testDataLearner);
+ ClientBase.recursiveDelete(testDataLeader);
+ }
+
+ private void startLearnerCnxAcceptorThread(Leader leader)
+ throws InterruptedException {
+ final CountDownLatch cnxAcceptorWatcher = new CountDownLatch(1);
+ leader.cnxAcceptor = leader.new LearnerCnxAcceptor(){
+ @Override
+ public void run() {
+ cnxAcceptorWatcher.countDown();
+ super.run();
+ }
+ };
+ leader.cnxAcceptor.start();
+ // waiting to start the thread
+ Assert.assertTrue("Failed to start leader.cnxAcceptor thread!",
+ cnxAcceptorWatcher.await(15, TimeUnit.SECONDS));
+ LOG.info("Started leader.cnxAcceptor:{} thread, state:{}",
+ leader.cnxAcceptor.getName(), leader.cnxAcceptor.getState());
+ }
+
+ /**
+ * Test verifies that the Auth enabled Learner is connecting to a Null Auth
+ * Leader server. Learner is failing to get an auth response from Null Auth
+ * Leader and fails the connection establishment.
+ */
+ @Test(timeout = 30000)
+ public void testAuthLearnerConnectsToNullAuthServer()
+ throws Exception {
+ File testDataLearner = ClientBase.createTmpDir();
+ File tmpDir = File.createTempFile("test", ".dir", testDataLearner);
+ tmpDir.delete();
+ FileTxnSnapLog ftsl = new FileTxnSnapLog(tmpDir, tmpDir);
+ QuorumPeer learnerPeer = createQuorumPeer(tmpDir, true, true, true,
+ "QuorumLearner", "QuorumServer",
+ QuorumAuth.QUORUM_KERBEROS_SERVICE_PRINCIPAL_DEFAULT_VALUE);
+ SimpleLearner sl = new SimpleLearner(ftsl, learnerPeer);
+
+ File testDataLeader = ClientBase.createTmpDir();
+ tmpDir = File.createTempFile("test", ".dir", testDataLeader);
+ tmpDir.delete();
+ tmpDir.mkdir();
+ Leader leader = null;
+ QuorumPeer peer = createQuorumPeer(tmpDir, false, false, false,
+ "QuorumLearner", "QuorumServer",
+ QuorumAuth.QUORUM_KERBEROS_SERVICE_PRINCIPAL_DEFAULT_VALUE);
+ CountDownLatch learnerLatch = new CountDownLatch(1);
+ leader = createSimpleLeader(tmpDir, peer, learnerLatch);
+ peer.leader = leader;
+
+ startLearnerCnxAcceptorThread(leader);
+ LOG.info("Start establishing a connection with the Leader");
+
+ try {
+ String hostname = getLeaderHostname(peer);
+ sl.connectToLeader(peer.getQuorumAddress(), hostname);
+ Assert.fail("Must throw exception as server doesn't supports authentication");
+ } catch (IOException e) {
+ // expected
+ Assert.assertTrue("Leader should accept the auth learner connection",
+ learnerLatch.await(leader.self.tickTime * leader.self.initLimit + 500,
+ TimeUnit.MILLISECONDS));
+ }
+
+ ClientBase.recursiveDelete(testDataLearner);
+ ClientBase.recursiveDelete(testDataLeader);
+ }
+
+ /**
+ * Test verifies that the No Auth enabled Learner is connecting to a No Auth
+ * Leader server. Learner should be able to establish a connection with
+ * Leader as auth is not required.
+ */
+ @Test(timeout = 30000)
+ public void testNoAuthLearnerConnectsToServerWithAuthNotRequired()
+ throws Exception {
+ File testDataLearner = ClientBase.createTmpDir();
+ File tmpDir = File.createTempFile("test", ".dir", testDataLearner);
+ tmpDir.delete();
+ FileTxnSnapLog ftsl = new FileTxnSnapLog(tmpDir, tmpDir);
+ QuorumPeer learnerPeer = createQuorumPeer(tmpDir, true, false, false,
+ "QuorumLearner", "QuorumServer", "");
+ SimpleLearner sl = new SimpleLearner(ftsl, learnerPeer);
+
+ File testDataLeader = ClientBase.createTmpDir();
+ tmpDir = File.createTempFile("test", ".dir", testDataLeader);
+ tmpDir.delete();
+ tmpDir.mkdir();
+ Leader leader = null;
+ QuorumPeer peer = createQuorumPeer(tmpDir, true, false, false, "QuorumLearner",
+ "QuorumServer",
+ QuorumAuth.QUORUM_KERBEROS_SERVICE_PRINCIPAL_DEFAULT_VALUE);
+ CountDownLatch learnerLatch = new CountDownLatch(1);
+ leader = createSimpleLeader(tmpDir, peer, learnerLatch);
+ peer.leader = leader;
+
+ startLearnerCnxAcceptorThread(leader);
+ LOG.info("Start establishing a connection with the Leader");
+ String hostname = getLeaderHostname(peer);
+ sl.connectToLeader(peer.getQuorumAddress(), hostname);
+
+ Assert.assertTrue("Leader should accept no auth learner connection",
+ learnerLatch.await(leader.self.tickTime * leader.self.initLimit + 1000,
+ TimeUnit.MILLISECONDS));
+ ClientBase.recursiveDelete(testDataLearner);
+ ClientBase.recursiveDelete(testDataLeader);
+ }
+
+ /**
+ * Test verifies that the No Auth enabled Learner is connecting to a No Auth
+ * Leader server. Learner shouldn't be able to establish a connection with
+ * Leader as auth as auth is required.
+ */
+ @Test(timeout = 30000)
+ public void testNoAuthLearnerConnectsToServerWithAuthRequired()
+ throws Exception {
+ File testDataLearner = ClientBase.createTmpDir();
+ File tmpDir = File.createTempFile("test", ".dir", testDataLearner);
+ tmpDir.delete();
+ FileTxnSnapLog ftsl = new FileTxnSnapLog(tmpDir, tmpDir);
+ QuorumPeer learnerPeer = createQuorumPeer(tmpDir, true, false, false,
+ "QuorumLearner", "QuorumServer", "");
+ SimpleLearner sl = new SimpleLearner(ftsl, learnerPeer);
+
+ File testDataLeader = ClientBase.createTmpDir();
+ tmpDir = File.createTempFile("test", ".dir", testDataLeader);
+ tmpDir.delete();
+ tmpDir.mkdir();
+ Leader leader = null;
+ QuorumPeer peer = createQuorumPeer(tmpDir, true, true, true, "QuorumLearner",
+ "QuorumServer",
+ QuorumAuth.QUORUM_KERBEROS_SERVICE_PRINCIPAL_DEFAULT_VALUE);
+ CountDownLatch learnerLatch = new CountDownLatch(1);
+ leader = createSimpleLeader(tmpDir, peer, learnerLatch);
+ peer.leader = leader;
+
+ startLearnerCnxAcceptorThread(leader);
+ LOG.info("Start establishing a connection with the Leader");
+ String hostname = getLeaderHostname(peer);
+ sl.connectToLeader(peer.getQuorumAddress(), hostname);
+ Assert.assertFalse("Leader shouldn't accept no auth learner connection",
+ learnerLatch.await(leader.self.tickTime * leader.self.initLimit + 1000,
+ TimeUnit.MILLISECONDS));
+ ClientBase.recursiveDelete(testDataLearner);
+ ClientBase.recursiveDelete(testDataLeader);
+ }
+
+ /**
+ * Test verifies that the No Auth enabled Learner is connecting to a No Auth
+ * Leader server. Learner should be able to establish a connection with
+ * Leader as auth is not required.
+ */
+ @Test(timeout = 30000)
+ public void testNoAuthLearnerConnectsToNullAuthServer()
+ throws Exception {
+ File testDataLearner = ClientBase.createTmpDir();
+ File tmpDir = File.createTempFile("test", ".dir", testDataLearner);
+ tmpDir.delete();
+ FileTxnSnapLog ftsl = new FileTxnSnapLog(tmpDir, tmpDir);
+ QuorumPeer learnerPeer = createQuorumPeer(tmpDir, true, false, false,
+ "QuorumLearner", "QuorumServer", "");
+ SimpleLearner sl = new SimpleLearner(ftsl, learnerPeer);
+
+ File testDataLeader = ClientBase.createTmpDir();
+ tmpDir = File.createTempFile("test", ".dir", testDataLeader);
+ tmpDir.delete();
+ tmpDir.mkdir();
+ Leader leader = null;
+ QuorumPeer peer = createQuorumPeer(tmpDir, false, false, false, "", "",
+ "");
+ CountDownLatch learnerLatch = new CountDownLatch(1);
+ leader = createSimpleLeader(tmpDir, peer, learnerLatch);
+ peer.leader = leader;
+
+ startLearnerCnxAcceptorThread(leader);
+ LOG.info("Start establishing a connection with the Leader");
+ String hostname = getLeaderHostname(peer);
+ sl.connectToLeader(peer.getQuorumAddress(), hostname);
+
+ Assert.assertTrue("Leader should accept no auth learner connection",
+ learnerLatch.await(leader.self.tickTime * leader.self.initLimit + 1000,
+ TimeUnit.MILLISECONDS));
+ ClientBase.recursiveDelete(testDataLearner);
+ ClientBase.recursiveDelete(testDataLeader);
+ }
+
+ /**
+ * SaslQuorumAuthServer throws exception on receiving an invalid quorum
+ * auth packet.
+ */
+ @Test(timeout = 30000)
+ public void testSaslQuorumAuthServerWithInvalidQuorumAuthPacket()
+ throws Exception {
+ Socket socket = getSocketPair();
+ DataOutputStream dout = new DataOutputStream(socket.getOutputStream());
+ BufferedOutputStream bufferedOutput = new BufferedOutputStream(dout);
+ BinaryOutputArchive boa = BinaryOutputArchive
+ .getArchive(bufferedOutput);
+ QuorumAuthPacket authPacket = QuorumAuth
+ .createPacket(QuorumAuth.Status.IN_PROGRESS, null);
+ authPacket.setMagic(Long.MAX_VALUE); // invalid magic number
+ boa.writeRecord(authPacket, null);
+ bufferedOutput.flush();
+ QuorumAuthServer authServer = new SaslQuorumAuthServer(true,
+ "QuorumServer", authzHosts);
+ BufferedInputStream is = new BufferedInputStream(
+ socket.getInputStream());
+ try {
+ authServer.authenticate(socket, new DataInputStream(is));
+ Assert.fail("Must throw exception as QuorumAuthPacket is invalid");
+ } catch (SaslException e) {
+ // expected
+ }
+ }
+
+ /**
+ * NullQuorumAuthServer should return true when no auth quorum packet
+ * received and timed out.
+ */
+ @Test(timeout = 30000)
+ public void testNullQuorumAuthServerShouldReturnTrue()
+ throws Exception {
+ Socket socket = getSocketPair();
+ QuorumAuthServer authServer = new NullQuorumAuthServer();
+ BufferedInputStream is = new BufferedInputStream(
+ socket.getInputStream());
+ // It will throw exception and fail the
+ // test if any unexpected error. Not adding any extra assertion.
+ authServer.authenticate(socket, new DataInputStream(is));
+ }
+
+ /**
+ * NullQuorumAuthServer should return true on receiving a valid quorum auth
+ * packet.
+ */
+ @Test(timeout = 30000)
+ public void testNullQuorumAuthServerWithValidQuorumAuthPacket()
+ throws Exception {
+ Socket socket = getSocketPair();
+ DataOutputStream dout = new DataOutputStream(socket.getOutputStream());
+ BufferedOutputStream bufferedOutput = new BufferedOutputStream(dout);
+ BinaryOutputArchive boa = BinaryOutputArchive
+ .getArchive(bufferedOutput);
+ QuorumAuthPacket authPacket = QuorumAuth
+ .createPacket(QuorumAuth.Status.IN_PROGRESS, null);
+ boa.writeRecord(authPacket, null);
+ bufferedOutput.flush();
+ QuorumAuthServer authServer = new NullQuorumAuthServer();
+ BufferedInputStream is = new BufferedInputStream(
+ socket.getInputStream());
+ // It will throw exception and fail the
+ // test if any unexpected error. Not adding any extra assertion.
+ authServer.authenticate(socket, new DataInputStream(is));
+ }
+
+ private QuorumCnxManager createAndStartManager(long sid) {
+ QuorumCnxManager peer = new QuorumCnxManager(sid, peers,
+ new NullQuorumAuthServer(), new NullQuorumAuthLearner(), 10000,
+ false, quorumCnxnThreadsSize, false);
+ executor.submit(peer.listener);
+ InetSocketAddress electionAddr = peer.view.get(sid).electionAddr;
+ waitForElectionAddrBinding(electionAddr, 15);
+ return peer;
+ }
+
+ private QuorumCnxManager createAndStartManager(long sid,
+ String serverLoginContext,
+ String learnerLoginContext,
+ boolean serverRequireSasl,
+ boolean learnerRequireSasl)
+ throws Exception {
+ QuorumAuthLearner authClient = new SaslQuorumAuthLearner(learnerRequireSasl,
+ "NOT_USING_KRB_PRINCIPAL", learnerLoginContext);
+ QuorumAuthServer authServer = new SaslQuorumAuthServer(serverRequireSasl,
+ serverLoginContext, authzHosts);
+ QuorumCnxManager peer = new QuorumCnxManager(sid, peers,
+ authServer, authClient, 10000, false, quorumCnxnThreadsSize, true);
+ executor.submit(peer.listener);
+ InetSocketAddress electionAddr = peer.view.get(sid).electionAddr;
+ waitForElectionAddrBinding(electionAddr, 15);
+ return peer;
+ }
+
+ private void waitForElectionAddrBinding(InetSocketAddress electionAddr,
+ int retries) {
+ boolean success = false;
+ while (retries > 0) {
+ Socket sock = new Socket();
+ try {
+ sock.setTcpNoDelay(true);
+ sock.setSoTimeout(5000);
+ sock.connect(electionAddr, 5000);
+ success = true;
+ } catch (IOException e) {
+ LOG.error("IOException while checking election addr", e);
+ } finally {
+ cleanup(sock);
+ }
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException e) {
+ // ignore
+ }
+ retries--;
+ }
+ Assert.assertTrue("Did not connect to election port", success);
+ }
+
+ private void cleanup(Socket sock) {
+ try {
+ sock.close();
+ } catch (IOException ie) {
+ LOG.error("Exception while closing socket", ie);
+ }
+ }
+
+ private void assertEventuallyConnected(QuorumCnxManager peer, long sid)
+ throws Exception {
+ for (int i = 0; i < 20 && !peer.connectedToPeer(sid); i++) {
+ Thread.sleep(1000);
+ }
+ Assert.assertTrue("Not connected to peer", peer.connectedToPeer(sid));
+ }
+
+ private void assertEventuallyNotConnected(QuorumCnxManager peer, long sid)
+ throws Exception {
+ for (int i = 0; i < 3 && !peer.connectedToPeer(sid); i++) {
+ Thread.sleep(1000);
+ }
+ Assert.assertFalse("Connected to peer (shouldn't be)",
+ peer.connectedToPeer(sid));
+ }
+
+ private QuorumPeer createQuorumPeer(File tmpDir,
+ boolean isQuorumAuthEnabled, boolean isQuorumLearnerAuthRequired,
+ boolean isQuorumServerAuthRequired, String quorumLearnerLoginContext,
+ String quorumServerLoginContext, String quorumServicePrincipal)
+ throws IOException, FileNotFoundException {
+ QuorumPeer peer = QuorumPeer.testingQuorumPeer();
+ peer.syncLimit = 2;
+ peer.initLimit = 2;
+ peer.tickTime = 2000;
+ peer.quorumPeers = new HashMap<Long, QuorumServer>();
+ peer.quorumPeers.put(0L,
+ new QuorumServer(0, "0.0.0.0", PortAssignment.unique(), null, null));
+ peer.quorumPeers.put(1L,
+ new QuorumServer(1, "0.0.0.0", PortAssignment.unique(), null, null));
+ peer.setQuorumVerifier(new QuorumMaj(3));
+ peer.setCnxnFactory(new NullServerCnxnFactory());
+ // auth
+ if (isQuorumAuthEnabled) {
+ peer.authServer = new SaslQuorumAuthServer(
+ isQuorumServerAuthRequired, quorumServerLoginContext, authzHosts);
+ peer.authLearner = new SaslQuorumAuthLearner(
+ isQuorumLearnerAuthRequired, quorumServicePrincipal,
+ quorumLearnerLoginContext);
+ }
+ File version2 = new File(tmpDir, "version-2");
+ version2.mkdir();
+ FileOutputStream fos;
+ fos = new FileOutputStream(new File(version2, "currentEpoch"));
+ fos.write("0\n".getBytes());
+ fos.close();
+ fos = new FileOutputStream(new File(version2, "acceptedEpoch"));
+ fos.write("0\n".getBytes());
+ fos.close();
+ return peer;
+ }
+
+ private static final class NullServerCnxnFactory extends ServerCnxnFactory {
+ public void startup(ZooKeeperServer zkServer)
+ throws IOException, InterruptedException {
+ }
+
+ public void start() {
+ }
+
+ public void shutdown() {
+ }
+
+ public void setMaxClientCnxnsPerHost(int max) {
+ }
+
+ public void join() throws InterruptedException {
+ }
+
+ public int getMaxClientCnxnsPerHost() {
+ return 0;
+ }
+
+ public int getLocalPort() {
+ return 0;
+ }
+
+ public InetSocketAddress getLocalAddress() {
+ return null;
+ }
+
+ public Iterable<ServerCnxn> getConnections() {
+ return null;
+ }
+
+ public void configure(InetSocketAddress addr, int maxClientCnxns)
+ throws IOException {
+ }
+
+ public void closeSession(long sessionId) {
+ }
+
+ public void closeAll() {
+ }
+
+ @Override
+ public int getNumAliveConnections() {
+ return 0;
+ }
+ }
+
+ private static Socket getSocketPair() throws IOException {
+ ServerSocket ss = new ServerSocket();
+ ss.bind(null);
+ InetSocketAddress endPoint = (InetSocketAddress) ss
+ .getLocalSocketAddress();
+ Socket s = new Socket(endPoint.getAddress(), endPoint.getPort());
+ s.setSoTimeout(5000);
+ return s;
+ }
+
+ private Leader createLeader(File tmpDir, QuorumPeer peer) throws IOException,
+ NoSuchFieldException, IllegalAccessException {
+ LeaderZooKeeperServer zk = prepareLeader(tmpDir, peer);
+ return new Leader(peer, zk);
+ }
+
+ private Leader createSimpleLeader(File tmpDir, QuorumPeer peer,
+ CountDownLatch learnerLatch) throws IOException,
+ NoSuchFieldException, IllegalAccessException {
+ LeaderZooKeeperServer zk = prepareLeader(tmpDir, peer);
+ return new SimpleLeader(peer, zk, learnerLatch);
+ }
+
+ class SimpleLeader extends Leader {
+ final CountDownLatch learnerLatch;
+
+ SimpleLeader(QuorumPeer self, LeaderZooKeeperServer zk,
+ CountDownLatch latch) throws IOException {
+ super(self, zk);
+ this.learnerLatch = latch;
+ }
+
+ @Override
+ void addLearnerHandler(LearnerHandler learner) {
+ super.addLearnerHandler(learner);
+ learnerLatch.countDown();
+ }
+ }
+
+ private LeaderZooKeeperServer prepareLeader(File tmpDir, QuorumPeer peer)
+ throws IOException, NoSuchFieldException, IllegalAccessException {
+ FileTxnSnapLog logFactory = new FileTxnSnapLog(tmpDir, tmpDir);
+ peer.setTxnFactory(logFactory);
+ Field addrField = peer.getClass().getDeclaredField("myQuorumAddr");
+ addrField.setAccessible(true);
+ addrField.set(peer, new InetSocketAddress(PortAssignment.unique()));
+ ZKDatabase zkDb = new ZKDatabase(logFactory);
+ LeaderZooKeeperServer zk = new LeaderZooKeeperServer(logFactory, peer,
+ new ZooKeeperServer.BasicDataTreeBuilder(), zkDb);
+ return zk;
+ }
+
+ class SimpleLearnerZooKeeperServer extends LearnerZooKeeperServer {
+ boolean startupCalled;
+
+ public SimpleLearnerZooKeeperServer(FileTxnSnapLog ftsl,
+ QuorumPeer self) throws IOException {
+ super(ftsl, 2000, 2000, 2000, null, new ZKDatabase(ftsl), self);
+ }
+
+ Learner learner;
+
+ @Override
+ public Learner getLearner() {
+ return learner;
+ }
+
+ @Override
+ public void startup() {
+ startupCalled = true;
+ }
+ }
+
+ class SimpleLearner extends Learner {
+ SimpleLearner(FileTxnSnapLog ftsl, QuorumPeer learner)
+ throws IOException {
+ self = learner;
+ zk = new SimpleLearnerZooKeeperServer(ftsl, self);
+ ((SimpleLearnerZooKeeperServer) zk).learner = this;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java
----------------------------------------------------------------------
diff --git a/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java b/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java
index 85817b2..6d5eb47 100644
--- a/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java
+++ b/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java
@@ -24,6 +24,10 @@ package org.apache.zookeeper.server.quorum;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
import java.util.concurrent.CountDownLatch;
import org.apache.zookeeper.WatchedEvent;
@@ -42,6 +46,8 @@ public class QuorumPeerTestBase extends ZKTestCase implements Watcher {
protected static final Logger LOG = LoggerFactory
.getLogger(QuorumPeerTestBase.class);
+ public static final int TIMEOUT = 5000;
+
public void process(WatchedEvent event) {
// ignore for this test
}
@@ -60,20 +66,29 @@ public class QuorumPeerTestBase extends ZKTestCase implements Watcher {
volatile TestQPMain main;
final File dataDir;
CountDownLatch mainFailed;
-
- public MainThread(int myid, int clientPort, String quorumCfgSection)
- throws IOException {
- File tmpDir = ClientBase.createTmpDir();
- LOG.info("id = " + myid + " tmpDir = " + tmpDir + " clientPort = "
+ File baseDir;
+ private final int myid;
+ private final int clientPort;
+ private final String quorumCfgSection;
+ private final Map<String, String> otherConfigs;
+
+ public MainThread(int myid, int clientPort, String quorumCfgSection,
+ Map<String, String> otherConfigs) throws IOException {
+ baseDir = ClientBase.createTmpDir();
+ this.myid = myid;
+ this.clientPort = clientPort;
+ this.quorumCfgSection = quorumCfgSection;
+ this.otherConfigs = otherConfigs;
+ LOG.info("id = " + myid + " tmpDir = " + baseDir + " clientPort = "
+ clientPort);
- confFile = new File(tmpDir, "zoo.cfg");
+ confFile = new File(baseDir, "zoo.cfg");
FileWriter fwriter = new FileWriter(confFile);
fwriter.write("tickTime=4000\n");
fwriter.write("initLimit=10\n");
fwriter.write("syncLimit=5\n");
- dataDir = new File(tmpDir, "data");
+ dataDir = new File(baseDir, "data");
if (!dataDir.mkdir()) {
throw new IOException("Unable to mkdir " + dataDir);
}
@@ -87,6 +102,13 @@ public class QuorumPeerTestBase extends ZKTestCase implements Watcher {
fwriter.write("dataDir=" + dir + "\n");
fwriter.write("clientPort=" + clientPort + "\n");
+
+ // write extra configurations
+ Set<Entry<String, String>> entrySet = otherConfigs.entrySet();
+ for (Entry<String, String> entry : entrySet) {
+ fwriter.write(entry.getKey() + "=" + entry.getValue() + "\n");
+ }
+
fwriter.write(quorumCfgSection + "\n");
fwriter.flush();
fwriter.close();
@@ -98,6 +120,12 @@ public class QuorumPeerTestBase extends ZKTestCase implements Watcher {
fwriter.close();
}
+ public MainThread(int myid, int clientPort, String quorumCfgSection)
+ throws IOException {
+ this(myid, clientPort, quorumCfgSection,
+ new HashMap<String, String>());
+ }
+
Thread currentThread;
synchronized public void start() {
@@ -151,5 +179,28 @@ public class QuorumPeerTestBase extends ZKTestCase implements Watcher {
return main.quorumPeer;
}
+ public void deleteBaseDir() {
+ ClientBase.recursiveDelete(baseDir);
+ }
+
+ public int getMyid() {
+ return myid;
+ }
+
+ public int getClientPort() {
+ return clientPort;
+ }
+
+ public String getQuorumCfgSection() {
+ return quorumCfgSection;
+ }
+
+ public Map<String, String> getOtherConfigs() {
+ return otherConfigs;
+ }
+
+ public File getConfFile() {
+ return confFile;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/test/org/apache/zookeeper/server/quorum/Zab1_0Test.java
----------------------------------------------------------------------
diff --git a/src/java/test/org/apache/zookeeper/server/quorum/Zab1_0Test.java b/src/java/test/org/apache/zookeeper/server/quorum/Zab1_0Test.java
index ab8ce42..52e7d27 100644
--- a/src/java/test/org/apache/zookeeper/server/quorum/Zab1_0Test.java
+++ b/src/java/test/org/apache/zookeeper/server/quorum/Zab1_0Test.java
@@ -20,6 +20,7 @@ package org.apache.zookeeper.server.quorum;
import static org.junit.Assert.assertEquals;
+import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -367,7 +368,9 @@ public class Zab1_0Test {
Thread.sleep(20);
}
- LearnerHandler lh = new LearnerHandler(leaderSocket, leader);
+ LearnerHandler lh = new LearnerHandler(leaderSocket,
+ new BufferedInputStream(leaderSocket.getInputStream()),
+ leader);
lh.start();
leaderSocket.setSoTimeout(4000);
@@ -435,8 +438,10 @@ public class Zab1_0Test {
while(leader.cnxAcceptor == null || !leader.cnxAcceptor.isAlive()) {
Thread.sleep(20);
}
-
- LearnerHandler lh = new LearnerHandler(leaderSocket, leader);
+
+ LearnerHandler lh = new LearnerHandler(leaderSocket,
+ new BufferedInputStream(leaderSocket.getInputStream()),
+ leader);
lh.start();
leaderSocket.setSoTimeout(4000);
@@ -458,7 +463,6 @@ public class Zab1_0Test {
}
}
-
public void testFollowerConversation(FollowerConversation conversation) throws Exception {
File tmpDir = File.createTempFile("test", "dir", testData);
tmpDir.delete();
@@ -473,7 +477,9 @@ public class Zab1_0Test {
ServerSocket ss = new ServerSocket();
ss.bind(null);
- follower.setLeaderSocketAddress((InetSocketAddress)ss.getLocalSocketAddress());
+ QuorumServer leaderQS = new QuorumServer(1,
+ (InetSocketAddress) ss.getLocalSocketAddress());
+ follower.setLeaderQuorumServer(leaderQS);
final Follower followerForThread = follower;
followerThread = new Thread() {
@@ -526,7 +532,9 @@ public class Zab1_0Test {
ServerSocket ss = new ServerSocket();
ss.bind(null);
- observer.setLeaderSocketAddress((InetSocketAddress)ss.getLocalSocketAddress());
+ QuorumServer leaderQS = new QuorumServer(1,
+ (InetSocketAddress) ss.getLocalSocketAddress());
+ observer.setLeaderQuorumServer(leaderQS);
final Observer observerForThread = observer;
observerThread = new Thread() {
@@ -1338,14 +1346,14 @@ public class Zab1_0Test {
super(self, zk);
}
- InetSocketAddress leaderAddr;
- public void setLeaderSocketAddress(InetSocketAddress addr) {
- leaderAddr = addr;
+ QuorumServer leaderQuorumServer;
+ public void setLeaderQuorumServer(QuorumServer quorumServer) {
+ leaderQuorumServer = quorumServer;
}
@Override
- protected InetSocketAddress findLeader() {
- return leaderAddr;
+ protected QuorumServer findLeader() {
+ return leaderQuorumServer;
}
}
private ConversableFollower createFollower(File tmpDir, QuorumPeer peer)
@@ -1364,14 +1372,14 @@ public class Zab1_0Test {
super(self, zk);
}
- InetSocketAddress leaderAddr;
- public void setLeaderSocketAddress(InetSocketAddress addr) {
- leaderAddr = addr;
+ QuorumServer leaderQuorumServer;
+ public void setLeaderQuorumServer(QuorumServer quorumServer) {
+ leaderQuorumServer = quorumServer;
}
@Override
- protected InetSocketAddress findLeader() {
- return leaderAddr;
+ protected QuorumServer findLeader() {
+ return leaderQuorumServer;
}
}
@@ -1389,7 +1397,7 @@ public class Zab1_0Test {
private QuorumPeer createQuorumPeer(File tmpDir) throws IOException,
FileNotFoundException {
- QuorumPeer peer = new QuorumPeer();
+ QuorumPeer peer = QuorumPeer.testingQuorumPeer();
peer.syncLimit = SYNC_LIMIT;
peer.initLimit = 2;
peer.tickTime = 2000;
@@ -1435,7 +1443,7 @@ public class Zab1_0Test {
logFactory.append(req);
logFactory.commit();
ZKDatabase zkDb = new ZKDatabase(logFactory);
- QuorumPeer peer = new QuorumPeer();
+ QuorumPeer peer = QuorumPeer.testingQuorumPeer();
peer.setZKDatabase(zkDb);
peer.setTxnFactory(logFactory);
peer.getLastLoggedZxid();
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/test/org/apache/zookeeper/server/quorum/auth/KerberosSecurityTestcase.java
----------------------------------------------------------------------
diff --git a/src/java/test/org/apache/zookeeper/server/quorum/auth/KerberosSecurityTestcase.java b/src/java/test/org/apache/zookeeper/server/quorum/auth/KerberosSecurityTestcase.java
new file mode 100644
index 0000000..9617c70
--- /dev/null
+++ b/src/java/test/org/apache/zookeeper/server/quorum/auth/KerberosSecurityTestcase.java
@@ -0,0 +1,120 @@
+/**
+ * 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.server.quorum.auth;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Properties;
+
+/*
+ * This code is originally from HDFS, see the similarly named file there
+ * in case of bug fixing, history, etc.
+ *
+ * Branch : trunk
+ * Github Revision: 1d1ab587e4e92ce3aea4cb144811f69145cb3b33
+ */
+
+/**
+ * KerberosSecurityTestcase provides a base class for using MiniKdc with other
+ * test cases. KerberosSecurityTestcase starts the MiniKdc (@Before) before
+ * running tests, and stop the MiniKdc (@After) after the testcases, using
+ * default settings (working dir and kdc configurations).
+ * <p>
+ * Users can directly inherit this class and implement their own test functions
+ * using the default settings, or override functions getTestDir() and
+ * createMiniKdcConf() to provide new settings.
+ */
+public class KerberosSecurityTestcase extends QuorumAuthTestBase {
+ private static MiniKdc kdc;
+ private static File workDir;
+ private static Properties conf;
+
+ @BeforeClass
+ public static void setUpSasl() throws Exception {
+ startMiniKdc();
+ }
+
+ @AfterClass
+ public static void tearDownSasl() throws Exception {
+ stopMiniKdc();
+ FileUtils.deleteQuietly(workDir);
+ }
+
+ public static void startMiniKdc() throws Exception {
+ createTestDir();
+ createMiniKdcConf();
+
+ kdc = new MiniKdc(conf, workDir);
+ kdc.start();
+ }
+
+ /**
+ * Create a working directory, it should be the build directory. Under this
+ * directory an ApacheDS working directory will be created, this directory
+ * will be deleted when the MiniKdc stops.
+ *
+ * @throws IOException
+ */
+ public static void createTestDir() throws IOException {
+ workDir = createTmpDir(
+ new File(System.getProperty("build.test.dir", "build")));
+ }
+
+ static File createTmpDir(File parentDir) throws IOException {
+ File tmpFile = File.createTempFile("test", ".junit", parentDir);
+ // don't delete tmpFile - this ensures we don't attempt to create
+ // a tmpDir with a duplicate name
+ File tmpDir = new File(tmpFile + ".dir");
+ // never true if tmpfile does it's job
+ Assert.assertFalse(tmpDir.exists());
+ Assert.assertTrue(tmpDir.mkdirs());
+ return tmpDir;
+ }
+
+ /**
+ * Create a Kdc configuration
+ */
+ public static void createMiniKdcConf() {
+ conf = MiniKdc.createConf();
+ }
+
+ public static void stopMiniKdc() {
+ if (kdc != null) {
+ kdc.stop();
+ }
+ }
+
+ public static MiniKdc getKdc() {
+ return kdc;
+ }
+
+ public static File getWorkDir() {
+ return workDir;
+ }
+
+ public static Properties getConf() {
+ return conf;
+ }
+}
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/test/org/apache/zookeeper/server/quorum/auth/KerberosTestUtils.java
----------------------------------------------------------------------
diff --git a/src/java/test/org/apache/zookeeper/server/quorum/auth/KerberosTestUtils.java b/src/java/test/org/apache/zookeeper/server/quorum/auth/KerberosTestUtils.java
new file mode 100644
index 0000000..4a75f83
--- /dev/null
+++ b/src/java/test/org/apache/zookeeper/server/quorum/auth/KerberosTestUtils.java
@@ -0,0 +1,76 @@
+/**
+ * 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.server.quorum.auth;
+
+import java.io.File;
+import java.util.UUID;
+
+import org.apache.zookeeper.util.SecurityUtils;
+
+public class KerberosTestUtils {
+ private static String keytabFile = new File(System.getProperty("test.dir", "build"), UUID.randomUUID().toString())
+ .getAbsolutePath();
+
+ public static String getRealm() {
+ return "EXAMPLE.COM";
+ }
+
+ public static String getLearnerPrincipal() {
+ return "learner@EXAMPLE.COM";
+ }
+
+ public static String getServerPrincipal() {
+ return "zkquorum/localhost@EXAMPLE.COM";
+ }
+
+ public static String getHostLearnerPrincipal() {
+ return "learner/_HOST@EXAMPLE.COM";
+ }
+
+ public static String getHostServerPrincipal() {
+ return "zkquorum/_HOST@EXAMPLE.COM";
+ }
+
+ public static String getHostNamedLearnerPrincipal(String myHostname) {
+ return "learner/" + myHostname + "@EXAMPLE.COM";
+ }
+
+ public static String getKeytabFile() {
+ return keytabFile;
+ }
+
+ public static String replaceHostPattern(String principal) {
+ String[] components = principal.split("[/@]");
+ if (components == null || components.length < 2
+ || !components[1].equals(SecurityUtils.QUORUM_HOSTNAME_PATTERN)) {
+ return principal;
+ } else {
+ return replacePattern(components, "localhost");
+ }
+ }
+
+ public static String replacePattern(String[] components, String hostname) {
+ if (components.length == 3) {
+ return components[0] + "/" + hostname.toLowerCase() + "@"
+ + components[2];
+ } else {
+ return components[0] + "/" + hostname.toLowerCase();
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/test/org/apache/zookeeper/server/quorum/auth/MiniKdc.java
----------------------------------------------------------------------
diff --git a/src/java/test/org/apache/zookeeper/server/quorum/auth/MiniKdc.java b/src/java/test/org/apache/zookeeper/server/quorum/auth/MiniKdc.java
new file mode 100644
index 0000000..4afef41
--- /dev/null
+++ b/src/java/test/org/apache/zookeeper/server/quorum/auth/MiniKdc.java
@@ -0,0 +1,418 @@
+/**
+ * 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.server.quorum.auth;
+import org.apache.commons.io.Charsets;
+import org.apache.kerby.kerberos.kerb.KrbException;
+import org.apache.kerby.kerberos.kerb.server.KdcConfigKey;
+import org.apache.kerby.kerberos.kerb.server.SimpleKdcServer;
+import org.apache.kerby.util.IOUtil;
+import org.apache.kerby.util.NetworkUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+/**
+ * Mini KDC based on Apache Directory Server that can be embedded in testcases
+ * or used from command line as a standalone KDC.
+ * <p>
+ * <b>From within testcases:</b>
+ * <p>
+ * MiniKdc sets one System property when started and un-set when stopped:
+ * <ul>
+ * <li>sun.security.krb5.debug: set to the debug value provided in the
+ * configuration</li>
+ * </ul>
+ * Because of this, multiple MiniKdc instances cannot be started in parallel.
+ * For example, running testcases in parallel that start a KDC each. To
+ * accomplish this a single MiniKdc should be used for all testcases running
+ * in parallel.
+ * <p>
+ * MiniKdc default configuration values are:
+ * <ul>
+ * <li>org.name=EXAMPLE (used to create the REALM)</li>
+ * <li>org.domain=COM (used to create the REALM)</li>
+ * <li>kdc.bind.address=localhost</li>
+ * <li>kdc.port=0 (ephemeral port)</li>
+ * <li>instance=DefaultKrbServer</li>
+ * <li>max.ticket.lifetime=86400000 (1 day)</li>
+ * <li>max.renewable.lifetime=604800000 (7 days)</li>
+ * <li>transport=TCP</li>
+ * <li>debug=false</li>
+ * </ul>
+ * The generated krb5.conf forces TCP connections.
+ */
+/*
+ * This code is originally from HDFS, see the file name MiniKdc there
+ * in case of bug fixing, history, etc.
+ *
+ * Branch : trunk
+ * Github Revision: 916140604ffef59466ba30832478311d3e6249bd
+ */
+public class MiniKdc {
+
+ public static final String JAVA_SECURITY_KRB5_CONF =
+ "java.security.krb5.conf";
+ public static final String SUN_SECURITY_KRB5_DEBUG =
+ "sun.security.krb5.debug";
+
+ public static void main(String[] args) throws Exception {
+ if (args.length < 4) {
+ System.out.println("Arguments: <WORKDIR> <MINIKDCPROPERTIES> " +
+ "<KEYTABFILE> [<PRINCIPALS>]+");
+ System.exit(1);
+ }
+ File workDir = new File(args[0]);
+ if (!workDir.exists()) {
+ throw new RuntimeException("Specified work directory does not exists: "
+ + workDir.getAbsolutePath());
+ }
+ Properties conf = createConf();
+ File file = new File(args[1]);
+ if (!file.exists()) {
+ throw new RuntimeException("Specified configuration does not exists: "
+ + file.getAbsolutePath());
+ }
+ Properties userConf = new Properties();
+ InputStreamReader r = null;
+ try {
+ r = new InputStreamReader(new FileInputStream(file), Charsets.UTF_8);
+ userConf.load(r);
+ } finally {
+ if (r != null) {
+ r.close();
+ }
+ }
+ for (Map.Entry<?, ?> entry : userConf.entrySet()) {
+ conf.put(entry.getKey(), entry.getValue());
+ }
+ final MiniKdc miniKdc = new MiniKdc(conf, workDir);
+ miniKdc.start();
+ File krb5conf = new File(workDir, "krb5.conf");
+ if (miniKdc.getKrb5conf().renameTo(krb5conf)) {
+ File keytabFile = new File(args[2]).getAbsoluteFile();
+ String[] principals = new String[args.length - 3];
+ System.arraycopy(args, 3, principals, 0, args.length - 3);
+ miniKdc.createPrincipal(keytabFile, principals);
+ System.out.println();
+ System.out.println("Standalone MiniKdc Running");
+ System.out.println("---------------------------------------------------");
+ System.out.println(" Realm : " + miniKdc.getRealm());
+ System.out.println(" Running at : " + miniKdc.getHost() + ":" +
+ miniKdc.getHost());
+ System.out.println(" krb5conf : " + krb5conf);
+ System.out.println();
+ System.out.println(" created keytab : " + keytabFile);
+ System.out.println(" with principals : " + Arrays.asList(principals));
+ System.out.println();
+ System.out.println(" Do <CTRL-C> or kill <PID> to stop it");
+ System.out.println("---------------------------------------------------");
+ System.out.println();
+ Runtime.getRuntime().addShutdownHook(new Thread() {
+ @Override
+ public void run() {
+ miniKdc.stop();
+ }
+ });
+ } else {
+ throw new RuntimeException("Cannot rename KDC's krb5conf to "
+ + krb5conf.getAbsolutePath());
+ }
+ }
+
+ private static final Logger LOG = LoggerFactory.getLogger(MiniKdc.class);
+
+ public static final String ORG_NAME = "org.name";
+ public static final String ORG_DOMAIN = "org.domain";
+ public static final String KDC_BIND_ADDRESS = "kdc.bind.address";
+ public static final String KDC_PORT = "kdc.port";
+ public static final String INSTANCE = "instance";
+ public static final String MAX_TICKET_LIFETIME = "max.ticket.lifetime";
+ public static final String MAX_RENEWABLE_LIFETIME = "max.renewable.lifetime";
+ public static final String TRANSPORT = "transport";
+ public static final String DEBUG = "debug";
+
+ private static final Set<String> PROPERTIES = new HashSet<String>();
+ private static final Properties DEFAULT_CONFIG = new Properties();
+
+ static {
+ PROPERTIES.add(ORG_NAME);
+ PROPERTIES.add(ORG_DOMAIN);
+ PROPERTIES.add(KDC_BIND_ADDRESS);
+ PROPERTIES.add(KDC_BIND_ADDRESS);
+ PROPERTIES.add(KDC_PORT);
+ PROPERTIES.add(INSTANCE);
+ PROPERTIES.add(TRANSPORT);
+ PROPERTIES.add(MAX_TICKET_LIFETIME);
+ PROPERTIES.add(MAX_RENEWABLE_LIFETIME);
+
+ DEFAULT_CONFIG.setProperty(KDC_BIND_ADDRESS, "localhost");
+ DEFAULT_CONFIG.setProperty(KDC_PORT, "0");
+ DEFAULT_CONFIG.setProperty(INSTANCE, "DefaultKrbServer");
+ DEFAULT_CONFIG.setProperty(ORG_NAME, "EXAMPLE");
+ DEFAULT_CONFIG.setProperty(ORG_DOMAIN, "COM");
+ DEFAULT_CONFIG.setProperty(TRANSPORT, "TCP");
+ DEFAULT_CONFIG.setProperty(MAX_TICKET_LIFETIME, "86400000");
+ DEFAULT_CONFIG.setProperty(MAX_RENEWABLE_LIFETIME, "604800000");
+ DEFAULT_CONFIG.setProperty(DEBUG, "false");
+ }
+
+ /**
+ * Convenience method that returns MiniKdc default configuration.
+ * <p>
+ * The returned configuration is a copy, it can be customized before using
+ * it to create a MiniKdc.
+ * @return a MiniKdc default configuration.
+ */
+ public static Properties createConf() {
+ return (Properties) DEFAULT_CONFIG.clone();
+ }
+
+ private Properties conf;
+ private SimpleKdcServer simpleKdc;
+ private int port;
+ private String realm;
+ private File workDir;
+ private File krb5conf;
+ private String transport;
+ private boolean krb5Debug;
+
+ public void setTransport(String transport) {
+ this.transport = transport;
+ }
+ /**
+ * Creates a MiniKdc.
+ *
+ * @param conf MiniKdc configuration.
+ * @param workDir working directory, it should be the build directory. Under
+ * this directory an ApacheDS working directory will be created, this
+ * directory will be deleted when the MiniKdc stops.
+ * @throws Exception thrown if the MiniKdc could not be created.
+ */
+ public MiniKdc(Properties conf, File workDir) throws Exception {
+ if (!conf.keySet().containsAll(PROPERTIES)) {
+ Set<String> missingProperties = new HashSet<String>(PROPERTIES);
+ missingProperties.removeAll(conf.keySet());
+ throw new IllegalArgumentException("Missing configuration properties: "
+ + missingProperties);
+ }
+ this.workDir = new File(workDir, Long.toString(System.currentTimeMillis()));
+ if (!this.workDir.exists()
+ && !this.workDir.mkdirs()) {
+ throw new RuntimeException("Cannot create directory " + this.workDir);
+ }
+ LOG.info("Configuration:");
+ LOG.info("---------------------------------------------------------------");
+ for (Map.Entry<?, ?> entry : conf.entrySet()) {
+ LOG.info(" {}: {}", entry.getKey(), entry.getValue());
+ }
+ LOG.info("---------------------------------------------------------------");
+ this.conf = conf;
+ port = Integer.parseInt(conf.getProperty(KDC_PORT));
+ String orgName= conf.getProperty(ORG_NAME);
+ String orgDomain = conf.getProperty(ORG_DOMAIN);
+ realm = orgName.toUpperCase(Locale.ENGLISH) + "."
+ + orgDomain.toUpperCase(Locale.ENGLISH);
+ }
+
+ /**
+ * Returns the port of the MiniKdc.
+ *
+ * @return the port of the MiniKdc.
+ */
+ public int getPort() {
+ return port;
+ }
+
+ /**
+ * Returns the host of the MiniKdc.
+ *
+ * @return the host of the MiniKdc.
+ */
+ public String getHost() {
+ return conf.getProperty(KDC_BIND_ADDRESS);
+ }
+
+ /**
+ * Returns the realm of the MiniKdc.
+ *
+ * @return the realm of the MiniKdc.
+ */
+ public String getRealm() {
+ return realm;
+ }
+
+ public File getKrb5conf() {
+ krb5conf = new File(System.getProperty(JAVA_SECURITY_KRB5_CONF));
+ return krb5conf;
+ }
+
+ /**
+ * Starts the MiniKdc.
+ *
+ * @throws Exception thrown if the MiniKdc could not be started.
+ */
+ public synchronized void start() throws Exception {
+ if (simpleKdc != null) {
+ throw new RuntimeException("Already started");
+ }
+ simpleKdc = new SimpleKdcServer();
+ prepareKdcServer();
+ simpleKdc.init();
+ resetDefaultRealm();
+ simpleKdc.start();
+ LOG.info("MiniKdc stated.");
+ }
+
+ private void resetDefaultRealm() throws IOException {
+ InputStream templateResource = new FileInputStream(
+ getKrb5conf().getAbsolutePath());
+ String content = IOUtil.readInput(templateResource);
+ content = content.replaceAll("default_realm = .*\n",
+ "default_realm = " + getRealm() + "\n");
+ IOUtil.writeFile(content, getKrb5conf());
+ }
+
+ private void prepareKdcServer() throws Exception {
+ // transport
+ simpleKdc.setWorkDir(workDir);
+ simpleKdc.setKdcHost(getHost());
+ simpleKdc.setKdcRealm(realm);
+ if (transport == null) {
+ transport = conf.getProperty(TRANSPORT);
+ }
+ if (port == 0) {
+ port = NetworkUtil.getServerPort();
+ }
+ if (transport != null) {
+ if (transport.trim().equals("TCP")) {
+ simpleKdc.setKdcTcpPort(port);
+ simpleKdc.setAllowUdp(false);
+ } else if (transport.trim().equals("UDP")) {
+ simpleKdc.setKdcUdpPort(port);
+ simpleKdc.setAllowTcp(false);
+ } else {
+ throw new IllegalArgumentException("Invalid transport: " + transport);
+ }
+ } else {
+ throw new IllegalArgumentException("Need to set transport!");
+ }
+ simpleKdc.getKdcConfig().setString(KdcConfigKey.KDC_SERVICE_NAME,
+ conf.getProperty(INSTANCE));
+ if (conf.getProperty(DEBUG) != null) {
+ krb5Debug = getAndSet(SUN_SECURITY_KRB5_DEBUG, conf.getProperty(DEBUG));
+ }
+ }
+
+ /**
+ * Stops the MiniKdc
+ */
+ public synchronized void stop() {
+ if (simpleKdc != null) {
+ try {
+ simpleKdc.stop();
+ } catch (KrbException e) {
+ e.printStackTrace();
+ } finally {
+ if(conf.getProperty(DEBUG) != null) {
+ System.setProperty(SUN_SECURITY_KRB5_DEBUG,
+ Boolean.toString(krb5Debug));
+ }
+ }
+ }
+ delete(workDir);
+ try {
+ // Will be fixed in next Kerby version.
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ LOG.info("MiniKdc stopped.");
+ }
+
+ private void delete(File f) {
+ if (f.isFile()) {
+ if (! f.delete()) {
+ LOG.warn("WARNING: cannot delete file " + f.getAbsolutePath());
+ }
+ } else {
+ for (File c: f.listFiles()) {
+ delete(c);
+ }
+ if (! f.delete()) {
+ LOG.warn("WARNING: cannot delete directory " + f.getAbsolutePath());
+ }
+ }
+ }
+
+ /**
+ * Creates a principal in the KDC with the specified user and password.
+ *
+ * @param principal principal name, do not include the domain.
+ * @param password password.
+ * @throws Exception thrown if the principal could not be created.
+ */
+ public synchronized void createPrincipal(String principal, String password)
+ throws Exception {
+ simpleKdc.createPrincipal(principal, password);
+ }
+
+ /**
+ * Creates multiple principals in the KDC and adds them to a keytab file.
+ *
+ * @param keytabFile keytab file to add the created principals.
+ * @param principals principals to add to the KDC, do not include the domain.
+ * @throws Exception thrown if the principals or the keytab file could not be
+ * created.
+ */
+ public synchronized void createPrincipal(File keytabFile,
+ String ... principals)
+ throws Exception {
+ simpleKdc.createPrincipals(principals);
+ if (keytabFile.exists() && !keytabFile.delete()) {
+ LOG.error("Failed to delete keytab file: " + keytabFile);
+ }
+ for (String principal : principals) {
+ simpleKdc.getKadmin().exportKeytab(keytabFile, principal);
+ }
+ }
+
+ /**
+ * Set the System property; return the old value for caching.
+ *
+ * @param sysprop property
+ * @param debug true or false
+ * @return the previous value
+ */
+ private boolean getAndSet(String sysprop, String debug) {
+ boolean old = Boolean.getBoolean(sysprop);
+ System.setProperty(sysprop, debug);
+ return old;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/test/org/apache/zookeeper/server/quorum/auth/MiniKdcTest.java
----------------------------------------------------------------------
diff --git a/src/java/test/org/apache/zookeeper/server/quorum/auth/MiniKdcTest.java b/src/java/test/org/apache/zookeeper/server/quorum/auth/MiniKdcTest.java
new file mode 100644
index 0000000..a7bbf7f
--- /dev/null
+++ b/src/java/test/org/apache/zookeeper/server/quorum/auth/MiniKdcTest.java
@@ -0,0 +1,184 @@
+/**
+ * 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.server.quorum.auth;
+
+import org.apache.kerby.kerberos.kerb.keytab.Keytab;
+import org.apache.kerby.kerberos.kerb.type.base.PrincipalName;
+import org.junit.Assert;
+import org.junit.Test;
+
+import javax.security.auth.Subject;
+import javax.security.auth.kerberos.KerberosPrincipal;
+import javax.security.auth.login.AppConfigurationEntry;
+import javax.security.auth.login.Configuration;
+import javax.security.auth.login.LoginContext;
+import java.io.File;
+import java.security.Principal;
+import java.util.List;
+import java.util.Set;
+import java.util.Map;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Arrays;
+
+/*
+ * This code is originally from HDFS, see the file name TestMiniKdc there
+ * in case of bug fixing, history, etc.
+ *
+ * Branch : trunk
+ * Github Revision: 916140604ffef59466ba30832478311d3e6249bd
+ */
+public class MiniKdcTest extends KerberosSecurityTestcase {
+ private static final boolean IBM_JAVA = System.getProperty("java.vendor")
+ .contains("IBM");
+
+ @Test(timeout = 60000)
+ public void testMiniKdcStart() {
+ MiniKdc kdc = getKdc();
+ Assert.assertNotSame(0, kdc.getPort());
+ }
+
+ @Test(timeout = 60000)
+ public void testKeytabGen() throws Exception {
+ MiniKdc kdc = getKdc();
+ File workDir = getWorkDir();
+
+ kdc.createPrincipal(new File(workDir, "keytab"), "foo/bar", "bar/foo");
+ List<PrincipalName> principalNameList =
+ Keytab.loadKeytab(new File(workDir, "keytab")).getPrincipals();
+
+ Set<String> principals = new HashSet<String>();
+ for (PrincipalName principalName : principalNameList) {
+ principals.add(principalName.getName());
+ }
+
+ Assert.assertEquals(new HashSet<String>(Arrays.asList(
+ "foo/bar@" + kdc.getRealm(), "bar/foo@" + kdc.getRealm())),
+ principals);
+ }
+
+ private static class KerberosConfiguration extends Configuration {
+ private String principal;
+ private String keytab;
+ private boolean isInitiator;
+
+ private KerberosConfiguration(String principal, File keytab,
+ boolean client) {
+ this.principal = principal;
+ this.keytab = keytab.getAbsolutePath();
+ this.isInitiator = client;
+ }
+
+ public static Configuration createClientConfig(String principal,
+ File keytab) {
+ return new KerberosConfiguration(principal, keytab, true);
+ }
+
+ public static Configuration createServerConfig(String principal,
+ File keytab) {
+ return new KerberosConfiguration(principal, keytab, false);
+ }
+
+ private static String getKrb5LoginModuleName() {
+ return System.getProperty("java.vendor").contains("IBM")
+ ? "com.ibm.security.auth.module.Krb5LoginModule"
+ : "com.sun.security.auth.module.Krb5LoginModule";
+ }
+
+ @Override
+ public AppConfigurationEntry[] getAppConfigurationEntry(String name) {
+ Map<String, String> options = new HashMap<String, String>();
+ options.put("principal", principal);
+ options.put("refreshKrb5Config", "true");
+ if (IBM_JAVA) {
+ options.put("useKeytab", keytab);
+ options.put("credsType", "both");
+ } else {
+ options.put("keyTab", keytab);
+ options.put("useKeyTab", "true");
+ options.put("storeKey", "true");
+ options.put("doNotPrompt", "true");
+ options.put("useTicketCache", "true");
+ options.put("renewTGT", "true");
+ options.put("isInitiator", Boolean.toString(isInitiator));
+ }
+ String ticketCache = System.getenv("KRB5CCNAME");
+ if (ticketCache != null) {
+ options.put("ticketCache", ticketCache);
+ }
+ options.put("debug", "true");
+
+ return new AppConfigurationEntry[] {
+ new AppConfigurationEntry(getKrb5LoginModuleName(),
+ AppConfigurationEntry.LoginModuleControlFlag.REQUIRED,
+ options) };
+ }
+ }
+
+ @Test(timeout = 60000)
+ public void testKerberosLogin() throws Exception {
+ MiniKdc kdc = getKdc();
+ File workDir = getWorkDir();
+ LoginContext loginContext = null;
+ try {
+ String principal = "foo";
+ File keytab = new File(workDir, "foo.keytab");
+ kdc.createPrincipal(keytab, principal);
+
+ Set<Principal> principals = new HashSet<Principal>();
+ principals.add(new KerberosPrincipal(principal));
+
+ // client login
+ Subject subject = new Subject(false, principals,
+ new HashSet<Object>(), new HashSet<Object>());
+ loginContext = new LoginContext("", subject, null,
+ KerberosConfiguration.createClientConfig(principal,
+ keytab));
+ loginContext.login();
+ subject = loginContext.getSubject();
+ Assert.assertEquals(1, subject.getPrincipals().size());
+ Assert.assertEquals(KerberosPrincipal.class,
+ subject.getPrincipals().iterator().next().getClass());
+ Assert.assertEquals(principal + "@" + kdc.getRealm(),
+ subject.getPrincipals().iterator().next().getName());
+ loginContext.logout();
+
+ // server login
+ subject = new Subject(false, principals, new HashSet<Object>(),
+ new HashSet<Object>());
+ loginContext = new LoginContext("", subject, null,
+ KerberosConfiguration.createServerConfig(principal,
+ keytab));
+ loginContext.login();
+ subject = loginContext.getSubject();
+ Assert.assertEquals(1, subject.getPrincipals().size());
+ Assert.assertEquals(KerberosPrincipal.class,
+ subject.getPrincipals().iterator().next().getClass());
+ Assert.assertEquals(principal + "@" + kdc.getRealm(),
+ subject.getPrincipals().iterator().next().getName());
+ loginContext.logout();
+
+ } finally {
+ if (loginContext != null) {
+ loginContext.logout();
+ }
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumAuthTestBase.java
----------------------------------------------------------------------
diff --git a/src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumAuthTestBase.java b/src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumAuthTestBase.java
new file mode 100644
index 0000000..8978d17
--- /dev/null
+++ b/src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumAuthTestBase.java
@@ -0,0 +1,146 @@
+/**
+ * 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.server.quorum.auth;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.zookeeper.PortAssignment;
+import org.apache.zookeeper.ZKTestCase;
+import org.apache.zookeeper.server.quorum.QuorumPeerTestBase.MainThread;
+import org.apache.zookeeper.test.ClientBase;
+import org.junit.Assert;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * QuorumAuthTestBase provides a base class for testing quorum peer mutual
+ * authentication using SASL mechanisms.
+ */
+public class QuorumAuthTestBase extends ZKTestCase {
+ protected static final Logger LOG = LoggerFactory.getLogger(QuorumAuthTestBase.class);
+ protected List<MainThread> mt = new ArrayList<MainThread>();
+ protected static File jaasConfigDir;
+
+ public static void setupJaasConfig(String jaasEntries) {
+ try {
+ jaasConfigDir = ClientBase.createTmpDir();
+ File saslConfFile = new File(jaasConfigDir, "jaas.conf");
+ FileWriter fwriter = new FileWriter(saslConfFile);
+ fwriter.write(jaasEntries);
+ fwriter.close();
+ System.setProperty("java.security.auth.login.config",
+ saslConfFile.getAbsolutePath());
+ } catch (IOException ioe) {
+ LOG.error("Failed to create tmp directory to hold JAAS conf file", ioe);
+ // could not create tmp directory to hold JAAS conf file : test will
+ // fail now.
+ }
+ }
+
+ public static void cleanupJaasConfig() {
+ if (jaasConfigDir != null) {
+ FileUtils.deleteQuietly(jaasConfigDir);
+ }
+ }
+
+ protected String startQuorum(final int serverCount,
+ Map<String, String> authConfigs, int authServerCount) throws IOException {
+ StringBuilder connectStr = new StringBuilder();
+ final int[] clientPorts = startQuorum(serverCount, connectStr,
+ authConfigs, authServerCount);
+ for (int i = 0; i < serverCount; i++) {
+ Assert.assertTrue("waiting for server " + i + " being up",
+ ClientBase.waitForServerUp("127.0.0.1:" + clientPorts[i],
+ ClientBase.CONNECTION_TIMEOUT));
+ }
+ return connectStr.toString();
+ }
+
+ protected int[] startQuorum(final int serverCount, StringBuilder connectStr,
+ Map<String, String> authConfigs, int authServerCount) throws IOException {
+ final int clientPorts[] = new int[serverCount];
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < serverCount; i++) {
+ clientPorts[i] = PortAssignment.unique();
+ String server = String.format(
+ "server.%d=localhost:%d:%d:participant", i,
+ PortAssignment.unique(), PortAssignment.unique());
+ sb.append(server + "\n");
+ connectStr.append("127.0.0.1:" + clientPorts[i]);
+ if (i < serverCount - 1) {
+ connectStr.append(",");
+ }
+ }
+ String quorumCfg = sb.toString();
+ // servers with authentication interfaces configured
+ int i = 0;
+ for (; i < authServerCount; i++) {
+ startServer(authConfigs, clientPorts, quorumCfg, i);
+ }
+ // servers without any authentication configured
+ for (int j = 0; j < serverCount - authServerCount; j++, i++) {
+ MainThread mthread = new MainThread(i, clientPorts[i], quorumCfg);
+ mt.add(mthread);
+ mthread.start();
+ }
+ return clientPorts;
+ }
+
+ private void startServer(Map<String, String> authConfigs,
+ final int[] clientPorts, String quorumCfg, int i)
+ throws IOException {
+ MainThread mthread = new MainThread(i, clientPorts[i], quorumCfg,
+ authConfigs);
+ mt.add(mthread);
+ mthread.start();
+ }
+
+ protected void startServer(MainThread restartPeer,
+ Map<String, String> authConfigs) throws IOException {
+ MainThread mthread = new MainThread(restartPeer.getMyid(),
+ restartPeer.getClientPort(), restartPeer.getQuorumCfgSection(),
+ authConfigs);
+ mt.add(mthread);
+ mthread.start();
+ }
+
+ void shutdownAll() {
+ for (int i = 0; i < mt.size(); i++) {
+ shutdown(i);
+ }
+ }
+
+ MainThread shutdown(int index) {
+ MainThread mainThread = mt.get(index);
+ try {
+ mainThread.shutdown();
+ } catch (InterruptedException e) {
+ } finally {
+ mt.remove(index);
+ }
+ mainThread.deleteBaseDir();
+ return mainThread;
+ }
+}
[3/4] zookeeper git commit: ZOOKEEPER-1045: Support Quorum Peer
mutual authentication via SASL (rakeshr via phunt)
Posted by ph...@apache.org.
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerMain.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerMain.java b/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerMain.java
index e9c8007..4ea7e54 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerMain.java
+++ b/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerMain.java
@@ -130,26 +130,37 @@ public class QuorumPeerMain {
cnxnFactory.configure(config.getClientPortAddress(),
config.getMaxClientCnxns());
- quorumPeer = new QuorumPeer();
+ quorumPeer = new QuorumPeer(config.getServers(),
+ new File(config.getDataDir()),
+ new File(config.getDataLogDir()),
+ config.getElectionAlg(),
+ config.getServerId(),
+ config.getTickTime(),
+ config.getInitLimit(),
+ config.getSyncLimit(),
+ config.getQuorumListenOnAllIPs(),
+ cnxnFactory,
+ config.getQuorumVerifier());
quorumPeer.setClientPortAddress(config.getClientPortAddress());
- quorumPeer.setTxnFactory(new FileTxnSnapLog(
- new File(config.getDataLogDir()),
- new File(config.getDataDir())));
- quorumPeer.setQuorumPeers(config.getServers());
- quorumPeer.setElectionType(config.getElectionAlg());
- quorumPeer.setMyid(config.getServerId());
- quorumPeer.setTickTime(config.getTickTime());
quorumPeer.setMinSessionTimeout(config.getMinSessionTimeout());
quorumPeer.setMaxSessionTimeout(config.getMaxSessionTimeout());
- quorumPeer.setInitLimit(config.getInitLimit());
- quorumPeer.setSyncLimit(config.getSyncLimit());
- quorumPeer.setQuorumVerifier(config.getQuorumVerifier());
- quorumPeer.setCnxnFactory(cnxnFactory);
quorumPeer.setZKDatabase(new ZKDatabase(quorumPeer.getTxnFactory()));
quorumPeer.setLearnerType(config.getPeerType());
quorumPeer.setSyncEnabled(config.getSyncEnabled());
- quorumPeer.setQuorumListenOnAllIPs(config.getQuorumListenOnAllIPs());
-
+
+ // sets quorum sasl authentication configurations
+ quorumPeer.setQuorumSaslEnabled(config.quorumEnableSasl);
+ if(quorumPeer.isQuorumSaslAuthEnabled()){
+ quorumPeer.setQuorumServerSaslRequired(config.quorumServerRequireSasl);
+ quorumPeer.setQuorumLearnerSaslRequired(config.quorumLearnerRequireSasl);
+ quorumPeer.setQuorumServicePrincipal(config.quorumServicePrincipal);
+ quorumPeer.setQuorumServerLoginContext(config.quorumServerLoginContext);
+ quorumPeer.setQuorumLearnerLoginContext(config.quorumLearnerLoginContext);
+ }
+
+ quorumPeer.setQuorumCnxnThreadsSize(config.quorumCnxnThreadsSize);
+ quorumPeer.initialize();
+
quorumPeer.start();
quorumPeer.join();
} catch (InterruptedException e) {
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/main/org/apache/zookeeper/server/quorum/auth/NullQuorumAuthLearner.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/quorum/auth/NullQuorumAuthLearner.java b/src/java/main/org/apache/zookeeper/server/quorum/auth/NullQuorumAuthLearner.java
new file mode 100644
index 0000000..0af891c
--- /dev/null
+++ b/src/java/main/org/apache/zookeeper/server/quorum/auth/NullQuorumAuthLearner.java
@@ -0,0 +1,33 @@
+/**
+ * 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.server.quorum.auth;
+
+import java.net.Socket;
+
+/**
+ * This class represents no authentication learner, it just return
+ * without performing any authentication.
+ */
+public class NullQuorumAuthLearner implements QuorumAuthLearner {
+
+ @Override
+ public void authenticate(Socket sock, String hostname) {
+ return; // simply return don't require auth
+ }
+}
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/main/org/apache/zookeeper/server/quorum/auth/NullQuorumAuthServer.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/quorum/auth/NullQuorumAuthServer.java b/src/java/main/org/apache/zookeeper/server/quorum/auth/NullQuorumAuthServer.java
new file mode 100644
index 0000000..b26a54a
--- /dev/null
+++ b/src/java/main/org/apache/zookeeper/server/quorum/auth/NullQuorumAuthServer.java
@@ -0,0 +1,34 @@
+/**
+ * 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.server.quorum.auth;
+
+import java.io.DataInputStream;
+import java.net.Socket;
+
+/**
+ * This class represents no authentication server, it just return
+ * without performing any authentication.
+ */
+public class NullQuorumAuthServer implements QuorumAuthServer {
+
+ @Override
+ public void authenticate(final Socket sock, final DataInputStream din) {
+ return; // simply return don't require auth
+ }
+}
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/main/org/apache/zookeeper/server/quorum/auth/QuorumAuth.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/quorum/auth/QuorumAuth.java b/src/java/main/org/apache/zookeeper/server/quorum/auth/QuorumAuth.java
new file mode 100644
index 0000000..8bfa394
--- /dev/null
+++ b/src/java/main/org/apache/zookeeper/server/quorum/auth/QuorumAuth.java
@@ -0,0 +1,96 @@
+/**
+ * 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.server.quorum.auth;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import org.apache.jute.BinaryInputArchive;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.zookeeper.server.quorum.QuorumAuthPacket;
+
+public class QuorumAuth {
+ private static final Logger LOG = LoggerFactory.getLogger(QuorumAuth.class);
+
+ public static final String QUORUM_SASL_AUTH_ENABLED = "quorum.auth.enableSasl";
+ public static final String QUORUM_SERVER_SASL_AUTH_REQUIRED = "quorum.auth.serverRequireSasl";
+ public static final String QUORUM_LEARNER_SASL_AUTH_REQUIRED = "quorum.auth.learnerRequireSasl";
+
+ public static final String QUORUM_KERBEROS_SERVICE_PRINCIPAL = "quorum.auth.kerberos.servicePrincipal";
+ public static final String QUORUM_KERBEROS_SERVICE_PRINCIPAL_DEFAULT_VALUE = "zkquorum/localhost";
+
+ public static final String QUORUM_LEARNER_SASL_LOGIN_CONTEXT = "quorum.auth.learner.saslLoginContext";
+ public static final String QUORUM_LEARNER_SASL_LOGIN_CONTEXT_DFAULT_VALUE = "QuorumLearner";
+
+ public static final String QUORUM_SERVER_SASL_LOGIN_CONTEXT = "quorum.auth.server.saslLoginContext";
+ public static final String QUORUM_SERVER_SASL_LOGIN_CONTEXT_DFAULT_VALUE = "QuorumServer";
+
+ static final String QUORUM_SERVER_PROTOCOL_NAME = "zookeeper-quorum";
+ static final String QUORUM_SERVER_SASL_DIGEST = "zk-quorum-sasl-md5";
+ static final String QUORUM_AUTH_MESSAGE_TAG = "qpconnect";
+
+ // this is negative, so that if a learner that does auth, connects to a
+ // server, it'll think the received packet is an authentication packet
+ public static final long QUORUM_AUTH_MAGIC_NUMBER = -0xa0dbcafecafe1234L;
+
+ public enum Status {
+ IN_PROGRESS(0), SUCCESS(1), ERROR(-1);
+ private int status;
+
+ Status(int status) {
+ this.status = status;
+ }
+
+ static Status getStatus(int status) {
+ switch (status) {
+ case 0:
+ return IN_PROGRESS;
+ case 1:
+ return SUCCESS;
+ case -1:
+ return ERROR;
+ default:
+ LOG.error("Unknown status:{}!", status);
+ assert false : "Unknown status!";
+ return ERROR;
+ }
+ }
+
+ int status() {
+ return status;
+ }
+ }
+
+ public static QuorumAuthPacket createPacket(Status status, byte[] response) {
+ return new QuorumAuthPacket(QUORUM_AUTH_MAGIC_NUMBER,
+ status.status(), response);
+ }
+
+ public static boolean nextPacketIsAuth(DataInputStream din)
+ throws IOException {
+ din.mark(32);
+ BinaryInputArchive bia = new BinaryInputArchive(din);
+ boolean firstIsAuth = (bia.readLong("NO_TAG")
+ == QuorumAuth.QUORUM_AUTH_MAGIC_NUMBER);
+ din.reset();
+ return firstIsAuth;
+ }
+}
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/main/org/apache/zookeeper/server/quorum/auth/QuorumAuthLearner.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/quorum/auth/QuorumAuthLearner.java b/src/java/main/org/apache/zookeeper/server/quorum/auth/QuorumAuthLearner.java
new file mode 100644
index 0000000..af71257
--- /dev/null
+++ b/src/java/main/org/apache/zookeeper/server/quorum/auth/QuorumAuthLearner.java
@@ -0,0 +1,40 @@
+/**
+ * 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.server.quorum.auth;
+
+import java.io.IOException;
+import java.net.Socket;
+
+/**
+ * Interface for quorum learner authentication mechanisms.
+ */
+public interface QuorumAuthLearner {
+
+ /**
+ * Performs an authentication step for the given socket connection.
+ *
+ * @param sock
+ * socket connection to other quorum peer server
+ * @param hostname
+ * host name of other quorum peer server
+ * @throws IOException
+ * if there is an authentication failure
+ */
+ public void authenticate(Socket sock, String hostname) throws IOException;
+}
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/main/org/apache/zookeeper/server/quorum/auth/QuorumAuthServer.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/quorum/auth/QuorumAuthServer.java b/src/java/main/org/apache/zookeeper/server/quorum/auth/QuorumAuthServer.java
new file mode 100644
index 0000000..e9de8f0
--- /dev/null
+++ b/src/java/main/org/apache/zookeeper/server/quorum/auth/QuorumAuthServer.java
@@ -0,0 +1,41 @@
+/**
+ * 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.server.quorum.auth;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.net.Socket;
+
+/**
+ * Interface for quorum server authentication mechanisms.
+ */
+public interface QuorumAuthServer {
+
+ /**
+ * Performs an authentication step for the given socket connection.
+ *
+ * @param sock
+ * socket connection to other quorum peer
+ * @param din
+ * stream used to read auth data send by the quorum learner
+ * @throws IOException if the server fails to authenticate connecting quorum learner
+ */
+ public void authenticate(Socket sock, DataInputStream din)
+ throws IOException;
+}
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/main/org/apache/zookeeper/server/quorum/auth/SaslQuorumAuthLearner.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/quorum/auth/SaslQuorumAuthLearner.java b/src/java/main/org/apache/zookeeper/server/quorum/auth/SaslQuorumAuthLearner.java
new file mode 100644
index 0000000..fffb55a
--- /dev/null
+++ b/src/java/main/org/apache/zookeeper/server/quorum/auth/SaslQuorumAuthLearner.java
@@ -0,0 +1,230 @@
+/**
+ * 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.server.quorum.auth;
+
+import java.io.BufferedOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.net.Socket;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+
+import javax.security.auth.Subject;
+import javax.security.auth.login.AppConfigurationEntry;
+import javax.security.auth.login.Configuration;
+import javax.security.auth.login.LoginException;
+import javax.security.sasl.SaslClient;
+import javax.security.sasl.SaslException;
+
+import org.apache.jute.BinaryInputArchive;
+import org.apache.jute.BinaryOutputArchive;
+import org.apache.zookeeper.Login;
+import org.apache.zookeeper.SaslClientCallbackHandler;
+import org.apache.zookeeper.server.quorum.QuorumAuthPacket;
+import org.apache.zookeeper.util.SecurityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SaslQuorumAuthLearner implements QuorumAuthLearner {
+ private static final Logger LOG = LoggerFactory
+ .getLogger(SaslQuorumAuthLearner.class);
+
+ private final Login learnerLogin;
+ private final boolean quorumRequireSasl;
+ private final String quorumServicePrincipal;
+
+ public SaslQuorumAuthLearner(boolean quorumRequireSasl,
+ String quorumServicePrincipal, String loginContext)
+ throws SaslException {
+ this.quorumRequireSasl = quorumRequireSasl;
+ this.quorumServicePrincipal = quorumServicePrincipal;
+ try {
+ AppConfigurationEntry entries[] = Configuration
+ .getConfiguration()
+ .getAppConfigurationEntry(loginContext);
+ if (entries == null || entries.length == 0) {
+ throw new LoginException("SASL-authentication failed because"
+ + " the specified JAAS configuration "
+ + "section '" + loginContext
+ + "' could not be found.");
+ }
+ this.learnerLogin = new Login(loginContext,
+ new SaslClientCallbackHandler(null, "QuorumLearner"));
+ this.learnerLogin.startThreadIfNeeded();
+ } catch (LoginException e) {
+ throw new SaslException("Failed to initialize authentication mechanism using SASL", e);
+ }
+ }
+
+ @Override
+ public void authenticate(Socket sock, String hostName) throws IOException {
+ if (!quorumRequireSasl) { // let it through, we don't require auth
+ LOG.info("Skipping SASL authentication as {}={}",
+ QuorumAuth.QUORUM_LEARNER_SASL_AUTH_REQUIRED,
+ quorumRequireSasl);
+ return;
+ }
+ SaslClient sc = null;
+ String principalConfig = SecurityUtils
+ .getServerPrincipal(quorumServicePrincipal, hostName);
+ try {
+ DataOutputStream dout = new DataOutputStream(
+ sock.getOutputStream());
+ DataInputStream din = new DataInputStream(sock.getInputStream());
+ byte[] responseToken = new byte[0];
+ sc = SecurityUtils.createSaslClient(learnerLogin.getSubject(),
+ principalConfig,
+ QuorumAuth.QUORUM_SERVER_PROTOCOL_NAME,
+ QuorumAuth.QUORUM_SERVER_SASL_DIGEST, LOG, "QuorumLearner");
+
+ if (sc.hasInitialResponse()) {
+ responseToken = createSaslToken(new byte[0], sc, learnerLogin);
+ }
+ send(dout, responseToken);
+ QuorumAuthPacket authPacket = receive(din);
+ QuorumAuth.Status qpStatus = QuorumAuth.Status
+ .getStatus(authPacket.getStatus());
+ while (!sc.isComplete()) {
+ switch (qpStatus) {
+ case SUCCESS:
+ responseToken = createSaslToken(authPacket.getToken(), sc,
+ learnerLogin);
+ // we're done; don't expect to send another BIND
+ if (responseToken != null) {
+ throw new SaslException("Protocol error: attempting to send response after completion");
+ }
+ break;
+ case IN_PROGRESS:
+ responseToken = createSaslToken(authPacket.getToken(), sc,
+ learnerLogin);
+ send(dout, responseToken);
+ authPacket = receive(din);
+ qpStatus = QuorumAuth.Status
+ .getStatus(authPacket.getStatus());
+ break;
+ case ERROR:
+ throw new SaslException(
+ "Authentication failed against server addr: "
+ + sock.getRemoteSocketAddress());
+ default:
+ LOG.warn("Unknown status:{}!", qpStatus);
+ throw new SaslException(
+ "Authentication failed against server addr: "
+ + sock.getRemoteSocketAddress());
+ }
+ }
+
+ // Validate status code at the end of authentication exchange.
+ checkAuthStatus(sock, qpStatus);
+ } finally {
+ if (sc != null) {
+ try {
+ sc.dispose();
+ } catch (SaslException e) {
+ LOG.error("SaslClient dispose() failed", e);
+ }
+ }
+ }
+ return;
+ }
+
+ private void checkAuthStatus(Socket sock, QuorumAuth.Status qpStatus)
+ throws SaslException {
+ if (qpStatus == QuorumAuth.Status.SUCCESS) {
+ LOG.info("Successfully completed the authentication using SASL. server addr: {}, status: {}",
+ sock.getRemoteSocketAddress(), qpStatus);
+ } else {
+ throw new SaslException("Authentication failed against server addr: "
+ + sock.getRemoteSocketAddress() + ", qpStatus: "
+ + qpStatus);
+ }
+ }
+
+ private QuorumAuthPacket receive(DataInputStream din) throws IOException {
+ QuorumAuthPacket authPacket = new QuorumAuthPacket();
+ BinaryInputArchive bia = BinaryInputArchive.getArchive(din);
+ authPacket.deserialize(bia, QuorumAuth.QUORUM_AUTH_MESSAGE_TAG);
+ return authPacket;
+ }
+
+ private void send(DataOutputStream dout, byte[] response)
+ throws IOException {
+ QuorumAuthPacket authPacket;
+ BufferedOutputStream bufferedOutput = new BufferedOutputStream(dout);
+ BinaryOutputArchive boa = BinaryOutputArchive
+ .getArchive(bufferedOutput);
+ if (response != null && response.length < 0) {
+ throw new IOException("Response length < 0");
+ } else if (response == null) {
+ authPacket = QuorumAuth.createPacket(
+ QuorumAuth.Status.IN_PROGRESS, response);
+ } else {
+ authPacket = QuorumAuth.createPacket(
+ QuorumAuth.Status.IN_PROGRESS, response);
+ }
+
+ boa.writeRecord(authPacket, QuorumAuth.QUORUM_AUTH_MESSAGE_TAG);
+ bufferedOutput.flush();
+ }
+
+ // TODO: need to consolidate the #createSaslToken() implementation between ZooKeeperSaslClient#createSaslToken().
+ private byte[] createSaslToken(final byte[] saslToken,
+ final SaslClient saslClient, final Login login)
+ throws SaslException {
+ if (saslToken == null) {
+ throw new SaslException(
+ "Error in authenticating with a Zookeeper Quorum member: the quorum member's saslToken is null.");
+ }
+ if (login.getSubject() != null) {
+ synchronized (login) {
+ try {
+ final byte[] retval = Subject.doAs(login.getSubject(),
+ new PrivilegedExceptionAction<byte[]>() {
+ public byte[] run() throws SaslException {
+ LOG.debug("saslClient.evaluateChallenge(len="
+ + saslToken.length + ")");
+ return saslClient.evaluateChallenge(saslToken);
+ }
+ });
+ return retval;
+ } catch (PrivilegedActionException e) {
+ String error = "An error: (" + e
+ + ") occurred when evaluating Zookeeper Quorum Member's "
+ + " received SASL token.";
+ // Try to provide hints to use about what went wrong so they
+ // can fix their configuration.
+ // TODO: introspect about e: look for GSS information.
+ final String UNKNOWN_SERVER_ERROR_TEXT = "(Mechanism level: Server not found in Kerberos database (7) - UNKNOWN_SERVER)";
+ if (e.toString().indexOf(UNKNOWN_SERVER_ERROR_TEXT) > -1) {
+ error += " This may be caused by Java's being unable to resolve the Zookeeper Quorum Member's"
+ + " hostname correctly. You may want to try to adding"
+ + " '-Dsun.net.spi.nameservice.provider.1=dns,sun' to your server's JVMFLAGS environment.";
+ }
+ LOG.error(error);
+ throw new SaslException(error);
+ }
+ }
+ } else {
+ throw new SaslException(
+ "Cannot make SASL token without subject defined. "
+ + "For diagnosis, please look for WARNs and ERRORs in your log related to the Login class.");
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/main/org/apache/zookeeper/server/quorum/auth/SaslQuorumAuthServer.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/quorum/auth/SaslQuorumAuthServer.java b/src/java/main/org/apache/zookeeper/server/quorum/auth/SaslQuorumAuthServer.java
new file mode 100644
index 0000000..8430da2
--- /dev/null
+++ b/src/java/main/org/apache/zookeeper/server/quorum/auth/SaslQuorumAuthServer.java
@@ -0,0 +1,180 @@
+/**
+ * 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.server.quorum.auth;
+
+import java.io.BufferedOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.net.Socket;
+import java.util.Set;
+
+import javax.security.auth.login.AppConfigurationEntry;
+import javax.security.auth.login.Configuration;
+import javax.security.auth.login.LoginException;
+import javax.security.sasl.SaslException;
+import javax.security.sasl.SaslServer;
+
+import org.apache.jute.BinaryInputArchive;
+import org.apache.jute.BinaryOutputArchive;
+import org.apache.zookeeper.Login;
+import org.apache.zookeeper.server.quorum.QuorumAuthPacket;
+import org.apache.zookeeper.util.SecurityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SaslQuorumAuthServer implements QuorumAuthServer {
+
+ private static final Logger LOG = LoggerFactory
+ .getLogger(SaslQuorumAuthServer.class);
+
+ private final static int MAX_RETRIES = 5;
+ private final Login serverLogin;
+ private final boolean quorumRequireSasl;
+
+ public SaslQuorumAuthServer(boolean quorumRequireSasl, String loginContext, Set<String> authzHosts)
+ throws SaslException {
+ this.quorumRequireSasl = quorumRequireSasl;
+ try {
+ AppConfigurationEntry entries[] = Configuration.getConfiguration()
+ .getAppConfigurationEntry(loginContext);
+ if (entries == null || entries.length == 0) {
+ throw new LoginException("SASL-authentication failed"
+ + " because the specified JAAS configuration "
+ + "section '" + loginContext + "' could not be found.");
+ }
+ SaslQuorumServerCallbackHandler saslServerCallbackHandler = new SaslQuorumServerCallbackHandler(
+ Configuration.getConfiguration(), loginContext, authzHosts);
+ serverLogin = new Login(loginContext, saslServerCallbackHandler);
+ serverLogin.startThreadIfNeeded();
+ } catch (Throwable e) {
+ throw new SaslException(
+ "Failed to initialize authentication mechanism using SASL",
+ e);
+ }
+ }
+
+ @Override
+ public void authenticate(Socket sock, DataInputStream din)
+ throws SaslException {
+ DataOutputStream dout = null;
+ SaslServer ss = null;
+ try {
+ if (!QuorumAuth.nextPacketIsAuth(din)) {
+ if (quorumRequireSasl) {
+ throw new SaslException("Learner not trying to authenticate"
+ + " and authentication is required");
+ } else {
+ // let it through, we don't require auth
+ return;
+ }
+ }
+
+ byte[] token = receive(din);
+ int tries = 0;
+ dout = new DataOutputStream(sock.getOutputStream());
+ byte[] challenge = null;
+ ss = SecurityUtils.createSaslServer(serverLogin.getSubject(),
+ QuorumAuth.QUORUM_SERVER_PROTOCOL_NAME,
+ QuorumAuth.QUORUM_SERVER_SASL_DIGEST, serverLogin.callbackHandler,
+ LOG);
+ while (!ss.isComplete()) {
+ challenge = ss.evaluateResponse(token);
+ if (!ss.isComplete()) {
+ // limited number of retries.
+ if (++tries > MAX_RETRIES) {
+ send(dout, challenge, QuorumAuth.Status.ERROR);
+ LOG.warn("Failed to authenticate using SASL, server addr: {}, retries={} exceeded.",
+ sock.getRemoteSocketAddress(), tries);
+ break;
+ }
+ send(dout, challenge, QuorumAuth.Status.IN_PROGRESS);
+ token = receive(din);
+ }
+ }
+ // Authentication exchange has completed
+ if (ss.isComplete()) {
+ send(dout, challenge, QuorumAuth.Status.SUCCESS);
+ LOG.info("Successfully completed the authentication using SASL. learner addr: {}",
+ sock.getRemoteSocketAddress());
+ }
+ } catch (Exception e) {
+ try {
+ if (dout != null) {
+ // send error message to the learner
+ send(dout, new byte[0], QuorumAuth.Status.ERROR);
+ }
+ } catch (IOException ioe) {
+ LOG.warn("Exception while sending failed status", ioe);
+ }
+ // If sasl is not required, when a server initializes a
+ // connection it will try to log in, but it will also
+ // accept connections that do not start with a sasl
+ // handshake.
+ if (quorumRequireSasl) {
+ LOG.error("Failed to authenticate using SASL", e);
+ throw new SaslException(
+ "Failed to authenticate using SASL: " + e.getMessage());
+ } else {
+ LOG.warn("Failed to authenticate using SASL", e);
+ LOG.warn("Maintaining learner connection despite SASL authentication failure."
+ + " server addr: {}, {}: {}",
+ new Object[] { sock.getRemoteSocketAddress(),
+ QuorumAuth.QUORUM_SERVER_SASL_AUTH_REQUIRED,
+ quorumRequireSasl });
+ return; // let it through, we don't require auth
+ }
+ } finally {
+ if (ss != null) {
+ try {
+ ss.dispose();
+ } catch (SaslException e) {
+ LOG.error("SaslServer dispose() failed", e);
+ }
+ }
+ }
+ return;
+ }
+
+ private byte[] receive(DataInputStream din) throws IOException {
+ QuorumAuthPacket authPacket = new QuorumAuthPacket();
+ BinaryInputArchive bia = BinaryInputArchive.getArchive(din);
+ authPacket.deserialize(bia, QuorumAuth.QUORUM_AUTH_MESSAGE_TAG);
+ return authPacket.getToken();
+ }
+
+ private void send(DataOutputStream dout, byte[] challenge,
+ QuorumAuth.Status s) throws IOException {
+ BufferedOutputStream bufferedOutput = new BufferedOutputStream(dout);
+ BinaryOutputArchive boa = BinaryOutputArchive
+ .getArchive(bufferedOutput);
+ QuorumAuthPacket authPacket;
+ if (challenge != null && challenge.length < 0) {
+ throw new IOException("Response length < 0");
+ } else if (challenge == null && s != QuorumAuth.Status.SUCCESS) {
+ authPacket = QuorumAuth.createPacket(
+ QuorumAuth.Status.IN_PROGRESS, challenge);
+ } else {
+ authPacket = QuorumAuth.createPacket(s, challenge);
+ }
+
+ boa.writeRecord(authPacket, QuorumAuth.QUORUM_AUTH_MESSAGE_TAG);
+ bufferedOutput.flush();
+ }
+}
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/main/org/apache/zookeeper/server/quorum/auth/SaslQuorumServerCallbackHandler.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/server/quorum/auth/SaslQuorumServerCallbackHandler.java b/src/java/main/org/apache/zookeeper/server/quorum/auth/SaslQuorumServerCallbackHandler.java
new file mode 100644
index 0000000..3e71bb1
--- /dev/null
+++ b/src/java/main/org/apache/zookeeper/server/quorum/auth/SaslQuorumServerCallbackHandler.java
@@ -0,0 +1,148 @@
+/**
+ * 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.server.quorum.auth;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.auth.login.AppConfigurationEntry;
+import javax.security.auth.login.Configuration;
+import javax.security.sasl.AuthorizeCallback;
+import javax.security.sasl.RealmCallback;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This is used by the SASL mechanisms to get further information to complete
+ * the authentication. For example, a SASL mechanism might use this callback
+ * handler to do verification operation. This is used by the QuorumServer to
+ * perform the mutual quorum peer authentication.
+ */
+public class SaslQuorumServerCallbackHandler implements CallbackHandler {
+ private static final String USER_PREFIX = "user_";
+ private static final Logger LOG = LoggerFactory.getLogger(SaslQuorumServerCallbackHandler.class);
+
+ private String userName;
+ private final Map<String,String> credentials = new HashMap<String,String>();
+ private final Set<String> authzHosts;
+
+ public SaslQuorumServerCallbackHandler(Configuration configuration,
+ String serverSection, Set<String> authzHosts) throws IOException {
+ AppConfigurationEntry configurationEntries[] = configuration.getAppConfigurationEntry(serverSection);
+
+ if (configurationEntries == null) {
+ String errorMessage = "Could not find a '" + serverSection + "' entry in this configuration: Server cannot start.";
+ LOG.error(errorMessage);
+ throw new IOException(errorMessage);
+ }
+ credentials.clear();
+ for(AppConfigurationEntry entry: configurationEntries) {
+ Map<String,?> options = entry.getOptions();
+ // Populate DIGEST-MD5 user -> password map with JAAS configuration entries from the "QuorumServer" section.
+ // Usernames are distinguished from other options by prefixing the username with a "user_" prefix.
+ for(Map.Entry<String, ?> pair : options.entrySet()) {
+ String key = pair.getKey();
+ if (key.startsWith(USER_PREFIX)) {
+ String userName = key.substring(USER_PREFIX.length());
+ credentials.put(userName,(String)pair.getValue());
+ }
+ }
+ }
+
+ // authorized host lists
+ this.authzHosts = authzHosts;
+ }
+
+ public void handle(Callback[] callbacks) throws UnsupportedCallbackException {
+ for (Callback callback : callbacks) {
+ if (callback instanceof NameCallback) {
+ handleNameCallback((NameCallback) callback);
+ } else if (callback instanceof PasswordCallback) {
+ handlePasswordCallback((PasswordCallback) callback);
+ } else if (callback instanceof RealmCallback) {
+ handleRealmCallback((RealmCallback) callback);
+ } else if (callback instanceof AuthorizeCallback) {
+ handleAuthorizeCallback((AuthorizeCallback) callback);
+ }
+ }
+ }
+
+ private void handleNameCallback(NameCallback nc) {
+ // check to see if this user is in the user password database.
+ if (credentials.get(nc.getDefaultName()) == null) {
+ LOG.warn("User '{}' not found in list of DIGEST-MD5 authenticateable users.",
+ nc.getDefaultName());
+ return;
+ }
+ nc.setName(nc.getDefaultName());
+ userName = nc.getDefaultName();
+ }
+
+ private void handlePasswordCallback(PasswordCallback pc) {
+ if (credentials.containsKey(userName) ) {
+ pc.setPassword(credentials.get(userName).toCharArray());
+ } else {
+ LOG.warn("No password found for user: {}", userName);
+ }
+ }
+
+ private void handleRealmCallback(RealmCallback rc) {
+ LOG.debug("QuorumLearner supplied realm: {}", rc.getDefaultText());
+ rc.setText(rc.getDefaultText());
+ }
+
+ private void handleAuthorizeCallback(AuthorizeCallback ac) {
+ String authenticationID = ac.getAuthenticationID();
+ String authorizationID = ac.getAuthorizationID();
+
+ boolean authzFlag = false;
+ // 1. Matches authenticationID and authorizationID
+ authzFlag = authenticationID.equals(authorizationID);
+
+ // 2. Verify whether the connecting host is present in authorized hosts.
+ // If not exists, then connecting peer is not authorized to join the
+ // ensemble and will reject it.
+ if (authzFlag) {
+ String[] components = authorizationID.split("[/@]");
+ if (components.length == 3) {
+ authzFlag = authzHosts.contains(components[1]);
+ }
+ if (!authzFlag) {
+ LOG.error("SASL authorization completed, {} is not authorized to connect",
+ components[1]);
+ }
+ }
+
+ // Sets authorization flag
+ ac.setAuthorized(authzFlag);
+ if (ac.isAuthorized()) {
+ ac.setAuthorizedID(authorizationID);
+ LOG.info("Successfully authenticated learner: authenticationID={}; authorizationID={}.",
+ authenticationID, authorizationID);
+ }
+ LOG.debug("SASL authorization completed, authorized flag set to {}", ac.isAuthorized());
+ }
+}
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/main/org/apache/zookeeper/util/SecurityUtils.java
----------------------------------------------------------------------
diff --git a/src/java/main/org/apache/zookeeper/util/SecurityUtils.java b/src/java/main/org/apache/zookeeper/util/SecurityUtils.java
new file mode 100644
index 0000000..67484e4
--- /dev/null
+++ b/src/java/main/org/apache/zookeeper/util/SecurityUtils.java
@@ -0,0 +1,298 @@
+/**
+ * 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.util;
+
+import java.security.Principal;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+
+import javax.security.auth.Subject;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.sasl.Sasl;
+import javax.security.sasl.SaslClient;
+import javax.security.sasl.SaslException;
+import javax.security.sasl.SaslServer;
+
+import org.apache.zookeeper.SaslClientCallbackHandler;
+import org.apache.zookeeper.server.auth.KerberosName;
+import org.ietf.jgss.GSSContext;
+import org.ietf.jgss.GSSCredential;
+import org.ietf.jgss.GSSException;
+import org.ietf.jgss.GSSManager;
+import org.ietf.jgss.GSSName;
+import org.ietf.jgss.Oid;
+import org.slf4j.Logger;
+
+public final class SecurityUtils {
+
+ public static final String QUORUM_HOSTNAME_PATTERN = "_HOST";
+
+ /**
+ * Create an instance of a SaslClient. It will return null if there is an exception.
+ *
+ * @param subject subject
+ * @param servicePrincipal principal
+ * @param protocol name of the protocol for which the authentication is being performed
+ * @param serverName name of the server to authenticate to
+ * @param LOG logger
+ * @param entity can be either zookeeper client or quorum learner
+ *
+ * @return saslclient object
+ * @throws SaslException
+ */
+ public static SaslClient createSaslClient(final Subject subject,
+ final String servicePrincipal, final String protocol,
+ final String serverName, final Logger LOG, final String entity) throws SaslException {
+ SaslClient saslClient;
+ // Use subject.getPrincipals().isEmpty() as an indication of which SASL
+ // mechanism to use: if empty, use DIGEST-MD5; otherwise, use GSSAPI.
+ if (subject.getPrincipals().isEmpty()) {
+ // no principals: must not be GSSAPI: use DIGEST-MD5 mechanism
+ // instead.
+ LOG.info("{} will use DIGEST-MD5 as SASL mechanism.", entity);
+ String[] mechs = { "DIGEST-MD5" };
+ String username = (String) (subject.getPublicCredentials()
+ .toArray()[0]);
+ String password = (String) (subject.getPrivateCredentials()
+ .toArray()[0]);
+ // 'domain' parameter is hard-wired between the server and client
+ saslClient = Sasl.createSaslClient(mechs, username, protocol,
+ serverName, null, new SaslClientCallbackHandler(password, entity));
+ return saslClient;
+ } else { // GSSAPI.
+ final Object[] principals = subject.getPrincipals().toArray();
+ // determine client principal from subject.
+ final Principal clientPrincipal = (Principal) principals[0];
+ boolean usingNativeJgss = Boolean
+ .getBoolean("sun.security.jgss.native");
+ if (usingNativeJgss) {
+ // http://docs.oracle.com/javase/6/docs/technotes/guides/security/jgss/jgss-features.html
+ // """
+ // In addition, when performing operations as a particular
+ // Subject, e.g. Subject.doAs(...) or
+ // Subject.doAsPrivileged(...),
+ // the to-be-used GSSCredential should be added to Subject's
+ // private credential set. Otherwise, the GSS operations will
+ // fail since no credential is found.
+ // """
+ try {
+ GSSManager manager = GSSManager.getInstance();
+ Oid krb5Mechanism = new Oid("1.2.840.113554.1.2.2");
+ GSSCredential cred = manager.createCredential(null,
+ GSSContext.DEFAULT_LIFETIME, krb5Mechanism,
+ GSSCredential.INITIATE_ONLY);
+ subject.getPrivateCredentials().add(cred);
+ LOG.debug("Added private credential to {} principal name: '{}'",
+ entity, clientPrincipal);
+ } catch (GSSException ex) {
+ LOG.warn("Cannot add private credential to subject; "
+ + "authentication at the server may fail", ex);
+ }
+ }
+ final KerberosName clientKerberosName = new KerberosName(
+ clientPrincipal.getName());
+ // assume that server and client are in the same realm (by default;
+ // unless the system property
+ // "zookeeper.server.realm" is set).
+ String serverRealm = System.getProperty("zookeeper.server.realm",
+ clientKerberosName.getRealm());
+ KerberosName serviceKerberosName = new KerberosName(
+ servicePrincipal + "@" + serverRealm);
+ final String serviceName = serviceKerberosName.getServiceName();
+ final String serviceHostname = serviceKerberosName.getHostName();
+ final String clientPrincipalName = clientKerberosName.toString();
+ try {
+ saslClient = Subject.doAs(subject,
+ new PrivilegedExceptionAction<SaslClient>() {
+ public SaslClient run() throws SaslException {
+ LOG.info("{} will use GSSAPI as SASL mechanism.", entity);
+ String[] mechs = { "GSSAPI" };
+ LOG.debug("creating sasl client: {}={};service={};serviceHostname={}",
+ new Object[] { entity, clientPrincipalName, serviceName, serviceHostname });
+ SaslClient saslClient = Sasl.createSaslClient(
+ mechs, clientPrincipalName, serviceName,
+ serviceHostname, null,
+ new SaslClientCallbackHandler(null, entity));
+ return saslClient;
+ }
+ });
+ return saslClient;
+ } catch (Exception e) {
+ LOG.error("Exception while trying to create SASL client", e);
+ return null;
+ }
+ }
+ }
+
+ /**
+ * Create an instance of a SaslServer. It will return null if there is an exception.
+ *
+ * @param subject subject
+ * @param protocol protocol
+ * @param serverName server name
+ * @param callbackHandler login callback handler
+ * @param LOG logger
+ * @return sasl server object
+ */
+ public static SaslServer createSaslServer(final Subject subject,
+ final String protocol, final String serverName,
+ final CallbackHandler callbackHandler, final Logger LOG) {
+ if (subject != null) {
+ // server is using a JAAS-authenticated subject: determine service
+ // principal name and hostname from zk server's subject.
+ if (subject.getPrincipals().size() > 0) {
+ try {
+ final Object[] principals = subject.getPrincipals()
+ .toArray();
+ final Principal servicePrincipal = (Principal) principals[0];
+
+ // e.g. servicePrincipalNameAndHostname :=
+ // "zookeeper/myhost.foo.com@FOO.COM"
+ final String servicePrincipalNameAndHostname = servicePrincipal
+ .getName();
+
+ int indexOf = servicePrincipalNameAndHostname.indexOf("/");
+
+ // e.g. servicePrincipalName := "zookeeper"
+ final String servicePrincipalName = servicePrincipalNameAndHostname
+ .substring(0, indexOf);
+
+ // e.g. serviceHostnameAndKerbDomain :=
+ // "myhost.foo.com@FOO.COM"
+ final String serviceHostnameAndKerbDomain = servicePrincipalNameAndHostname
+ .substring(indexOf + 1,
+ servicePrincipalNameAndHostname.length());
+
+ indexOf = serviceHostnameAndKerbDomain.indexOf("@");
+ // e.g. serviceHostname := "myhost.foo.com"
+ final String serviceHostname = serviceHostnameAndKerbDomain
+ .substring(0, indexOf);
+
+ // TODO: should depend on zoo.cfg specified mechs, but if
+ // subject is non-null, it can be assumed to be GSSAPI.
+ final String mech = "GSSAPI";
+
+ LOG.debug("serviceHostname is '" + serviceHostname + "'");
+ LOG.debug("servicePrincipalName is '" + servicePrincipalName
+ + "'");
+ LOG.debug("SASL mechanism(mech) is '" + mech + "'");
+
+ boolean usingNativeJgss = Boolean
+ .getBoolean("sun.security.jgss.native");
+ if (usingNativeJgss) {
+ // http://docs.oracle.com/javase/6/docs/technotes/guides/security/jgss/jgss-features.html
+ // """
+ // In addition, when performing operations as a
+ // particular
+ // Subject, e.g. Subject.doAs(...) or
+ // Subject.doAsPrivileged(...), the to-be-used
+ // GSSCredential should be added to Subject's
+ // private credential set. Otherwise, the GSS operations
+ // will fail since no credential is found.
+ // """
+ try {
+ GSSManager manager = GSSManager.getInstance();
+ Oid krb5Mechanism = new Oid("1.2.840.113554.1.2.2");
+ GSSName gssName = manager.createName(
+ servicePrincipalName + "@"
+ + serviceHostname,
+ GSSName.NT_HOSTBASED_SERVICE);
+ GSSCredential cred = manager.createCredential(
+ gssName, GSSContext.DEFAULT_LIFETIME,
+ krb5Mechanism, GSSCredential.ACCEPT_ONLY);
+ subject.getPrivateCredentials().add(cred);
+ LOG.debug("Added private credential to service principal name: '{}',"
+ + " GSSCredential name: {}", servicePrincipalName, cred.getName());
+ } catch (GSSException ex) {
+ LOG.warn("Cannot add private credential to subject; "
+ + "clients authentication may fail", ex);
+ }
+ }
+ try {
+ return Subject.doAs(subject,
+ new PrivilegedExceptionAction<SaslServer>() {
+ public SaslServer run() {
+ try {
+ SaslServer saslServer;
+ saslServer = Sasl.createSaslServer(
+ mech, servicePrincipalName,
+ serviceHostname, null,
+ callbackHandler);
+ return saslServer;
+ } catch (SaslException e) {
+ LOG.error("Zookeeper Server failed to create a SaslServer to interact with a client during session initiation: ", e);
+ return null;
+ }
+ }
+ });
+ } catch (PrivilegedActionException e) {
+ // TODO: exit server at this point(?)
+ LOG.error("Zookeeper Quorum member experienced a PrivilegedActionException exception while creating a SaslServer using a JAAS principal context:", e);
+ }
+ } catch (IndexOutOfBoundsException e) {
+ LOG.error("server principal name/hostname determination error: ", e);
+ }
+ } else {
+ // JAAS non-GSSAPI authentication: assuming and supporting only
+ // DIGEST-MD5 mechanism for now.
+ // TODO: use 'authMech=' value in zoo.cfg.
+ try {
+ SaslServer saslServer = Sasl.createSaslServer("DIGEST-MD5",
+ protocol, serverName, null, callbackHandler);
+ return saslServer;
+ } catch (SaslException e) {
+ LOG.error("Zookeeper Quorum member failed to create a SaslServer to interact with a client during session initiation", e);
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Convert Kerberos principal name pattern to valid Kerberos principal name.
+ * If the principal name contains hostname pattern "_HOST" then it replaces
+ * with the given hostname, which should be fully-qualified domain name.
+ *
+ * @param principalConfig
+ * the Kerberos principal name conf value to convert
+ * @param hostname
+ * the fully-qualified domain name used for substitution
+ * @return converted Kerberos principal name
+ */
+ public static String getServerPrincipal(String principalConfig,
+ String hostname) {
+ String[] components = getComponents(principalConfig);
+ if (components == null || components.length != 2
+ || !components[1].equals(QUORUM_HOSTNAME_PATTERN)) {
+ return principalConfig;
+ } else {
+ return replacePattern(components, hostname);
+ }
+ }
+
+ private static String[] getComponents(String principalConfig) {
+ if (principalConfig == null)
+ return null;
+ return principalConfig.split("[/]");
+ }
+
+ private static String replacePattern(String[] components, String hostname) {
+ return components[0] + "/" + hostname.toLowerCase();
+ }
+}
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/test/data/kerberos/minikdc-krb5.conf
----------------------------------------------------------------------
diff --git a/src/java/test/data/kerberos/minikdc-krb5.conf b/src/java/test/data/kerberos/minikdc-krb5.conf
new file mode 100644
index 0000000..43ec7c4
--- /dev/null
+++ b/src/java/test/data/kerberos/minikdc-krb5.conf
@@ -0,0 +1,30 @@
+#
+# 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.
+#
+# This resource is originally from HDFS, see the similarly named files there
+# in case of bug fixing, history, etc.
+# Branch : trunk
+# Github Revision: 1d1ab587e4e92ce3aea4cb144811f69145cb3b33
+#
+[libdefaults]
+ default_realm = {0}
+ udp_preference_limit = 1
+
+[realms]
+ {0} = '{'
+ kdc = {1}:{2}
+ '}'
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/test/data/kerberos/minikdc.ldiff
----------------------------------------------------------------------
diff --git a/src/java/test/data/kerberos/minikdc.ldiff b/src/java/test/data/kerberos/minikdc.ldiff
new file mode 100644
index 0000000..20c8d77
--- /dev/null
+++ b/src/java/test/data/kerberos/minikdc.ldiff
@@ -0,0 +1,52 @@
+#
+# 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.
+#
+# This resource is originally from HDFS, see the similarly named files there
+# in case of bug fixing, history, etc.
+# Branch : trunk
+# Github Revision: 1d1ab587e4e92ce3aea4cb144811f69145cb3b33
+#
+dn: ou=users,dc=${0},dc=${1}
+objectClass: organizationalUnit
+objectClass: top
+ou: users
+
+dn: uid=krbtgt,ou=users,dc=${0},dc=${1}
+objectClass: top
+objectClass: person
+objectClass: inetOrgPerson
+objectClass: krb5principal
+objectClass: krb5kdcentry
+cn: KDC Service
+sn: Service
+uid: krbtgt
+userPassword: secret
+krb5PrincipalName: krbtgt/${2}.${3}@${2}.${3}
+krb5KeyVersionNumber: 0
+
+dn: uid=ldap,ou=users,dc=${0},dc=${1}
+objectClass: top
+objectClass: person
+objectClass: inetOrgPerson
+objectClass: krb5principal
+objectClass: krb5kdcentry
+cn: LDAP
+sn: Service
+uid: ldap
+userPassword: secret
+krb5PrincipalName: ldap/${4}@${2}.${3}
+krb5KeyVersionNumber: 0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/test/org/apache/zookeeper/server/quorum/CnxManagerTest.java
----------------------------------------------------------------------
diff --git a/src/java/test/org/apache/zookeeper/server/quorum/CnxManagerTest.java b/src/java/test/org/apache/zookeeper/server/quorum/CnxManagerTest.java
index 8db7fa8..a82a728 100644
--- a/src/java/test/org/apache/zookeeper/server/quorum/CnxManagerTest.java
+++ b/src/java/test/org/apache/zookeeper/server/quorum/CnxManagerTest.java
@@ -87,7 +87,7 @@ public class CnxManagerTest extends ZKTestCase {
public void run(){
try {
QuorumPeer peer = new QuorumPeer(peers, peerTmpdir[0], peerTmpdir[0], peerClientPort[0], 3, 0, 1000, 2, 2);
- QuorumCnxManager cnxManager = new QuorumCnxManager(peer);
+ QuorumCnxManager cnxManager = peer.createCnxnManager();
QuorumCnxManager.Listener listener = cnxManager.listener;
if(listener != null){
listener.start();
@@ -131,7 +131,7 @@ public class CnxManagerTest extends ZKTestCase {
thread.start();
QuorumPeer peer = new QuorumPeer(peers, peerTmpdir[1], peerTmpdir[1], peerClientPort[1], 3, 1, 1000, 2, 2);
- QuorumCnxManager cnxManager = new QuorumCnxManager(peer);
+ QuorumCnxManager cnxManager = peer.createCnxnManager();
QuorumCnxManager.Listener listener = cnxManager.listener;
if(listener != null){
listener.start();
@@ -175,7 +175,7 @@ public class CnxManagerTest extends ZKTestCase {
peerTmpdir[2] = ClientBase.createTmpDir();
QuorumPeer peer = new QuorumPeer(peers, peerTmpdir[1], peerTmpdir[1], peerClientPort[1], 3, 1, 1000, 2, 2);
- QuorumCnxManager cnxManager = new QuorumCnxManager(peer);
+ QuorumCnxManager cnxManager = peer.createCnxnManager();
QuorumCnxManager.Listener listener = cnxManager.listener;
if(listener != null){
listener.start();
@@ -202,7 +202,7 @@ public class CnxManagerTest extends ZKTestCase {
@Test
public void testCnxManagerSpinLock() throws Exception {
QuorumPeer peer = new QuorumPeer(peers, peerTmpdir[1], peerTmpdir[1], peerClientPort[1], 3, 1, 1000, 2, 2);
- QuorumCnxManager cnxManager = new QuorumCnxManager(peer);
+ QuorumCnxManager cnxManager = peer.createCnxnManager();
QuorumCnxManager.Listener listener = cnxManager.listener;
if(listener != null){
listener.start();
@@ -258,7 +258,10 @@ public class CnxManagerTest extends ZKTestCase {
class TestCnxManager extends QuorumCnxManager {
TestCnxManager(QuorumPeer self) {
- super(self);
+ super(self.getId(), self.getView(), self.authServer,
+ self.authLearner, self.tickTime * self.syncLimit,
+ self.getQuorumListenOnAllIPs(),
+ self.quorumCnxnThreadsSize, false);
}
boolean senderWorkerMapContains(Long l){
@@ -359,7 +362,7 @@ public class CnxManagerTest extends ZKTestCase {
@Test
public void testSocketTimeout() throws Exception {
QuorumPeer peer = new QuorumPeer(peers, peerTmpdir[1], peerTmpdir[1], peerClientPort[1], 3, 1, 2000, 2, 2);
- QuorumCnxManager cnxManager = new QuorumCnxManager(peer);
+ QuorumCnxManager cnxManager = peer.createCnxnManager();
QuorumCnxManager.Listener listener = cnxManager.listener;
if(listener != null){
listener.start();
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/test/org/apache/zookeeper/server/quorum/FLEBackwardElectionRoundTest.java
----------------------------------------------------------------------
diff --git a/src/java/test/org/apache/zookeeper/server/quorum/FLEBackwardElectionRoundTest.java b/src/java/test/org/apache/zookeeper/server/quorum/FLEBackwardElectionRoundTest.java
index c1259d1..c0ab3ea 100644
--- a/src/java/test/org/apache/zookeeper/server/quorum/FLEBackwardElectionRoundTest.java
+++ b/src/java/test/org/apache/zookeeper/server/quorum/FLEBackwardElectionRoundTest.java
@@ -113,7 +113,7 @@ public class FLEBackwardElectionRoundTest extends ZKTestCase {
* Start mock server 1
*/
QuorumPeer mockPeer = new QuorumPeer(peers, tmpdir[1], tmpdir[1], port[1], 3, 1, 1000, 2, 2);
- cnxManagers[0] = new QuorumCnxManager(mockPeer);
+ cnxManagers[0] = mockPeer.createCnxnManager();
QuorumCnxManager.Listener listener = cnxManagers[0].listener;
listener.start();
@@ -124,7 +124,7 @@ public class FLEBackwardElectionRoundTest extends ZKTestCase {
* Start mock server 2
*/
mockPeer = new QuorumPeer(peers, tmpdir[2], tmpdir[2], port[2], 3, 2, 1000, 2, 2);
- cnxManagers[1] = new QuorumCnxManager(mockPeer);
+ cnxManagers[1] = mockPeer.createCnxnManager();
listener = cnxManagers[1].listener;
listener.start();
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/test/org/apache/zookeeper/server/quorum/FLECompatibilityTest.java
----------------------------------------------------------------------
diff --git a/src/java/test/org/apache/zookeeper/server/quorum/FLECompatibilityTest.java b/src/java/test/org/apache/zookeeper/server/quorum/FLECompatibilityTest.java
index 72e4fc9..f1c04ca 100644
--- a/src/java/test/org/apache/zookeeper/server/quorum/FLECompatibilityTest.java
+++ b/src/java/test/org/apache/zookeeper/server/quorum/FLECompatibilityTest.java
@@ -288,7 +288,7 @@ public class FLECompatibilityTest extends ZKTestCase {
QuorumPeer peer = new QuorumPeer(peers, tmpdir[0], tmpdir[0], port[0], 3, 0, 1000, 2, 2);
peer.setPeerState(ServerState.LOOKING);
- QuorumCnxManager mng = new QuorumCnxManager(peer);
+ QuorumCnxManager mng = peer.createCnxnManager();
/*
* Check that it generates an internal notification correctly
@@ -325,7 +325,7 @@ public class FLECompatibilityTest extends ZKTestCase {
QuorumPeer peer = new QuorumPeer(peers, tmpdir[0], tmpdir[0], port[0], 3, 0, 1000, 2, 2);
peer.setPeerState(ServerState.LOOKING);
- QuorumCnxManager mng = new QuorumCnxManager(peer);
+ QuorumCnxManager mng = peer.createCnxnManager();
/*
* Check that it generates an internal notification correctly
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/test/org/apache/zookeeper/server/quorum/FLEDontCareTest.java
----------------------------------------------------------------------
diff --git a/src/java/test/org/apache/zookeeper/server/quorum/FLEDontCareTest.java b/src/java/test/org/apache/zookeeper/server/quorum/FLEDontCareTest.java
index a4c0cb0..3d4a02c 100644
--- a/src/java/test/org/apache/zookeeper/server/quorum/FLEDontCareTest.java
+++ b/src/java/test/org/apache/zookeeper/server/quorum/FLEDontCareTest.java
@@ -90,7 +90,7 @@ public class FLEDontCareTest {
@Test
public void testDontCare() {
- MockFLE fle = new MockFLE(peer, new QuorumCnxManager(peer));
+ MockFLE fle = new MockFLE(peer, peer.createCnxnManager());
HashMap<Long, Vote> votes = new HashMap<Long, Vote>();
votes.put(0L, new Vote(0x1, 4L, ZxidUtils.makeZxid(1, 1), 1, 2, ServerState.FOLLOWING));
@@ -104,7 +104,7 @@ public class FLEDontCareTest {
@Test
public void testDontCareVersion() {
- MockFLE fle = new MockFLE(peer, new QuorumCnxManager(peer));
+ MockFLE fle = new MockFLE(peer, peer.createCnxnManager());
HashMap<Long, Vote> votes = new HashMap<Long, Vote>();
votes.put(0L, new Vote(0x1, 4L, ZxidUtils.makeZxid(1, 1), 1, 1, ServerState.FOLLOWING));
@@ -118,7 +118,7 @@ public class FLEDontCareTest {
@Test
public void testLookingNormal() {
- MockFLE fle = new MockFLE(peer, new QuorumCnxManager(peer));
+ MockFLE fle = new MockFLE(peer, peer.createCnxnManager());
HashMap<Long, Vote> votes = new HashMap<Long, Vote>();
votes.put(0L, new Vote(4L, ZxidUtils.makeZxid(2, 1), 1, 1, ServerState.LOOKING));
@@ -132,7 +132,7 @@ public class FLEDontCareTest {
@Test
public void testLookingDiffRounds() {
- MockFLE fle = new MockFLE(peer, new QuorumCnxManager(peer));
+ MockFLE fle = new MockFLE(peer, peer.createCnxnManager());
HashMap<Long, Vote> votes = new HashMap<Long, Vote>();
votes.put(0L, new Vote(4L, ZxidUtils.makeZxid(1, 1), 1, 1, ServerState.LOOKING));
@@ -188,7 +188,7 @@ public class FLEDontCareTest {
@Test
public void testOutofElection() {
- MockFLE fle = new MockFLE(peer, new QuorumCnxManager(peer));
+ MockFLE fle = new MockFLE(peer, peer.createCnxnManager());
HashMap<Long,Vote> outofelection = new HashMap<Long,Vote>();
/*
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/test/org/apache/zookeeper/server/quorum/FLELostMessageTest.java
----------------------------------------------------------------------
diff --git a/src/java/test/org/apache/zookeeper/server/quorum/FLELostMessageTest.java b/src/java/test/org/apache/zookeeper/server/quorum/FLELostMessageTest.java
index 39a53ca..190785c 100644
--- a/src/java/test/org/apache/zookeeper/server/quorum/FLELostMessageTest.java
+++ b/src/java/test/org/apache/zookeeper/server/quorum/FLELostMessageTest.java
@@ -101,7 +101,7 @@ public class FLELostMessageTest extends ZKTestCase {
* Create an instance of the connection manager
*/
QuorumPeer peer = new QuorumPeer(peers, tmpdir[0], tmpdir[0], port[0], 3, 0, 1000, 2, 2);
- cnxManager = new QuorumCnxManager(peer);
+ cnxManager = peer.createCnxnManager();
QuorumCnxManager.Listener listener = cnxManager.listener;
listener.start();
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/8a06bd1c/src/java/test/org/apache/zookeeper/server/quorum/LearnerTest.java
----------------------------------------------------------------------
diff --git a/src/java/test/org/apache/zookeeper/server/quorum/LearnerTest.java b/src/java/test/org/apache/zookeeper/server/quorum/LearnerTest.java
index 2ae57ce..fd08d21 100644
--- a/src/java/test/org/apache/zookeeper/server/quorum/LearnerTest.java
+++ b/src/java/test/org/apache/zookeeper/server/quorum/LearnerTest.java
@@ -69,8 +69,8 @@ public class LearnerTest extends ZKTestCase {
}
class SimpleLearner extends Learner {
SimpleLearner(FileTxnSnapLog ftsl) throws IOException {
- self = new QuorumPeer();
- zk = new SimpleLearnerZooKeeperServer(ftsl, self);
+ self = QuorumPeer.testingQuorumPeer();
+ zk = new SimpleLearnerZooKeeperServer(ftsl, self);
((SimpleLearnerZooKeeperServer)zk).learner = this;
}
}