From commits-return-7172-archive-asf-public=cust-asf.ponee.io@zookeeper.apache.org Wed Oct 10 12:30:14 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 4C22A1807DA for ; Wed, 10 Oct 2018 12:30:08 +0200 (CEST) Received: (qmail 33992 invoked by uid 500); 10 Oct 2018 10:30:03 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zookeeper.apache.org Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 31697 invoked by uid 99); 10 Oct 2018 10:30:01 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Oct 2018 10:30:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D090AE11BD; Wed, 10 Oct 2018 10:30:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: andor@apache.org To: commits@zookeeper.apache.org Date: Wed, 10 Oct 2018 10:30:35 -0000 Message-Id: <61f0d697d85a4c00a48cdac0288c02b8@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [36/51] [partial] zookeeper git commit: ZOOKEEPER-3032: MAVEN MIGRATION - branch 3.4 move java server, client http://git-wip-us.apache.org/repos/asf/zookeeper/blob/c0aa3b3f/src/java/main/org/apache/zookeeper/server/ZooTrace.java ---------------------------------------------------------------------- diff --git a/src/java/main/org/apache/zookeeper/server/ZooTrace.java b/src/java/main/org/apache/zookeeper/server/ZooTrace.java deleted file mode 100644 index 946a4bf..0000000 --- a/src/java/main/org/apache/zookeeper/server/ZooTrace.java +++ /dev/null @@ -1,91 +0,0 @@ -/** - * 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; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.zookeeper.server.quorum.LearnerHandler; -import org.apache.zookeeper.server.quorum.QuorumPacket; - -/** - * This class encapsulates and centralizes tracing for the ZooKeeper server. - * Trace messages go to the log with TRACE level. - *

