Skip to content

acl for zookeeper is added #2190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
genevien wants to merge 1 commit into from
Closed

acl for zookeeper is added #2190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions server/src/main/java/io/druid/curator/CuratorConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ public class CuratorConfig

@JsonProperty("compress")
private boolean enableCompression = true;

@JsonProperty("acl")
private boolean enableAcl = false;

public String getZkHosts()
{
Expand Down Expand Up @@ -66,4 +69,14 @@ public void setEnableCompression(Boolean enableCompression)
{
this.enableCompression = enableCompression;
}

public Boolean getEnableAcl()
{
return enableAcl;
}

public void setEnableAcl(Boolean enableAcl)
{
this.enableAcl = enableAcl;
}
}
25 changes: 25 additions & 0 deletions server/src/main/java/io/druid/curator/CuratorModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,23 @@
import com.google.inject.Provides;
import com.metamx.common.lifecycle.Lifecycle;
import com.metamx.common.logger.Logger;

import io.druid.guice.JsonConfigProvider;
import io.druid.guice.LazySingleton;

import org.apache.curator.framework.api.ACLProvider;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.framework.imps.DefaultACLProvider;
import org.apache.curator.retry.BoundedExponentialBackoffRetry;

import java.io.IOException;

import java.util.List;

import org.apache.zookeeper.ZooDefs;
import org.apache.zookeeper.data.ACL;

/**
*/
public class CuratorModule implements Module
Expand All @@ -55,6 +64,7 @@ public CuratorFramework makeCurator(CuratorConfig config, Lifecycle lifecycle) t
.sessionTimeoutMs(config.getZkSessionTimeoutMs())
.retryPolicy(new BoundedExponentialBackoffRetry(1000, 45000, 30))
.compressionProvider(new PotentiallyGzippedCompressionProvider(config.getEnableCompression()))
.aclProvider(config.getEnableAcl() ? new SecuredACLProvider() : new DefaultACLProvider())
.build();

lifecycle.addHandler(
Expand All @@ -78,4 +88,19 @@ public void stop()

return framework;
}

class SecuredACLProvider implements 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;
}
}
}