Skip to content

Commit ffe809b

Browse files
WangJPLeoWangJPLeo
authored
[Fix-10338] Tenant does not belong to resource permission. (#10339)
* Tenant does not belong to resource permission. * rerun * rerun again * resource create and upload fix. * func constant clear.
1 parent 0c25d4a commit ffe809b

4 files changed

Lines changed: 6 additions & 13 deletions

File tree

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/constants/ApiFuncIdentificationConstant.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public class ApiFuncIdentificationConstant {
120120
public static final String DATASOURCE_PARAM_VIEW = "datasource:param-view";
121121

122122
public static final String FILE_VIEW = "resources:file:view";
123-
public static final String FOLDER_ONLINE_CREATE = "resources:folder:online-create";
123+
public static final String FOLDER_ONLINE_CREATE = "resources:file:create";
124124
public static final String FILE_ONLINE_CREATE = "resources:file:online-create";
125125
public static final String FILE_UPLOAD = "resources:file:upload";
126126
public static final String FILE_UPDATE = "resources:file:update-content";
@@ -129,7 +129,7 @@ public class ApiFuncIdentificationConstant {
129129
public static final String FILE_DELETE = "resources:file:delete";
130130

131131
public static final String UDF_FILE_VIEW = "resources:udf:view";
132-
public static final String UDF_FOLDER_ONLINE_CREATE = "resources:udf-folder:online-create";
132+
public static final String UDF_FOLDER_ONLINE_CREATE = "resources:udf:create";
133133
public static final String UDF_UPLOAD = "resources:udf:upload";
134134
public static final String UDF_UPDATE = "resources:udf:edit";
135135
public static final String UDF_DOWNLOAD = "resources:udf:download";
@@ -154,10 +154,6 @@ public class ApiFuncIdentificationConstant {
154154
public static final String MONITOR_WORKER_VIEW = "monitor:workers:view";
155155
public static final String MONITOR_DATABASES_VIEW = "monitor:databases:view";
156156

157-
public static final String MONITOR_STATISTICS_VIEW = "monitor:statistics:view";
158-
public static final String MONITOR_EVENT_LIST_VIEW = "monitor:event:view";
159-
public static final String MONITOR_ALERT_LIST_VIEW = "monitor:alert:view";
160-
161157
public final static Map<ExecuteType,String> map = new HashMap<ExecuteType,String>();
162158

163159
static{

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ public Result<Object> createResource(User loginUser,
223223
int pid,
224224
String currentDir) {
225225
Result<Object> result = new Result<>();
226-
String funcPermissionKey = type.equals(ResourceType.FILE) ? ApiFuncIdentificationConstant.FILE_ONLINE_CREATE : ApiFuncIdentificationConstant.UDF_FOLDER_ONLINE_CREATE;
226+
String funcPermissionKey = type.equals(ResourceType.FILE) ? ApiFuncIdentificationConstant.FILE_UPLOAD : ApiFuncIdentificationConstant.UDF_UPLOAD;
227227
boolean canOperatorPermissions = canOperatorPermissions(loginUser, null, AuthorizationType.RESOURCE_FILE_ID, funcPermissionKey);
228228
if (!canOperatorPermissions){
229229
putMsg(result, Status.NO_CURRENT_OPERATING_PERMISSION);

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,8 @@ public Map<String, Object> createTenant(User loginUser,
132132
if (PropertyUtils.getResUploadStartupState()) {
133133
storageOperate.createTenantDirIfNotExists(tenantCode);
134134
}
135-
136135
result.put(Constants.DATA_LIST, tenant);
137136
putMsg(result, Status.SUCCESS);
138-
permissionPostHandle(AuthorizationType.TENANT, loginUser.getId(), Collections.singletonList(tenant.getId()),logger);
139-
140137
return result;
141138
}
142139

‎dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ResourcesServiceTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public void setUp() {
138138
@Test
139139
public void testCreateResource() {
140140

141-
PowerMockito.when(resourcePermissionCheckService.operationPermissionCheck(AuthorizationType.RESOURCE_FILE_ID, 1, ApiFuncIdentificationConstant.FILE_ONLINE_CREATE, serviceLogger)).thenReturn(true);
141+
PowerMockito.when(resourcePermissionCheckService.operationPermissionCheck(AuthorizationType.RESOURCE_FILE_ID, 1, ApiFuncIdentificationConstant.FILE_UPLOAD, serviceLogger)).thenReturn(true);
142142
PowerMockito.when(resourcePermissionCheckService.resourcePermissionCheck(AuthorizationType.RESOURCE_FILE_ID, null, 1, serviceLogger)).thenReturn(true);
143143

144144
PowerMockito.when(PropertyUtils.getResUploadStartupState()).thenReturn(false);
@@ -180,7 +180,7 @@ public void testCreateResource() {
180180
Assert.assertEquals(Status.RESOURCE_SUFFIX_FORBID_CHANGE.getMsg(), result.getMsg());
181181

182182
//UDF_RESOURCE_SUFFIX_NOT_JAR
183-
PowerMockito.when(resourcePermissionCheckService.operationPermissionCheck(AuthorizationType.RESOURCE_FILE_ID, 1, ApiFuncIdentificationConstant.UDF_FOLDER_ONLINE_CREATE, serviceLogger)).thenReturn(true);
183+
PowerMockito.when(resourcePermissionCheckService.operationPermissionCheck(AuthorizationType.RESOURCE_FILE_ID, 1, ApiFuncIdentificationConstant.UDF_UPLOAD, serviceLogger)).thenReturn(true);
184184
PowerMockito.when(resourcePermissionCheckService.resourcePermissionCheck(AuthorizationType.RESOURCE_FILE_ID, null, 1, serviceLogger)).thenReturn(true);
185185

186186
mockMultipartFile = new MockMultipartFile("ResourcesServiceTest.pdf", "ResourcesServiceTest.pdf", "pdf", "test".getBytes());
@@ -190,7 +190,7 @@ public void testCreateResource() {
190190
Assert.assertEquals(Status.UDF_RESOURCE_SUFFIX_NOT_JAR.getMsg(), result.getMsg());
191191

192192
//FULL_FILE_NAME_TOO_LONG
193-
PowerMockito.when(resourcePermissionCheckService.operationPermissionCheck(AuthorizationType.RESOURCE_FILE_ID, 1, ApiFuncIdentificationConstant.FILE_ONLINE_CREATE, serviceLogger)).thenReturn(true);
193+
PowerMockito.when(resourcePermissionCheckService.operationPermissionCheck(AuthorizationType.RESOURCE_FILE_ID, 1, ApiFuncIdentificationConstant.FILE_UPLOAD, serviceLogger)).thenReturn(true);
194194
PowerMockito.when(resourcePermissionCheckService.resourcePermissionCheck(AuthorizationType.RESOURCE_FILE_ID, null, 1, serviceLogger)).thenReturn(true);
195195

196196
String tooLongFileName = getRandomStringWithLength(Constants.RESOURCE_FULL_NAME_MAX_LENGTH) + ".pdf";

0 commit comments

Comments
 (0)