shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-04-01 06:50:25 +03:00
Code Releases Wiki Activity

Feature #3588: Users with vnet manage can see all leases

Browse Source
This commit is contained in:
Carlos Martín 2015-02-13 18:22:26 +01:00
parent c47c549f1e
commit 6839df6ff5
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/rm/RequestManagerInfo.cc
View File

@ -77,11 +77,30 @@ void VirtualNetworkInfo::to_xml(RequestAttributes& att, PoolObjectSQL * object,
string where_vnets;
string where_vms;
bool all_reservations = RequestManagerPoolInfoFilter::use_filter(att,
PoolObjectSQL::NET, true, true, false, "(pid != -1)", where_vnets);
bool all_reservations;
bool all_vms;
bool all_vms = RequestManagerPoolInfoFilter::use_filter(att,
PoolObjectSQL::VM, false, false, false, "", where_vms);
PoolObjectAuth perms;
object->get_permissions(perms);
AuthRequest ar(att.uid, att.group_ids);
ar.add_auth(AuthRequest::MANAGE, perms);
if (UserPool::authorize(ar) == 0)
{
all_reservations = true;
all_vms = true;
}
else
{
all_reservations = RequestManagerPoolInfoFilter::use_filter(att,
PoolObjectSQL::NET, true, true, false, "(pid != -1)", where_vnets);
all_vms = RequestManagerPoolInfoFilter::use_filter(att,
PoolObjectSQL::VM, false, false, false, "", where_vms);
}
if ( all_reservations == true )
{