Throwing exception upon AuthFailed and added new test case.

Author: jzillmann

CHANGELOG.markdown

@@ -4,6 +4,7 @@ CHANGELOG
 ZkClient 0.8 (???)
 ---------------
 - #45: Support for conditional deletes
+- Adding ZkAuthFailedException
 
 
 ZkClient 0.7 (Nov 2015)

src/main/java/org/I0Itec/zkclient/ZkClient.java

@@ -31,6 +31,7 @@
 import javax.security.auth.login.Configuration;
 
 import org.I0Itec.zkclient.ZkEventThread.ZkEvent;
+import org.I0Itec.zkclient.exception.ZkAuthFailedException;
 import org.I0Itec.zkclient.exception.ZkBadVersionException;
 import org.I0Itec.zkclient.exception.ZkException;
 import org.I0Itec.zkclient.exception.ZkInterruptedException;
@@ -940,6 +941,10 @@ public boolean waitForKeeperState(KeeperState keeperState, long time, TimeUnit t
                     return false;
                 }
                 stillWaiting = getEventLock().getStateChangedCondition().awaitUntil(timeout);
+                // Throw an exception in the case authorization fails
+                if (_currentState == KeeperState.AuthFailed) {
+                    throw new ZkAuthFailedException("Authentication failure");
+                }
             }
             LOG.debug("State is " + _currentState);
             return true;

src/main/java/org/I0Itec/zkclient/exception/ZkAuthFailedException.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright 2010 the original author or authors.
+ *
+ * Licensed 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.I0Itec.zkclient.exception;
+
+public class ZkAuthFailedException extends ZkException {
+
+    private static final long serialVersionUID = 1L;
+
+    public ZkAuthFailedException() {
+        super();
+    }
+
+    public ZkAuthFailedException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public ZkAuthFailedException(String message) {
+        super(message);
+    }
+
+    public ZkAuthFailedException(Throwable cause) {
+        super(cause);
+    }
+}

src/test/java/org/I0Itec/zkclient/SaslAuthenticatedTest.java

@@ -27,6 +27,7 @@
 
 import javax.security.auth.login.Configuration;
 
+import org.I0Itec.zkclient.exception.ZkAuthFailedException;
 import org.I0Itec.zkclient.exception.ZkException;
 import org.I0Itec.zkclient.exception.ZkTimeoutException;
 import org.apache.log4j.Logger;
@@ -150,7 +151,7 @@ public void testAuthFailure_AllowFailedSasl() throws IOException {
             bootstrapWithAuthFailure();
             fail("Expected to fail!");
         } catch (ZkException e) {
-            assertThat(e).isInstanceOf(ZkTimeoutException.class);
+            assertThat(e).isInstanceOf(ZkAuthFailedException.class);
         } finally {
             System.clearProperty(ZK_ALLOW_FAILED_SASL);
         }
@@ -172,4 +173,20 @@ public void testAuthFailure_DisabledSasl() throws IOException {
         }
     }
 
+    @Test
+    public void testUnauthenticatedClient() throws IOException {
+        ZkClient unauthed = null;
+        try {
+            bootstrap();
+            System.clearProperty(ZkClient.JAVA_LOGIN_CONFIG_PARAM);
+            System.setProperty("zookeeper.sasl.client", "true");
+            unauthed = new ZkClient("localhost:" + _port, 6000);
+            unauthed.createPersistent("/test", new byte[0], Ids.OPEN_ACL_UNSAFE);
+        } finally {
+            if (unauthed != null) {
+                unauthed.close();
+            }
+        }
+    }
+
 }