From fcb7ac0a23f99f663ac34a7902dfa4ba0eff5a71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tino=20V=C3=A1zquez?= Date: Tue, 13 Jul 2010 13:49:16 +0200 Subject: [PATCH 1/2] feature #203: Changed RM to use log functions --- include/RequestManager.h | 58 +++++++++++++++---- src/rm/RequestManagerAction.cc | 11 ++-- src/rm/RequestManagerAllocate.cc | 6 +- src/rm/RequestManagerCancel.cc | 8 ++- src/rm/RequestManagerClusterAdd.cc | 12 ++-- src/rm/RequestManagerClusterAllocate.cc | 10 ++-- src/rm/RequestManagerClusterDelete.cc | 9 +-- src/rm/RequestManagerClusterInfo.cc | 6 +- src/rm/RequestManagerClusterPoolInfo.cc | 8 ++- src/rm/RequestManagerClusterRemove.cc | 23 ++++---- src/rm/RequestManagerDeploy.cc | 17 ++++-- src/rm/RequestManagerHostAllocate.cc | 8 ++- src/rm/RequestManagerHostDelete.cc | 10 ++-- src/rm/RequestManagerHostEnable.cc | 12 ++-- src/rm/RequestManagerHostInfo.cc | 7 ++- src/rm/RequestManagerHostPoolInfo.cc | 8 ++- src/rm/RequestManagerImageAllocate.cc | 13 ++--- src/rm/RequestManagerImageDelete.cc | 11 ++-- src/rm/RequestManagerImageEnable.cc | 11 ++-- src/rm/RequestManagerImageInfo.cc | 9 +-- src/rm/RequestManagerImagePoolInfo.cc | 9 +-- src/rm/RequestManagerImagePublish.cc | 9 +-- src/rm/RequestManagerImageRemoveAttribute.cc | 12 ++-- src/rm/RequestManagerImageUpdate.cc | 12 ++-- src/rm/RequestManagerInfo.cc | 8 ++- src/rm/RequestManagerMigrate.cc | 15 +++-- src/rm/RequestManagerPoolInfo.cc | 6 +- src/rm/RequestManagerUserAllocate.cc | 11 ++-- src/rm/RequestManagerUserDelete.cc | 22 +++---- src/rm/RequestManagerUserPoolInfo.cc | 7 ++- .../RequestManagerVirtualNetworkAllocate.cc | 12 ++-- src/rm/RequestManagerVirtualNetworkDelete.cc | 10 ++-- src/rm/RequestManagerVirtualNetworkInfo.cc | 9 +-- .../RequestManagerVirtualNetworkPoolInfo.cc | 12 ++-- src/rm/RequestManagerVirtualNetworkPublish.cc | 9 +-- 35 files changed, 253 insertions(+), 167 deletions(-) diff --git a/include/RequestManager.h b/include/RequestManager.h index d59c0b9ed4..6b118cc454 100644 --- a/include/RequestManager.h +++ b/include/RequestManager.h @@ -24,8 +24,6 @@ #include "VirtualNetworkPool.h" #include "ImagePool.h" -#include "NebulaLog.h" - #include #include #include @@ -183,10 +181,17 @@ private: { ostringstream oss; oss << "[" << method << "]" << " User [" << uid << "] not authorized " - << " to perform " << action << " on " << object - << " [" << id << "]"; - - NebulaLog::log("RM",Log::ERROR,oss); + << " to perform " << action << " on " << object; + + + if ( id != (int)NULL ) + { + oss << " [" << id << "]."; + } + else + { + oss << " Pool"; + } return oss.str(); } @@ -196,9 +201,8 @@ private: ostringstream oss; oss << "[" << method << "]" << " User couldn't be authenticated," << - " aborting call"; - NebulaLog::log("RM",Log::ERROR,oss); - + " aborting call."; + return oss.str(); } @@ -209,7 +213,41 @@ private: ostringstream oss; oss << "[" << method << "]" << " Error getting " << - object << " [" << id << "]"; + object; + + if ( id != (int)NULL ) + { + oss << " [" << id << "]."; + } + else + { + oss << " Pool."; + } + + return oss.str(); + } + + static string action_error (const string& method, + const string &action, + const string &object, + int id, + int rc) + { + ostringstream oss; + + oss << "[" << method << "]" << " Error trying to " << action << " " + << object; + + if ( id != (int)NULL ) + { + oss << " [" << id << "]."; + } + + if ( rc != (int)NULL ) + { + oss << " .Returned error code [" << rc << "]."; + } + NebulaLog::log("RM",Log::ERROR,oss); return oss.str(); diff --git a/src/rm/RequestManagerAction.cc b/src/rm/RequestManagerAction.cc index cb9032de67..11ff2f1b9e 100644 --- a/src/rm/RequestManagerAction.cc +++ b/src/rm/RequestManagerAction.cc @@ -42,6 +42,8 @@ void RequestManager::VirtualMachineAction::execute( VirtualMachine * vm; ostringstream oss; + + const string method_name = "VirtualMachineAction"; NebulaLog::log("ReM",Log::DEBUG,"VirtualMachineAction invoked"); @@ -150,23 +152,24 @@ error_operation: goto error_common; error_vm_get: - oss << "The virtual machine " << vid << " does not exists"; + oss.str(get_error(method_name, "VM", vid)); goto error_common; error_authenticate: - oss << "Error in user authentication"; + oss.str(authenticate_error(method_name)); goto error_common; error_authorize: - oss << "User not authorized to perform VM operation"; + oss.str(authorization_error(method_name, "MANAGE", "VM", rc, vid)); goto error_common; error_common: - arrayData.push_back(xmlrpc_c::value_boolean(false)); arrayData.push_back(xmlrpc_c::value_string(oss.str())); xmlrpc_c::value_array arrayresult_error(arrayData); + + NebulaLog::log("ReM",Log::ERROR,oss); *retval = arrayresult_error; diff --git a/src/rm/RequestManagerAllocate.cc b/src/rm/RequestManagerAllocate.cc index 84f5556838..f91ffde242 100644 --- a/src/rm/RequestManagerAllocate.cc +++ b/src/rm/RequestManagerAllocate.cc @@ -28,6 +28,8 @@ void RequestManager::VirtualMachineAllocate::execute( { string session; string vm_template; + + const string method_name = "VirtualMachineAllocate"; int vid; int rc; @@ -75,11 +77,11 @@ void RequestManager::VirtualMachineAllocate::execute( return; error_authenticate: - oss << "Error in user authentication"; + oss.str(authenticate_error(method_name)); goto error_common; error_allocate: - oss << "Error inserting VM in the database, check oned.log"; + oss.str(action_error(method_name, "CREATE", "VM", NULL, rc)); goto error_common; error_common: diff --git a/src/rm/RequestManagerCancel.cc b/src/rm/RequestManagerCancel.cc index 91178be808..85322e3e0f 100644 --- a/src/rm/RequestManagerCancel.cc +++ b/src/rm/RequestManagerCancel.cc @@ -29,6 +29,8 @@ void RequestManager::VirtualMachineCancel::execute( // of the vid to retrieve the information for int vid; int uid; + + const string method_name = "VirtualMachineCancel"; VirtualMachine * vm; @@ -95,15 +97,15 @@ void RequestManager::VirtualMachineCancel::execute( return; error_authenticate: - oss << "Error in user authentication"; + oss.str(authenticate_error(method_name)); goto error_common; error_authorize: - oss << "User not authorized to canel VM"; + oss.str(authorization_error(method_name, "MANAGE", "VM", uid, vid)); goto error_common; error_vm_get: - oss << "Error getting vm for cancelling with VID = " << vid; + oss.str(get_error(method_name, "VM", vid)); goto error_common; error_common: diff --git a/src/rm/RequestManagerClusterAdd.cc b/src/rm/RequestManagerClusterAdd.cc index 3f75b2c97e..199928e6e4 100644 --- a/src/rm/RequestManagerClusterAdd.cc +++ b/src/rm/RequestManagerClusterAdd.cc @@ -31,6 +31,8 @@ void RequestManager::ClusterAdd::execute( int hid; int clid; int rc; + + const string method_name = "ClusterAdd"; Host * host; @@ -101,22 +103,20 @@ void RequestManager::ClusterAdd::execute( return; error_authenticate: - oss << "User not authorized to add hosts to clusters"; + oss.str(authenticate_error(method_name)); goto error_common; error_authorize: - oss << "User not authorized to manage HOST"; + oss.str(authorization_error(method_name, "MANAGE", "HOST", rc, hid)); goto error_common; error_host_get: - oss << "The host " << hid << " does not exists"; + oss.str(get_error(method_name, "HOST", hid)); goto error_common; error_cluster_add: host->unlock(); - - oss << "Can not add host " << hid << " to cluster " << clid << - ", returned error code [" << rc << "]"; + oss.str(action_error(method_name, "MANAGE", "HOST", hid, rc)); goto error_common; error_common: diff --git a/src/rm/RequestManagerClusterAllocate.cc b/src/rm/RequestManagerClusterAllocate.cc index c64b72b9c4..05dbb647f2 100644 --- a/src/rm/RequestManagerClusterAllocate.cc +++ b/src/rm/RequestManagerClusterAllocate.cc @@ -29,8 +29,9 @@ void RequestManager::ClusterAllocate::execute( string session; string clustername; - int id; + + const string method_name = "ClusterAllocate"; int rc; ostringstream oss; @@ -86,16 +87,15 @@ void RequestManager::ClusterAllocate::execute( return; error_authenticate: - oss << "User not authorized to add new clusters"; + oss.str(authenticate_error(method_name)); goto error_common; error_authorize: - oss << "User not authorized to manage HOST"; + oss.str(authorization_error(method_name, "MANAGE", "HOST", rc, -1)); goto error_common; error_cluster_allocate: - oss << "Can not allocate cluster " << clustername << - " in the ClusterPool, returned error code [" << rc << "]"; + oss.str(action_error(method_name, "CREATE", "CLUSTER", NULL, rc)); goto error_common; error_common: diff --git a/src/rm/RequestManagerClusterDelete.cc b/src/rm/RequestManagerClusterDelete.cc index 23c407fc09..e840dd6689 100644 --- a/src/rm/RequestManagerClusterDelete.cc +++ b/src/rm/RequestManagerClusterDelete.cc @@ -32,6 +32,8 @@ void RequestManager::ClusterDelete::execute( int clid; ostringstream oss; int rc; + + const string method_name = "ClusterDelete"; /* -- RPC specific vars -- */ vector arrayData; @@ -83,16 +85,15 @@ void RequestManager::ClusterDelete::execute( return; error_authenticate: - oss << "User not authorized to delete clusters"; + oss.str(authenticate_error(method_name)); goto error_common; error_authorize: - oss << "User not authorized to manage HOST"; + oss.str(authorization_error(method_name, "MANAGE", "HOST", rc, -1)); goto error_common; error_cluster_delete: - oss << "Can not delete cluster with CLID " << clid << - " from the ClusterPool, returned error code [" << rc << "]"; + oss.str(action_error(method_name, "DELETE", "CLUSTER", clid, rc)); goto error_common; error_common: diff --git a/src/rm/RequestManagerClusterInfo.cc b/src/rm/RequestManagerClusterInfo.cc index 4c088636e1..c11208b56f 100644 --- a/src/rm/RequestManagerClusterInfo.cc +++ b/src/rm/RequestManagerClusterInfo.cc @@ -31,6 +31,8 @@ void RequestManager::ClusterInfo::execute( int clid; int rc; + + const string method_name = "ClusterInfo"; ostringstream oss; @@ -73,11 +75,11 @@ void RequestManager::ClusterInfo::execute( return; error_authenticate: - oss << "User not authenticated, ClusterInfo call aborted."; + oss.str(authenticate_error(method_name)); goto error_common; error_cluster: - oss << "Error getting cluster with CLID = " << clid; + oss.str(get_error(method_name, "CLUSTER", clid)); goto error_common; error_common: diff --git a/src/rm/RequestManagerClusterPoolInfo.cc b/src/rm/RequestManagerClusterPoolInfo.cc index b3ec68a89a..46d6a28d52 100755 --- a/src/rm/RequestManagerClusterPoolInfo.cc +++ b/src/rm/RequestManagerClusterPoolInfo.cc @@ -28,7 +28,9 @@ void RequestManager::ClusterPoolInfo::execute( { string session; ostringstream oss; - int rc; + int rc; + + const string method_name = "ClusterPoolInfo"; /* -- RPC specific vars -- */ vector arrayData; @@ -70,11 +72,11 @@ void RequestManager::ClusterPoolInfo::execute( return; error_authenticate: - oss << "User not authenticated, RequestManagerClusterPoolInfo aborted."; + oss.str(authenticate_error(method_name)); goto error_common; error_dump: - oss << "Error getting Cluster pool"; + oss.str(get_error(method_name, "CLUSTER", NULL)); goto error_common; error_common: diff --git a/src/rm/RequestManagerClusterRemove.cc b/src/rm/RequestManagerClusterRemove.cc index 91df8d0a79..573e1aeb00 100644 --- a/src/rm/RequestManagerClusterRemove.cc +++ b/src/rm/RequestManagerClusterRemove.cc @@ -26,12 +26,14 @@ void RequestManager::ClusterRemove::execute( xmlrpc_c::paramList const& paramList, xmlrpc_c::value * const retval) { - string session; + string session; + + int hid; + int rc; + + const string method_name = "ClusterRemove"; - int hid; - int rc; - - Host * host; + Host * host; ostringstream oss; @@ -99,26 +101,23 @@ void RequestManager::ClusterRemove::execute( return; error_authenticate: - oss << "User not authorized to remove hosts from clusters"; + oss.str(authenticate_error(method_name)); goto error_common; error_authorize: - oss << "User not authorized to manage HOST"; + oss.str(authorization_error(method_name, "MANAGE", "HOST", rc, -1)); goto error_common; error_host_get: - oss << "The host " << hid << " does not exists"; + oss.str(get_error(method_name, "HOST", hid)); goto error_common; error_cluster_remove: host->unlock(); - - oss << "Can not remove host " << hid << " from its cluster, " - << "returned error code [" << rc << "]"; + oss.str(action_error(method_name, "MANAGE", "HOST", hid, rc)); goto error_common; error_common: - arrayData.push_back(xmlrpc_c::value_boolean(false)); // FAILURE arrayData.push_back(xmlrpc_c::value_string(oss.str())); diff --git a/src/rm/RequestManagerDeploy.cc b/src/rm/RequestManagerDeploy.cc index d31a5d9460..97b272a1d1 100644 --- a/src/rm/RequestManagerDeploy.cc +++ b/src/rm/RequestManagerDeploy.cc @@ -36,6 +36,8 @@ void RequestManager::VirtualMachineDeploy::execute( string vmm_mad; string tm_mad; string vmdir; + + const string method_name = "VirtualMachineDeploy"; VirtualMachine * vm; Host * host; @@ -138,27 +140,28 @@ void RequestManager::VirtualMachineDeploy::execute( return; error_host_get: - oss << "The host " << hid << " does not exists"; + oss.str(get_error(method_name, "HOST", hid)); goto error_common; error_vm_get: - oss << "The virtual machine " << vid << " does not exists"; + oss.str(get_error(method_name, "VM", vid)); goto error_common; error_state: - oss << "Can not deploy VM, wrong state"; + oss.str(action_error(method_name, "MANAGE", "VM", vid, rc)); + oss << " Reason: VM in wrong state."; goto error_common_lock; error_authenticate: - oss << "Error in user authentication"; + oss.str(authenticate_error(method_name)); goto error_common_lock; error_authorize: - oss << "User not authorized to deploy VM on host"; + oss.str(authorization_error(method_name, "MANAGE", "VM", rc, vid)); goto error_common_lock; error_history: - oss << "Can not insert history to deploy VM"; + oss.str(action_error(method_name, "INSERT HISTORY", "VM", vid, rc)); goto error_common_lock; error_common_lock: @@ -167,6 +170,8 @@ error_common_lock: error_common: arrayData.push_back(xmlrpc_c::value_boolean(false)); arrayData.push_back(xmlrpc_c::value_string(oss.str())); + + NebulaLog::log("ReM",Log::ERROR,oss); xmlrpc_c::value_array arrayresult_error(arrayData); diff --git a/src/rm/RequestManagerHostAllocate.cc b/src/rm/RequestManagerHostAllocate.cc index c78971497f..5fcbcc91c2 100644 --- a/src/rm/RequestManagerHostAllocate.cc +++ b/src/rm/RequestManagerHostAllocate.cc @@ -32,6 +32,8 @@ void RequestManager::HostAllocate::execute( string im_mad_name; string vmm_mad_name; string tm_mad_name; + + const string method_name = "HostAllocate"; int hid; @@ -95,15 +97,15 @@ void RequestManager::HostAllocate::execute( return; error_authenticate: - oss << "Error in user authentication"; + oss.str(authenticate_error(method_name)); goto error_common; error_authorize: - oss << "User not authorized to allocate a new HOST"; + oss.str(authorization_error(method_name, "CREATE", "HOST", rc, NULL)); goto error_common; error_host_allocate: - oss << "Error inserting HOST in the database, check oned.log"; + oss.str(action_error(method_name, "CREATE", "HOST", NULL, rc)); goto error_common; error_common: diff --git a/src/rm/RequestManagerHostDelete.cc b/src/rm/RequestManagerHostDelete.cc index 4bd0c50333..0a453a8f56 100644 --- a/src/rm/RequestManagerHostDelete.cc +++ b/src/rm/RequestManagerHostDelete.cc @@ -32,7 +32,9 @@ void RequestManager::HostDelete::execute( int hid; Host * host; ostringstream oss; - int rc; + int rc; + + const string method_name = "HostDelete"; /* -- RPC specific vars -- */ vector arrayData; @@ -89,15 +91,15 @@ void RequestManager::HostDelete::execute( return; error_authenticate: - oss << "Error in user authentication"; + oss.str(authenticate_error(method_name)); goto error_common; error_authorize: - oss << "User not authorized to delete HOST"; + oss.str(authorization_error(method_name, "DELETE", "HOST", rc, hid)); goto error_common; error_host_get: - oss << "Error getting host with HID = " < arrayData; + vector arrayData; xmlrpc_c::value_array * arrayresult; NebulaLog::log("ReM",Log::DEBUG,"HostEnable method invoked"); @@ -97,15 +99,15 @@ void RequestManager::HostEnable::execute( return; error_authenticate: - oss << "Error in user authentication"; + oss.str(authenticate_error(method_name)); goto error_common; error_authorize: - oss << "User not authorized to enable HOST"; + oss.str(authorization_error(method_name, "MANAGE", "HOST", rc, hid)); goto error_common; error_host_get: - oss << "Error getting host with HID = " << hid; + oss.str(get_error(method_name, "HOST", hid)); goto error_common; error_common: diff --git a/src/rm/RequestManagerHostInfo.cc b/src/rm/RequestManagerHostInfo.cc index 3bff4b530c..c94b73c24f 100644 --- a/src/rm/RequestManagerHostInfo.cc +++ b/src/rm/RequestManagerHostInfo.cc @@ -31,6 +31,8 @@ void RequestManager::HostInfo::execute( Host * host; ostringstream oss; + + const string method_name = "HostInfo"; /* -- RPC specific vars -- */ vector arrayData; @@ -75,15 +77,14 @@ void RequestManager::HostInfo::execute( return; error_authenticate: - oss << "Error in user authentication"; + oss.str(authenticate_error(method_name)); goto error_common; error_host_get: - oss << "Error getting host with HID = " << hid; + oss.str(get_error(method_name, "HOST", hid)); goto error_common; error_common: - arrayData.push_back(xmlrpc_c::value_boolean(false)); // FAILURE arrayData.push_back(xmlrpc_c::value_string(oss.str())); diff --git a/src/rm/RequestManagerHostPoolInfo.cc b/src/rm/RequestManagerHostPoolInfo.cc index 945bbe6471..babb66b745 100755 --- a/src/rm/RequestManagerHostPoolInfo.cc +++ b/src/rm/RequestManagerHostPoolInfo.cc @@ -26,7 +26,9 @@ void RequestManager::HostPoolInfo::execute( { string session; ostringstream oss; - int rc; + int rc; + + const string method_name = "HostPoolInfo"; /* -- RPC specific vars -- */ vector arrayData; @@ -68,11 +70,11 @@ void RequestManager::HostPoolInfo::execute( return; error_authenticate: - oss << "Error in user authentication"; + oss.str(authenticate_error(method_name)); goto error_common; error_dump: - oss << "Error getting host pool"; + oss.str(get_error(method_name, "HOST", -1)); goto error_common; error_common: diff --git a/src/rm/RequestManagerImageAllocate.cc b/src/rm/RequestManagerImageAllocate.cc index 64f8d064c4..10f47a047c 100644 --- a/src/rm/RequestManagerImageAllocate.cc +++ b/src/rm/RequestManagerImageAllocate.cc @@ -36,6 +36,8 @@ void RequestManager::ImageAllocate::execute( int rc; ostringstream oss; + + const string method_name = "ImageAllocate"; vector arrayData; xmlrpc_c::value_array * arrayresult; @@ -78,18 +80,11 @@ void RequestManager::ImageAllocate::execute( return; error_authenticate: - oss << "User not authenticated, aborting ImageAllocate call."; + oss.str(authenticate_error(method_name)); goto error_common; error_allocate: - if (rc == -1) - { - oss << "Error allocating image, check oned.log"; - } - else - { - oss << "Error parsing image template"; - } + oss.str(action_error(method_name, "CREATE", "IMAGE", NULL, rc)); goto error_common; error_common: diff --git a/src/rm/RequestManagerImageDelete.cc b/src/rm/RequestManagerImageDelete.cc index 403833f137..846e77109b 100644 --- a/src/rm/RequestManagerImageDelete.cc +++ b/src/rm/RequestManagerImageDelete.cc @@ -37,6 +37,8 @@ void RequestManager::ImageDelete::execute( Image * image; ostringstream oss; + + const string method_name = "ImageDelete"; vector arrayData; xmlrpc_c::value_array * arrayresult; @@ -101,19 +103,20 @@ void RequestManager::ImageDelete::execute( return; error_authenticate: - oss << "User not authenticated, aborting ImageDelete call."; + oss.str(authenticate_error(method_name)); goto error_common; error_image_get: - oss << "Error getting image with ID = " << iid; + oss.str(get_error(method_name, "IMAGE", iid)); goto error_common; error_authorize: - oss << "User not authorized to delete image, aborting ImageDelete call."; + oss.str(authorization_error(method_name, "DELETE", "IMAGE", uid, iid)); goto error_common; error_delete: - oss << "Cannot delete image, VMs might be running on it."; + oss.str(action_error(method_name, "DELETE", "IMAGE", iid, rc)); + oss << " VMs might be running on it."; image->unlock(); goto error_common; diff --git a/src/rm/RequestManagerImageEnable.cc b/src/rm/RequestManagerImageEnable.cc index 2f16ee6417..e21110b42c 100644 --- a/src/rm/RequestManagerImageEnable.cc +++ b/src/rm/RequestManagerImageEnable.cc @@ -38,6 +38,8 @@ void RequestManager::ImageEnable::execute( Image * image; ostringstream oss; + + const string method_name = "ImageEnable"; vector arrayData; xmlrpc_c::value_array * arrayresult; @@ -104,20 +106,19 @@ void RequestManager::ImageEnable::execute( return; error_authenticate: - oss << "[ImageEnable] User not authenticated, aborting call."; + oss.str(authenticate_error(method_name)); goto error_common; error_image_get: - oss << "[ImageEnable] Error getting image with ID = " << iid; + oss.str(get_error(method_name, "IMAGE", iid)); goto error_common; error_authorize: - oss << "[ImageEnable] User not authorized to enable/disable image" << - " attributes, aborting call."; + oss.str(authorization_error(method_name, "MANAGE", "IMAGE", uid, iid)); goto error_common; error_enable: - oss << "[ImageEnable] Cannot enable/disable image [" << iid << "]"; + oss.str(action_error(method_name, "ENABLE/DISABLE", "IMAGE", iid, rc)); image->unlock(); goto error_common; diff --git a/src/rm/RequestManagerImageInfo.cc b/src/rm/RequestManagerImageInfo.cc index a21adaee2f..cb3c838de4 100644 --- a/src/rm/RequestManagerImageInfo.cc +++ b/src/rm/RequestManagerImageInfo.cc @@ -34,6 +34,8 @@ void RequestManager::ImageInfo::execute( Image * image; ostringstream oss; + + const string method_name = "ImageInfo"; /* -- RPC specific vars -- */ vector arrayData; @@ -97,17 +99,16 @@ void RequestManager::ImageInfo::execute( return; error_image_get: - oss << "Error getting image with ID = " << iid; + oss.str(get_error(method_name, "IMAGE", iid)); goto error_common; error_authenticate: -oss << "Cannot authenticate user, aborting ImageInfo call."; + oss.str(authenticate_error(method_name)); image->unlock(); goto error_common; error_authorize: - oss << "User not authorized to use image with " << - "ID = " << iid << " , ImageInfo call aborted."; + oss.str(authorization_error(method_name, "USE", "IMAGE", rc, iid)); image->unlock(); goto error_common; diff --git a/src/rm/RequestManagerImagePoolInfo.cc b/src/rm/RequestManagerImagePoolInfo.cc index e1880b4fc7..b0c3b4e64d 100755 --- a/src/rm/RequestManagerImagePoolInfo.cc +++ b/src/rm/RequestManagerImagePoolInfo.cc @@ -32,6 +32,8 @@ void RequestManager::ImagePoolInfo::execute( int rc; int uid; int filter_flag; + + const string method_name = "ImagePoolInfo"; /* -- RPC specific vars -- */ vector arrayData; @@ -109,11 +111,11 @@ void RequestManager::ImagePoolInfo::execute( return; error_authenticate: - oss << "User not authenticated, ImagePoolInfo call aborted."; + oss.str(authenticate_error(method_name)); goto error_common; error_authorization: - oss << "User not authorized to perform this operation."; + oss.str(authorization_error(method_name, "USE", "IMAGE", uid, NULL)); goto error_common; error_filter_flag: @@ -121,11 +123,10 @@ error_filter_flag: goto error_common; error_dump: - oss << "Error getting image pool"; + oss.str(get_error(method_name, "IMAGE", -1)); goto error_common; error_common: - arrayData.push_back(xmlrpc_c::value_boolean(false)); // FAILURE arrayData.push_back(xmlrpc_c::value_string(oss.str())); diff --git a/src/rm/RequestManagerImagePublish.cc b/src/rm/RequestManagerImagePublish.cc index cfd0bc8bd9..ad3d1c899b 100644 --- a/src/rm/RequestManagerImagePublish.cc +++ b/src/rm/RequestManagerImagePublish.cc @@ -38,6 +38,8 @@ void RequestManager::ImagePublish::execute( Image * image; ostringstream oss; + + const string method_name = "ImagePublish"; vector arrayData; xmlrpc_c::value_array * arrayresult; @@ -102,16 +104,15 @@ void RequestManager::ImagePublish::execute( return; error_authenticate: - oss << "[ImagePublish] User not authenticated, aborting call."; + oss.str(authenticate_error(method_name)); goto error_common; error_image_get: - oss << "[ImagePublish] Error getting image with ID = " << iid; + oss.str(get_error(method_name, "IMAGE", iid)); goto error_common; error_authorize: - oss << "[ImagePublish] User not authorized to publish/unpublish image" << - ", aborting call."; + oss.str(authorization_error(method_name, "MANAGE", "IMAGE", uid, iid)); goto error_common; error_common: diff --git a/src/rm/RequestManagerImageRemoveAttribute.cc b/src/rm/RequestManagerImageRemoveAttribute.cc index b00c88c1ef..2aba7ffc7d 100644 --- a/src/rm/RequestManagerImageRemoveAttribute.cc +++ b/src/rm/RequestManagerImageRemoveAttribute.cc @@ -38,6 +38,8 @@ void RequestManager::ImageRemoveAttribute::execute( Image * image; ostringstream oss; + + const string method_name = "ImageRemoveAttribute"; vector arrayData; xmlrpc_c::value_array * arrayresult; @@ -105,21 +107,19 @@ void RequestManager::ImageRemoveAttribute::execute( return; error_authenticate: - oss << "[ImageRemoveAttribute] User not authenticated, aborting call."; + oss.str(authenticate_error(method_name)); goto error_common; error_image_get: - oss << "[ImageRemoveAttribute] Error getting image with ID = " << iid; + oss.str(get_error(method_name, "IMAGE", iid)); goto error_common; error_authorize: - oss << "[ImageRemoveAttribute] User not authorized to remove image" << - " attributes aborting call."; + oss.str(authorization_error(method_name, "MANAGE", "IMAGE", uid, iid)); goto error_common; error_remove_attribute: - oss << "[ImageRemoveAttribute] Cannot remove attribute with name = " - << name << " for image [" << iid << "]"; + oss.str(action_error(method_name, "PUBLISH/UNPUBLISH", "IMAGE", iid, rc)); image->unlock(); goto error_common; diff --git a/src/rm/RequestManagerImageUpdate.cc b/src/rm/RequestManagerImageUpdate.cc index 4af4a054a7..5783c7dad7 100644 --- a/src/rm/RequestManagerImageUpdate.cc +++ b/src/rm/RequestManagerImageUpdate.cc @@ -42,7 +42,8 @@ void RequestManager::ImageUpdate::execute( vector arrayData; xmlrpc_c::value_array * arrayresult; - + + const string method_name = "ImageUpdate"; NebulaLog::log("ReM",Log::DEBUG,"ImageUpdate invoked"); @@ -109,20 +110,19 @@ void RequestManager::ImageUpdate::execute( return; error_authenticate: - oss << "User not authenticated, aborting ImageUpdate call."; + oss.str(authenticate_error(method_name)); goto error_common; error_image_get: - oss << "Error getting image with ID = " << iid; + oss.str(get_error(method_name, "IMAGE", iid)); goto error_common; error_authorize: - oss << "User not authorized to modify image attributes " << - ", aborting ImageUpdate call."; + oss.str(authorization_error(method_name, "MANAGE", "IMAGE", uid, iid)); goto error_common; error_update: - oss << "Cannot modify image [" << iid << "] attribute with name = " << name; + oss.str(action_error(method_name, "UPDATE ATTRIBUTE", "IMAGE", iid, rc)); image->unlock(); goto error_common; diff --git a/src/rm/RequestManagerInfo.cc b/src/rm/RequestManagerInfo.cc index d53624efe8..1fed884046 100644 --- a/src/rm/RequestManagerInfo.cc +++ b/src/rm/RequestManagerInfo.cc @@ -29,7 +29,9 @@ void RequestManager::VirtualMachineInfo::execute( int vid, rc; VirtualMachine * vm; - ostringstream oss; + ostringstream oss; + + const string method_name = "VirtualMachineInfo"; /* -- RPC specific vars -- */ vector arrayData; @@ -74,11 +76,11 @@ void RequestManager::VirtualMachineInfo::execute( return; error_authenticate: - oss << "Error in user authentication"; + oss.str(authenticate_error(method_name)); goto error_common; error_vm_get: - oss << "Error getting VM " << vid; + oss.str(get_error(method_name, "VM", vid)); goto error_common; error_common: diff --git a/src/rm/RequestManagerMigrate.cc b/src/rm/RequestManagerMigrate.cc index 11088a6ddd..5658020871 100644 --- a/src/rm/RequestManagerMigrate.cc +++ b/src/rm/RequestManagerMigrate.cc @@ -48,6 +48,8 @@ void RequestManager::VirtualMachineMigrate::execute( xmlrpc_c::value_array * arrayresult; ostringstream oss; + + const string method_name = "VirtualMachineMigrate"; NebulaLog::log("ReM",Log::DEBUG,"VirtualMachineMigrate invoked"); @@ -146,27 +148,28 @@ void RequestManager::VirtualMachineMigrate::execute( error_host_get: - oss << "The host " << hid << " does not exists"; + oss.str(get_error(method_name, "HOST", hid)); goto error_common; error_vm_get: - oss << "The virtual machine " << vid << " does not exists"; + oss.str(get_error(method_name, "VM", vid)); goto error_common; error_authenticate: - oss << "Error in user authentication"; + oss.str(authenticate_error(method_name)); goto error_common_lock; error_authorize: - oss << "User not authorized to migrate VM on host"; + oss.str(authorization_error(method_name, "MANAGE", "VM", uid, vid)); goto error_common_lock; error_history: - oss << "Can not insert history to migrate VM"; + oss.str(action_error(method_name, "INSERT HISTORY", "VM", vid, rc)); goto error_common_lock; error_state: - oss << "Can not migrate VM, wrong state"; + oss.str(action_error(method_name, "MANAGE", "VM", vid, rc)); + oss << " Reason: VM in wrong state."; goto error_common_lock; error_common_lock: diff --git a/src/rm/RequestManagerPoolInfo.cc b/src/rm/RequestManagerPoolInfo.cc index 6196da19c7..ba4d4dfd5c 100644 --- a/src/rm/RequestManagerPoolInfo.cc +++ b/src/rm/RequestManagerPoolInfo.cc @@ -37,6 +37,8 @@ void RequestManager::VirtualMachinePoolInfo::execute( /* -- RPC specific vars -- */ vector arrayData; xmlrpc_c::value_array * arrayresult; + + const string method_name = "VirtualMachinePoolInfo"; NebulaLog::log("ReM",Log::DEBUG,"VirtualMachinePoolInfo method invoked"); @@ -86,11 +88,11 @@ void RequestManager::VirtualMachinePoolInfo::execute( return; error_authenticate: - oss << "Error in user authentication"; + oss.str(authenticate_error(method_name)); goto error_common; error_dump: - oss << "Error getting the pool info"; + oss.str(get_error(method_name, "VM", -1)); goto error_common; error_common: diff --git a/src/rm/RequestManagerUserAllocate.cc b/src/rm/RequestManagerUserAllocate.cc index e38bb4ee45..e31759295d 100644 --- a/src/rm/RequestManagerUserAllocate.cc +++ b/src/rm/RequestManagerUserAllocate.cc @@ -37,6 +37,8 @@ void RequestManager::UserAllocate::execute( ostringstream oss; User * user; + + const string method_name = "UserAllocate"; /* -- RPC specific vars -- */ vector arrayData; @@ -103,20 +105,21 @@ void RequestManager::UserAllocate::execute( return; error_authenticate: - oss << "User not authenticated, aborting UserAllocate call."; + oss.str(authenticate_error(method_name)); goto error_common; error_authorize: - oss << "User not authorized to add new users, aborting UserAllocate call."; + oss.str(authorization_error(method_name, "CREATE", "USER", rc, NULL)); goto error_common; error_duplicate: - oss << "Existing user, cannot duplicate."; + oss.str(action_error(method_name, "CREATE", "USER", NULL, NULL)); + oss << " Reason: Existing user, cannot duplicate."; goto error_common; error_allocate: - oss << "Error allocating user."; + oss.str(action_error(method_name, "CREATE", "USER", NULL, rc)); goto error_common; error_common: diff --git a/src/rm/RequestManagerUserDelete.cc b/src/rm/RequestManagerUserDelete.cc index d1a388ea67..c6817d2b00 100644 --- a/src/rm/RequestManagerUserDelete.cc +++ b/src/rm/RequestManagerUserDelete.cc @@ -26,13 +26,15 @@ void RequestManager::UserDelete::execute( xmlrpc_c::paramList const& paramList, xmlrpc_c::value * const retval) { - string session; + string session; - int uid; - User * user; + int uid; + User * user; - int rc; + int rc; ostringstream oss; + + const string method_name = "UserDelete"; /* -- RPC specific vars -- */ vector arrayData; @@ -103,24 +105,24 @@ void RequestManager::UserDelete::execute( return; error_oneadmin_deletion: - oss << "User oneadmin cannot be deleted"; + oss.str(action_error(method_name, "DELETE", "USER", uid, NULL)); + oss << " Reason: Oneadmin cannot be deleted."; goto error_common; error_authenticate: - oss << "User not authenticated, aborting UserDelete call."; + oss.str(authenticate_error(method_name)); goto error_common; error_authorize: - oss << "User not authorized to delete user with uid " << uid - << ", aborting UserDelete call."; + oss.str(authorization_error(method_name, "DELETE", "USER", rc, uid)); goto error_common; error_get_user: - oss << "Error retrieving user " << uid; + oss.str(get_error(method_name, "USER", uid)); goto error_common; error_delete: - oss << "Error deleting user " << uid; + oss.str(action_error(method_name, "DELETE", "USER", uid, rc)); goto error_common; error_common: diff --git a/src/rm/RequestManagerUserPoolInfo.cc b/src/rm/RequestManagerUserPoolInfo.cc index 96bd11f977..7138a4a3a2 100644 --- a/src/rm/RequestManagerUserPoolInfo.cc +++ b/src/rm/RequestManagerUserPoolInfo.cc @@ -28,6 +28,8 @@ void RequestManager::UserPoolInfo::execute( int rc; ostringstream oss; + + const string method_name = "UserPoolInfo"; /* -- RPC specific vars -- */ vector arrayData; @@ -67,15 +69,14 @@ void RequestManager::UserPoolInfo::execute( return; error_authenticate: - oss << "User not authorized to pull user pool info. Error code: " << rc; + oss.str(authenticate_error(method_name)); goto error_common; error_dumping: - oss << "Error dumping pool info"; + oss.str(get_error(method_name, "IMAGE", -1)); goto error_common; error_common: - arrayData.push_back(xmlrpc_c::value_boolean(false)); // FAILURE arrayData.push_back(xmlrpc_c::value_string(oss.str())); diff --git a/src/rm/RequestManagerVirtualNetworkAllocate.cc b/src/rm/RequestManagerVirtualNetworkAllocate.cc index 3c97f902b2..1be91fdb19 100644 --- a/src/rm/RequestManagerVirtualNetworkAllocate.cc +++ b/src/rm/RequestManagerVirtualNetworkAllocate.cc @@ -39,6 +39,8 @@ void RequestManager::VirtualNetworkAllocate::execute( User * user; ostringstream oss; + + const string method_name = "VirtualNetworkAllocate"; /* -- RPC specific vars -- */ vector arrayData; @@ -52,7 +54,7 @@ void RequestManager::VirtualNetworkAllocate::execute( if ( User::split_secret(session,username,password) != 0 ) { - goto error_session; + goto error_authenticate; } // Now let's get the user @@ -86,16 +88,16 @@ void RequestManager::VirtualNetworkAllocate::execute( return; -error_session: - oss << "Session information malformed, cannot allocate VirtualNetwork"; +error_authenticate: + oss.str(authenticate_error(method_name)); goto error_common; error_get_user: - oss << "User not recognized, cannot allocate VirtualNetwork"; + oss.str(get_error(method_name, "USER", -1)); goto error_common; error_vn_allocate: - oss << "Error allocating VN with template: " << endl << stemplate; + oss.str(action_error(method_name, "ALLOCATE", "NET", NULL, rc)); goto error_common; error_common: diff --git a/src/rm/RequestManagerVirtualNetworkDelete.cc b/src/rm/RequestManagerVirtualNetworkDelete.cc index 6ffe35e113..d365f36ca3 100644 --- a/src/rm/RequestManagerVirtualNetworkDelete.cc +++ b/src/rm/RequestManagerVirtualNetworkDelete.cc @@ -36,6 +36,8 @@ void RequestManager::VirtualNetworkDelete::execute( int rc; ostringstream oss; + + const string method_name = "VirtualNetworkDelete"; /* -- RPC specific vars -- */ vector arrayData; @@ -94,19 +96,19 @@ void RequestManager::VirtualNetworkDelete::execute( return; error_authenticate: - oss << "User not authenticated, aborting VirtualNetworkDelete call"; + oss.str(authenticate_error(method_name)); goto error_common; error_authorize: - oss << "User not authorized to delete Virtual Network with NID = " << nid; + oss.str(authorization_error(method_name, "DELETE", "NET", rc, nid)); goto error_common; error_vn_get: - oss << "Error getting Virtual Network with NID = " << nid; + oss.str(get_error(method_name, "NET", nid)); goto error_common; error_common: - NebulaLog::log ("Rem",Log::ERROR,oss); + NebulaLog::log ("ReM",Log::ERROR,oss); arrayData.push_back(xmlrpc_c::value_boolean(false)); // FAILURE arrayData.push_back(xmlrpc_c::value_string(oss.str())); diff --git a/src/rm/RequestManagerVirtualNetworkInfo.cc b/src/rm/RequestManagerVirtualNetworkInfo.cc index 5649c96b35..0ce88949e6 100644 --- a/src/rm/RequestManagerVirtualNetworkInfo.cc +++ b/src/rm/RequestManagerVirtualNetworkInfo.cc @@ -35,6 +35,8 @@ void RequestManager::VirtualNetworkInfo::execute( VirtualNetwork * vn; ostringstream oss; + + const string method_name = "VirtualNetworkInfo"; /* -- RPC specific vars -- */ vector arrayData; @@ -95,17 +97,16 @@ void RequestManager::VirtualNetworkInfo::execute( return; error_authenticate: - oss << "User not authenticated, VirtualNetworkInfo call aborted."; + oss.str(authenticate_error(method_name)); goto error_common; error_vn_get: - oss << "Error getting Virtual Network with NID = " << nid; + oss.str(get_error(method_name, "NET", nid)); goto error_common; error_authorize: vn->unlock(); - oss << "User not authorized to view VirtualNetwork" << - ", VirtualNetworkInfo call aborted."; + oss.str(authorization_error(method_name, "USE", "NET", rc, nid)); goto error_common; error_common: diff --git a/src/rm/RequestManagerVirtualNetworkPoolInfo.cc b/src/rm/RequestManagerVirtualNetworkPoolInfo.cc index ac1294d203..216d3d82f5 100755 --- a/src/rm/RequestManagerVirtualNetworkPoolInfo.cc +++ b/src/rm/RequestManagerVirtualNetworkPoolInfo.cc @@ -31,11 +31,13 @@ void RequestManager::VirtualNetworkPoolInfo::execute( ostringstream oss; ostringstream where_string; - int rc; + int rc; int filter_flag; User * user; - + + const string method_name = "VirtualNetworkPoolInfo"; + /* -- RPC specific vars -- */ vector arrayData; xmlrpc_c::value_array * arrayresult; @@ -105,15 +107,15 @@ void RequestManager::VirtualNetworkPoolInfo::execute( return; error_authenticate: - oss << "User not authenticated, NetworkPoolInfo call aborted."; + oss.str(authenticate_error(method_name)); goto error_common; error_get_user: - oss << "Error getting user, aborting NetworkPoolInfo call"; + oss.str(get_error(method_name, "USER", -1)); goto error_common; error_dump: - oss << "Error getting virtual network pool"; + oss.str(get_error(method_name, "HOST", -1)); goto error_common; error_common: diff --git a/src/rm/RequestManagerVirtualNetworkPublish.cc b/src/rm/RequestManagerVirtualNetworkPublish.cc index f60bb538eb..6d6874f52b 100644 --- a/src/rm/RequestManagerVirtualNetworkPublish.cc +++ b/src/rm/RequestManagerVirtualNetworkPublish.cc @@ -39,6 +39,8 @@ void RequestManager::VirtualNetworkPublish::execute( ostringstream oss; + const string method_name = "VirtualNetworkPublish"; + vector arrayData; xmlrpc_c::value_array * arrayresult; @@ -102,16 +104,15 @@ void RequestManager::VirtualNetworkPublish::execute( return; error_authenticate: - oss << "[VirtualNetworkPublish] User not authenticated, aborting call."; + oss.str(authenticate_error(method_name)); goto error_common; error_vn_get: - oss << "[VirtualNetworkPublish] Error getting VN with ID = " << nid; + oss.str(get_error(method_name, "NET", nid)); goto error_common; error_authorize: - oss << "[VirtualNetworkPublish] User not authorized to (un)publish VN" << - ", aborting call."; + oss.str(authorization_error(method_name, "MANAGE", "NET", uid, nid)); vn->unlock(); goto error_common; From 0659115f705e3dbb1722a4387cf6cf4903b3835d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tino=20V=C3=A1zquez?= Date: Tue, 13 Jul 2010 18:16:05 +0200 Subject: [PATCH 2/2] feature #203: Finishing RM authorization task --- include/AuthManager.h | 12 ++-- src/authm/AuthManager.cc | 19 +++++-- src/rm/RequestManagerClusterAdd.cc | 7 ++- src/rm/RequestManagerClusterAllocate.cc | 4 +- src/rm/RequestManagerClusterDelete.cc | 4 +- src/rm/RequestManagerHostInfo.cc | 10 ++-- src/rm/RequestManagerImageAllocate.cc | 6 +- src/rm/RequestManagerImageDelete.cc | 26 +++++++-- src/rm/RequestManagerImageEnable.cc | 26 +++++++-- src/rm/RequestManagerImageInfo.cc | 34 ++--------- src/rm/RequestManagerImagePoolInfo.cc | 20 +------ src/rm/RequestManagerImagePublish.cc | 57 ++++++++++++------- src/rm/RequestManagerImageRemoveAttribute.cc | 24 ++++++-- src/rm/RequestManagerImageUpdate.cc | 24 ++++++-- src/rm/RequestManagerUserPoolInfo.cc | 35 ++++++++++-- src/rm/RequestManagerVirtualNetworkInfo.cc | 22 ------- .../RequestManagerVirtualNetworkPoolInfo.cc | 2 + src/rm/RequestManagerVirtualNetworkPublish.cc | 6 +- 18 files changed, 195 insertions(+), 143 deletions(-) diff --git a/include/AuthManager.h b/include/AuthManager.h index f9c7afdd94..d29a163560 100644 --- a/include/AuthManager.h +++ b/include/AuthManager.h @@ -276,10 +276,11 @@ public: */ enum Operation { - CREATE, /** Authorization to create an object (host, vm, net, image)*/ - DELETE, /** Authorization to delete an object */ - USE, /** Authorization to use an object */ - MANAGE /** Authorization to manage an object */ + CREATE, /** Authorization to create an object (host, vm, net, image)*/ + DELETE, /** Authorization to delete an object */ + USE, /** Authorization to use an object */ + MANAGE, /** Authorization to manage an object */ + INFO /** Authorization to view an object */ }; /** @@ -291,7 +292,8 @@ public: HOST, NET, IMAGE, - USER + USER, + CLUSTER }; /** diff --git a/src/authm/AuthManager.cc b/src/authm/AuthManager.cc index 4704c2031a..d3ccf6a6d4 100644 --- a/src/authm/AuthManager.cc +++ b/src/authm/AuthManager.cc @@ -80,11 +80,12 @@ void AuthRequest::add_auth(Object ob, switch (ob) { - case VM: oss << "VM:" ; break; - case HOST: oss << "HOST:" ; break; - case NET: oss << "NET:" ; break; - case IMAGE: oss << "IMAGE:" ; break; - case USER: oss << "USER:" ; break; + case VM: oss << "VM:" ; break; + case HOST: oss << "HOST:" ; break; + case NET: oss << "NET:" ; break; + case IMAGE: oss << "IMAGE:" ; break; + case USER: oss << "USER:" ; break; + case CLUSTER: oss << "CLUSTER:" ; break; } if (op == CREATE) //encode the ob_id, it is a template @@ -123,6 +124,10 @@ void AuthRequest::add_auth(Object ob, case MANAGE: oss << "MANAGE:" ; break; + + case INFO: + oss << "INFO:" ; + break; } oss << owner << ":" << pub; @@ -166,6 +171,10 @@ void AuthRequest::add_auth(Object ob, case MANAGE: auth = owner == uid; break; + + case INFO: // This is for completeness, as the only INFO existing + // is for UserPool, and just oneadmin can see it + break; } } diff --git a/src/rm/RequestManagerClusterAdd.cc b/src/rm/RequestManagerClusterAdd.cc index 199928e6e4..b42f156e61 100644 --- a/src/rm/RequestManagerClusterAdd.cc +++ b/src/rm/RequestManagerClusterAdd.cc @@ -61,8 +61,9 @@ void RequestManager::ClusterAdd::execute( if ( rc != 0 ) // rc == 0 means oneadmin { AuthRequest ar(rc); - + ar.add_auth(AuthRequest::HOST,hid,AuthRequest::MANAGE,0,false); + ar.add_auth(AuthRequest::CLUSTER,clid,AuthRequest::USE,0,false); if (UserPool::authorize(ar) == -1) { @@ -107,7 +108,7 @@ error_authenticate: goto error_common; error_authorize: - oss.str(authorization_error(method_name, "MANAGE", "HOST", rc, hid)); + oss.str(authorization_error(method_name, "USE", "CLUSTER", rc, clid)); goto error_common; error_host_get: @@ -116,7 +117,7 @@ error_host_get: error_cluster_add: host->unlock(); - oss.str(action_error(method_name, "MANAGE", "HOST", hid, rc)); + oss.str(action_error(method_name, "USE", "CLUSTER", clid, rc)); goto error_common; error_common: diff --git a/src/rm/RequestManagerClusterAllocate.cc b/src/rm/RequestManagerClusterAllocate.cc index 05dbb647f2..72e154e6e5 100644 --- a/src/rm/RequestManagerClusterAllocate.cc +++ b/src/rm/RequestManagerClusterAllocate.cc @@ -59,7 +59,7 @@ void RequestManager::ClusterAllocate::execute( { AuthRequest ar(rc); - ar.add_auth(AuthRequest::HOST,-1,AuthRequest::MANAGE,0,false); + ar.add_auth(AuthRequest::CLUSTER,-1,AuthRequest::CREATE,0,false); if (UserPool::authorize(ar) == -1) { @@ -91,7 +91,7 @@ error_authenticate: goto error_common; error_authorize: - oss.str(authorization_error(method_name, "MANAGE", "HOST", rc, -1)); + oss.str(authorization_error(method_name, "CREATE", "CLUSTER", rc, -1)); goto error_common; error_cluster_allocate: diff --git a/src/rm/RequestManagerClusterDelete.cc b/src/rm/RequestManagerClusterDelete.cc index e840dd6689..ddfcee56e3 100644 --- a/src/rm/RequestManagerClusterDelete.cc +++ b/src/rm/RequestManagerClusterDelete.cc @@ -58,7 +58,7 @@ void RequestManager::ClusterDelete::execute( { AuthRequest ar(rc); - ar.add_auth(AuthRequest::HOST,-1,AuthRequest::MANAGE,0,false); + ar.add_auth(AuthRequest::CLUSTER,clid,AuthRequest::DELETE,0,false); if (UserPool::authorize(ar) == -1) { @@ -89,7 +89,7 @@ error_authenticate: goto error_common; error_authorize: - oss.str(authorization_error(method_name, "MANAGE", "HOST", rc, -1)); + oss.str(authorization_error(method_name, "DELETE", "CLUSTER", rc, clid)); goto error_common; error_cluster_delete: diff --git a/src/rm/RequestManagerHostInfo.cc b/src/rm/RequestManagerHostInfo.cc index c94b73c24f..f6b351b2d6 100644 --- a/src/rm/RequestManagerHostInfo.cc +++ b/src/rm/RequestManagerHostInfo.cc @@ -24,11 +24,11 @@ void RequestManager::HostInfo::execute( xmlrpc_c::paramList const& paramList, xmlrpc_c::value * const retval) { - string session; - - int hid; - int rc; - Host * host; + string session; + + int hid; + int rc; + Host * host; ostringstream oss; diff --git a/src/rm/RequestManagerImageAllocate.cc b/src/rm/RequestManagerImageAllocate.cc index 10f47a047c..74357cf73b 100644 --- a/src/rm/RequestManagerImageAllocate.cc +++ b/src/rm/RequestManagerImageAllocate.cc @@ -51,15 +51,13 @@ void RequestManager::ImageAllocate::execute( // First, we need to authenticate the user - rc = ImageAllocate::upool->authenticate(session); + uid = ImageAllocate::upool->authenticate(session); - if ( rc == -1 ) + if ( uid == -1 ) { goto error_authenticate; } - uid = rc; - rc = ImageAllocate::ipool->allocate(uid,image_template,&iid); if ( rc < 0 ) diff --git a/src/rm/RequestManagerImageDelete.cc b/src/rm/RequestManagerImageDelete.cc index 846e77109b..6d7813063c 100644 --- a/src/rm/RequestManagerImageDelete.cc +++ b/src/rm/RequestManagerImageDelete.cc @@ -33,6 +33,9 @@ void RequestManager::ImageDelete::execute( int iid; int uid; int rc; + + int image_owner; + bool is_public; Image * image; @@ -51,21 +54,36 @@ void RequestManager::ImageDelete::execute( // First, we need to authenticate the user - rc = ImageDelete::upool->authenticate(session); + uid = ImageDelete::upool->authenticate(session); - if ( rc == -1 ) + if ( uid == -1 ) { goto error_authenticate; } + + // Get image from the ImagePool + image = ImageDelete::ipool->get(iid,true); - uid = rc; + if ( image == 0 ) + { + goto error_image_get; + } + + image_owner = image->get_uid(); + is_public = image->isPublic(); + + image->unlock(); //Authorize the operation if ( uid != 0 ) // uid == 0 means oneadmin { AuthRequest ar(uid); - ar.add_auth(AuthRequest::IMAGE,iid,AuthRequest::DELETE,0,false); + ar.add_auth(AuthRequest::IMAGE, + iid, + AuthRequest::DELETE, + image_owner, + is_public); if (UserPool::authorize(ar) == -1) { diff --git a/src/rm/RequestManagerImageEnable.cc b/src/rm/RequestManagerImageEnable.cc index e21110b42c..498875fb28 100644 --- a/src/rm/RequestManagerImageEnable.cc +++ b/src/rm/RequestManagerImageEnable.cc @@ -35,6 +35,9 @@ void RequestManager::ImageEnable::execute( int uid; int rc; + int image_owner; + bool is_public; + Image * image; ostringstream oss; @@ -52,21 +55,36 @@ void RequestManager::ImageEnable::execute( enable_flag = xmlrpc_c::value_boolean(paramList.getBoolean(2)); // First, we need to authenticate the user - rc = ImageEnable::upool->authenticate(session); + uid = ImageEnable::upool->authenticate(session); - if ( rc == -1 ) + if ( uid == -1 ) { goto error_authenticate; } - uid = rc; + // Get image from the ImagePool + image = ImageEnable::ipool->get(iid,true); + + if ( image == 0 ) + { + goto error_image_get; + } + + image_owner = image->get_uid(); + is_public = image->isPublic(); + + image->unlock(); //Authorize the operation if ( uid != 0 ) // uid == 0 means oneadmin { AuthRequest ar(uid); - ar.add_auth(AuthRequest::IMAGE,iid,AuthRequest::MANAGE,0,false); + ar.add_auth(AuthRequest::IMAGE, + iid, + AuthRequest::MANAGE, + image_owner, + is_public); if (UserPool::authorize(ar) == -1) { diff --git a/src/rm/RequestManagerImageInfo.cc b/src/rm/RequestManagerImageInfo.cc index cb3c838de4..9359460887 100644 --- a/src/rm/RequestManagerImageInfo.cc +++ b/src/rm/RequestManagerImageInfo.cc @@ -28,14 +28,14 @@ void RequestManager::ImageInfo::execute( { string session; - int iid; - int uid; // Image owner user id - int rc; // Requesting user id - Image * image; - + int iid; + int uid; // Image owner user id + int rc; // Requesting user id + Image * image; + ostringstream oss; - const string method_name = "ImageInfo"; + const string method_name = "ImageInfo"; /* -- RPC specific vars -- */ vector arrayData; @@ -65,23 +65,6 @@ void RequestManager::ImageInfo::execute( goto error_authenticate; } - //Authorize the operation - if ( rc != 0 ) // rc == 0 means oneadmin - { - AuthRequest ar(rc); - - ar.add_auth(AuthRequest::IMAGE, - iid, - AuthRequest::USE, - 0, - image->isPublic()); - - if (UserPool::authorize(ar) == -1) - { - goto error_authorize; - } - } - oss << *image; image->unlock(); @@ -107,11 +90,6 @@ error_authenticate: image->unlock(); goto error_common; -error_authorize: - oss.str(authorization_error(method_name, "USE", "IMAGE", rc, iid)); - image->unlock(); - goto error_common; - error_common: arrayData.push_back(xmlrpc_c::value_boolean(false)); // FAILURE arrayData.push_back(xmlrpc_c::value_string(oss.str())); diff --git a/src/rm/RequestManagerImagePoolInfo.cc b/src/rm/RequestManagerImagePoolInfo.cc index b0c3b4e64d..d634243c3e 100755 --- a/src/rm/RequestManagerImagePoolInfo.cc +++ b/src/rm/RequestManagerImagePoolInfo.cc @@ -46,14 +46,12 @@ void RequestManager::ImagePoolInfo::execute( filter_flag = xmlrpc_c::value_int(paramList.getInt(1)); // Check if it is a valid user - rc = ImagePoolInfo::upool->authenticate(session); + uid = ImagePoolInfo::upool->authenticate(session); - if ( rc == -1 ) + if ( uid == -1 ) { goto error_authenticate; } - - uid = rc; where_string.str(""); @@ -70,21 +68,13 @@ void RequestManager::ImagePoolInfo::execute( switch(filter_flag) { case -2: - if ( uid != 0 ) - { - goto error_authorization; - } + // TODO define authentication bug #278 // where remains empty. break; case -1: where_string << "UID=" << uid << " OR public = 'YES'"; break; default: - // Only oneadmin or the user can list a specific user's images. - if ( uid != 0 && uid != filter_flag ) - { - goto error_authorization; - } where_string << "UID=" << filter_flag; } @@ -114,10 +104,6 @@ error_authenticate: oss.str(authenticate_error(method_name)); goto error_common; -error_authorization: - oss.str(authorization_error(method_name, "USE", "IMAGE", uid, NULL)); - goto error_common; - error_filter_flag: oss << "Incorrect filter_flag, must be >= -2."; goto error_common; diff --git a/src/rm/RequestManagerImagePublish.cc b/src/rm/RequestManagerImagePublish.cc index ad3d1c899b..9137766983 100644 --- a/src/rm/RequestManagerImagePublish.cc +++ b/src/rm/RequestManagerImagePublish.cc @@ -33,7 +33,9 @@ void RequestManager::ImagePublish::execute( int iid; bool publish_flag; int uid; - int rc; + + int image_owner; + bool is_public; Image * image; @@ -52,32 +54,13 @@ void RequestManager::ImagePublish::execute( publish_flag = xmlrpc_c::value_boolean(paramList.getBoolean(2)); // First, we need to authenticate the user - rc = ImagePublish::upool->authenticate(session); + uid = ImagePublish::upool->authenticate(session); - if ( rc == -1 ) + if ( uid == -1 ) { goto error_authenticate; } - uid = rc; - - //Authorize the operation - if ( uid != 0 ) // uid == 0 means oneadmin - { - AuthRequest ar(uid); - - ar.add_auth(AuthRequest::IMAGE, - iid, - AuthRequest::MANAGE, - 0, - image->isPublic()); - - if (UserPool::authorize(ar) == -1) - { - goto error_authorize; - } - } - // Get image from the ImagePool image = ImagePublish::ipool->get(iid,true); @@ -86,6 +69,36 @@ void RequestManager::ImagePublish::execute( goto error_image_get; } + image_owner = image->get_uid(); + is_public = image->isPublic(); + + image->unlock(); + + //Authorize the operation + if ( uid != 0 ) // uid == 0 means oneadmin + { + AuthRequest ar(uid); + + ar.add_auth(AuthRequest::IMAGE, + iid, + AuthRequest::MANAGE, + image_owner, + is_public); + + if (UserPool::authorize(ar) == -1) + { + goto error_authorize; + } + } + + // Get the image locked again + image = ImagePublish::ipool->get(iid,true); + + if ( image == 0 ) + { + goto error_image_get; + } + image->publish(publish_flag); ImagePublish::ipool->update(image); diff --git a/src/rm/RequestManagerImageRemoveAttribute.cc b/src/rm/RequestManagerImageRemoveAttribute.cc index 2aba7ffc7d..a86d05882b 100644 --- a/src/rm/RequestManagerImageRemoveAttribute.cc +++ b/src/rm/RequestManagerImageRemoveAttribute.cc @@ -34,6 +34,9 @@ void RequestManager::ImageRemoveAttribute::execute( int iid; int uid; int rc; + + int image_owner; + bool is_public; Image * image; @@ -52,14 +55,25 @@ void RequestManager::ImageRemoveAttribute::execute( name = xmlrpc_c::value_string(paramList.getString(2)); // First, we need to authenticate the user - rc = ImageRemoveAttribute::upool->authenticate(session); + uid = ImageRemoveAttribute::upool->authenticate(session); - if ( rc == -1 ) + if ( uid == -1 ) { goto error_authenticate; } + + // Get image from the ImagePool + image = ImageRemoveAttribute::ipool->get(iid,true); - uid = rc; + if ( image == 0 ) + { + goto error_image_get; + } + + image_owner = image->get_uid(); + is_public = image->isPublic(); + + image->unlock(); //Authorize the operation if ( uid != 0 ) // uid == 0 means oneadmin @@ -69,8 +83,8 @@ void RequestManager::ImageRemoveAttribute::execute( ar.add_auth(AuthRequest::IMAGE, iid, AuthRequest::MANAGE, - 0, - image->isPublic()); + image_owner, + is_public); if (UserPool::authorize(ar) == -1) { diff --git a/src/rm/RequestManagerImageUpdate.cc b/src/rm/RequestManagerImageUpdate.cc index 5783c7dad7..acc6eef587 100644 --- a/src/rm/RequestManagerImageUpdate.cc +++ b/src/rm/RequestManagerImageUpdate.cc @@ -35,6 +35,9 @@ void RequestManager::ImageUpdate::execute( string name; string value; int rc; + + int image_owner; + bool is_public; Image * image; @@ -53,14 +56,25 @@ void RequestManager::ImageUpdate::execute( value = xmlrpc_c::value_string(paramList.getString(3)); // First, we need to authenticate the user - rc = ImageUpdate::upool->authenticate(session); + uid = ImageUpdate::upool->authenticate(session); - if ( rc == -1 ) + if ( uid == -1 ) { goto error_authenticate; } + + // Get image from the ImagePool + image = ImageUpdate::ipool->get(iid,true); - uid = rc; + if ( image == 0 ) + { + goto error_image_get; + } + + image_owner = image->get_uid(); + is_public = image->isPublic(); + + image->unlock(); //Authorize the operation if ( uid != 0 ) // uid == 0 means oneadmin @@ -70,8 +84,8 @@ void RequestManager::ImageUpdate::execute( ar.add_auth(AuthRequest::IMAGE, iid, AuthRequest::MANAGE, - 0, - image->isPublic()); + image_owner, + is_public); if (UserPool::authorize(ar) == -1) { diff --git a/src/rm/RequestManagerUserPoolInfo.cc b/src/rm/RequestManagerUserPoolInfo.cc index 7138a4a3a2..70c9434b90 100644 --- a/src/rm/RequestManagerUserPoolInfo.cc +++ b/src/rm/RequestManagerUserPoolInfo.cc @@ -17,6 +17,8 @@ #include "RequestManager.h" #include "NebulaLog.h" +#include "AuthManager.h" + /* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */ @@ -26,7 +28,8 @@ void RequestManager::UserPoolInfo::execute( { string session; - int rc; + int rc; + int uid; ostringstream oss; const string method_name = "UserPoolInfo"; @@ -41,15 +44,31 @@ void RequestManager::UserPoolInfo::execute( session = xmlrpc_c::value_string(paramList.getString(0)); // Only oneadmin can list the whole user pool - rc = UserPoolInfo::upool->authenticate(session); + uid = UserPoolInfo::upool->authenticate(session); - if ( rc != 0 ) + if ( uid == -1 ) { goto error_authenticate; } - // Now let's get the info - + //Authorize the operation + if ( uid != 0 ) // uid == 0 means oneadmin + { + AuthRequest ar(uid); + + ar.add_auth(AuthRequest::USER, + -1, + AuthRequest::INFO, + 0, + false); + + if (UserPool::authorize(ar) == -1) + { + goto error_authorize; + } + } + + // Now let's get the info rc = UserPoolInfo::upool->dump(oss,""); if ( rc != 0 ) @@ -71,9 +90,13 @@ void RequestManager::UserPoolInfo::execute( error_authenticate: oss.str(authenticate_error(method_name)); goto error_common; + +error_authorize: + oss.str(authorization_error(method_name, "INFO", "USER", uid, -1)); + goto error_common; error_dumping: - oss.str(get_error(method_name, "IMAGE", -1)); + oss.str(get_error(method_name, "USER", -1)); goto error_common; error_common: diff --git a/src/rm/RequestManagerVirtualNetworkInfo.cc b/src/rm/RequestManagerVirtualNetworkInfo.cc index 0ce88949e6..664cf4fdc4 100644 --- a/src/rm/RequestManagerVirtualNetworkInfo.cc +++ b/src/rm/RequestManagerVirtualNetworkInfo.cc @@ -63,23 +63,6 @@ void RequestManager::VirtualNetworkInfo::execute( goto error_vn_get; } - //Authorize the operation - if ( rc != 0 ) // rc == 0 means oneadmin - { - AuthRequest ar(rc); - - ar.add_auth(AuthRequest::NET, - nid, - AuthRequest::USE, - 0, - vn->isPublic()); - - if (UserPool::authorize(ar) == -1) - { - goto error_authorize; - } - } - oss << *vn; vn->unlock(); @@ -104,11 +87,6 @@ error_vn_get: oss.str(get_error(method_name, "NET", nid)); goto error_common; -error_authorize: - vn->unlock(); - oss.str(authorization_error(method_name, "USE", "NET", rc, nid)); - goto error_common; - error_common: arrayData.push_back(xmlrpc_c::value_boolean(false)); // FAILURE arrayData.push_back(xmlrpc_c::value_string(oss.str())); diff --git a/src/rm/RequestManagerVirtualNetworkPoolInfo.cc b/src/rm/RequestManagerVirtualNetworkPoolInfo.cc index 216d3d82f5..ba36bffaa5 100755 --- a/src/rm/RequestManagerVirtualNetworkPoolInfo.cc +++ b/src/rm/RequestManagerVirtualNetworkPoolInfo.cc @@ -63,6 +63,8 @@ void RequestManager::VirtualNetworkPoolInfo::execute( * -1 :: User's VMs * >=0 :: UID User's VMs **/ + + // TODO define authorization (bug #278) if (filter_flag == -1) { User::split_secret(session,username,password); diff --git a/src/rm/RequestManagerVirtualNetworkPublish.cc b/src/rm/RequestManagerVirtualNetworkPublish.cc index 6d6874f52b..4ec9c3d414 100644 --- a/src/rm/RequestManagerVirtualNetworkPublish.cc +++ b/src/rm/RequestManagerVirtualNetworkPublish.cc @@ -52,15 +52,13 @@ void RequestManager::VirtualNetworkPublish::execute( publish_flag = xmlrpc_c::value_boolean(paramList.getBoolean(2)); // First, we need to authenticate the user - rc = VirtualNetworkPublish::upool->authenticate(session); + uid = VirtualNetworkPublish::upool->authenticate(session); - if ( rc == -1 ) + if ( uid == -1 ) { goto error_authenticate; } - uid = rc; - // Get virtual network from the VirtualNetworkPool vn = VirtualNetworkPublish::vnpool->get(nid,true);