shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-23 17:33:56 +03:00
Code Releases Wiki Activity

feature-862: Check persistent state and permissions for Images

Browse Source
This commit is contained in:
Ruben S. Montero 2012-01-06 01:36:57 +01:00
parent 30acd6df4f
commit 5c033040aa
3 changed files with 52 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
include/Image.h
View File

@ -190,6 +190,43 @@ public:
*/
int set_type(string& _type);
/**
* Check if the image can be used by other users
* @return true if group or others can access the image
*/
bool isPublic()
{
return (group_u == 1 || other_u == 1);
}
/**
* Set permissions for the Image. Extends the PoolSQLObject method
* by checking the persistent state of the image.
*/
int set_permissions(int _owner_u,
int _owner_m,
int _owner_a,
int _group_u,
int _group_m,
int _group_a,
int _other_u,
int _other_m,
int _other_a,
string& error_str)
{
if ( isPersistent() && (_group_u == 1 || _other_u == 1) )
{
error_str = "Image cannot be public and persistent.";
return -1;
}
return PoolObjectSQL::set_permissions(_owner_u, _owner_m, _owner_a,
_group_u, _group_m, _group_a,
_other_u, _other_m, _other_a,
error_str);
};
/**
* Set/Unset an image as persistent
* @param persistent true to make an image persistent
@ -206,13 +243,12 @@ public:
if (persis == true)
{
// TODO
/*
if ( isPublic() )
{
goto error_public;
}
*/
persistent_img = 1;
}
else
@ -225,11 +261,11 @@ public:
error_vms:
error_str = "Image cannot be in 'used' state.";
goto error_common;
/*
error_public:
error_str = "Image cannot be public and persistent.";
goto error_common;
*/
error_common:
return -1;

20
include/PoolObjectSQL.h
View File

@ -182,16 +182,16 @@ public:
*
* @return 0 on success
*/
int set_permissions(int _owner_u,
int _owner_m,
int _owner_a,
int _group_u,
int _group_m,
int _group_a,
int _other_u,
int _other_m,
int _other_a,
string& error_str);
virtual int set_permissions(int _owner_u,
int _owner_m,
int _owner_a,
int _group_u,
int _group_m,
int _group_a,
int _other_u,
int _other_m,
int _other_a,
string& error_str);
/* --------------------------------------------------------------------- */

14
src/image/Image.cc
View File

@ -124,14 +124,6 @@ int Image::insert(SqlDB *db, string& error_str)
persistent_img = (persistent_attr == "YES");
// TODO
// An image cannot be public and persistent simultaneously
/*
if ( public_obj && persistent_img )
{
goto error_public_and_persistent;
}
*/
// ------------ PREFIX --------------------
get_template_attribute("DEV_PREFIX", dev_prefix);
@ -191,11 +183,7 @@ int Image::insert(SqlDB *db, string& error_str)
error_type:
error_str = "Incorrect TYPE in template.";
goto error_common;
/*
error_public_and_persistent:
error_str = "Image cannot be public and persistent.";
goto error_common;
*/
error_no_path:
if ( type == DATABLOCK )
{