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

Bug #963: Prevents seg fault if user is freed while executing RM action

Browse Source
This commit is contained in:
Ruben S. Montero 2011-12-19 22:42:33 +01:00
parent 5c74e8c537
commit f41a20d4dd
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/RequestManagerUser.h
View File

@ -48,7 +48,7 @@ protected:
void request_execute(xmlrpc_c::paramList const& _paramList,
RequestAttributes& att);
virtual int user_action(User * user,
virtual int user_action(int user_id,
xmlrpc_c::paramList const& _paramList,
string& error_str ) = 0;
@ -71,7 +71,7 @@ public:
~UserChangePassword(){};
int user_action(User * user,
int user_action(int user_id,
xmlrpc_c::paramList const& _paramList,
string& err);
};
@ -92,7 +92,7 @@ public:
~UserChangeAuth(){};
int user_action(User * user,
int user_action(int user_id,
xmlrpc_c::paramList const& _paramList,
string& err);
};

25
src/rm/RequestManagerUser.cc
View File

@ -42,7 +42,7 @@ void RequestManagerUser::
return;
}
if ( user_action(user,paramList,error_str) < 0 )
if ( user_action(id,paramList,error_str) < 0 )
{
failure_response(INTERNAL, request_error(error_str,""), att);
return;
@ -54,14 +54,20 @@ void RequestManagerUser::
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
int UserChangePassword::user_action(User * user,
int UserChangePassword::user_action(int user_id,
xmlrpc_c::paramList const& paramList,
string& error_str)
{
string new_pass = xmlrpc_c::value_string(paramList.getString(2));
User * user;
user->lock();
user = static_cast<User *>(pool->get(user_id,true));
if ( user == 0 )
{
return -1;
}
if (user->get_auth_driver() == UserPool::CORE_AUTH)
{
@ -83,16 +89,23 @@ int UserChangePassword::user_action(User * user,
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
int UserChangeAuth::user_action(User * user,
int UserChangeAuth::user_action(int user_id,
xmlrpc_c::paramList const& paramList,
string& error_str)
{
string new_auth = xmlrpc_c::value_string(paramList.getString(2));
string new_pass = xmlrpc_c::value_string(paramList.getString(3));
int rc = 0;
int rc = 0;
user->lock();
User * user;
user = static_cast<User *>(pool->get(user_id,true));
if ( user == 0 )
{
return -1;
}
if ( !new_pass.empty() )
{