You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ke...@apache.org on 2022/11/06 13:17:35 UTC
[dolphinscheduler] branch 3.1.1-prepare updated: cherry-pick [Bug] Resource default auth function disabled false.
This is an automated email from the ASF dual-hosted git repository.
kerwin pushed a commit to branch 3.1.1-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/3.1.1-prepare by this push:
new 4fcdba2c0c cherry-pick [Bug] Resource default auth function disabled false.
4fcdba2c0c is described below
commit 4fcdba2c0c3e7e7da8b4d78b44433741899742b2
Author: JiPeng Wang <10...@users.noreply.github.com>
AuthorDate: Sun Nov 6 21:15:27 2022 +0800
cherry-pick [Bug] Resource default auth function disabled false.
---
.../api/service/impl/ResourcesServiceImpl.java | 8 ++++----
.../dolphinscheduler/api/service/ResourcesServiceTest.java | 11 ++++++-----
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
index daa0f99b9f..377f90b54b 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
@@ -1503,7 +1503,7 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
@Override
public Map<String, Object> authorizeResourceTree(User loginUser, Integer userId) {
Map<String, Object> result = new HashMap<>();
- if (!resourcePermissionCheckService.functionDisabled()) {
+ if (resourcePermissionCheckService.functionDisabled()) {
putMsg(result, Status.FUNCTION_DISABLED);
return result;
}
@@ -1584,7 +1584,7 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
@Override
public Map<String, Object> unauthorizedUDFFunction(User loginUser, Integer userId) {
Map<String, Object> result = new HashMap<>();
- if (!resourcePermissionCheckService.functionDisabled()) {
+ if (resourcePermissionCheckService.functionDisabled()) {
putMsg(result, Status.FUNCTION_DISABLED);
return result;
}
@@ -1622,7 +1622,7 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
@Override
public Map<String, Object> authorizedUDFFunction(User loginUser, Integer userId) {
Map<String, Object> result = new HashMap<>();
- if (!resourcePermissionCheckService.functionDisabled()) {
+ if (resourcePermissionCheckService.functionDisabled()) {
putMsg(result, Status.FUNCTION_DISABLED);
return result;
}
@@ -1642,7 +1642,7 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
@Override
public Map<String, Object> authorizedFile(User loginUser, Integer userId) {
Map<String, Object> result = new HashMap<>();
- if (!resourcePermissionCheckService.functionDisabled()) {
+ if (resourcePermissionCheckService.functionDisabled()) {
putMsg(result, Status.FUNCTION_DISABLED);
return result;
}
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ResourcesServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ResourcesServiceTest.java
index 5443926e1a..1b951d6068 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ResourcesServiceTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ResourcesServiceTest.java
@@ -831,7 +831,7 @@ public class ResourcesServiceTest {
// test admin user
List<Integer> resIds = new ArrayList<>();
resIds.add(1);
- Mockito.when(resourcePermissionCheckService.functionDisabled()).thenReturn(true);
+ Mockito.when(resourcePermissionCheckService.functionDisabled()).thenReturn(false);
Mockito.when(resourcesMapper.queryResourceExceptUserId(userId)).thenReturn(getResourceList());
Map<String, Object> result = resourcesService.authorizeResourceTree(user, userId);
logger.info(result.toString());
@@ -889,7 +889,7 @@ public class ResourcesServiceTest {
int userId = 3;
// test admin user
- Mockito.when(resourcePermissionCheckService.functionDisabled()).thenReturn(true);
+ Mockito.when(resourcePermissionCheckService.functionDisabled()).thenReturn(false);
Mockito.when(udfFunctionMapper.queryUdfFuncExceptUserId(userId)).thenReturn(getUdfFuncList());
Mockito.when(udfFunctionMapper.queryAuthedUdfFunc(userId)).thenReturn(getSingleUdfFuncList());
Map<String, Object> result = resourcesService.unauthorizedUDFFunction(user, userId);
@@ -916,7 +916,7 @@ public class ResourcesServiceTest {
int userId = 3;
// test admin user
- Mockito.when(resourcePermissionCheckService.functionDisabled()).thenReturn(true);
+ Mockito.when(resourcePermissionCheckService.functionDisabled()).thenReturn(false);
Mockito.when(udfFunctionMapper.queryAuthedUdfFunc(userId)).thenReturn(getUdfFuncList());
Map<String, Object> result = resourcesService.authorizedUDFFunction(user, userId);
logger.info(result.toString());
@@ -945,8 +945,9 @@ public class ResourcesServiceTest {
// test admin user
List<Integer> resIds = new ArrayList<>();
resIds.add(1);
- Mockito.when(resourcePermissionCheckService.functionDisabled()).thenReturn(true);
- Mockito.when(resourceUserMapper.queryResourcesIdListByUserIdAndPerm(Mockito.anyInt(), Mockito.anyInt())).thenReturn(resIds);
+ Mockito.when(resourcePermissionCheckService.functionDisabled()).thenReturn(false);
+ Mockito.when(resourceUserMapper.queryResourcesIdListByUserIdAndPerm(Mockito.anyInt(), Mockito.anyInt()))
+ .thenReturn(resIds);
Mockito.when(resourcesMapper.queryResourceListById(Mockito.any())).thenReturn(getResourceList());
Map<String, Object> result = resourcesService.authorizedFile(user, userId);
logger.info(result.toString());