Skip to content

Fixing listVirtualMachinesMetrics to extend ListVMsCmd instead of ListVMsCmdByAdmin #4145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 3 commits into from
Jun 18, 2020
Merged

Fixing listVirtualMachinesMetrics to extend ListVMsCmd instead of ListVMsCmdByAdmin #4145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
902755c
Fixing listVirtualMachinesMetrics to extend ListVMsCmd instead of Lis…
davidjumani Jun 15, 2020
a0d194e
Update QueryManagerImpl.java
yadvr Jun 16, 2020
cab6a07
clusterid/pod/storage pool etc should not be returned to domain admin
yadvr Jun 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions plugins/metrics/src/main/java/org/apache/cloudstack/api/ListVMsMetricsCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package org.apache.cloudstack.api;

import org.apache.cloudstack.acl.RoleType;
import org.apache.cloudstack.api.command.admin.vm.ListVMsCmdByAdmin;
import org.apache.cloudstack.api.command.user.vm.ListVMsCmd;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.metrics.MetricsService;
Expand All @@ -30,7 +30,7 @@
@APICommand(name = ListVMsMetricsCmd.APINAME, description = "Lists VM metrics", responseObject = VmMetricsResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, responseView = ResponseObject.ResponseView.Full,
since = "4.9.3", authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
public class ListVMsMetricsCmd extends ListVMsCmdByAdmin {
public class ListVMsMetricsCmd extends ListVMsCmd {
public static final String APINAME = "listVirtualMachinesMetrics";

@Inject
Expand Down
5 changes: 3 additions & 2 deletions server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,8 @@ public ListResponse<UserVmResponse> searchForUserVMs(ListVMsCmd cmd) {
Pair<List<UserVmJoinVO>, Integer> result = searchForUserVMsInternal(cmd);
ListResponse<UserVmResponse> response = new ListResponse<UserVmResponse>();
ResponseView respView = ResponseView.Restricted;
if (cmd instanceof ListVMsCmdByAdmin) {
Account caller = CallContext.current().getCallingAccount();
if (_accountMgr.isRootAdmin(caller.getId())) {
respView = ResponseView.Full;
}
List<UserVmResponse> vmResponses = ViewResponseHelper.createUserVmResponse(respView, "virtualmachine", cmd.getDetails(), result.first().toArray(new UserVmJoinVO[result.first().size()]));
Expand Down Expand Up @@ -1691,7 +1692,7 @@ public ListResponse<VolumeResponse> searchForVolumes(ListVolumesCmd cmd) {

ResponseView respView = ResponseView.Restricted;
Account account = CallContext.current().getCallingAccount();
if (_accountMgr.isAdmin(account.getAccountId())) {
if (_accountMgr.isRootAdmin(account.getAccountId())) {
respView = ResponseView.Full;
}

Expand Down