support digest ACL

Author: vran-dev

src/main/java/cc/cc1234/main/cache/CuratorCache.java

@@ -38,6 +38,8 @@ public static Optional<TreeCache> getTreeCache(String host) {
     public static void close(String host) {
         getTreeCache(host).ifPresent(TreeCache::close);
         getClientOption(host).ifPresent(CuratorFramework::close);
+        curatorClientCache.remove(host);
+        curatorTreeCache.remove(host);
     }
 
     public static void closeAll() {

src/main/java/cc/cc1234/main/cache/TreeItemCache.java

@@ -43,4 +43,7 @@ public void remove(String server, String path) {
         treeItemCache.get(server).remove(path);
     }
 
+    public void remove(String server) {
+        treeItemCache.remove(server);
+    }
 }

src/main/java/cc/cc1234/main/context/ApplicationContext.java

@@ -1,5 +1,7 @@
 package cc.cc1234.main.context;
 
+import cc.cc1234.main.cache.CuratorCache;
+import cc.cc1234.main.cache.TreeItemCache;
 import javafx.stage.Stage;
 
 import java.util.Map;
@@ -35,4 +37,12 @@ public Stage getPrimaryStage() {
     public void setPrimaryStage(Stage primaryStage) {
         this.primaryStage = primaryStage;
     }
+
+    public static void close(String host) {
+        CuratorCache.close(host);
+        if (host.equals(ActiveServerContext.get())) {
+            ActiveServerContext.invalidate();
+        }
+        TreeItemCache.getInstance().remove(host);
+    }
 }

src/main/java/cc/cc1234/main/service/ZkNodeService.java

@@ -4,19 +4,26 @@
 import cc.cc1234.main.context.ActiveServerContext;
 import cc.cc1234.main.listener.TreeNodeListener;
 import cc.cc1234.main.model.ZkServerConfig;
+import cc.cc1234.main.util.ACLs;
+import org.apache.curator.framework.AuthInfo;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
+import org.apache.curator.framework.api.ACLProvider;
 import org.apache.curator.framework.api.CreateBuilder;
 import org.apache.curator.framework.api.DeleteBuilder;
 import org.apache.curator.framework.recipes.cache.TreeCache;
 import org.apache.curator.retry.RetryOneTime;
 import org.apache.zookeeper.CreateMode;
+import org.apache.zookeeper.ZooDefs;
+import org.apache.zookeeper.data.ACL;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 public class ZkNodeService {
 
@@ -29,11 +36,29 @@ public Optional<CuratorFramework> connectIfNecessary(ZkServerConfig config) thro
             return result;
         } else {
             final RetryOneTime retryPolicy = new RetryOneTime(3000);
-            final CuratorFramework client = CuratorFrameworkFactory.builder()
+            final CuratorFrameworkFactory.Builder builder = CuratorFrameworkFactory.builder()
                     .connectString(config.getHost())
-                    .retryPolicy(retryPolicy)
-                    .build();
+                    .retryPolicy(retryPolicy);
+
+            if (!config.getAclList().isEmpty()) {
+                final List<AuthInfo> acls = config.getAclList().stream().map(ACLs::parseDigest).collect(Collectors.toList());
+                builder.authorization(acls)
+                        .aclProvider(new ACLProvider() {
+                            @Override
+                            public List<ACL> getDefaultAcl() {
+                                return ZooDefs.Ids.CREATOR_ALL_ACL;
+                            }
+
+                            @Override
+                            public List<ACL> getAclForPath(String path) {
+                                return ZooDefs.Ids.CREATOR_ALL_ACL;
+                            }
+                        });
+            }
+
+            final CuratorFramework client = builder.build();
             client.start();
+
             // TODO use async
             if (!client.blockUntilConnected(5, TimeUnit.SECONDS)) {
                 return Optional.empty();

src/main/java/cc/cc1234/main/util/ACLs.java

@@ -0,0 +1,20 @@
+package cc.cc1234.main.util;
+
+import org.apache.curator.framework.AuthInfo;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class ACLs {
+
+    private static final Pattern DIGEST_PATTERN = Pattern.compile("(?<schema>digest)(\\:)(?<auth>.*)");
+
+    public static AuthInfo parseDigest(String acl) {
+        final Matcher matcher = DIGEST_PATTERN.matcher(acl);
+        if (!matcher.matches()) {
+            throw new IllegalArgumentException("illegal acl String: " + acl);
+        }
+        return new AuthInfo(matcher.group("schema"), matcher.group("auth").getBytes());
+    }
+
+}

src/main/java/cc/cc1234/main/vo/AddServerVO.java

@@ -8,6 +8,8 @@
 import javafx.beans.property.StringProperty;
 
 import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 
 public class AddServerVO {
 
@@ -20,7 +22,12 @@ public class AddServerVO {
     public void onConfirm() {
         final ZkServerConfig zkServerConfig = new ZkServerConfig();
         zkServerConfig.setHost(getHost());
-        zkServerConfig.getAclList().addAll(Arrays.asList(Strings.nullToEmpty(acl.get()).split("\n")));
+        if (!Strings.isNullOrEmpty(acl.get())) {
+            final List<String> acls = Arrays.stream(acl.get().split("\n"))
+                    .filter(acl -> !Strings.isNullOrEmpty(acl))
+                    .collect(Collectors.toList());
+            zkServerConfig.getAclList().addAll(acls);
+        }
         prettyZooConfigService.add(zkServerConfig);
     }
 

src/main/java/cc/cc1234/main/vo/PrettyZooConfigVO.java

@@ -1,7 +1,5 @@
 package cc.cc1234.main.vo;
 
-import cc.cc1234.main.cache.CuratorCache;
-import cc.cc1234.main.context.ActiveServerContext;
 import cc.cc1234.main.context.ApplicationContext;
 import cc.cc1234.main.model.PrettyZooConfig;
 import cc.cc1234.main.model.ZkServerConfig;
@@ -41,8 +39,7 @@ public void remove(String host) {
                 .collect(Collectors.toList());
         servers.removeAll(removeServers);
         prettyZooConfigService.save(toModel());
-        ActiveServerContext.invalidate();
-        CuratorCache.close(host);
+        ApplicationContext.close(host);
     }
 
     private PrettyZooConfig toModel() {