This is an automated email from the ASF dual-hosted git repository.
kerwin pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 606a5aeee5 [Bug] Resource default auth function disabled false.
(#12467)
606a5aeee5 is described below
commit 606a5aeee5b44b095ddf922e2c8c0de485e56c45
Author: JiPeng Wang <[email protected]>
AuthorDate: Sun Nov 6 21:15:27 2022 +0800
[Bug] Resource default auth function disabled false. (#12467)
* resource function disable check fix
Co-authored-by: Kerwin <[email protected]>
---
.../dolphinscheduler/api/service/impl/ResourcesServiceImpl.java | 8 ++++----
.../apache/dolphinscheduler/api/service/ResourcesServiceTest.java | 8 ++++----
2 files changed, 8 insertions(+), 8 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 91aff2347f..155595dfe0 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
@@ -1831,7 +1831,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;
}
@@ -1981,7 +1981,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;
}
@@ -2019,7 +2019,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;
}
@@ -2039,7 +2039,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 21f0a08d21..c052dda741 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
@@ -740,7 +740,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());
@@ -798,7 +798,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);
@@ -826,7 +826,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());
@@ -855,7 +855,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(resourceUserMapper.queryResourcesIdListByUserIdAndPerm(Mockito.anyInt(),
Mockito.anyInt()))
.thenReturn(resIds);
Mockito.when(resourcesMapper.queryResourceListById(Mockito.any())).thenReturn(getResourceList());
