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

Bug #847: Update the scheduler client, it does not hash the password

Browse Source
This commit is contained in:
Carlos Martín 2011-10-18 18:01:32 +02:00
parent 34359e7a60
commit 92b05d5971
2 changed files with 2 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/scheduler/include/Client.h
View File

@ -95,8 +95,6 @@ private:
void set_one_endpoint(string endpoint);
int read_oneauth(string &secret);
int split_secret(const string& secret);
};
#endif /*ONECLIENT_H_*/

39
src/scheduler/src/client/Client.cc
View File

@ -45,15 +45,7 @@ void Client::set_one_auth(string secret)
rc = read_oneauth(secret);
}
if ( rc == 0 )
{
rc = split_secret(secret);
if( rc != 0 )
{
throw runtime_error("Wrong format for auth token");
}
}
one_auth = secret;
}
/* -------------------------------------------------------------------------- */
@ -117,39 +109,12 @@ int Client::read_oneauth(string &secret)
if (rc != 0)
{
NebulaLog::log("XMLRPC",Log::ERROR,oss);
throw runtime_error( oss.str() );
}
return rc;
}
int Client::split_secret(const string& secret)
{
size_t pos;
pos = secret.find(":");
if ( pos == string::npos )
{
return -1;
}
if ( secret.rfind(":") == pos )
{
string user = secret.substr(0,pos);
string pass = secret.substr(pos+1);
string sha1_pass = SSLTools::sha1_digest(pass);
one_auth = user + ":" + sha1_pass;
}
else
{
one_auth = secret;
}
return 0;
}
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */