shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

feature #862: Work on INFO filter clause

Browse Source
This commit is contained in:
Ruben S. Montero 2012-01-07 04:14:18 +01:00
parent 409445ceb1
commit da68c653a9
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/rm/RequestManagerPoolInfoFilter.cc
View File

@ -139,14 +139,11 @@ void RequestManagerPoolInfoFilter::dump(
ostringstream id_filter;
string uid_str;
string acl_str;
string id_str;
int rc;
// -------------------------------------------------------------------------
// User ID filter
// -------------------------------------------------------------------------
if ( filter_flag < MINE )
{
failure_response(XML_RPC_API,
@ -160,7 +157,10 @@ void RequestManagerPoolInfoFilter::dump(
bool all;
vector<int> oids;
vector<int> gids;
// -------------------------------------------------------------------------
// User ID filter
// -------------------------------------------------------------------------
if ( att.uid == 0 || att.gid == 0 )
{
@ -168,6 +168,9 @@ void RequestManagerPoolInfoFilter::dump(
}
else
{
ostringstream acl_filter;
vector<int>::iterator it;
aclm->reverse_search(att.uid,
att.gid,
auth_object,
@ -175,6 +178,18 @@ void RequestManagerPoolInfoFilter::dump(
all,
oids,
gids);
for ( it = oids.begin(); it < oids.end(); it++ )
{
acl_filter << " OR oid = " << *it;
}
for ( it = gids.begin(); it < gids.end(); it++ )
{
acl_filter << " OR gid = " << *it;
}
acl_str = acl_filter.str();
}
switch ( filter_flag )
@ -192,21 +207,10 @@ void RequestManagerPoolInfoFilter::dump(
case ALL:
if (!all)
{
vector<int>::iterator it;
uid_filter << " uid = " << att.uid
<< " OR ( gid = " << att.gid
<< " AND group_u = 1 ) ";
for ( it=oids.begin(); it< oids.end(); it++ )
{
uid_filter << " OR oid = " << *it;
}
for ( it=gids.begin(); it< gids.end(); it++ )
{
uid_filter << " OR gid = " << *it;
}
<< " OR ( gid = " << att.gid << " AND group_u = 1 )"
<< " OR other_u = 1"
<< acl_str;
}
break;
@ -216,8 +220,9 @@ void RequestManagerPoolInfoFilter::dump(
if ( filter_flag != att.uid && !all )
{
uid_filter << " AND ("
<< " ( gid = " << att.gid << " AND group_u = 1) OR "
<< " other_u = 1"
<< " ( gid = " << att.gid << " AND group_u = 1)"
<< " OR other_u = 1"
<< acl_str
<< ")";
}
break;