EH: CS-1185: give more details in error message '<user> must be manager for this operation'

Author: ernst-bablick

source/common/msg_common.h

@@ -157,9 +157,15 @@
 #define MSG_ANSWER_ERRORREADINGFROMSTDIN    _MESSAGE(23043, _("error reading from stdin"))
 #define MSG_ANSWER_NOINPUT                  _MESSAGE(23044, _("no input read from stdin"))
 
+#define MSG_SGETEXT_MUSTBEMANAGERFORTAR_SS  _MESSAGE(23045, _("denied: " SFQ " must be manager to initiate operation for target " SFN))
+#define MSG_SGETEXT_MUSTBEOPERATORFORTAR_SS _MESSAGE(23046, _("denied: " SFQ " must be operator to initiate operation for target " SFN))
+
 #define MSG_USER_INVALIDNAMEX_S             _MESSAGE(23048, _("invalid user name " SFQ))
 #define MSG_USER_NOHOMEDIRFORUSERX_S        _MESSAGE(23049, _("missing home directory for user " SFQ))
 
+#define MSG_SGETEXT_MUSTBEMANAGERFOROP_SS   _MESSAGE(23050, _("denied: " SFQ " must be manager to initiate " SFN " operation"))
+#define MSG_SGETEXT_MUSTBEOPERATORFOROP_SS  _MESSAGE(23051, _("denied: " SFQ " must be operator to initiate " SFN " operation"))
+
 #define MSG_OBJ_USER                        _MESSAGE(23052, _("user"))
 #define MSG_OBJ_GROUP                       _MESSAGE(23053, _("group"))
 #define MSG_OBJ_USERPRJ                     _MESSAGE(23054, _("user/project"))

source/daemons/qmaster/sge_c_gdi.cc

@@ -140,7 +140,7 @@ static void
 trigger_scheduler_monitoring(ocs::gdi::Packet *packet, ocs::gdi::Task *task, monitoring_t *monitor);
 
 static bool
-sge_chck_mod_perm_user(const ocs::gdi::Packet *packet, lList **alpp, u_long32 target);
+sge_chck_mod_perm_user(const ocs::gdi::Packet *packet, lList **alpp, u_long32 tar);
 
 static bool
 sge_task_check_get_perm_host(ocs::gdi::Packet *packet, ocs::gdi::Task *task);
@@ -258,8 +258,8 @@ sge_c_gdi_process_in_listener(ocs::gdi::Packet *packet, ocs::gdi::Task *task,
 bool
 sge_c_gdi_check_execution_permission(ocs::gdi::Packet *packet, ocs::gdi::Task *task) {
    DENTER(TOP_LAYER);
-   int operation = task->command;
-   switch (operation) {
+
+   switch (const ocs::gdi::Command::Cmd cmd = task->command) {
       case ocs::gdi::Command::SGE_GDI_GET:
          DRETURN(sge_task_check_get_perm_host(packet, task));
       case ocs::gdi::Command::SGE_GDI_ADD:
@@ -284,13 +284,13 @@ sge_c_gdi_check_execution_permission(ocs::gdi::Packet *packet, ocs::gdi::Task *t
          // other trigger requests must have been initiated by a manager
          if (task->target == ocs::gdi::Target::SGE_CQ_LIST) {
             if (!manop_is_operator(packet, master_manager_list, master_operator_list)) {
-               ERROR(MSG_SGETEXT_MUSTBEOPERATOR_S, packet->user);
+               ERROR(MSG_SGETEXT_MUSTBEOPERATORFOROP_SS, packet->user, ocs::gdi::Command::toString(cmd).c_str());
                answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOMGR, ANSWER_QUALITY_ERROR);
                DRETURN(false);
             }
          } else {
             if (!manop_is_manager(packet, master_manager_list)) {
-               ERROR(MSG_SGETEXT_MUSTBEMANAGER_S, packet->user);
+               ERROR(MSG_SGETEXT_MUSTBEMANAGERFOROP_SS, packet->user, ocs::gdi::Command::toString(cmd).c_str());
                answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOMGR, ANSWER_QUALITY_ERROR);
                DRETURN(false);
             }
@@ -1302,14 +1302,13 @@ static void sge_c_gdi_mod(gdi_object_t *ao, ocs::gdi::Packet *packet, ocs::gdi::
 
 static bool
 sge_chck_mod_perm_user(const ocs::gdi::Packet *packet, lList **alpp, u_long32 target) {
+   DENTER(TOP_LAYER);
+
    const lList *master_manager_list = *ocs::DataStore::get_master_list(SGE_TYPE_MANAGER);
    const lList *master_operator_list = *ocs::DataStore::get_master_list(SGE_TYPE_OPERATOR);
 
-   DENTER(TOP_LAYER);
-
    /* check permissions of user */
-   switch (target) {
-
+   switch (const auto tar = static_cast<ocs::gdi::Target::TargetValue>(target)) {
       case ocs::gdi::Target::SGE_ORDER_LIST:
       case ocs::gdi::Target::SGE_AH_LIST:
       case ocs::gdi::Target::SGE_SH_LIST:
@@ -1332,7 +1331,7 @@ sge_chck_mod_perm_user(const ocs::gdi::Packet *packet, lList **alpp, u_long32 ta
       case ocs::gdi::Target::SGE_MASTER_EVENT:
          /* user must be a manager */
          if (!manop_is_manager(packet, master_manager_list)) {
-            ERROR(MSG_SGETEXT_MUSTBEMANAGER_S, packet->user);
+            ERROR(MSG_SGETEXT_MUSTBEMANAGERFORTAR_SS, packet->user, ocs::gdi::Target::targetToString(tar).c_str());
             answer_list_add(alpp, SGE_EVENT, STATUS_ENOMGR, ANSWER_QUALITY_ERROR);
             DRETURN(false);
          }
@@ -1341,7 +1340,7 @@ sge_chck_mod_perm_user(const ocs::gdi::Packet *packet, lList **alpp, u_long32 ta
       case ocs::gdi::Target::SGE_US_LIST:
          /* user must be a operator */
          if (!manop_is_operator(packet, master_manager_list, master_operator_list)) {
-            ERROR(MSG_SGETEXT_MUSTBEOPERATOR_S, packet->user);
+            ERROR(MSG_SGETEXT_MUSTBEOPERATORFORTAR_SS, packet->user, ocs::gdi::Target::targetToString(tar).c_str());
             answer_list_add(alpp, SGE_EVENT, STATUS_ENOMGR, ANSWER_QUALITY_ERROR);
             DRETURN(false);
          }