You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2023/02/16 07:16:46 UTC
[linkis] branch dev-1.3.2 updated: fix: White list manage request list with error and check new user error.(#4221) (#4222)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.2
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/dev-1.3.2 by this push:
new 004255d1b fix: White list manage request list with error and check new user error.(#4221) (#4222)
004255d1b is described below
commit 004255d1b5d7fbe6b817d41c7bd3e49093ed0fc6
Author: CharlieYan <16...@users.noreply.github.com>
AuthorDate: Thu Feb 16 15:16:40 2023 +0800
fix: White list manage request list with error and check new user error.(#4221) (#4222)
Co-authored-by: CharlieYan <yy...@users.noreply.github.com>
---
.../restful/api/UserIpConfigrationRestfulApi.java | 10 +++++-----
.../linkis/configuration/service/UserIpConfigService.java | 2 +-
.../configuration/service/impl/UserIpConfigServiceImpl.java | 9 +++------
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/UserIpConfigrationRestfulApi.java b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/UserIpConfigrationRestfulApi.java
index 470bc3b54..78e7003d4 100644
--- a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/UserIpConfigrationRestfulApi.java
+++ b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/UserIpConfigrationRestfulApi.java
@@ -71,7 +71,7 @@ public class UserIpConfigrationRestfulApi {
if (!Configuration.isAdmin(userName)) {
return Message.error("Failed to create-user-ip,msg: only administrators can configure");
}
- if (userIpConfigService.checkUserCteator(userIpVo.getUser(), userIpVo.getCreator())) {
+ if (userIpConfigService.userExists(userIpVo.getUser(), userIpVo.getCreator())) {
throw new ConfigurationException("User-creator is existed");
}
parameterVerification(userIpVo);
@@ -152,8 +152,8 @@ public class UserIpConfigrationRestfulApi {
@RequestMapping(path = "/query-user-ip-list", method = RequestMethod.GET)
public Message queryUserIpList(
HttpServletRequest req,
- @RequestParam(value = "user") String user,
- @RequestParam(value = "creator") String creator,
+ @RequestParam(value = "user", required = false) String user,
+ @RequestParam(value = "creator", required = false) String creator,
@RequestParam(value = "pageNow") Integer pageNow,
@RequestParam(value = "pageSize") Integer pageSize) {
String userName = ModuleUserUtils.getOperationUser(req, "queryUserIPList");
@@ -186,7 +186,7 @@ public class UserIpConfigrationRestfulApi {
HttpServletRequest req,
@RequestParam(value = "user") String user,
@RequestParam(value = "creator") String creator) {
- Boolean result = false;
+ boolean result = false;
try {
String userName = ModuleUserUtils.getOperationUser(req, "checkUserCreator");
if (!Configuration.isAdmin(userName)) {
@@ -202,7 +202,7 @@ public class UserIpConfigrationRestfulApi {
if (creator.equals("*")) {
throw new ConfigurationException("Application Name couldn't be '*' ");
}
- result = userIpConfigService.checkUserCteator(user, creator);
+ result = userIpConfigService.userExists(user, creator);
} catch (ConfigurationException e) {
return Message.error("Failed to check-user-creator,msg:" + e.getMessage());
}
diff --git a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/UserIpConfigService.java b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/UserIpConfigService.java
index 18b163a25..6d292d681 100644
--- a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/UserIpConfigService.java
+++ b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/UserIpConfigService.java
@@ -33,7 +33,7 @@ public interface UserIpConfigService {
Map<String, Object> queryUserIPList(
String user, String creator, Integer pageNow, Integer pageSize);
- Boolean checkUserCteator(String user, String creator);
+ boolean userExists(String user, String creator);
UserIpVo queryUserIP(String user, String creator);
}
diff --git a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/UserIpConfigServiceImpl.java b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/UserIpConfigServiceImpl.java
index 7e41b0ee8..9c9612115 100644
--- a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/UserIpConfigServiceImpl.java
+++ b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/UserIpConfigServiceImpl.java
@@ -134,14 +134,11 @@ public class UserIpConfigServiceImpl implements UserIpConfigService {
}
@Override
- public Boolean checkUserCteator(String user, String creator) {
- boolean result = true;
+ public boolean userExists(String user, String creator) {
Map<String, Object> resultMap =
- queryUserIPList(user.toLowerCase(), creator.toLowerCase(), null, null);
+ queryUserIPList(user.toLowerCase(), creator.toLowerCase(), 1, 20);
Object userIpList = resultMap.getOrDefault(JobRequestConstants.TOTAL_PAGE(), 0);
- int total = Integer.parseInt(userIpList.toString());
- if (total == 0) result = false;
- return result;
+ return Integer.parseInt(String.valueOf(userIpList)) > 0;
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org