chia7712 commented on code in PR #23696: URL: https://github.com/apache/kafka/pull/23696#discussion_r4252291053
########## server/src/main/java/org/apache/kafka/server/metrics/ClientMatchPattern.java: ########## @@ -0,0 +1,66 @@ +/* + * 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.kafka.server.metrics; + +/** + * A compiled client-metrics match pattern, backed by RE2/J. java.util.regex is supported only as + * a deprecated, temporary fallback for patterns that predate RE2/J validation. See + * {@link #ofLegacy}. + * <p> + * RE2/J's {@code Pattern} and {@code java.util.regex.Pattern} share no common supertype, so this + * interface gives both a uniform shape wherever a compiled match pattern is stored or evaluated. + */ +public interface ClientMatchPattern { + + boolean matches(String input); + + String pattern(); Review Comment: This method is used by tests only, and I bet the test cases could be modified to avoid using `pattern` ... and then we could simplify this class :) ```java @FunctionalInterface public interface ClientMatchPattern { boolean matches(String input); static ClientMatchPattern ofRe2(com.google.re2j.Pattern pattern) { return input -> pattern.matcher(input).matches(); } @Deprecated(since = "4.x", forRemoval = true) static ClientMatchPattern ofLegacy(java.util.regex.Pattern pattern) { return input -> pattern.matcher(input).matches(); } } ``` ########## server/src/main/java/org/apache/kafka/server/metrics/ClientMetricsConfigs.java: ########## @@ -70,6 +75,8 @@ */ public class ClientMetricsConfigs extends AbstractConfig { + private static final Logger log = LoggerFactory.getLogger(ClientMetricsConfigs.class); Review Comment: `LOG` ########## server/src/main/java/org/apache/kafka/server/metrics/ClientMetricsConfigs.java: ########## @@ -169,11 +185,39 @@ private static void validateConfigs(Map<?, ?> configs) { } } - // Make sure that client match patterns are valid by parsing them. - if (configs.containsKey(MATCH_CONFIG)) { + // Make sure that new or changed match patterns are valid RE2/J syntax. + if (configs.containsKey(MATCH_CONFIG) && matchPatternsChanged(configs, oldProps)) { List<String> patterns = (List<String>) parsed.get(MATCH_CONFIG); - // Parse the client matching patterns to validate if the patterns are valid. - parseMatchingPatterns(patterns); + patterns.forEach(pattern -> { + String[] nameValuePair = splitMatchPattern(pattern); Review Comment: It means the “existing” patterns get re-validated and the request could be rejected even though users are only appending a “new” regex, right? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
