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

F #5431: User encrypted attributes (#1574)

Browse Source
This commit is contained in:
Pavel Czerný 2021-11-24 10:58:42 +01:00 committed by GitHub
parent 896f8fe2f0
commit 9aa26b295d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/UserPool.h
View File

@ -40,7 +40,8 @@ class UserPool : public PoolSQL
public:
UserPool(SqlDB * db, time_t __session_expiration_time, bool is_slave,
std::vector<const SingleAttribute *>& restricted_attrs);
std::vector<const SingleAttribute *>& restricted_attrs,
std::vector<const SingleAttribute *>& encrypted_attrs);
~UserPool() = default;

23
include/UserTemplate.h
View File

@ -47,11 +47,34 @@ public:
Template::parse_restricted(ra, restricted);
}
// -------------------------------------------------------------------------
// Encrypted attributes interface implementation
// -------------------------------------------------------------------------
virtual void encrypt(const std::string& one_key)
{
Template::encrypt(one_key, encrypted);
}
virtual void decrypt(const std::string& one_key)
{
Template::decrypt(one_key, encrypted);
}
static void parse_encrypted(std::vector<const SingleAttribute *>& ea)
{
Template::parse_encrypted(ea, encrypted);
}
private:
/**
* Restricted attribute list for UserTemplate
*/
static std::map<std::string, std::set<std::string>> restricted;
/**
* Encrypted attribute list for ImageTemplates
*/
static std::map<std::string, std::set<std::string> > encrypted;
};
/* -------------------------------------------------------------------------- */

2
src/cli/oneuser
View File

@ -573,7 +573,7 @@ CommandParser::CmdParser.new(ARGV) do
EOT
command :show, show_desc, [:userid, nil],
:options => OpenNebulaHelper::FORMAT do
:options => [OpenNebulaHelper::FORMAT, OpenNebulaHelper::DECRYPT] do
user = args[0] || OpenNebula::User::SELF
helper.show_resource(user, options)
end

4
src/nebula/Nebula.cc
View File

@ -734,6 +734,7 @@ void Nebula::start(bool bootstrap_only)
/* ----------------------- Group/User Pool -------------------------- */
vector<const SingleAttribute *> user_restricted;
vector<const SingleAttribute *> group_restricted;
vector<const SingleAttribute *> user_encrypted;
time_t expiration_time;
@ -743,9 +744,10 @@ void Nebula::start(bool bootstrap_only)
nebula_configuration->get("SESSION_EXPIRATION_TIME", expiration_time);
nebula_configuration->get("USER_RESTRICTED_ATTR", user_restricted);
nebula_configuration->get("USER_ENCRYPTED_ATTR", user_encrypted);
upool = new UserPool(db_ptr, expiration_time, is_federation_slave(),
user_restricted);
user_restricted, user_encrypted);
/* -------------------- Image/Datastore Pool ------------------------ */
string image_type;

4
src/oca/ruby/opennebula/user.rb
View File

@ -89,8 +89,8 @@ module OpenNebula
#######################################################################
# Retrieves the information of the given User.
def info()
super(USER_METHODS[:info], 'USER')
def info(decrypt = false)
super(USER_METHODS[:info], 'USER', decrypt)
end
alias_method :info!, :info

5
src/um/UserPool.cc
View File

@ -54,7 +54,8 @@ string UserPool::oneadmin_name;
/* -------------------------------------------------------------------------- */
UserPool::UserPool(SqlDB * db, time_t __session_expiration_time, bool is_slave,
vector<const SingleAttribute *>& restricted_attrs)
vector<const SingleAttribute *>& restricted_attrs,
vector<const SingleAttribute *>& encrypted_attrs)
: PoolSQL(db, one_db::user_table)
{
int one_uid = -1;
@ -81,6 +82,8 @@ UserPool::UserPool(SqlDB * db, time_t __session_expiration_time, bool is_slave,
// Set restricted attributes
UserTemplate::parse_restricted(restricted_attrs);
UserTemplate::parse_encrypted(encrypted_attrs);
auto oneadmin_user = get_ro(0);
//Slaves do not need to init the pool, just the oneadmin username

2
src/um/UserTemplate.cc
View File

@ -20,3 +20,5 @@
/* -------------------------------------------------------------------------- */
std::map<std::string, std::set<std::string>> UserTemplate::restricted;
std::map<std::string, std::set<std::string> > UserTemplate::encrypted;