- * Log4j must be correctly configured to capture the TRACE messages. - */ -public class ZooTrace { - final static public long CLIENT_REQUEST_TRACE_MASK = 1 << 1; - - final static public long CLIENT_DATA_PACKET_TRACE_MASK = 1 << 2; - - final static public long CLIENT_PING_TRACE_MASK = 1 << 3; - - final static public long SERVER_PACKET_TRACE_MASK = 1 << 4; - - final static public long SESSION_TRACE_MASK = 1 << 5; - - final static public long EVENT_DELIVERY_TRACE_MASK = 1 << 6; - - final static public long SERVER_PING_TRACE_MASK = 1 << 7; - - final static public long WARNING_TRACE_MASK = 1 << 8; - - final static public long JMX_TRACE_MASK = 1 << 9; - - private static long traceMask = CLIENT_REQUEST_TRACE_MASK - | SERVER_PACKET_TRACE_MASK | SESSION_TRACE_MASK - | WARNING_TRACE_MASK; - - public static long getTextTraceLevel() { - return traceMask; - } - - public static void setTextTraceLevel(long mask) { - traceMask = mask; - Logger LOG = LoggerFactory.getLogger(ZooTrace.class); - LOG.info("Set text trace mask to 0x" + Long.toHexString(mask)); - } - - public static boolean isTraceEnabled(Logger log, long mask) { - return log.isTraceEnabled() && (mask & traceMask) != 0; - } - - public static void logTraceMessage(Logger log, long mask, String msg) { - if (isTraceEnabled(log, mask)) { - log.trace(msg); - } - } - - static public void logQuorumPacket(Logger log, long mask, - char direction, QuorumPacket qp) - { - if (isTraceEnabled(log, mask)) { - logTraceMessage(log, mask, direction + - " " + LearnerHandler.packetToString(qp)); - } - } - - static public void logRequest(Logger log, long mask, - char rp, Request request, String header) - { - if (isTraceEnabled(log, mask)) { - log.trace(header + ":" + rp + request.toString()); - } - } -} http://git-wip-us.apache.org/repos/asf/zookeeper/blob/c0aa3b3f/src/java/main/org/apache/zookeeper/server/auth/AuthenticationProvider.java ---------------------------------------------------------------------- diff --git a/src/java/main/org/apache/zookeeper/server/auth/AuthenticationProvider.java b/src/java/main/org/apache/zookeeper/server/auth/AuthenticationProvider.java deleted file mode 100644 index dd6e32f..0000000 --- a/src/java/main/org/apache/zookeeper/server/auth/AuthenticationProvider.java +++ /dev/null @@ -1,82 +0,0 @@ -/** - * 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 org.apache.zookeeper.KeeperException; -import org.apache.zookeeper.server.ServerCnxn; - -/** - * This interface is implemented by authentication providers to add new kinds of - * authentication schemes to ZooKeeper. - */ -public interface AuthenticationProvider { - /** - * The String used to represent this provider. This will correspond to the - * scheme field of an Id. - * - * @return the scheme of this provider. - */ - String getScheme(); - - /** - * This method is called when a client passes authentication data for this - * scheme. The authData is directly from the authentication packet. The - * implementor may attach new ids to the authInfo field of cnxn or may use - * cnxn to send packets back to the client. - * - * @param cnxn - * the cnxn that received the authentication information. - * @param authData - * the authentication data received. - * @return TODO - */ - KeeperException.Code handleAuthentication(ServerCnxn cnxn, byte authData[]); - - /** - * This method is called to see if the given id matches the given id - * expression in the ACL. This allows schemes to use application specific - * wild cards. - * - * @param id - * the id to check. - * @param aclExpr - * the expression to match ids against. - * @return true if the id can be matched by the expression. - */ - boolean matches(String id, String aclExpr); - - /** - * This method is used to check if the authentication done by this provider - * should be used to identify the creator of a node. Some ids such as hosts - * and ip addresses are rather transient and in general don't really - * identify a client even though sometimes they do. - * - * @return true if this provider identifies creators. - */ - boolean isAuthenticated(); - - /** - * Validates the syntax of an id. - * - * @param id - * the id to validate. - * @return true if id is well formed. - */ - boolean isValid(String id); -} http://git-wip-us.apache.org/repos/asf/zookeeper/blob/c0aa3b3f/src/java/main/org/apache/zookeeper/server/auth/DigestAuthenticationProvider.java ---------------------------------------------------------------------- diff --git a/src/java/main/org/apache/zookeeper/server/auth/DigestAuthenticationProvider.java b/src/java/main/org/apache/zookeeper/server/auth/DigestAuthenticationProvider.java deleted file mode 100644 index 2427e7a..0000000 --- a/src/java/main/org/apache/zookeeper/server/auth/DigestAuthenticationProvider.java +++ /dev/null @@ -1,139 +0,0 @@ -/** - * 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.security.MessageDigest; -import java.security.NoSuchAlgorithmException; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.zookeeper.KeeperException; -import org.apache.zookeeper.data.Id; -import org.apache.zookeeper.server.ServerCnxn; - -public class DigestAuthenticationProvider implements AuthenticationProvider { - private static final Logger LOG = - LoggerFactory.getLogger(DigestAuthenticationProvider.class); - - /** specify a command line property with key of - * "zookeeper.DigestAuthenticationProvider.superDigest" - * and value of "super:" to enable - * super user access (i.e. acls disabled) - */ - private final static String superDigest = System.getProperty( - "zookeeper.DigestAuthenticationProvider.superDigest"); - - public String getScheme() { - return "digest"; - } - - static final private String base64Encode(byte b[]) { - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < b.length;) { - int pad = 0; - int v = (b[i++] & 0xff) << 16; - if (i < b.length) { - v |= (b[i++] & 0xff) << 8; - } else { - pad++; - } - if (i < b.length) { - v |= (b[i++] & 0xff); - } else { - pad++; - } - sb.append(encode(v >> 18)); - sb.append(encode(v >> 12)); - if (pad < 2) { - sb.append(encode(v >> 6)); - } else { - sb.append('='); - } - if (pad < 1) { - sb.append(encode(v)); - } else { - sb.append('='); - } - } - return sb.toString(); - } - - static final private char encode(int i) { - i &= 0x3f; - if (i < 26) { - return (char) ('A' + i); - } - if (i < 52) { - return (char) ('a' + i - 26); - } - if (i < 62) { - return (char) ('0' + i - 52); - } - return i == 62 ? '+' : '/'; - } - - static public String generateDigest(String idPassword) - throws NoSuchAlgorithmException { - String parts[] = idPassword.split(":", 2); - byte digest[] = MessageDigest.getInstance("SHA1").digest( - idPassword.getBytes()); - return parts[0] + ":" + base64Encode(digest); - } - - public KeeperException.Code - handleAuthentication(ServerCnxn cnxn, byte[] authData) - { - String id = new String(authData); - try { - String digest = generateDigest(id); - if (digest.equals(superDigest)) { - cnxn.addAuthInfo(new Id("super", "")); - } - cnxn.addAuthInfo(new Id(getScheme(), digest)); - return KeeperException.Code.OK; - } catch (NoSuchAlgorithmException e) { - LOG.error("Missing algorithm",e); - } - return KeeperException.Code.AUTHFAILED; - } - - public boolean isAuthenticated() { - return true; - } - - public boolean isValid(String id) { - String parts[] = id.split(":"); - return parts.length == 2; - } - - public boolean matches(String id, String aclExpr) { - return id.equals(aclExpr); - } - - /** Call with a single argument of user:pass to generate authdata. - * Authdata output can be used when setting superDigest for example. - * @param args single argument of user:pass - * @throws NoSuchAlgorithmException - */ - public static void main(String args[]) throws NoSuchAlgorithmException { - for (int i = 0; i < args.length; i++) { - System.out.println(args[i] + "->" + generateDigest(args[i])); - } - } -} http://git-wip-us.apache.org/repos/asf/zookeeper/blob/c0aa3b3f/src/java/main/org/apache/zookeeper/server/auth/DigestLoginModule.java ---------------------------------------------------------------------- diff --git a/src/java/main/org/apache/zookeeper/server/auth/DigestLoginModule.java b/src/java/main/org/apache/zookeeper/server/auth/DigestLoginModule.java deleted file mode 100644 index 955c728..0000000 --- a/src/java/main/org/apache/zookeeper/server/auth/DigestLoginModule.java +++ /dev/null @@ -1,61 +0,0 @@ -/** - * 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 javax.security.auth.Subject; -import javax.security.auth.callback.CallbackHandler; -import javax.security.auth.spi.LoginModule; -import java.util.Map; - -public class DigestLoginModule implements LoginModule { - private Subject subject; - - public boolean abort() { - return false; - } - - public boolean commit() { - return true; - } - - public void initialize(Subject subject, CallbackHandler callbackHandler, Map sharedState, Map options) { - if (options.containsKey("username")) { - // Zookeeper client: get username and password from JAAS conf (only used if using DIGEST-MD5). - this.subject = subject; - String username = (String)options.get("username"); - this.subject.getPublicCredentials().add((Object)username); - String password = (String)options.get("password"); - this.subject.getPrivateCredentials().add((Object)password); - } - return; - } - - public boolean logout() { - return true; - } - - public boolean login() { - // Unlike with Krb5LoginModule, we don't do any actual login or credential passing here: authentication to Zookeeper - // is done later, through the SASLClient object. - return true; - } - -} - - http://git-wip-us.apache.org/repos/asf/zookeeper/blob/c0aa3b3f/src/java/main/org/apache/zookeeper/server/auth/IPAuthenticationProvider.java ---------------------------------------------------------------------- diff --git a/src/java/main/org/apache/zookeeper/server/auth/IPAuthenticationProvider.java b/src/java/main/org/apache/zookeeper/server/auth/IPAuthenticationProvider.java deleted file mode 100644 index 192dc06..0000000 --- a/src/java/main/org/apache/zookeeper/server/auth/IPAuthenticationProvider.java +++ /dev/null @@ -1,117 +0,0 @@ -/** - * 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 org.apache.zookeeper.KeeperException; -import org.apache.zookeeper.data.Id; -import org.apache.zookeeper.server.ServerCnxn; - -public class IPAuthenticationProvider implements AuthenticationProvider { - - public String getScheme() { - return "ip"; - } - - public KeeperException.Code - handleAuthentication(ServerCnxn cnxn, byte[] authData) - { - String id = cnxn.getRemoteSocketAddress().getAddress().getHostAddress(); - cnxn.addAuthInfo(new Id(getScheme(), id)); - return KeeperException.Code.OK; - } - - // This is a bit weird but we need to return the address and the number of - // bytes (to distinguish between IPv4 and IPv6 - private byte[] addr2Bytes(String addr) { - byte b[] = v4addr2Bytes(addr); - // TODO Write the v6addr2Bytes - return b; - } - - private byte[] v4addr2Bytes(String addr) { - String parts[] = addr.split("\\.", -1); - if (parts.length != 4) { - return null; - } - byte b[] = new byte[4]; - for (int i = 0; i < 4; i++) { - try { - int v = Integer.parseInt(parts[i]); - if (v >= 0 && v <= 255) { - b[i] = (byte) v; - } else { - return null; - } - } catch (NumberFormatException e) { - return null; - } - } - return b; - } - - private void mask(byte b[], int bits) { - int start = bits / 8; - int startMask = (1 << (8 - (bits % 8))) - 1; - startMask = ~startMask; - while (start < b.length) { - b[start] &= startMask; - startMask = 0; - start++; - } - } - - public boolean matches(String id, String aclExpr) { - String parts[] = aclExpr.split("/", 2); - byte aclAddr[] = addr2Bytes(parts[0]); - if (aclAddr == null) { - return false; - } - int bits = aclAddr.length * 8; - if (parts.length == 2) { - try { - bits = Integer.parseInt(parts[1]); - if (bits < 0 || bits > aclAddr.length * 8) { - return false; - } - } catch (NumberFormatException e) { - return false; - } - } - mask(aclAddr, bits); - byte remoteAddr[] = addr2Bytes(id); - if (remoteAddr == null) { - return false; - } - mask(remoteAddr, bits); - for (int i = 0; i < remoteAddr.length; i++) { - if (remoteAddr[i] != aclAddr[i]) { - return false; - } - } - return true; - } - - public boolean isAuthenticated() { - return false; - } - - public boolean isValid(String id) { - return addr2Bytes(id) != null; - } -} http://git-wip-us.apache.org/repos/asf/zookeeper/blob/c0aa3b3f/src/java/main/org/apache/zookeeper/server/auth/KerberosName.java ---------------------------------------------------------------------- diff --git a/src/java/main/org/apache/zookeeper/server/auth/KerberosName.java b/src/java/main/org/apache/zookeeper/server/auth/KerberosName.java deleted file mode 100644 index 01d1f66..0000000 --- a/src/java/main/org/apache/zookeeper/server/auth/KerberosName.java +++ /dev/null @@ -1,418 +0,0 @@ -/** - * 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. - */ - - /* This file copied from Hadoop's security branch, - * with the following changes: - * 1. package changed from org.apache.hadoop.security to - * org.apache.zookeeper.server.auth. - * 2. Usage of Hadoop's Configuration class removed since - * it is not available in Zookeeper: instead, system property - * "zookeeper.security.auth_to_local" is used. - */ - -package org.apache.zookeeper.server.auth; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.apache.zookeeper.server.util.KerberosUtil; - -/** - * This class implements parsing and handling of Kerberos principal names. In - * particular, it splits them apart and translates them down into local - * operating system names. - */ -public class KerberosName { - /** The first component of the name */ - private final String serviceName; - /** The second component of the name. It may be null. */ - private final String hostName; - /** The realm of the name. */ - private final String realm; - - /** - * A pattern that matches a Kerberos name with at most 2 components. - */ - private static final Pattern nameParser = - Pattern.compile("([^/@]*)(/([^/@]*))?@([^/@]*)"); - - /** - * A pattern that matches a string with out '$' and then a single - * parameter with $n. - */ - private static Pattern parameterPattern = - Pattern.compile("([^$]*)(\\$(\\d*))?"); - - /** - * A pattern for parsing a auth_to_local rule. - */ - private static final Pattern ruleParser = - Pattern.compile("\\s*((DEFAULT)|(RULE:\\[(\\d*):([^\\]]*)](\$([^)]*)\$)?"+ - "(s/([^/]*)/([^/]*)/(g)?)?))"); - - /** - * A pattern that recognizes simple/non-simple names. - */ - private static final Pattern nonSimplePattern = Pattern.compile("[/@]"); - - /** - * The list of translation rules. - */ - private static List rules; - - private static String defaultRealm; - - static { - try { - defaultRealm = KerberosUtil.getDefaultRealm(); - } catch (Exception ke) { - if ((System.getProperty("zookeeper.requireKerberosConfig") != null) && - (System.getProperty("zookeeper.requireKerberosConfig").equals("true"))) { - throw new IllegalArgumentException("Can't get Kerberos configuration",ke); - } - else - defaultRealm=""; - } - try { - // setConfiguration() will work even if the above try() fails due - // to a missing Kerberos configuration (unless zookeeper.requireKerberosConfig - // is set to true, which would not allow execution to reach here due to the - // throwing of an IllegalArgumentException above). - setConfiguration(); - } - catch (IOException e) { - throw new IllegalArgumentException("Could not configure Kerberos principal name mapping."); - } - } - - /** - * Create a name from the full Kerberos principal name. - * @param name - */ - public KerberosName(String name) { - Matcher match = nameParser.matcher(name); - if (!match.matches()) { - if (name.contains("@")) { - throw new IllegalArgumentException("Malformed Kerberos name: " + name); - } else { - serviceName = name; - hostName = null; - realm = null; - } - } else { - serviceName = match.group(1); - hostName = match.group(3); - realm = match.group(4); - } - } - - /** - * Get the configured default realm. - * @return the default realm from the krb5.conf - */ - public String getDefaultRealm() { - return defaultRealm; - } - - /** - * Put the name back together from the parts. - */ - @Override - public String toString() { - StringBuilder result = new StringBuilder(); - result.append(serviceName); - if (hostName != null) { - result.append('/'); - result.append(hostName); - } - if (realm != null) { - result.append('@'); - result.append(realm); - } - return result.toString(); - } - - /** - * Get the first component of the name. - * @return the first section of the Kerberos principal name - */ - public String getServiceName() { - return serviceName; - } - - /** - * Get the second component of the name. - * @return the second section of the Kerberos principal name, and may be null - */ - public String getHostName() { - return hostName; - } - - /** - * Get the realm of the name. - * @return the realm of the name, may be null - */ - public String getRealm() { - return realm; - } - - /** - * An encoding of a rule for translating kerberos names. - */ - private static class Rule { - private final boolean isDefault; - private final int numOfComponents; - private final String format; - private final Pattern match; - private final Pattern fromPattern; - private final String toPattern; - private final boolean repeat; - - Rule() { - isDefault = true; - numOfComponents = 0; - format = null; - match = null; - fromPattern = null; - toPattern = null; - repeat = false; - } - - Rule(int numOfComponents, String format, String match, String fromPattern, - String toPattern, boolean repeat) { - isDefault = false; - this.numOfComponents = numOfComponents; - this.format = format; - this.match = match == null ? null : Pattern.compile(match); - this.fromPattern = - fromPattern == null ? null : Pattern.compile(fromPattern); - this.toPattern = toPattern; - this.repeat = repeat; - } - - @Override - public String toString() { - StringBuilder buf = new StringBuilder(); - if (isDefault) { - buf.append("DEFAULT"); - } else { - buf.append("RULE:["); - buf.append(numOfComponents); - buf.append(':'); - buf.append(format); - buf.append(']'); - if (match != null) { - buf.append('('); - buf.append(match); - buf.append(')'); - } - if (fromPattern != null) { - buf.append("s/"); - buf.append(fromPattern); - buf.append('/'); - buf.append(toPattern); - buf.append('/'); - if (repeat) { - buf.append('g'); - } - } - } - return buf.toString(); - } - - /** - * Replace the numbered parameters of the form $n where n is from 1 to - * the length of params. Normal text is copied directly and $n is replaced - * by the corresponding parameter. - * @param format the string to replace parameters again - * @param params the list of parameters - * @return the generated string with the parameter references replaced. - * @throws BadFormatString - */ - static String replaceParameters(String format, - String[] params) throws BadFormatString { - Matcher match = parameterPattern.matcher(format); - int start = 0; - StringBuilder result = new StringBuilder(); - while (start < format.length() && match.find(start)) { - result.append(match.group(1)); - String paramNum = match.group(3); - if (paramNum != null) { - try { - int num = Integer.parseInt(paramNum); - if (num < 0 || num > params.length) { - throw new BadFormatString("index " + num + " from " + format + - " is outside of the valid range 0 to " + - (params.length - 1)); - } - result.append(params[num]); - } catch (NumberFormatException nfe) { - throw new BadFormatString("bad format in username mapping in " + - paramNum, nfe); - } - - } - start = match.end(); - } - return result.toString(); - } - - /** - * Replace the matches of the from pattern in the base string with the value - * of the to string. - * @param base the string to transform - * @param from the pattern to look for in the base string - * @param to the string to replace matches of the pattern with - * @param repeat whether the substitution should be repeated - * @return - */ - static String replaceSubstitution(String base, Pattern from, String to, - boolean repeat) { - Matcher match = from.matcher(base); - if (repeat) { - return match.replaceAll(to); - } else { - return match.replaceFirst(to); - } - } - - /** - * Try to apply this rule to the given name represented as a parameter - * array. - * @param params first element is the realm, second and later elements are - * are the components of the name "a/b@FOO" -> {"FOO", "a", "b"} - * @return the short name if this rule applies or null - * @throws IOException throws if something is wrong with the rules - */ - String apply(String[] params) throws IOException { - String result = null; - if (isDefault) { - if (defaultRealm.equals(params[0])) { - result = params[1]; - } - } else if (params.length - 1 == numOfComponents) { - String base = replaceParameters(format, params); - if (match == null || match.matcher(base).matches()) { - if (fromPattern == null) { - result = base; - } else { - result = replaceSubstitution(base, fromPattern, toPattern, repeat); - } - } - } - if (result != null && nonSimplePattern.matcher(result).find()) { - throw new NoMatchingRule("Non-simple name " + result + - " after auth_to_local rule " + this); - } - return result; - } - } - - static List parseRules(String rules) { - List result = new ArrayList(); - String remaining = rules.trim(); - while (remaining.length() > 0) { - Matcher matcher = ruleParser.matcher(remaining); - if (!matcher.lookingAt()) { - throw new IllegalArgumentException("Invalid rule: " + remaining); - } - if (matcher.group(2) != null) { - result.add(new Rule()); - } else { - result.add(new Rule(Integer.parseInt(matcher.group(4)), - matcher.group(5), - matcher.group(7), - matcher.group(9), - matcher.group(10), - "g".equals(matcher.group(11)))); - } - remaining = remaining.substring(matcher.end()); - } - return result; - } - - /** - * Set the static configuration to get the rules. - * @param conf the new configuration - * @throws IOException - */ - public static void setConfiguration() throws IOException { - String ruleString = System.getProperty("zookeeper.security.auth_to_local", "DEFAULT"); - rules = parseRules(ruleString); - } - - @SuppressWarnings("serial") - public static class BadFormatString extends IOException { - BadFormatString(String msg) { - super(msg); - } - BadFormatString(String msg, Throwable err) { - super(msg, err); - } - } - - @SuppressWarnings("serial") - public static class NoMatchingRule extends IOException { - NoMatchingRule(String msg) { - super(msg); - } - } - - /** - * Get the translation of the principal name into an operating system - * user name. - * @return the short name - * @throws IOException - */ - public String getShortName() throws IOException { - String[] params; - if (hostName == null) { - // if it is already simple, just return it - if (realm == null) { - return serviceName; - } - params = new String[]{realm, serviceName}; - } else { - params = new String[]{realm, serviceName, hostName}; - } - for(Rule r: rules) { - String result = r.apply(params); - if (result != null) { - return result; - } - } - throw new NoMatchingRule("No rules applied to " + toString()); - } - - static void printRules() throws IOException { - int i = 0; - for(Rule r: rules) { - System.out.println(++i + " " + r); - } - } - - public static void main(String[] args) throws Exception { - for(String arg: args) { - KerberosName name = new KerberosName(arg); - System.out.println("Name: " + name + " to " + name.getShortName()); - } - } -} http://git-wip-us.apache.org/repos/asf/zookeeper/blob/c0aa3b3f/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java ---------------------------------------------------------------------- diff --git a/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java b/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java deleted file mode 100644 index 855971b..0000000 --- a/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java +++ /dev/null @@ -1,77 +0,0 @@ -/** - * 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.Enumeration; -import java.util.HashMap; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.apache.zookeeper.server.ZooKeeperServer; - -public class ProviderRegistry { - private static final Logger LOG = LoggerFactory.getLogger(ProviderRegistry.class); - - private static boolean initialized = false; - private static HashMap authenticationProviders = - new HashMap(); - - public static void initialize() { - synchronized (ProviderRegistry.class) { - if (initialized) - return; - IPAuthenticationProvider ipp = new IPAuthenticationProvider(); - DigestAuthenticationProvider digp = new DigestAuthenticationProvider(); - authenticationProviders.put(ipp.getScheme(), ipp); - authenticationProviders.put(digp.getScheme(), digp); - Enumeration

ZooKeeper server theory of operation

Request processing

Data structure maintenance

Session tracking