anmolnar commented on code in PR #1943: URL: https://github.com/apache/zookeeper/pull/1943#discussion_r1038044021
########## zookeeper-server/src/main/java/org/apache/zookeeper/server/util/RateLimiter.java: ########## @@ -0,0 +1,59 @@ +/* + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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.util; + +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; + +/** + * A class that provides simple interval-based rate limiting implementation. + */ +public class RateLimiter { + private final int rate; + private final long intervalInMs; + private long lastTimeReset; + private final AtomicInteger remained; + + public RateLimiter(final int rate, final long interval, final TimeUnit unit) { + this.rate = rate; + this.intervalInMs = unit.toMillis(interval); + this.lastTimeReset = System.currentTimeMillis(); Review Comment: Please use ZooKeeper `Time.java` class for tracking elapsed time. It uses System.nanoTime() internally which is more reliable. ########## zookeeper-server/src/main/java/org/apache/zookeeper/server/auth/IPAuthenticationProvider.java: ########## @@ -128,4 +131,18 @@ public boolean isValid(String id) { return true; } + /** + * Returns the HTTP(s) client IP address + * @param request HttpServletRequest + * @return IP address + */ + public static String getClientIPAddress(final HttpServletRequest request) { + // to handle the case that a HTTP(s) client connects via a proxy or load balancer + final String xForwardedForHeader = request.getHeader(X_FORWARDED_FOR_HEADER_NAME); + if (xForwardedForHeader == null) { + return request.getRemoteAddr(); + } + // the format of the field is: X-Forwarded-For: client, proxy1, proxy2 ... + return new StringTokenizer(xForwardedForHeader, ",").nextToken().trim(); + } Review Comment: I don't think this method belongs to this class. `IPAuthenticationProvider` is responsible for authenticating ZooKeeper client by the client IP address. You don't use any member of the class, neither instantiate it (static method), so please move it where the usage is (StreamOutputter.java). -- 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: notifications-unsubscr...@zookeeper.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
