javeme commented on code in PR #2299: URL: https://github.com/apache/incubator-hugegraph/pull/2299#discussion_r1320682392
########## hugegraph-api/src/main/java/org/apache/hugegraph/api/profile/WhiteIpAPI.java: ########## @@ -0,0 +1,157 @@ +/* + * 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.hugegraph.api.profile; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.apache.commons.lang.StringUtils; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.filter.StatusFilter; +import org.apache.hugegraph.auth.AuthManager; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.server.RestServer; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; +import org.slf4j.Logger; + +import com.codahale.metrics.annotation.Timed; +import com.google.common.collect.ImmutableMap; + +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Singleton; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; + +@Path("whiteiplist") +@Singleton +public class WhiteIpAPI extends API { Review Comment: also keep WhiteIpListAPI? ########## hugegraph-api/src/main/java/org/apache/hugegraph/api/profile/WhiteIpAPI.java: ########## @@ -0,0 +1,157 @@ +/* + * 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.hugegraph.api.profile; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.apache.commons.lang.StringUtils; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.filter.StatusFilter; +import org.apache.hugegraph.auth.AuthManager; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.server.RestServer; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; +import org.slf4j.Logger; + +import com.codahale.metrics.annotation.Timed; +import com.google.common.collect.ImmutableMap; + +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Singleton; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; + +@Path("whiteiplist") +@Singleton +public class WhiteIpAPI extends API { + + private static final Logger LOG = Log.logger(RestServer.class); + + @GET + @Timed + @Produces(APPLICATION_JSON_WITH_CHARSET) + @RolesAllowed("admin") + public Map<String, Object> list(@Context GraphManager manager) { + LOG.debug("List white ips"); + AuthManager authManager = manager.authManager(); + List<String> whiteIpList = authManager.listWhiteIp(); + return ImmutableMap.of("whiteIpList", whiteIpList); + } + + @POST + @Timed + @StatusFilter.Status(StatusFilter.Status.ACCEPTED) + @Consumes(APPLICATION_JSON) + @Produces(APPLICATION_JSON_WITH_CHARSET) + @RolesAllowed("admin") + public Map<String, Object> batch(@Context GraphManager manager, + Map<String, Object> actionMap) { + E.checkArgument(actionMap != null, + "Missing argument: actionMap"); + List<String> whiteIpList = manager.authManager().listWhiteIp(); + Object ips = actionMap.get("ips"); + E.checkArgument(ips instanceof List, + "Invalid ips type '%s', must be list", ips.getClass()); + List<String> ipList = (List<String>) ips; + Object value = actionMap.get("action"); + E.checkArgument(value != null, + "Missing argument: action"); + E.checkArgument(value instanceof String, + "Invalid action type '%s', must be string", + value.getClass()); + String action = (String) value; + E.checkArgument(StringUtils.isNotEmpty(action), + "Missing argument: action"); + List<String> existed = new ArrayList<>(); + List<String> loaded = new ArrayList<>(); + List<String> illegalIps = new ArrayList<>(); + Map<String, Object> result = new HashMap<>(); + for (String ip : ipList) { + if (whiteIpList.contains(ip)) { + existed.add(ip); + continue; + } + if ("load".equals(action)) { + boolean rightIp = checkIp(ip) ? loaded.add(ip) : illegalIps.add(ip); + } + } + switch (action) { + case "load": + LOG.debug("Load to white ip list"); + result.put("existed", existed); + result.put("loaded", loaded); + if (!illegalIps.isEmpty()) { + result.put("illegalIps", illegalIps); + } + whiteIpList.addAll(loaded); + break; + case "remove": + LOG.debug("Remove from white ip list"); + result.put("removed", existed); + result.put("nonexistent", loaded); + whiteIpList.removeAll(existed); + break; + default: + throw new AssertionError(String.format("Invalid action '%s', " + + "supported action is " + + "'load' or 'remove'", + action)); + } + manager.authManager().setWhiteIpList(whiteIpList); + return result; + } + + @PUT + @Timed + @Produces(APPLICATION_JSON_WITH_CHARSET) + @RolesAllowed("admin") + public Map<String, Object> update(@Context GraphManager manager, Review Comment: updateStatus ########## hugegraph-api/src/main/java/org/apache/hugegraph/api/profile/WhiteIpAPI.java: ########## @@ -0,0 +1,157 @@ +/* + * 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.hugegraph.api.profile; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.apache.commons.lang.StringUtils; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.filter.StatusFilter; +import org.apache.hugegraph.auth.AuthManager; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.server.RestServer; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; +import org.slf4j.Logger; + +import com.codahale.metrics.annotation.Timed; +import com.google.common.collect.ImmutableMap; + +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Singleton; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; + +@Path("whiteiplist") +@Singleton +public class WhiteIpAPI extends API { + + private static final Logger LOG = Log.logger(RestServer.class); + + @GET + @Timed + @Produces(APPLICATION_JSON_WITH_CHARSET) + @RolesAllowed("admin") + public Map<String, Object> list(@Context GraphManager manager) { + LOG.debug("List white ips"); + AuthManager authManager = manager.authManager(); + List<String> whiteIpList = authManager.listWhiteIp(); + return ImmutableMap.of("whiteIpList", whiteIpList); + } + + @POST + @Timed + @StatusFilter.Status(StatusFilter.Status.ACCEPTED) + @Consumes(APPLICATION_JSON) + @Produces(APPLICATION_JSON_WITH_CHARSET) + @RolesAllowed("admin") + public Map<String, Object> batch(@Context GraphManager manager, + Map<String, Object> actionMap) { + E.checkArgument(actionMap != null, + "Missing argument: actionMap"); + List<String> whiteIpList = manager.authManager().listWhiteIp(); + Object ips = actionMap.get("ips"); + E.checkArgument(ips instanceof List, + "Invalid ips type '%s', must be list", ips.getClass()); + List<String> ipList = (List<String>) ips; + Object value = actionMap.get("action"); Review Comment: keep a naming style, like `ipListRaw-ipList`, `actionRaw-action` ########## hugegraph-api/src/main/java/org/apache/hugegraph/auth/HugeGraphAuthProxy.java: ########## @@ -1568,6 +1568,26 @@ public UserWithRole validateUser(String token) { } } + @Override + public List<String> listWhiteIp() { Review Comment: prefer listWhiteIPs ########## hugegraph-api/src/main/java/org/apache/hugegraph/api/profile/WhiteIpAPI.java: ########## @@ -0,0 +1,157 @@ +/* + * 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.hugegraph.api.profile; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.apache.commons.lang.StringUtils; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.filter.StatusFilter; +import org.apache.hugegraph.auth.AuthManager; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.server.RestServer; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; +import org.slf4j.Logger; + +import com.codahale.metrics.annotation.Timed; +import com.google.common.collect.ImmutableMap; + +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Singleton; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; + +@Path("whiteiplist") +@Singleton +public class WhiteIpAPI extends API { + + private static final Logger LOG = Log.logger(RestServer.class); + + @GET + @Timed + @Produces(APPLICATION_JSON_WITH_CHARSET) + @RolesAllowed("admin") + public Map<String, Object> list(@Context GraphManager manager) { + LOG.debug("List white ips"); + AuthManager authManager = manager.authManager(); + List<String> whiteIpList = authManager.listWhiteIp(); + return ImmutableMap.of("whiteIpList", whiteIpList); + } + + @POST + @Timed + @StatusFilter.Status(StatusFilter.Status.ACCEPTED) + @Consumes(APPLICATION_JSON) + @Produces(APPLICATION_JSON_WITH_CHARSET) + @RolesAllowed("admin") + public Map<String, Object> batch(@Context GraphManager manager, + Map<String, Object> actionMap) { + E.checkArgument(actionMap != null, + "Missing argument: actionMap"); + List<String> whiteIpList = manager.authManager().listWhiteIp(); + Object ips = actionMap.get("ips"); + E.checkArgument(ips instanceof List, + "Invalid ips type '%s', must be list", ips.getClass()); + List<String> ipList = (List<String>) ips; + Object value = actionMap.get("action"); + E.checkArgument(value != null, + "Missing argument: action"); + E.checkArgument(value instanceof String, + "Invalid action type '%s', must be string", + value.getClass()); + String action = (String) value; + E.checkArgument(StringUtils.isNotEmpty(action), + "Missing argument: action"); + List<String> existed = new ArrayList<>(); + List<String> loaded = new ArrayList<>(); + List<String> illegalIps = new ArrayList<>(); + Map<String, Object> result = new HashMap<>(); + for (String ip : ipList) { + if (whiteIpList.contains(ip)) { + existed.add(ip); + continue; + } + if ("load".equals(action)) { + boolean rightIp = checkIp(ip) ? loaded.add(ip) : illegalIps.add(ip); + } + } + switch (action) { + case "load": + LOG.debug("Load to white ip list"); + result.put("existed", existed); + result.put("loaded", loaded); + if (!illegalIps.isEmpty()) { + result.put("illegalIps", illegalIps); + } + whiteIpList.addAll(loaded); + break; + case "remove": + LOG.debug("Remove from white ip list"); + result.put("removed", existed); + result.put("nonexistent", loaded); + whiteIpList.removeAll(existed); + break; + default: + throw new AssertionError(String.format("Invalid action '%s', " + + "supported action is " + + "'load' or 'remove'", + action)); + } + manager.authManager().setWhiteIpList(whiteIpList); + return result; + } + + @PUT + @Timed + @Produces(APPLICATION_JSON_WITH_CHARSET) + @RolesAllowed("admin") + public Map<String, Object> update(@Context GraphManager manager, + @QueryParam("status") String status) { Review Comment: prefer `boolean enabled` ########## hugegraph-api/src/main/java/org/apache/hugegraph/api/profile/WhiteIpAPI.java: ########## @@ -0,0 +1,157 @@ +/* + * 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.hugegraph.api.profile; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.apache.commons.lang.StringUtils; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.filter.StatusFilter; +import org.apache.hugegraph.auth.AuthManager; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.server.RestServer; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; +import org.slf4j.Logger; + +import com.codahale.metrics.annotation.Timed; +import com.google.common.collect.ImmutableMap; + +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Singleton; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; + +@Path("whiteiplist") +@Singleton +public class WhiteIpAPI extends API { + + private static final Logger LOG = Log.logger(RestServer.class); + + @GET + @Timed + @Produces(APPLICATION_JSON_WITH_CHARSET) + @RolesAllowed("admin") + public Map<String, Object> list(@Context GraphManager manager) { + LOG.debug("List white ips"); + AuthManager authManager = manager.authManager(); + List<String> whiteIpList = authManager.listWhiteIp(); + return ImmutableMap.of("whiteIpList", whiteIpList); + } + + @POST + @Timed + @StatusFilter.Status(StatusFilter.Status.ACCEPTED) + @Consumes(APPLICATION_JSON) + @Produces(APPLICATION_JSON_WITH_CHARSET) + @RolesAllowed("admin") + public Map<String, Object> batch(@Context GraphManager manager, Review Comment: rename to updateWhiteIPs? ########## hugegraph-api/src/main/java/org/apache/hugegraph/api/profile/WhiteIpAPI.java: ########## @@ -0,0 +1,157 @@ +/* + * 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.hugegraph.api.profile; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.apache.commons.lang.StringUtils; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.filter.StatusFilter; +import org.apache.hugegraph.auth.AuthManager; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.server.RestServer; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; +import org.slf4j.Logger; + +import com.codahale.metrics.annotation.Timed; +import com.google.common.collect.ImmutableMap; + +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Singleton; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; + +@Path("whiteiplist") +@Singleton +public class WhiteIpAPI extends API { + + private static final Logger LOG = Log.logger(RestServer.class); + + @GET + @Timed + @Produces(APPLICATION_JSON_WITH_CHARSET) + @RolesAllowed("admin") + public Map<String, Object> list(@Context GraphManager manager) { + LOG.debug("List white ips"); + AuthManager authManager = manager.authManager(); + List<String> whiteIpList = authManager.listWhiteIp(); + return ImmutableMap.of("whiteIpList", whiteIpList); + } + + @POST + @Timed + @StatusFilter.Status(StatusFilter.Status.ACCEPTED) + @Consumes(APPLICATION_JSON) + @Produces(APPLICATION_JSON_WITH_CHARSET) + @RolesAllowed("admin") + public Map<String, Object> batch(@Context GraphManager manager, + Map<String, Object> actionMap) { + E.checkArgument(actionMap != null, + "Missing argument: actionMap"); + List<String> whiteIpList = manager.authManager().listWhiteIp(); + Object ips = actionMap.get("ips"); + E.checkArgument(ips instanceof List, + "Invalid ips type '%s', must be list", ips.getClass()); + List<String> ipList = (List<String>) ips; + Object value = actionMap.get("action"); + E.checkArgument(value != null, + "Missing argument: action"); + E.checkArgument(value instanceof String, + "Invalid action type '%s', must be string", + value.getClass()); + String action = (String) value; + E.checkArgument(StringUtils.isNotEmpty(action), + "Missing argument: action"); + List<String> existed = new ArrayList<>(); + List<String> loaded = new ArrayList<>(); + List<String> illegalIps = new ArrayList<>(); + Map<String, Object> result = new HashMap<>(); + for (String ip : ipList) { + if (whiteIpList.contains(ip)) { + existed.add(ip); + continue; + } + if ("load".equals(action)) { + boolean rightIp = checkIp(ip) ? loaded.add(ip) : illegalIps.add(ip); + } + } + switch (action) { + case "load": + LOG.debug("Load to white ip list"); + result.put("existed", existed); + result.put("loaded", loaded); + if (!illegalIps.isEmpty()) { + result.put("illegalIps", illegalIps); + } + whiteIpList.addAll(loaded); + break; + case "remove": + LOG.debug("Remove from white ip list"); + result.put("removed", existed); + result.put("nonexistent", loaded); + whiteIpList.removeAll(existed); + break; + default: + throw new AssertionError(String.format("Invalid action '%s', " + + "supported action is " + + "'load' or 'remove'", + action)); + } + manager.authManager().setWhiteIpList(whiteIpList); + return result; + } + + @PUT + @Timed + @Produces(APPLICATION_JSON_WITH_CHARSET) + @RolesAllowed("admin") + public Map<String, Object> update(@Context GraphManager manager, + @QueryParam("status") String status) { + LOG.debug("Enable or disable white ip list"); + E.checkArgument("true".equals(status) || + "false".equals(status), + "Invalid status, valid status is 'true' or 'false'"); + boolean open = Boolean.parseBoolean(status); + manager.authManager().setWhiteIpStatus(open); + Map<String, Object> map = new HashMap<>(); + map.put("WhiteIpListOpen", open); Review Comment: map.put("status", open); ########## hugegraph-api/src/main/java/org/apache/hugegraph/api/profile/WhiteIpAPI.java: ########## @@ -0,0 +1,157 @@ +/* + * 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.hugegraph.api.profile; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.apache.commons.lang.StringUtils; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.filter.StatusFilter; +import org.apache.hugegraph.auth.AuthManager; +import org.apache.hugegraph.core.GraphManager; +import org.apache.hugegraph.server.RestServer; +import org.apache.hugegraph.util.E; +import org.apache.hugegraph.util.Log; +import org.slf4j.Logger; + +import com.codahale.metrics.annotation.Timed; +import com.google.common.collect.ImmutableMap; + +import jakarta.annotation.security.RolesAllowed; +import jakarta.inject.Singleton; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; + +@Path("whiteiplist") +@Singleton +public class WhiteIpAPI extends API { + + private static final Logger LOG = Log.logger(RestServer.class); + + @GET + @Timed + @Produces(APPLICATION_JSON_WITH_CHARSET) + @RolesAllowed("admin") + public Map<String, Object> list(@Context GraphManager manager) { + LOG.debug("List white ips"); + AuthManager authManager = manager.authManager(); + List<String> whiteIpList = authManager.listWhiteIp(); + return ImmutableMap.of("whiteIpList", whiteIpList); + } + + @POST + @Timed + @StatusFilter.Status(StatusFilter.Status.ACCEPTED) + @Consumes(APPLICATION_JSON) + @Produces(APPLICATION_JSON_WITH_CHARSET) + @RolesAllowed("admin") + public Map<String, Object> batch(@Context GraphManager manager, + Map<String, Object> actionMap) { + E.checkArgument(actionMap != null, + "Missing argument: actionMap"); + List<String> whiteIpList = manager.authManager().listWhiteIp(); + Object ips = actionMap.get("ips"); + E.checkArgument(ips instanceof List, + "Invalid ips type '%s', must be list", ips.getClass()); + List<String> ipList = (List<String>) ips; + Object value = actionMap.get("action"); + E.checkArgument(value != null, + "Missing argument: action"); + E.checkArgument(value instanceof String, + "Invalid action type '%s', must be string", + value.getClass()); + String action = (String) value; + E.checkArgument(StringUtils.isNotEmpty(action), + "Missing argument: action"); + List<String> existed = new ArrayList<>(); + List<String> loaded = new ArrayList<>(); + List<String> illegalIps = new ArrayList<>(); Review Comment: `existedIPs, loadedIPs, illegalIPs` ########## hugegraph-core/src/main/java/org/apache/hugegraph/auth/AuthManager.java: ########## @@ -126,4 +126,12 @@ public interface AuthManager { UserWithRole validateUser(String username, String password); UserWithRole validateUser(String token); + + List<String> listWhiteIp(); + + void setWhiteIpList(List<String> whiteIpList); Review Comment: prefer setWhiteIPs ########## hugegraph-core/src/main/java/org/apache/hugegraph/auth/StandardAuthManager.java: ########## @@ -77,6 +76,10 @@ public class StandardAuthManager implements AuthManager { private final TokenGenerator tokenGenerator; private final long tokenExpire; + private List<String> ipWhiteList; Review Comment: mark final ########## hugegraph-api/src/main/java/org/apache/hugegraph/auth/HugeGraphAuthProxy.java: ########## @@ -1568,6 +1568,26 @@ public UserWithRole validateUser(String token) { } } + @Override + public List<String> listWhiteIp() { + return this.authManager.listWhiteIp(); + } + + @Override + public void setWhiteIpList(List<String> whiteIpList) { Review Comment: prefer setWhiteIPs ########## hugegraph-core/src/main/java/org/apache/hugegraph/auth/AuthManager.java: ########## @@ -126,4 +126,12 @@ public interface AuthManager { UserWithRole validateUser(String username, String password); UserWithRole validateUser(String token); + + List<String> listWhiteIp(); Review Comment: prefer listWhiteIPs ########## hugegraph-core/src/main/java/org/apache/hugegraph/auth/AuthManager.java: ########## @@ -126,4 +126,12 @@ public interface AuthManager { UserWithRole validateUser(String username, String password); UserWithRole validateUser(String token); + + List<String> listWhiteIp(); + + void setWhiteIpList(List<String> whiteIpList); + + boolean getWhiteIpStatus(); + + void setWhiteIpStatus(boolean status); Review Comment: prefer enableWhiteIpList ########## hugegraph-core/src/main/java/org/apache/hugegraph/auth/StandardAuthManager.java: ########## @@ -77,6 +76,10 @@ public class StandardAuthManager implements AuthManager { private final TokenGenerator tokenGenerator; private final long tokenExpire; + private List<String> ipWhiteList; + + private Boolean whiteIpStatus; Review Comment: prefer boolean ipWhiteListEnabled ########## hugegraph-core/src/main/java/org/apache/hugegraph/auth/AuthManager.java: ########## @@ -126,4 +126,12 @@ public interface AuthManager { UserWithRole validateUser(String username, String password); UserWithRole validateUser(String token); + + List<String> listWhiteIp(); + + void setWhiteIpList(List<String> whiteIpList); + + boolean getWhiteIpStatus(); Review Comment: prefer enabledWhiteIpList -- 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] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
