You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@drill.apache.org by bitblender <gi...@git.apache.org> on 2017/07/13 14:34:02 UTC

[GitHub] drill pull request #875: DRILL-5671 Set secure ACLs (Access Control List) fo...

GitHub user bitblender opened a pull request:

    https://github.com/apache/drill/pull/875

    DRILL-5671   Set secure ACLs (Access Control List) for Drill ZK nodes in a secure cluster

    

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/bitblender/drill DRILL-5671-PR-2

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/drill/pull/875.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #875
    
----
commit 0b43d451df019026cc6d50128d229340580bb82e
Author: karthik <km...@maprtech.com>
Date:   2017-06-20T17:45:27Z

    DRILL 5671 - Set secure ACLs (Access Control List) for Drill ZK nodes in a secure cluster

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] drill pull request #875: DRILL-5671 Set secure ACLs (Access Control List) fo...

Posted by bitblender <gi...@git.apache.org>.
Github user bitblender commented on a diff in the pull request:

    https://github.com/apache/drill/pull/875#discussion_r127540793
  
    --- Diff: exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKACLProviderFactory.java ---
    @@ -0,0 +1,44 @@
    +/**
    + * 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.drill.exec.coord.zk;
    +
    +import org.apache.curator.framework.api.ACLProvider;
    +import org.apache.curator.framework.imps.DefaultACLProvider;
    +import org.apache.drill.common.config.DrillConfig;
    +import org.apache.drill.exec.ExecConstants;
    +
    +
    +public class ZKACLProviderFactory {
    +
    +    static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ZKACLProviderFactory.class);
    +
    +    public static ACLProvider getACLProvider(DrillConfig config, String clusterId, String zkRoot) {
    --- End diff --
    
    Will make that change.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] drill pull request #875: DRILL-5671 Set secure ACLs (Access Control List) fo...

Posted by adityakishore <gi...@git.apache.org>.
Github user adityakishore commented on a diff in the pull request:

    https://github.com/apache/drill/pull/875#discussion_r127295205
  
    --- Diff: exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKSecureACLProvider.java ---
    @@ -0,0 +1,71 @@
    +/**
    + * 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.drill.exec.coord.zk;
    +
    +import com.google.common.collect.ImmutableList;
    +import org.apache.curator.framework.api.ACLProvider;
    +import org.apache.zookeeper.ZooDefs.Ids;
    +import org.apache.zookeeper.data.ACL;
    +
    +import java.util.List;
    +
    +/**
    + * ZKSecureACLProvider restricts access to znodes created by Drill
    + * The cluster discovery znode i.e. the znode containing the list of Drillbits is
    + * readable by anyone.
    + * For all other znodes only the creator of the znode, i.e the Drillbit user, has full access.
    + */
    +
    +public class ZKSecureACLProvider implements ACLProvider {
    +
    +    static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ZKSecureACLProvider.class);
    +    // Creator has full access
    +    static ImmutableList<ACL> DEFAULT_ACL = new ImmutableList.Builder<ACL>()
    +                                              .addAll(Ids.CREATOR_ALL_ACL.iterator())
    +                                              .build();
    +    // Creator has full access
    +    // Everyone else has only read access
    +    static ImmutableList<ACL> DRILL_CLUSTER_ACL = new ImmutableList.Builder<ACL>()
    --- End diff --
    
    Please use java-doc style comment block and mention why and where this ACL is used.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] drill pull request #875: DRILL-5671 Set secure ACLs (Access Control List) fo...

Posted by paul-rogers <gi...@git.apache.org>.
Github user paul-rogers commented on a diff in the pull request:

    https://github.com/apache/drill/pull/875#discussion_r128879068
  
    --- Diff: exec/java-exec/src/main/resources/drill-module.conf ---
    @@ -112,7 +112,8 @@ drill.exec: {
         retry: {
           count: 7200,
           delay: 500
    -    }
    +    },
    +    use.secure_acl: false
    --- End diff --
    
    Best not to put vendor-specific comments in the Apache Drill PR...


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] drill pull request #875: DRILL-5671 Set secure ACLs (Access Control List) fo...

