Create X509AuthenticationConfig (#64)

This commit creates a X509AuthenticationConfig class as a central place for all the (except zookeeper.X509AuthenticationProvider.superUser to minimize changes on upstream zookeeper code) x509 authentication related config properties, including (1)keys (2)setters (3)getters for those properties. X509AuthenticationConfig enables reading configs from 1) the zoo.cfg file (by way of QuorumPeerConfig) and 2) JVM argument (System Properties) for backward-compatibility.

zookeeper-server/src/main/java/org/apache/zookeeper/server/PrepRequestProcessor.java

@@ -59,7 +59,7 @@
 import org.apache.zookeeper.server.ZooKeeperServer.PrecalculatedDigest;
 import org.apache.zookeeper.server.auth.ProviderRegistry;
 import org.apache.zookeeper.server.auth.ServerAuthenticationProvider;
-import org.apache.zookeeper.server.auth.znode.groupacl.ZNodeGroupAclProperties;
+import org.apache.zookeeper.server.auth.X509AuthenticationConfig;
 import org.apache.zookeeper.server.quorum.LeaderZooKeeperServer;
 import org.apache.zookeeper.server.quorum.QuorumPeer.QuorumServer;
 import org.apache.zookeeper.server.quorum.QuorumPeerConfig;
@@ -1011,11 +1011,11 @@ public static List<ACL> fixupACL(String path, List<Id> authInfo, List<ACL> acls)
             if (id == null || id.getScheme() == null) {
                 throw new KeeperException.InvalidACLException(path);
             }
-            if (id.getScheme().equals("world") && id.getId().equals("anyone") && !QuorumPeerConfig
-                .isSetX509ClientIdAsAclEnabled()) {
+            if (id.getScheme().equals("world") && id.getId().equals("anyone") && !X509AuthenticationConfig
+                .getInstance().isX509ClientIdAsAclEnabled()) {
                 rv.add(a);
-            } else if (id.getScheme().equals("auth") || QuorumPeerConfig
-                .isSetX509ClientIdAsAclEnabled()) {
+            } else if (id.getScheme().equals("auth") || X509AuthenticationConfig
+                .getInstance().isX509ClientIdAsAclEnabled()) {
                 // This is the "auth" id, so we have to expand it to the
                 // authenticated ids of the requestor
                 boolean authIdValid = false;
@@ -1029,7 +1029,7 @@ public static List<ACL> fixupACL(String path, List<Id> authInfo, List<ACL> acls)
                     }
                 }
                 // If the znode path contains open read access node path prefix, add (world:anyone, r)
