You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2020/08/13 10:15:53 UTC
[cloudstack] branch master updated (3adee27 -> c578004)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 3adee27 api: Prevent null pointer on listPublicIpAddress cmd (#4255)
add c578004 projects: Role based users in Projects (#4128)
No new revisions were added by this update.
Summary of changes:
api/src/main/java/com/cloud/event/EventTypes.java | 18 +-
.../java/com/cloud/projects/ProjectAccount.java | 4 +
.../java/com/cloud/projects/ProjectInvitation.java | 6 +
.../java/com/cloud/projects/ProjectService.java | 26 +-
.../cloudstack/acl/{Role.java => ProjectRole.java} | 8 +-
.../cloudstack/acl/ProjectRolePermission.java} | 15 +-
.../apache/cloudstack/acl/ProjectRoleService.java | 118 +++++
.../main/java/org/apache/cloudstack/acl/Role.java | 4 +-
.../cloudstack/acl/{Role.java => RoleEntity.java} | 4 +-
.../org/apache/cloudstack/acl/RolePermission.java | 10 +-
...lePermission.java => RolePermissionEntity.java} | 9 +-
.../org/apache/cloudstack/acl/RoleService.java | 2 +-
.../org/apache/cloudstack/api/ApiConstants.java | 5 +
.../apache/cloudstack/api/ApiServerService.java | 2 +-
.../java/org/apache/cloudstack/api/BaseCmd.java | 55 +-
.../command/admin/acl/BaseRolePermissionCmd.java | 63 +++
.../command/admin/acl/CreateRolePermissionCmd.java | 36 +-
.../command/admin/acl/UpdateRolePermissionCmd.java | 9 +-
.../acl/project/CreateProjectRoleCmd.java} | 69 +--
.../project/CreateProjectRolePermissionCmd.java | 105 ++++
.../acl/project/DeleteProjectRoleCmd.java} | 71 ++-
.../project/DeleteProjectRolePermissionCmd.java | 89 ++++
.../acl/project/ListProjectRolePermissionsCmd.java | 113 +++++
.../admin/acl/project/ListProjectRolesCmd.java | 116 +++++
.../command/admin/acl/project/ProjectRoleCmd.java | 62 +++
.../admin/acl/project/UpdateProjectRoleCmd.java | 85 ++++
.../project/UpdateProjectRolePermissionCmd.java | 163 ++++++
.../user/account/AddAccountToProjectCmd.java | 38 +-
.../command/user/account/AddUserToProjectCmd.java | 150 ++++++
.../user/account/DeleteAccountFromProjectCmd.java | 7 +
...ojectCmd.java => DeleteUserFromProjectCmd.java} | 79 +--
.../user/account/ListProjectAccountsCmd.java | 17 +-
.../command/user/project/ActivateProjectCmd.java | 7 +
.../api/command/user/project/CreateProjectCmd.java | 33 +-
.../api/command/user/project/DeleteProjectCmd.java | 7 +
.../user/project/ListProjectInvitationsCmd.java | 8 +
.../api/command/user/project/ListProjectsCmd.java | 7 +
.../command/user/project/SuspendProjectCmd.java | 7 +
.../api/command/user/project/UpdateProjectCmd.java | 58 ++-
.../user/project/UpdateProjectInvitationCmd.java | 22 +-
...sponse.java => BaseRolePermissionResponse.java} | 49 +-
.../{RoleResponse.java => BaseRoleResponse.java} | 29 +-
.../api/response/ProjectAccountResponse.java | 25 +-
.../api/response/ProjectInvitationResponse.java | 9 +-
.../cloudstack/api/response/ProjectResponse.java | 11 +-
.../response/ProjectRolePermissionResponse.java | 77 +++
.../api/response/ProjectRoleResponse.java} | 38 +-
.../api/response/RolePermissionResponse.java | 45 +-
.../cloudstack/api/response/RoleResponse.java | 31 +-
.../org/apache/cloudstack/context/CallContext.java | 14 +-
client/pom.xml | 5 +
.../java/com/cloud/projects/ProjectAccountVO.java | 30 +-
.../com/cloud/projects/ProjectInvitationVO.java | 37 ++
.../com/cloud/projects/dao/ProjectAccountDao.java | 10 +
.../cloud/projects/dao/ProjectAccountDaoImpl.java | 74 ++-
.../cloud/projects/dao/ProjectInvitationDao.java | 2 +
.../projects/dao/ProjectInvitationDaoImpl.java | 26 +-
.../src/main/java/com/cloud/user/dao/UserDao.java | 2 +
.../main/java/com/cloud/user/dao/UserDaoImpl.java | 16 +
.../cloudstack/acl/ProjectRolePermissionVO.java | 72 +++
.../{RolePermissionVO.java => ProjectRoleVO.java} | 84 ++--
...PermissionVO.java => RolePermissionBaseVO.java} | 44 +-
.../apache/cloudstack/acl/RolePermissionVO.java | 73 +--
.../apache/cloudstack/acl/dao/ProjectRoleDao.java | 16 +-
.../cloudstack/acl/dao/ProjectRoleDaoImpl.java | 61 +++
.../acl/dao/ProjectRolePermissionsDao.java} | 44 +-
.../acl/dao/ProjectRolePermissionsDaoImpl.java | 147 ++++++
.../cloudstack/acl/dao/RolePermissionsDao.java | 9 +-
.../cloudstack/acl/dao/RolePermissionsDaoImpl.java | 25 +-
.../spring-engine-schema-core-daos-context.xml | 2 +
.../resources/META-INF/db/schema-41400to41500.sql | 150 ++++++
.../java/com/cloud/cluster/ClusterManagerImpl.java | 4 +-
.../acl/DynamicRoleBasedAPIAccessChecker.java | 10 +-
.../acl/DynamicRoleBasedAPIAccessCheckerTest.java | 30 +-
.../baremetal => acl/project-role-based}/pom.xml | 79 ++-
.../acl/ProjectRoleBasedApiAccessChecker.java | 148 ++++++
.../acl-project-role-based/module.properties | 18 +
.../spring-acl-project-role-based-context.xml | 33 ++
.../discovery/ApiDiscoveryServiceImpl.java | 32 +-
plugins/hypervisors/baremetal/pom.xml | 32 +-
plugins/pom.xml | 1 +
.../com/cloud/acl/AffinityGroupAccessChecker.java | 21 +-
.../src/main/java/com/cloud/acl/DomainChecker.java | 74 ++-
server/src/main/java/com/cloud/api/ApiDBUtils.java | 5 +
.../main/java/com/cloud/api/ApiResponseHelper.java | 10 +-
server/src/main/java/com/cloud/api/ApiServer.java | 166 +++---
server/src/main/java/com/cloud/api/ApiServlet.java | 43 +-
.../com/cloud/api/dispatch/ParamProcessWorker.java | 14 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 79 ++-
.../com/cloud/api/query/ViewResponseHelper.java | 15 +-
.../api/query/dao/ProjectAccountJoinDaoImpl.java | 4 +-
.../query/dao/ProjectInvitationJoinDaoImpl.java | 6 +-
.../cloud/api/query/dao/ProjectJoinDaoImpl.java | 29 +-
.../cloud/api/query/vo/ProjectAccountJoinVO.java | 32 ++
.../api/query/vo/ProjectInvitationJoinVO.java | 5 +
.../java/com/cloud/api/query/vo/ProjectJoinVO.java | 7 +
.../java/com/cloud/network/NetworkModelImpl.java | 23 +-
.../com/cloud/projects/ProjectManagerImpl.java | 559 +++++++++++++++++----
.../com/cloud/server/ManagementServerImpl.java | 8 +-
.../java/com/cloud/user/AccountManagerImpl.java | 4 +-
.../cloudstack/acl/ProjectRoleManagerImpl.java | 315 ++++++++++++
.../org/apache/cloudstack/acl/RoleManagerImpl.java | 11 +-
.../core/spring-server-core-managers-context.xml | 2 +
.../com/cloud/projects/MockProjectManagerImpl.java | 30 +-
.../com/cloud/user/AccountManagerImplTest.java | 9 +-
.../test_enable_role_based_users_in_projects.py | 271 ++++++++++
tools/marvin/marvin/lib/base.py | 127 ++++-
107 files changed, 4273 insertions(+), 947 deletions(-)
copy api/src/main/java/org/apache/cloudstack/acl/{Role.java => ProjectRole.java} (85%)
copy api/src/main/java/{com/cloud/projects/ProjectAccount.java => org/apache/cloudstack/acl/ProjectRolePermission.java} (80%)
create mode 100644 api/src/main/java/org/apache/cloudstack/acl/ProjectRoleService.java
copy api/src/main/java/org/apache/cloudstack/acl/{Role.java => RoleEntity.java} (89%)
copy api/src/main/java/org/apache/cloudstack/acl/{RolePermission.java => RolePermissionEntity.java} (87%)
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/acl/BaseRolePermissionCmd.java
copy api/src/main/java/org/apache/cloudstack/api/command/{user/project/DeleteProjectCmd.java => admin/acl/project/CreateProjectRoleCmd.java} (51%)
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/CreateProjectRolePermissionCmd.java
copy api/src/main/java/org/apache/cloudstack/api/command/{user/project/DeleteProjectCmd.java => admin/acl/project/DeleteProjectRoleCmd.java} (50%)
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/DeleteProjectRolePermissionCmd.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/ListProjectRolePermissionsCmd.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/ListProjectRolesCmd.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/ProjectRoleCmd.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/UpdateProjectRoleCmd.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/UpdateProjectRolePermissionCmd.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/account/AddUserToProjectCmd.java
copy api/src/main/java/org/apache/cloudstack/api/command/user/account/{DeleteAccountFromProjectCmd.java => DeleteUserFromProjectCmd.java} (67%)
copy api/src/main/java/org/apache/cloudstack/api/response/{RolePermissionResponse.java => BaseRolePermissionResponse.java} (63%)
copy api/src/main/java/org/apache/cloudstack/api/response/{RoleResponse.java => BaseRoleResponse.java} (69%)
create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/ProjectRolePermissionResponse.java
copy api/src/main/java/{com/cloud/projects/ProjectInvitation.java => org/apache/cloudstack/api/response/ProjectRoleResponse.java} (55%)
create mode 100644 engine/schema/src/main/java/org/apache/cloudstack/acl/ProjectRolePermissionVO.java
copy engine/schema/src/main/java/org/apache/cloudstack/acl/{RolePermissionVO.java => ProjectRoleVO.java} (56%)
copy engine/schema/src/main/java/org/apache/cloudstack/acl/{RolePermissionVO.java => RolePermissionBaseVO.java} (71%)
copy api/src/main/java/com/cloud/projects/ProjectAccount.java => engine/schema/src/main/java/org/apache/cloudstack/acl/dao/ProjectRoleDao.java (70%)
create mode 100644 engine/schema/src/main/java/org/apache/cloudstack/acl/dao/ProjectRoleDaoImpl.java
copy engine/schema/src/main/java/{com/cloud/user/dao/UserDao.java => org/apache/cloudstack/acl/dao/ProjectRolePermissionsDao.java} (52%)
create mode 100644 engine/schema/src/main/java/org/apache/cloudstack/acl/dao/ProjectRolePermissionsDaoImpl.java
copy plugins/{hypervisors/baremetal => acl/project-role-based}/pom.xml (54%)
mode change 100755 => 100644
create mode 100644 plugins/acl/project-role-based/src/main/java/org/apache/cloudstack/acl/ProjectRoleBasedApiAccessChecker.java
create mode 100644 plugins/acl/project-role-based/src/main/resources/META-INF/cloudstack/acl-project-role-based/module.properties
create mode 100644 plugins/acl/project-role-based/src/main/resources/META-INF/cloudstack/acl-project-role-based/spring-acl-project-role-based-context.xml
create mode 100644 server/src/main/java/org/apache/cloudstack/acl/ProjectRoleManagerImpl.java
create mode 100644 test/integration/smoke/test_enable_role_based_users_in_projects.py