Posted by paul-rogers <gi...@git.apache.org>.
Github user paul-rogers commented on a diff in the pull request:

    https://github.com/apache/drill/pull/875#discussion_r127524590
  
    --- Diff: exec/java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java ---
    @@ -39,6 +39,7 @@
       String ZK_TIMEOUT = "drill.exec.zk.timeout";
       String ZK_ROOT = "drill.exec.zk.root";
       String ZK_REFRESH = "drill.exec.zk.refresh";
    +  String ZK_SECURE_ACL = "drill.exec.zk.use.secure_acl";
    --- End diff --
    
    `use.secure_acl` --> `secure_acl` as `use` is not a group. This provides:
    
    ```
      zk: {
        connect: "localhost:2181",
        root: "drill",
        secure_acl: true,
    ```
    
    Are we using ACL's for security? Then, we are really "applying" ACLs, so maybe `apply_acl` (apply an access control list...)


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] drill pull request #875: DRILL-5671 Set secure ACLs (Access Control List) fo...

Posted by adityakishore <gi...@git.apache.org>.
Github user adityakishore commented on a diff in the pull request:

    https://github.com/apache/drill/pull/875#discussion_r127295586
  
    --- Diff: exec/java-exec/src/main/resources/drill-module.conf ---
    @@ -112,7 +112,8 @@ drill.exec: {
         retry: {
           count: 7200,
           delay: 500
    -    }
    +    },
    +    use.secure_acl: false
    --- End diff --
    
    This needs to be set to true in `/opt/mapr/drill/drill-1.11.0/conf/drill-distrib.conf` by `configure.sh` when security is enabled on a MapR cluster. Do we have a tracking work item for this?


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] drill pull request #875: DRILL-5671 Set secure ACLs (Access Control List) fo...

Posted by bitblender <gi...@git.apache.org>.
Github user bitblender commented on a diff in the pull request:

    https://github.com/apache/drill/pull/875#discussion_r127367354
  
    --- Diff: exec/java-exec/src/main/resources/drill-module.conf ---
    @@ -112,7 +112,8 @@ drill.exec: {
         retry: {
           count: 7200,
           delay: 500
    -    }
    +    },
    +    use.secure_acl: false
    --- End diff --
    
    Opened https://maprdrill.atlassian.net/browse/MD-2278


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] drill issue #875: DRILL-5671 Set secure ACLs (Access Control List) for Drill...

Posted by paul-rogers <gi...@git.apache.org>.
Github user paul-rogers commented on the issue:

    https://github.com/apache/drill/pull/875
  
    Looks like this patch was applied to an internal branch. Will there be another commit to address the issues raised here for the Apache Drill branch?


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] drill pull request #875: DRILL-5671 Set secure ACLs (Access Control List) fo...