-                if (ZNodeGroupAclProperties.getInstance().getOpenReadAccessPathPrefixes().stream()
+                if (X509AuthenticationConfig.getInstance().getZnodeGroupAclOpenReadAccessPathPrefixes().stream()
                     .anyMatch(path::startsWith)) {
                     rv.add(new ACL(ZooDefs.Perms.READ, ZooDefs.Ids.ANYONE_ID_UNSAFE));
                 }

zookeeper-server/src/main/java/org/apache/zookeeper/server/auth/X509AuthenticationConfig.java

@@ -0,0 +1,324 @@
+/*
+ * 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.auth;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Set;
+import java.util.stream.Collectors;
+import com.google.common.annotations.VisibleForTesting;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This class contains config properties for x509-based authentication
+ */
+public class X509AuthenticationConfig {
+  private static final Logger LOG = LoggerFactory.getLogger(X509AuthenticationConfig.class);
+  private static X509AuthenticationConfig instance = null;
+  private static final String LOG_MSG_PREFIX = X509AuthenticationConfig.class.getName() + "::";
+
+  private X509AuthenticationConfig() {
+  }
+
+  public static X509AuthenticationConfig getInstance() {
+    if (instance == null) {
+      synchronized (X509AuthenticationConfig.class) {
+        if (instance == null) {
+          instance = new X509AuthenticationConfig();
+        }
+      }
+    }
+    return instance;
+  }
+
+  /**
+   * The following System Property keys are used to extract clientId from the client cert.
+   */
+  public static final String SSL_X509_CONFIG_PREFIX = "zookeeper.ssl.x509.";
+  public static final String SSL_X509_CLIENT_CERT_ID_TYPE =
+      SSL_X509_CONFIG_PREFIX + "clientCertIdType";
+  public static final String SSL_X509_CLIENT_CERT_ID_SAN_MATCH_TYPE =
+      SSL_X509_CONFIG_PREFIX + "clientCertIdSanMatchType";
+  // Match Regex is used to choose which entry to use, default value ".*"
+  public static final String SSL_X509_CLIENT_CERT_ID_SAN_MATCH_REGEX =
+      SSL_X509_CONFIG_PREFIX + "clientCertIdSanMatchRegex";
+  // Extract Regex is used to construct a client ID (acl entity) to return, default value ".*"
+  public static final String SSL_X509_CLIENT_CERT_ID_SAN_EXTRACT_REGEX =
+      SSL_X509_CONFIG_PREFIX + "clientCertIdSanExtractRegex";
+  // Specifies match group index for the extract regex (i in Matcher.group(i)), default value 0
+  public static final String SSL_X509_CLIENT_CERT_ID_SAN_EXTRACT_MATCHER_GROUP_INDEX =
+      SSL_X509_CONFIG_PREFIX + "clientCertIdSanExtractMatcherGroupIndex";
+  public static final String SUBJECT_ALTERNATIVE_NAME_SHORT = "SAN";
+  private static final String DEFAULT_REGEX = ".*";
+  private String clientCertIdType;
+  private int clientCertIdSanMatchType = -1;
+  private String clientCertIdSanMatchRegex;
+  private String clientCertIdSanExtractRegex;
+  private int clientCertIdSanExtractMatcherGroupIndex = -1;
+
+  /** ZooKeeper server-side ZNode group ACL feature */
+//   x509ClientIdAsAclEnabled enables/disables whether znodes created by auth'ed clients
+//   should have ACL fields populated with the client Id given by the authentication provider.
+//   Has the same effect as the ZK client using ZooDefs.Ids.CREATOR_ALL_ACL.
+  public static final String ZNODE_GROUP_ACL_CONFIG_PREFIX = "zookeeper.X509ZNodeGroupAclProvider.";
+  // Enables/disables whether znodes created by auth'ed clients
+  // should have ACL fields populated with the client Id given by the authentication provider.
+  // Has the same effect as the ZK client using ZooDefs.Ids.CREATOR_ALL_ACL.
+  public static final String SET_X509_CLIENT_ID_AS_ACL =
+      ZNODE_GROUP_ACL_CONFIG_PREFIX + "setX509ClientIdAsAcl";
+  // A list of domain names that will have cross-domain access privilege, separated by ","
+  public static final String CROSS_DOMAIN_ACCESS_DOMAIN_NAME =
+      ZNODE_GROUP_ACL_CONFIG_PREFIX + "crossDomainAccessDomainName";
+  // A defined URI represents a super user, same concept as the original x509 superuser
+  public static final String ZOOKEEPER_ZNODEGROUPACL_SUPERUSER_ID =
+      ZNODE_GROUP_ACL_CONFIG_PREFIX + "superUserId";
+  // A list of znode path prefixes, separated by ","
+  // Znode whose path starts with the defined path prefix would have open read access
+  // Meaning the znode will have (world:anyone, r) ACL
+  public static final String OPEN_READ_ACCESS_PATH_PREFIX =
+      ZNODE_GROUP_ACL_CONFIG_PREFIX + "openReadAccessPathPrefix";
+  // If the server is dedicated for one domain, use this config property to define the domain name,
+  // and enable connection filtering feature for this domain
+  public static final String DEDICATED_DOMAIN = ZNODE_GROUP_ACL_CONFIG_PREFIX + "dedicatedDomain";
+  public static final String CLIENT_URI_DOMAIN_MAPPING_ROOT_PATH =
+      ZNODE_GROUP_ACL_CONFIG_PREFIX + "clientUriDomainMappingRootPath";
+
+  private String x509ClientIdAsAclEnabled;
+  private String znodeGroupAclSuperUserId;
+  private String znodeGroupAclCrossDomainAccessDomainNameStr;
+  private String znodeGroupAclOpenReadAccessPathPrefixStr;
+  private String znodeGroupAclServerDedicatedDomain;
+  private String znodeGroupAclClientUriDomainMappingRootPath;
+  // Although using "volatile" keyword with double checked locking could prevent the undesired
+  //creation of multiple objects; not using here for the consideration of read performance
+  private Set<String> openReadAccessPathPrefixes;
+  private Set<String> crossDomainAccessDomains;
+  private final Object openReadAccessPathPrefixesLock = new Object();
+  private final Object crossDomainAccessDomainsLock = new Object();
+
+  /**
+   * Setters for X509 properties
+   */
+  public void setClientCertIdType(String clientCertIdType) {
+    this.clientCertIdType = clientCertIdType;
+  }
+
+  public void setClientCertIdSanMatchType(String clientCertIdSanMatchType) {
+    if (clientCertIdSanMatchType == null) {
+      return;
+    }
+    try {
+      this.clientCertIdSanMatchType = Integer.parseInt(clientCertIdSanMatchType);
+    } catch (NumberFormatException e) {
+      String errMsg =
+          LOG_MSG_PREFIX + "Could not parse number for clientCertIdSanMatchType, provided value: "
+              + clientCertIdSanMatchType;
+      LOG.error(errMsg);
+      throw new IllegalArgumentException(errMsg);
+    }
+  }
+
+  public void setClientCertIdSanMatchRegex(String clientCertIdSanMatchRegex) {
+    this.clientCertIdSanMatchRegex = clientCertIdSanMatchRegex;
+  }
+
+  public void setClientCertIdSanExtractRegex(String clientCertIdSanExtractRegex) {
+    this.clientCertIdSanExtractRegex = clientCertIdSanExtractRegex;
+  }
+
+  public void setClientCertIdSanExtractMatcherGroupIndex(
+      String clientCertIdSanExtractMatcherGroupIndex) {
+    if (clientCertIdSanExtractMatcherGroupIndex == null) {
+      return;
+    }
+    try {
+      this.clientCertIdSanExtractMatcherGroupIndex =
+          Integer.parseInt(clientCertIdSanExtractMatcherGroupIndex);
+    } catch (NumberFormatException e) {
+      String errMsg = LOG_MSG_PREFIX
+          + "Could not parse number for clientCertIdSanExtractMatcherGroupIndex, provided value: "
+          + clientCertIdSanExtractMatcherGroupIndex;
+      LOG.error(errMsg);
+      throw new IllegalArgumentException(errMsg);
+    }
+  }
+
+  /**
+   * Setters for X509 Znode Group Acl properties
+   */
+  public void setX509ClientIdAsAclEnabled(String enabled) {
+    x509ClientIdAsAclEnabled = enabled;
+  }
+
+  public void setZnodeGroupAclSuperUserId(String znodeGroupAclSuperUserId) {
+    this.znodeGroupAclSuperUserId = znodeGroupAclSuperUserId;
+  }
+
+  public void setZnodeGroupAclCrossDomainAccessDomainNameStr(String znodeGroupAclCrossDomainAccessDomainNameStr) {
+    this.znodeGroupAclCrossDomainAccessDomainNameStr = znodeGroupAclCrossDomainAccessDomainNameStr;
+  }
+
+  public void setZnodeGroupAclOpenReadAccessPathPrefixStr(
+      String znodeGroupAclOpenReadAccessPathPrefixStr) {
+    this.znodeGroupAclOpenReadAccessPathPrefixStr = znodeGroupAclOpenReadAccessPathPrefixStr;
+  }
+
+  public void setZnodeGroupAclServerDedicatedDomain(String znodeGroupAclServerDedicatedDomain) {
+    this.znodeGroupAclServerDedicatedDomain = znodeGroupAclServerDedicatedDomain;
+  }
+
+  public void setZnodeGroupAclClientUriDomainMappingRootPath(
+      String znodeGroupAclClientUriDomainMappingRootPath) {
+    this.znodeGroupAclClientUriDomainMappingRootPath = znodeGroupAclClientUriDomainMappingRootPath;
+  }
+
+  /**
+   * Getters for X509 properties
+   */
+  public String getClientCertIdType() {
+    if (clientCertIdType == null) {
+      setClientCertIdType(System.getProperty(SSL_X509_CLIENT_CERT_ID_TYPE));
+    }
+    return clientCertIdType;
+  }
+
+  public int getClientCertIdSanMatchType() {
+    if (clientCertIdSanMatchType == -1) {
+      setClientCertIdSanMatchType(System.getProperty(SSL_X509_CLIENT_CERT_ID_SAN_MATCH_TYPE));
+    }
+    return clientCertIdSanMatchType;
+  }
+
+  public String getClientCertIdSanMatchRegex() {
+    if (clientCertIdSanMatchRegex == null) {
+      setClientCertIdSanMatchRegex(System.getProperty(SSL_X509_CLIENT_CERT_ID_SAN_MATCH_REGEX));
+    }
+    return clientCertIdSanMatchRegex == null ? DEFAULT_REGEX : clientCertIdSanMatchRegex;
+  }
+
+  public String getClientCertIdSanExtractRegex() {
+    if (clientCertIdSanExtractRegex == null) {
+      setClientCertIdSanExtractRegex(System.getProperty(SSL_X509_CLIENT_CERT_ID_SAN_EXTRACT_REGEX));
+    }
+    return clientCertIdSanExtractRegex == null ? DEFAULT_REGEX : clientCertIdSanExtractRegex;
+  }
+
+  public int getClientCertIdSanExtractMatcherGroupIndex() {
+    if (clientCertIdSanExtractMatcherGroupIndex == -1) {
+      setClientCertIdSanExtractMatcherGroupIndex(
+          System.getProperty(SSL_X509_CLIENT_CERT_ID_SAN_EXTRACT_MATCHER_GROUP_INDEX));
+    }
+    return clientCertIdSanExtractMatcherGroupIndex == -1 ? 0
+        : clientCertIdSanExtractMatcherGroupIndex;
+  }
+
+  /**
+   * Getters for X509 Znode Group Acl properties
+   */
+  public boolean isX509ClientIdAsAclEnabled() {
+    return Boolean.parseBoolean(x509ClientIdAsAclEnabled) || Boolean
+        .parseBoolean(System.getProperty(SET_X509_CLIENT_ID_AS_ACL));
+  }
+
+  public String getZnodeGroupAclSuperUserId() {
+    if (znodeGroupAclSuperUserId == null) {
+      setZnodeGroupAclSuperUserId(System.getProperty(ZOOKEEPER_ZNODEGROUPACL_SUPERUSER_ID));
+    }
+    return znodeGroupAclSuperUserId;
+  }
+
+  public Set<String> getZnodeGroupAclCrossDomainAccessDomains() {
+    if (crossDomainAccessDomains == null) {
+      synchronized (crossDomainAccessDomainsLock) {
+        if (crossDomainAccessDomains == null) {
+          crossDomainAccessDomains = loadCrossDomainAccessDomainNames();
+        }
+      }
+    }
+    return crossDomainAccessDomains;
+  }
+
+  public Set<String> getZnodeGroupAclOpenReadAccessPathPrefixes() {
+    if (openReadAccessPathPrefixes == null) {
+      synchronized (openReadAccessPathPrefixesLock) {
+        if (openReadAccessPathPrefixes == null) {
+          openReadAccessPathPrefixes = loadOpenReadAccessPathPrefixes();
+        }
+      }
+    }
+    return openReadAccessPathPrefixes;
+  }
+
+  public String getZnodeGroupAclServerDedicatedDomain() {
+    if (znodeGroupAclServerDedicatedDomain == null) {
+      setZnodeGroupAclServerDedicatedDomain(System.getProperty(DEDICATED_DOMAIN));
+    }
+    return znodeGroupAclServerDedicatedDomain;
+  }
+
+  public String getZnodeGroupAclClientUriDomainMappingRootPath() {
+    if (znodeGroupAclClientUriDomainMappingRootPath == null) {
+      setZnodeGroupAclClientUriDomainMappingRootPath(
+          System.getProperty(CLIENT_URI_DOMAIN_MAPPING_ROOT_PATH));
+    }
+    return znodeGroupAclClientUriDomainMappingRootPath;
+  }
+
+  /**
+   * Helper method for Znode Group Acl feature
+   * Get open read access path prefixes from config
+   * @return A set of path prefixes
+   */
+  private Set<String> loadOpenReadAccessPathPrefixes() {
+    if (znodeGroupAclOpenReadAccessPathPrefixStr == null) {
+      setZnodeGroupAclOpenReadAccessPathPrefixStr(System.getProperty(OPEN_READ_ACCESS_PATH_PREFIX));
+    }
+    if (znodeGroupAclOpenReadAccessPathPrefixStr == null
+        || znodeGroupAclOpenReadAccessPathPrefixStr.isEmpty()) {
+      return Collections.emptySet();
+    }
+    return Arrays.stream(znodeGroupAclOpenReadAccessPathPrefixStr.split(","))
+        .filter(str -> str.length() > 0).collect(Collectors.toSet());
+  }
+
+  /**
+   * Helper method for Znode Group Acl feature
+   * Get the domain names that are mapped to cross-domain access privilege
+   * @return A set of domain names
+   */
+  private Set<String> loadCrossDomainAccessDomainNames() {
+    if (znodeGroupAclCrossDomainAccessDomainNameStr == null) {
+      setZnodeGroupAclCrossDomainAccessDomainNameStr(System.getProperty(CROSS_DOMAIN_ACCESS_DOMAIN_NAME));
+    }
+    if (znodeGroupAclCrossDomainAccessDomainNameStr == null || znodeGroupAclCrossDomainAccessDomainNameStr
+        .isEmpty()) {
+      return Collections.emptySet();
+    }
+    return Arrays.stream(znodeGroupAclCrossDomainAccessDomainNameStr.split(","))
+        .filter(str -> str.length() > 0).collect(Collectors.toSet());
+  }
+
+  @VisibleForTesting
+  public static void reset() {
+    synchronized (X509AuthenticationConfig.class) {
+      instance = null;
+    }
+  }
+}