Merge remote-tracking branch 'refs/remotes/origin/main' into merge_2502_into_main_0417

# Conflicts:
#	server/odc-core/src/main/resources/i18n/ErrorMessages.properties
#	server/odc-service/src/main/java/com/oceanbase/odc/service/schedule/export/ScheduleExportService.java
#	server/odc-service/src/main/java/com/oceanbase/odc/service/schedule/export/ScheduleTaskExporter.java
#	server/odc-service/src/main/java/com/oceanbase/odc/service/schedule/export/ScheduleTaskImporter.java
#	server/odc-service/src/main/java/com/oceanbase/odc/service/schedule/model/Schedule.java

Author: MarkPotato777

libs/db-browser/src/main/java/com/oceanbase/tools/dbbrowser/schema/oracle/OBOracleSchemaAccessor.java

@@ -561,12 +561,17 @@ public DBProcedure getProcedure(String schemaName, String procedureName) {
         procedure.setProName(procedureName);
         jdbcOperations.query(sb.toString(), (rs) -> {
             procedure.setDefiner(rs.getString("OWNER"));
-            procedure.setDdl(String.format("create or replace %s;", rs.getClob("TEXT").toString()));
+            procedure.setDdl(String.format("create or replace %s", rs.getClob("TEXT").toString()));
             procedure.setStatus(rs.getString("STATUS"));
             procedure.setCreateTime(rs.getTimestamp("CREATED"));
             procedure.setModifyTime(rs.getTimestamp("LAST_DDL_TIME"));
         });
 
+        String ddl = procedure.getDdl();
+        if (ddl != null && !ddl.endsWith(";")) {
+            procedure.setDdl(ddl + ";");
+        }
+
         if (StringUtils.containsIgnoreCase(procedure.getStatus(), PLConstants.PL_OBJECT_STATUS_INVALID)) {
             procedure.setErrorMessage(PLObjectErrMsgUtils.getOraclePLObjErrMsg(jdbcOperations,
                     procedure.getDefiner(), DBObjectType.PROCEDURE.name(), procedure.getProName()));

server/integration-test/src/test/java/com/oceanbase/odc/AuthorityTestEnv.java

@@ -39,6 +39,8 @@
 import com.oceanbase.odc.metadb.iam.RolePermissionRepository;
 import com.oceanbase.odc.metadb.iam.RoleRepository;
 import com.oceanbase.odc.metadb.iam.UserEntity;
+import com.oceanbase.odc.metadb.iam.UserOrganizationEntity;
+import com.oceanbase.odc.metadb.iam.UserOrganizationRepository;
 import com.oceanbase.odc.metadb.iam.UserPermissionRepository;
 import com.oceanbase.odc.metadb.iam.UserRepository;
 import com.oceanbase.odc.metadb.iam.UserRoleEntity;
@@ -52,6 +54,8 @@ public abstract class AuthorityTestEnv extends ServiceTestEnv {
 
     @Autowired
     protected UserRepository userRepository;
+    @Autowired
+    protected UserOrganizationRepository userOrganizationRepository;
 
     @Autowired
     protected RoleRepository roleRepository;
@@ -108,7 +112,13 @@ protected UserEntity createUser(String username, String accountName) {
         entity.setActive(true);
         entity.setEnabled(true);
         entity.setDescription("internal for unit test");
-        return userRepository.saveAndFlush(entity);
+
+        UserEntity user = userRepository.saveAndFlush(entity);
+        UserOrganizationEntity userOrganizationEntity = new UserOrganizationEntity();
+        userOrganizationEntity.setOrganizationId(user.getOrganizationId());
+        userOrganizationEntity.setUserId(user.getId());
+        userOrganizationRepository.saveAndFlush(userOrganizationEntity);
+        return user;
     }
 
     protected RoleEntity createRole() {

…ganizationIsolatedValueProviderTest.java …ganizationResourceValueProviderTest.javaserver/integration-test/src/test/java/com/oceanbase/odc/authority/OrganizationIsolatedValueProviderTest.java renamed to server/integration-test/src/test/java/com/oceanbase/odc/authority/SingleOrganizationResourceValueProviderTest.java server/integration-test/src/test/java/com/oceanbase/odc/authority/OrganizationIsolatedValueProviderTest.java renamed to server/integration-test/src/test/java/com/oceanbase/odc/authority/SingleOrganizationResourceValueProviderTest.java

@@ -38,7 +38,7 @@
  * @date 2021-08-04 14:31
  * @since ODC-release_3.2.0
  */
-public class OrganizationIsolatedValueProviderTest {
+public class SingleOrganizationResourceValueProviderTest {
 
     @Test
     public void testListReturnValueOrganizationIsolated_success() {

server/integration-test/src/test/java/com/oceanbase/odc/service/iam/ResourceRoleBasedPermissionExtractorTest.java

@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2023 OceanBase.
+ *
+ * Licensed 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 com.oceanbase.odc.service.iam;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.oceanbase.odc.AuthorityTestEnv;
+import com.oceanbase.odc.core.authority.permission.Permission;
+import com.oceanbase.odc.metadb.iam.resourcerole.UserResourceRoleEntity;
+
+/**
+ * @Author: Lebie
+ * @Date: 2025/3/27 15:28
+ * @Description: []
+ */
+public class ResourceRoleBasedPermissionExtractorTest extends AuthorityTestEnv {
+    @Autowired
+    private ResourceRoleBasedPermissionExtractor extractor;
+
+    @Test
+    public void testGetResourcePermissions_MultiResourceIds_Success() {
+        UserResourceRoleEntity entity1 = new UserResourceRoleEntity();
+        entity1.setId(1L);
+        entity1.setResourceId(1L);
+        entity1.setResourceRoleId(1L);
+
+        UserResourceRoleEntity entity2 = new UserResourceRoleEntity();
+        entity2.setId(2L);
+        entity2.setResourceId(2L);
+        entity2.setResourceRoleId(2L);
+
+        List<Permission> actual = extractor.getResourcePermissions(Arrays.asList(entity1, entity2));
+        Assert.assertEquals(2, actual.size());
+    }
+
+    @Test
+    public void testGetResourcePermissions_OneResourceIdMultiRoles_Success() {
+        UserResourceRoleEntity entity1 = new UserResourceRoleEntity();
+        entity1.setId(1L);
+        entity1.setResourceId(1L);
+        entity1.setResourceRoleId(1L);
+
+        UserResourceRoleEntity entity2 = new UserResourceRoleEntity();
+        entity2.setId(2L);
+        entity2.setResourceId(1L);
+        entity2.setResourceRoleId(2L);
+
+        List<Permission> actual = extractor.getResourcePermissions(Arrays.asList(entity1, entity2));
+        Assert.assertEquals(1, actual.size());
+    }
+
+    @Test
+    public void testGetResourcePermissions_SameResourceIdMultiTypes_Success() {
+        UserResourceRoleEntity entity1 = new UserResourceRoleEntity();
+        entity1.setId(1L);
+        entity1.setResourceId(1L);
+        entity1.setResourceRoleId(1L);
+
+        UserResourceRoleEntity entity2 = new UserResourceRoleEntity();
+        entity2.setId(2L);
+        entity2.setResourceId(1L);
+        entity2.setResourceRoleId(6L);
+
+        List<Permission> result = extractor.getResourcePermissions(Arrays.asList(entity1, entity2));
+        Assert.assertEquals(2, result.size());
+    }
+
+}

server/odc-core/src/main/java/com/oceanbase/odc/core/authority/BaseValueFilterSecurityManager.java

@@ -26,7 +26,7 @@
 import com.oceanbase.odc.core.authority.auth.SecurityContext;
 import com.oceanbase.odc.core.authority.exception.AccessDeniedException;
 import com.oceanbase.odc.core.authority.model.SecurityResource;
-import com.oceanbase.odc.core.shared.OrganizationIsolated;
+import com.oceanbase.odc.core.shared.OrganizationResource;
 
 import lombok.Getter;
 import lombok.NonNull;
@@ -67,7 +67,7 @@ public BaseValueFilterSecurityManager(AuthenticatorManager authenticatorManager,
     public Object decide(Subject subject, Object returnValue, SecurityContext context)
             throws AccessDeniedException {
         if (returnValue instanceof SecurityResource || returnValue instanceof Iterable
-                || returnValue instanceof Map || returnValue instanceof OrganizationIsolated) {
+                || returnValue instanceof Map || returnValue instanceof OrganizationResource) {
             return this.returnValueProvider.decide(subject, returnValue, context);
         }
         return returnValue;

server/odc-core/src/main/java/com/oceanbase/odc/core/shared/MultiOrganizationResource.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2023 OceanBase.
+ *
+ * Licensed 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 com.oceanbase.odc.core.shared;
+
+import java.util.Set;
+
+/**
+ * Organization resource bind to multi organizations.
+ */
+public interface MultiOrganizationResource extends OrganizationResource {
+    Set<Long> organizationIds();
+}

…dc/core/shared/OrganizationIsolated.java …dc/core/shared/OrganizationResource.javaserver/odc-core/src/main/java/com/oceanbase/odc/core/shared/OrganizationIsolated.java renamed to server/odc-core/src/main/java/com/oceanbase/odc/core/shared/OrganizationResource.java server/odc-core/src/main/java/com/oceanbase/odc/core/shared/OrganizationIsolated.java renamed to server/odc-core/src/main/java/com/oceanbase/odc/core/shared/OrganizationResource.java

@@ -15,12 +15,12 @@
  */
 package com.oceanbase.odc.core.shared;
 
-public interface OrganizationIsolated {
-
+/**
+ * @author jingtian
+ * @date 2025/1/14
+ */
+public interface OrganizationResource {
     String resourceType();
 
-    Long organizationId();
-
     Long id();
-
 }

server/odc-core/src/main/java/com/oceanbase/odc/core/shared/SingleOrganizationResource.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2023 OceanBase.
+ *
+ * Licensed 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 com.oceanbase.odc.core.shared;
+
+/**
+ * Organization resource bind to single organization.
+ */
+public interface SingleOrganizationResource extends OrganizationResource {
+    Long organizationId();
+
+}

server/odc-core/src/main/resources/i18n/ErrorMessages.properties

@@ -212,4 +212,4 @@ com.oceanbase.odc.ErrorCodes.UpdateNotAllowed=Editing is not allowed in the curr
 com.oceanbase.odc.ErrorCodes.PauseNotAllowed=Disabling is not allowed in the current state, please check if there are any records in execution.
 com.oceanbase.odc.ErrorCodes.DeleteNotAllowed=Deletion is not allowed in the current state.
 com.oceanbase.odc.ErrorCodes.ExtractFileFailed=Failed to extract the file. Please check whether the file is correct. Details: {0}
-com.oceanbase.odc.ErrorCodes.InvalidSignature=The file fails to be checked, do not modify the exported file or the wrong key was provided
+com.oceanbase.odc.ErrorCodes.InvalidSignature=File verification failed. Do not modify exported files or check if the correct key was used.

server/odc-migrate/src/main/resources/migrate/common/V_4_3_3_10__add_file_import_history.sql

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2025 OceanBase.
+ *
+ * Licensed 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.
+ */
+
+CREATE TABLE IF NOT EXISTS import_file_row_history (
+     id bigint(20) NOT NULL AUTO_INCREMENT,
+     file_signature varchar(255) NOT NULL,
+     row_id varchar(255) NOT NULL,
+     create_time timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+     update_time timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+     PRIMARY KEY (id)
+);