Posted by paul-rogers <gi...@git.apache.org>.
Github user paul-rogers commented on a diff in the pull request:

    https://github.com/apache/drill/pull/875#discussion_r127528429
  
    --- Diff: exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKSecureACLProvider.java ---
    @@ -0,0 +1,80 @@
    +/**
    + * 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.drill.exec.coord.zk;
    +
    +import com.google.common.collect.ImmutableList;
    +import org.apache.curator.framework.api.ACLProvider;
    +import org.apache.zookeeper.ZooDefs.Ids;
    +import org.apache.zookeeper.data.ACL;
    +
    +import java.util.List;
    +
    +/**
    + * ZKSecureACLProvider restricts access to znodes created by Drill in a secure installation.
    + *
    + * The cluster discovery znode i.e. the znode containing the list of Drillbits is
    + * readable by anyone.
    + *
    + * For all other znodes, only the creator of the znode, i.e the Drillbit user, has full access.
    + *
    + */
    +
    +public class ZKSecureACLProvider implements ACLProvider {
    +
    +    static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ZKSecureACLProvider.class);
    +
    +    /**
    +     * DEFAULT_ACL gives the creator of a znode full-access to it
    +     */
    +    static ImmutableList<ACL> DEFAULT_ACL = new ImmutableList.Builder<ACL>()
    +                                              .addAll(Ids.CREATOR_ALL_ACL.iterator())
    +                                              .build();
    +    /**
    +     * DRILL_CLUSTER_ACL gives the creator full access and everyone else only read access.
    +     * Used on the Drillbit discovery znode (znode path /<drill.exec.zk.root>/<drill.exec.cluster-id>)
    +     * i.e. the node that contains the list of Drillbits in the cluster.
    +     */
    +     static ImmutableList<ACL> DRILL_CLUSTER_ACL = new ImmutableList.Builder<ACL>()
    +                                                .addAll(Ids.READ_ACL_UNSAFE.iterator())
    +                                                .addAll(Ids.CREATOR_ALL_ACL.iterator())
    +                                                .build();
    +    final String clusterName;
    +    final String drillZkRoot;
    +    final String drillClusterPath;
    +
    +    public ZKSecureACLProvider(String clusterName, String drillZKRoot) {
    +        this.clusterName = clusterName;
    +        this.drillZkRoot = drillZKRoot;
    +        this.drillClusterPath = "/" + this.drillZkRoot + "/" +  this.clusterName ;
    +    }
    +
    +    public List<ACL> getDefaultAcl() {
    +        return DEFAULT_ACL;
    +    }
    +
    +    public List<ACL> getAclForPath(String path) {
    --- End diff --
    
    This approach encodes the meaning of paths in just the path name. Seems fragile.
    
    Alternatives:
    
    * Register the secure (or insecure) paths so that the ZK cluster coordinator (not this class) decides on security.
    * Get ACL base on type: `getSecureACL()` or `getPublicACL()`, and let the cluster coordinator define which is which.
    * As a refinement of the first idea, provide some kind of config option to externalize the set of paths and their security.
    
    For example, in Drill-on-YARN, the app master creates ZK entries to ensure that only one app master starts per cluster. We would not want to encode that path information here.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] drill pull request #875: DRILL-5671 Set secure ACLs (Access Control List) fo...

Posted by paul-rogers <gi...@git.apache.org>.
Github user paul-rogers commented on a diff in the pull request:

    https://github.com/apache/drill/pull/875#discussion_r127525830
  
    --- Diff: exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKACLProviderFactory.java ---
    @@ -0,0 +1,44 @@
    +/**
    + * 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.drill.exec.coord.zk;
    +
    +import org.apache.curator.framework.api.ACLProvider;
    +import org.apache.curator.framework.imps.DefaultACLProvider;
    +import org.apache.drill.common.config.DrillConfig;
    +import org.apache.drill.exec.ExecConstants;
    +
    +
    +public class ZKACLProviderFactory {
    +
    +    static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ZKACLProviderFactory.class);
    +
    +    public static ACLProvider getACLProvider(DrillConfig config, String clusterId, String zkRoot) {
    +        if (config.getBoolean(ExecConstants.ZK_SECURE_ACL)) {
    +            if (config.getBoolean(ExecConstants.USER_AUTHENTICATION_ENABLED)){
    +                logger.trace("ZKACLProviderFactory: Using secure ZK ACL");
    --- End diff --
    
    The logger inserts the class name for you; no need to repeat it here.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] drill pull request #875: DRILL-5671 Set secure ACLs (Access Control List) fo...

Posted by bitblender <gi...@git.apache.org>.
Github user bitblender commented on a diff in the pull request:

    https://github.com/apache/drill/pull/875#discussion_r127367344
  
    --- Diff: exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKSecureACLProvider.java ---
    @@ -0,0 +1,71 @@
    +/**
    + * 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.drill.exec.coord.zk;
    +
    +import com.google.common.collect.ImmutableList;
    +import org.apache.curator.framework.api.ACLProvider;
    +import org.apache.zookeeper.ZooDefs.Ids;
    +import org.apache.zookeeper.data.ACL;
    +
    +import java.util.List;
    +
    +/**
    + * ZKSecureACLProvider restricts access to znodes created by Drill
    + * The cluster discovery znode i.e. the znode containing the list of Drillbits is
    + * readable by anyone.
    + * For all other znodes only the creator of the znode, i.e the Drillbit user, has full access.
    + */
    +
    +public class ZKSecureACLProvider implements ACLProvider {
    +
    +    static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ZKSecureACLProvider.class);
    +    // Creator has full access
    +    static ImmutableList<ACL> DEFAULT_ACL = new ImmutableList.Builder<ACL>()
    +                                              .addAll(Ids.CREATOR_ALL_ACL.iterator())
    +                                              .build();
    +    // Creator has full access
    +    // Everyone else has only read access
    +    static ImmutableList<ACL> DRILL_CLUSTER_ACL = new ImmutableList.Builder<ACL>()
    --- End diff --
    
    Done


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] drill pull request #875: DRILL-5671 Set secure ACLs (Access Control List) fo...

