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: Create new configuration files for serveradmin user, create a random password for it

Browse Source
This commit is contained in:
Carlos Martín 2011-10-26 16:25:37 +02:00
parent 84d42493e2
commit b69340c917
2 changed files with 95 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/onedb/3.0.0_to_3.1.0.rb
View File

@ -13,6 +13,7 @@
# limitations under the License. *
# -------------------------------------------------------------------------- *
require 'digest/sha1'
require "rexml/document"
include REXML
@ -157,6 +158,12 @@ module Migrator
e.text = "server_cipher"
}
pass = Digest::SHA1.hexdigest( rand(10000).to_s )
doc.root.each_element("PASSWORD") { |e|
e.text = Digest::SHA1.hexdigest( pass )
}
# Insert new user
@db[:user_pool].insert(
:oid => user_oid,
@ -179,6 +186,21 @@ module Migrator
@db.run("UPDATE group_pool SET body='#{doc.root.to_s}' WHERE oid=0;")
# Create new config files
new_auth = "#{username}:#{pass}\n"
begin
["sunstone_auth", "occi_auth", "ec2_auth"].each { |name|
File.open("#{VAR_LOCATION}/#{name}", 'w') {|f|
f.write(new_auth)
}
}
rescue
puts "Error trying to create new configuration files in #{VAR_LOCATION}"
return false
end
puts " > New user '#{username}' created "<<
"for Sunstone and public servers operation.\n"<<
" You will need to create some configuration files "<<

91
src/um/UserPool.cc
View File

@ -60,6 +60,11 @@ UserPool::UserPool(SqlDB * db,
const char * one_auth;
ifstream file;
string var_location;
const char * one_location;
string filenames[3];
string error_str;
_session_expiration_time = __session_expiration_time;
if (get(0,false) != 0)
@ -109,26 +114,76 @@ UserPool::UserPool(SqlDB * db,
}
else
{
string error_str;
// Create the serveradmin user with a random password, and
// write its authentication configuration files
allocate(&one_uid,
GroupPool::ONEADMIN_ID,
one_name,
GroupPool::ONEADMIN_NAME,
one_pass,
UserPool::CORE_AUTH,
true,
error_str);
stringstream sstr;
srand(time(0));
sstr << rand();
// Create the serveradmin user with the same password
allocate(&server_uid,
GroupPool::ONEADMIN_ID,
SERVER_NAME,
GroupPool::ONEADMIN_NAME,
SSLTools::sha1_digest(one_pass),
"server_cipher",
true,
error_str);
string random = SSLTools::sha1_digest( sstr.str() );
one_location = getenv("ONE_LOCATION");
if (one_location == 0)
{
var_location = "/var/lib/one/";
}
else
{
var_location = one_location;
var_location += "/var/";
}
filenames[0] = var_location + "sunstone_auth";
filenames[1] = var_location + "occi_auth";
filenames[2] = var_location + "ec2_auth";
bool success = true;
int i = 0;
while ( i < 3 && success )
{
ofstream ofile;
ofile.open(filenames[i].c_str(), ios::out | ios::trunc);
if ( ofile.is_open() )
{
ofile << SERVER_NAME << ":" << random << endl;
}
else
{
success = false;
oss << "Could not create configuration file "<<
filenames[i];
}
ofile.close();
i++;
}
if ( success )
{
allocate(&one_uid,
GroupPool::ONEADMIN_ID,
one_name,
GroupPool::ONEADMIN_NAME,
one_pass,
UserPool::CORE_AUTH,
true,
error_str);
allocate(&server_uid,
GroupPool::ONEADMIN_ID,
SERVER_NAME,
GroupPool::ONEADMIN_NAME,
SSLTools::sha1_digest(random),
"server_cipher",
true,
error_str);
}
}
}
else