From 7d5cd539703dfc6bb19e43d5795bc694e37b1382 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Fri, 20 May 2016 12:56:45 +0200 Subject: [PATCH] bug #4477: Add/del # VROUTER/* CREATE * for group admins by default --- src/group/Group.cc | 58 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 41 insertions(+), 17 deletions(-) diff --git a/src/group/Group.cc b/src/group/Group.cc index 0343fe1493..a4557d1958 100644 --- a/src/group/Group.cc +++ b/src/group/Group.cc @@ -330,13 +330,12 @@ int Group::add_admin(int user_id, string& error_msg) void Group::add_admin_rules(int user_id) { - int rc; string error_msg; AclManager* aclm = Nebula::instance().get_aclm(); // # USER/@ USE+MANAGE+ADMIN+CREATE * - rc = aclm->add_rule( + if ( aclm->add_rule( AclRule::INDIVIDUAL_ID | user_id, @@ -351,15 +350,13 @@ void Group::add_admin_rules(int user_id) AclRule::ALL_ID, - error_msg); - - if (rc < 0) + error_msg) < 0 ) { NebulaLog::log("GROUP",Log::ERROR,error_msg); } // # VM+NET+IMAGE+TEMPLATE+DOCUMENT+SECGROUP+VROUTER/@ USE+MANAGE * - rc = aclm->add_rule( + if ( aclm->add_rule( AclRule::INDIVIDUAL_ID | user_id, @@ -378,9 +375,24 @@ void Group::add_admin_rules(int user_id) AclRule::ALL_ID, - error_msg); + error_msg) < 0 ) + { + NebulaLog::log("GROUP",Log::ERROR,error_msg); + } - if (rc < 0) + // # VROUTER/* CREATE * + if ( aclm->add_rule( + AclRule::INDIVIDUAL_ID | + user_id, + + AclRule::ALL_ID | + PoolObjectSQL::VROUTER, + + AuthRequest::CREATE, + + AclRule::ALL_ID, + + error_msg) < 0 ) { NebulaLog::log("GROUP",Log::ERROR,error_msg); } @@ -414,13 +426,12 @@ int Group::del_admin(int user_id, string& error_msg) void Group::del_admin_rules(int user_id) { - int rc; string error_msg; - AclManager* aclm = Nebula::instance().get_aclm(); + AclManager *aclm = Nebula::instance().get_aclm(); // # USER/@ USE+MANAGE+ADMIN+CREATE * - rc = aclm->del_rule( + if ( aclm->del_rule( AclRule::INDIVIDUAL_ID | user_id, @@ -435,15 +446,13 @@ void Group::del_admin_rules(int user_id) AclRule::ALL_ID, - error_msg); - - if (rc < 0) + error_msg) < 0) { NebulaLog::log("GROUP",Log::ERROR,error_msg); } // # VM+NET+IMAGE+TEMPLATE+DOCUMENT+SECGROUP+VROUTER/@ USE+MANAGE * - rc = aclm->del_rule( + if ( aclm->del_rule( AclRule::INDIVIDUAL_ID | user_id, @@ -462,9 +471,24 @@ void Group::del_admin_rules(int user_id) AclRule::ALL_ID, - error_msg); + error_msg) < 0) + { + NebulaLog::log("GROUP",Log::ERROR,error_msg); + } - if (rc < 0) + // # VROUTER/* CREATE * + if ( aclm->del_rule( + AclRule::INDIVIDUAL_ID | + user_id, + + AclRule::ALL_ID | + PoolObjectSQL::VROUTER, + + AuthRequest::CREATE, + + AclRule::ALL_ID, + + error_msg) < 0 ) { NebulaLog::log("GROUP",Log::ERROR,error_msg); }