Posted by chunhui-shi <gi...@git.apache.org>.
Github user chunhui-shi commented on a diff in the pull request:

    https://github.com/apache/drill/pull/875#discussion_r128875470
  
    --- Diff: exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKACLProviderFactory.java ---
    @@ -0,0 +1,44 @@
    +/**
    + * 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.drill.exec.coord.zk;
    +
    +import org.apache.curator.framework.api.ACLProvider;
    +import org.apache.curator.framework.imps.DefaultACLProvider;
    +import org.apache.drill.common.config.DrillConfig;
    +import org.apache.drill.exec.ExecConstants;
    +
    +
    +public class ZKACLProviderFactory {
    +
    +    static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ZKACLProviderFactory.class);
    +
    +    public static ACLProvider getACLProvider(DrillConfig config, String clusterId, String zkRoot) {
    +        if (config.getBoolean(ExecConstants.ZK_SECURE_ACL)) {
    +            if (config.getBoolean(ExecConstants.USER_AUTHENTICATION_ENABLED)){
    +                logger.trace("ZKACLProviderFactory: Using secure ZK ACL");
    +                return new ZKSecureACLProvider(clusterId, zkRoot);
    +            } else {
    +                logger.warn("ZKACLProviderFactory : Secure ZK ACL enabled but user authentication is disabled." +
    --- End diff --
    
    USER_AUTHENTICATION_ENABLED means the drill's client is logging in drill as some authenticated users, but enabling zookeeper ACL means we are going to protect our znodes using ACL. so other user should not be able to modify our znodes, I think this is a valid scenario, meaning no warning needed.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] drill issue #875: DRILL-5671 Set secure ACLs (Access Control List) for Drill...

Posted by bitblender <gi...@git.apache.org>.
Github user bitblender commented on the issue:

    https://github.com/apache/drill/pull/875
  
    Yes. There will be a commit addressing the issues raised here.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] drill pull request #875: DRILL-5671 Set secure ACLs (Access Control List) fo...

Posted by paul-rogers <gi...@git.apache.org>.
Github user paul-rogers commented on a diff in the pull request:

    https://github.com/apache/drill/pull/875#discussion_r127525673
  
    --- Diff: exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKACLProviderFactory.java ---
    @@ -0,0 +1,44 @@
    +/**
    + * 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.drill.exec.coord.zk;
    +
    +import org.apache.curator.framework.api.ACLProvider;
    +import org.apache.curator.framework.imps.DefaultACLProvider;
    +import org.apache.drill.common.config.DrillConfig;
    +import org.apache.drill.exec.ExecConstants;
    +
    +
    +public class ZKACLProviderFactory {
    +
    +    static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ZKACLProviderFactory.class);
    +
    +    public static ACLProvider getACLProvider(DrillConfig config, String clusterId, String zkRoot) {
    --- End diff --
    
    See comment below: probably want to pass a root path here rather than the components.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] drill pull request #875: DRILL-5671 Set secure ACLs (Access Control List) fo...

Posted by bitblender <gi...@git.apache.org>.
Github user bitblender commented on a diff in the pull request:

    https://github.com/apache/drill/pull/875#discussion_r127540711
  
    --- Diff: exec/java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java ---
    @@ -39,6 +39,7 @@
       String ZK_TIMEOUT = "drill.exec.zk.timeout";
       String ZK_ROOT = "drill.exec.zk.root";
       String ZK_REFRESH = "drill.exec.zk.refresh";
    +  String ZK_SECURE_ACL = "drill.exec.zk.use.secure_acl";
    --- End diff --
    
    I was going to make this "zk.use_secure_acl" but when I was looking for an example I found "bit.use.ip", so I modeled it on that. I will change this to "zk.apply_secure_acl"


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] drill pull request #875: DRILL-5671 Set secure ACLs (Access Control List) fo...

Posted by paul-rogers <gi...@git.apache.org>.
Github user paul-rogers commented on a diff in the pull request:

    https://github.com/apache/drill/pull/875#discussion_r127526692
  
    --- Diff: exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKSecureACLProvider.java ---
    @@ -0,0 +1,80 @@
    +/**
    + * 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.drill.exec.coord.zk;
    +
    +import com.google.common.collect.ImmutableList;
    +import org.apache.curator.framework.api.ACLProvider;
    +import org.apache.zookeeper.ZooDefs.Ids;
    +import org.apache.zookeeper.data.ACL;
    +
    +import java.util.List;
    +
    +/**
    + * ZKSecureACLProvider restricts access to znodes created by Drill in a secure installation.
    + *
    + * The cluster discovery znode i.e. the znode containing the list of Drillbits is
    + * readable by anyone.
    + *
    + * For all other znodes, only the creator of the znode, i.e the Drillbit user, has full access.
    + *
    + */
    +
    +public class ZKSecureACLProvider implements ACLProvider {
    +
    +    static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ZKSecureACLProvider.class);
    +
    +    /**
    +     * DEFAULT_ACL gives the creator of a znode full-access to it
    +     */
    +    static ImmutableList<ACL> DEFAULT_ACL = new ImmutableList.Builder<ACL>()
    +                                              .addAll(Ids.CREATOR_ALL_ACL.iterator())
    +                                              .build();
    +    /**
    +     * DRILL_CLUSTER_ACL gives the creator full access and everyone else only read access.
    +     * Used on the Drillbit discovery znode (znode path /<drill.exec.zk.root>/<drill.exec.cluster-id>)
    +     * i.e. the node that contains the list of Drillbits in the cluster.
    +     */
    +     static ImmutableList<ACL> DRILL_CLUSTER_ACL = new ImmutableList.Builder<ACL>()
    +                                                .addAll(Ids.READ_ACL_UNSAFE.iterator())
    +                                                .addAll(Ids.CREATOR_ALL_ACL.iterator())
    +                                                .build();
    +    final String clusterName;
    +    final String drillZkRoot;
    +    final String drillClusterPath;
    +
    +    public ZKSecureACLProvider(String clusterName, String drillZKRoot) {
    +        this.clusterName = clusterName;
    +        this.drillZkRoot = drillZKRoot;
    +        this.drillClusterPath = "/" + this.drillZkRoot + "/" +  this.clusterName ;
    --- End diff --
    
    Encoding path building here seems fragile. The ZK cluster coordinator should build the path, then pass that along to the factory, which passes it here. Simplifies things if we ever have to change how we construct the path if we create it in one place rather than two (or more).


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] drill issue #875: DRILL-5671 Set secure ACLs (Access Control List) for Drill...

Posted by paul-rogers <gi...@git.apache.org>.
Github user paul-rogers commented on the issue:

    https://github.com/apache/drill/pull/875
  
    Where are we on this PR? A note three weeks ago said that another commit would be coming; but haven't see it...


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---