applied staff_access patch by ThiefMaster

diff --git a/src/modcmd.c b/src/modcmd.c
index 3d57da679fb5e7da1748595e9970805dd565c1c6..de67e0f06952990078012d54c4b570bc93fe5fc3 100644 (file)
--- a/src/modcmd.c
+++ b/src/modcmd.c
@@ -39,6 +39,7 @@ static const struct message_entry msgtab[] = {
     { "MCMSG_BARE_FLAG", "Flag %.*s must be preceded by a + or -." },
     { "MCMSG_UNKNOWN_FLAG", "Unknown module flag %.*s." },
     { "MCMSG_BAD_OPSERV_LEVEL", "Invalid $O access level %s." },
+    { "MCMSG_BAD_STAFF_LEVEL", "Invalid staff level %s." },
     { "MCMSG_BAD_CHANSERV_LEVEL", "Invalid $C access level %s." },
     { "MCMSG_LEVEL_TOO_LOW", "You cannot set the access requirements for %s (your level is too low.)" },
     { "MCMSG_LEVEL_TOO_HIGH", "You cannot set the access requirements to %s (that is too high)." },
@@ -77,6 +78,7 @@ static const struct message_entry msgtab[] = {
     { "MCMSG_HELPFILE_READ", "Read %s help database in %lu.%03lu seconds." },
     { "MCMSG_COMMAND_TIME", "Command $b%s$b finished in %lu.%06lu seconds." },
     { "MCMSG_NEED_OPSERV_LEVEL", "You must have $O access of at least $b%u$b." },
+    { "MCMSG_NEED_STAFF_LEVEL", "You must have staff access of at least $b%u$b." },
     { "MCMSG_NEED_CHANSERV_LEVEL", "You must have $C access of at least $b%u$b in the channel." },
     { "MCMSG_NEED_ACCOUNT_FLAGS", "You must have account flags $b%s$b." },
     { "MCMSG_NEED_NOTHING", "Anyone may use the $b%s$b command." },
@@ -126,7 +128,7 @@ static const struct message_entry msgtab[] = {
     { "MCMSG_MESSAGE_DUMP_FAILED", "Message dump failed: %s." },
     { "MCMSG_COMMAND_FLAGS", "Command flags are %s (inferred: %s)." },
     { "MCMSG_COMMAND_ACCOUNT_FLAGS", "Requires account flags +%s, prohibits account flags +%s." },
-    { "MCMSG_COMMAND_ACCESS_LEVEL", "Requires channel access %d and $O access %d." },
+    { "MCMSG_COMMAND_ACCESS_LEVEL", "Requires channel access %d and $O access %d and staff access %d." },
     { "MCMSG_COMMAND_USES", "%s has been used %d times." },
     { NULL, NULL }
 };
@@ -302,6 +304,8 @@ svccmd_copy_rules(struct svccmd *dest, struct svccmd *src) {
     dest->deny_account_flags |= src->deny_account_flags;
     if (src->min_opserv_level > dest->min_opserv_level)
         dest->min_opserv_level = src->min_opserv_level;
+    if (src->min_staff_level > dest->min_staff_level)
+        dest->min_staff_level = src->min_staff_level;
     if (src->min_channel_access > dest->min_channel_access)
         dest->min_channel_access = src->min_channel_access;
     modcmd_set_effective_flags(dest);
@@ -379,6 +383,18 @@ svccmd_configure(struct svccmd *cmd, struct userNode *user, struct userNode *bot
         }
         cmd->min_opserv_level = newval;
         return 1;
+    } else if (!irccasecmp(param, "staff_level") || !irccasecmp(param, "staff_access")) {
+        unsigned int newval = atoi(value);
+        if (newval > 1000) {
+            if (user) {
+                send_message(user, bot, "MCMSG_BAD_STAFF_LEVEL", value);
+            } else {
+                log_module(MAIN_LOG, LOG_ERROR, "Invalid staff level %s (for command %s).", value, cmd->name);
+            }
+            return 0;
+        }
+        cmd->min_staff_level = newval;
+        return 1;
     } else if (!irccasecmp(param, "account_flags")) {
         return nickserv_modify_handle_flags(user, bot, value, &cmd->req_account_flags, &cmd->deny_account_flags);
     } else {
@@ -487,6 +503,7 @@ svccmd_can_invoke(struct userNode *user, struct userNode *bot, struct svccmd *cm
                         send_message(user, bot, "MCMSG_CHAN_SUSPENDED", channel->name, channel->channel_info->suspended->reason);
                     return 0;
                 }
+                if (cmd->min_staff_level > 0 && !staff_has_access(user, bot, cmd->min_staff_level, !(options & SVCCMD_NOISY))) return 0;
                 rflags |= ACTION_STAFF;
             }
         }
@@ -538,6 +555,7 @@ svccmd_can_invoke(struct userNode *user, struct userNode *bot, struct svccmd *cm
             || ((flags & MODCMD_REQUIRE_NETWORK_HELPER) && IsNetworkHelper(user))
             || ((flags & MODCMD_REQUIRE_SUPPORT_HELPER) && IsSupportHelper(user))) {
             /* allow it */
+            if (cmd->min_staff_level > 0 && !staff_has_access(user, bot, cmd->min_staff_level, !(options & SVCCMD_NOISY))) return 0;
             rflags |= ACTION_STAFF;
         } else {
             if (options & SVCCMD_NOISY)
@@ -551,11 +569,12 @@ svccmd_can_invoke(struct userNode *user, struct userNode *bot, struct svccmd *cm
                 send_message(user, bot, "MCMSG_MUST_BE_HELPING");
             return 0;
         }
+        if (cmd->min_staff_level > 0 && !staff_has_access(user, bot, cmd->min_staff_level, !(options & SVCCMD_NOISY))) return 0;
         rflags |= ACTION_STAFF;
     }
     if (cmd->min_opserv_level > 0) {
-        if (!oper_has_access(user, bot, cmd->min_opserv_level, !(options & SVCCMD_NOISY)))
-            return 0;
+        if (!oper_has_access(user, bot, cmd->min_opserv_level, !(options & SVCCMD_NOISY))) return 0;
+        if (cmd->min_staff_level > 0 && !staff_has_access(user, bot, cmd->min_staff_level, !(options & SVCCMD_NOISY))) return 0;
         rflags |= ACTION_STAFF;
     }
     if (cmd->req_account_flags || cmd->deny_account_flags) {
@@ -580,6 +599,7 @@ svccmd_can_invoke(struct userNode *user, struct userNode *bot, struct svccmd *cm
         && (!(uData = _GetChannelUser(channel->channel_info, user->handle_info, 0, 0))
             || uData->access < cmd->min_channel_access)
         && !(flags & (MODCMD_REQUIRE_STAFF|MODCMD_REQUIRE_HELPING))) {
+        if (cmd->min_staff_level > 0 && !staff_has_access(user, bot, cmd->min_staff_level, !(options & SVCCMD_NOISY))) return 0;
         rflags |= ACTION_OVERRIDE;
     }
     return rflags | ACTION_ALLOW;
@@ -1302,6 +1322,10 @@ static MODCMD_FUNC(cmd_command) {
         reply("MCMSG_NEED_OPSERV_LEVEL", svccmd->min_opserv_level);
         shown_flags |= MODCMD_REQUIRE_OPER | MODCMD_REQUIRE_AUTHED;
     }
+    if (svccmd->min_staff_level > 0 && (IsNetworkHelper(user) || IsSupportHelper(user) || IsOper(user))) {
+        reply("MCMSG_NEED_STAFF_LEVEL", svccmd->min_staff_level);
+        shown_flags |= MODCMD_REQUIRE_STAFF | MODCMD_REQUIRE_AUTHED;
+    }
     if (svccmd->min_channel_access > 0) {
         reply("MCMSG_NEED_CHANSERV_LEVEL", svccmd->min_channel_access);
         shown_flags |= MODCMD_REQUIRE_CHANUSER | MODCMD_REQUIRE_REGCHAN | MODCMD_REQUIRE_CHANNEL | MODCMD_REQUIRE_AUTHED;
@@ -1424,7 +1448,7 @@ modcmd_describe_command(struct userNode *user, struct svccmd *cmd, struct svccmd
     }
     buf1[buf1_used] = buf2[buf2_used] = '\0';
     reply("MCMSG_COMMAND_ACCOUNT_FLAGS", buf1, buf2);
-    reply("MCMSG_COMMAND_ACCESS_LEVEL", target->min_channel_access, target->min_opserv_level);
+    reply("MCMSG_COMMAND_ACCESS_LEVEL", target->min_channel_access, target->min_opserv_level, target->min_staff_level);
     reply("MCMSG_COMMAND_USES", target->name, target->uses);
 }
 
@@ -1967,6 +1991,8 @@ modcmd_saxdb_write_command(struct saxdb_context *ctx, struct svccmd *cmd) {
         saxdb_write_string_list(ctx, "aliased", &cmd->alias);
     if (cmd->min_opserv_level != template->min_opserv_level)
         saxdb_write_int(ctx, "oper_access", cmd->min_opserv_level);
+    if (cmd->min_staff_level != template->min_staff_level)
+        saxdb_write_int(ctx, "staff_access", cmd->min_staff_level);
     if (cmd->min_channel_access != template->min_channel_access)
         saxdb_write_int(ctx, "channel_access", cmd->min_channel_access);
     if (cmd->flags != template->flags) {
@@ -2247,6 +2273,10 @@ modcmd_db_load_command(struct service *service, const char *cmdname, struct dict
         || (str = database_get_data(obj, "opserv_level", RECDB_QSTRING))) {
         svccmd_configure(svccmd, NULL, service->bot, "oper_access", str);
     }
+    if ((str = database_get_data(obj, "staff_access", RECDB_QSTRING))
+        || (str = database_get_data(obj, "staff_level", RECDB_QSTRING))) {
+        svccmd_configure(svccmd, NULL, service->bot, "staff_access", str);
+    }
     if ((str = database_get_data(obj, "channel_access", RECDB_QSTRING))
         || (str = database_get_data(obj, "chanserv_level", RECDB_QSTRING))) {
         svccmd_configure(svccmd, NULL, service->bot, "channel_access", str);

diff --git a/src/modcmd.h b/src/modcmd.h
index a2996abd52d53da15c06e7e5bebda25e4aab8763..763efd9f42b972dad3444a8f0282905ae2b517fd 100644 (file)
--- a/src/modcmd.h
+++ b/src/modcmd.h
@@ -125,6 +125,7 @@ struct svccmd {
     unsigned long req_account_flags;
     unsigned long deny_account_flags;
     unsigned int min_opserv_level;
+    unsigned int min_staff_level;
     unsigned int min_channel_access;
     unsigned int effective_flags;
 };

diff --git a/src/modcmd.help b/src/modcmd.help
index 5030cc3b08d587516a44cf408e4cfaf91011d04a..d21521843f3160c784657990a91cdb5f876a0d9e 100644 (file)
--- a/src/modcmd.help
+++ b/src/modcmd.help
@@ -31,6 +31,7 @@
         "  FLAGS          Comma-separated, +/- prefixed list of flags to add or remove.",
         "  CHANNEL_ACCESS Minimum ChanServ access.",
         "  OPER_ACCESS    Minimum OpServ access.",
+        "  STAFF_ACCESS   Minimum staff level.",
         "  ACCOUNT_FLAGS  Account flags to require or deny (for example, +R-S)",
         "See the $bmodcmd flags$b help entry for a list of supported flags.");
 "modcmd flags" ("The following flags are supported for commands:",

diff --git a/src/nickserv.c b/src/nickserv.c
index 581d9b47d57ca0c881d6e6d3dca5af0eda1edcce..f521c6a980d109460c5fee54f7282b8d4b843803 100644 (file)
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -48,6 +48,7 @@
 #define KEY_VALID_NICK_REGEX "valid_nick_regex"
 #define KEY_DB_BACKUP_FREQ "db_backup_freq"
 #define KEY_MODOPER_LEVEL "modoper_level"
+#define KEY_MODSTAFF_LEVEL "modstaff_level"
 #define KEY_SET_EPITHET_LEVEL "set_epithet_level"
 #define KEY_SET_TITLE_LEVEL "set_title_level"
 #define KEY_SET_FAKEHOST_LEVEL "set_fakehost_level"
@@ -82,6 +83,7 @@
 #define KEY_NICKS "nicks"
 #define KEY_MASKS "masks"
 #define KEY_OPSERV_LEVEL "opserv_level"
+#define KEY_STAFF_LEVEL "staff_level"
 #define KEY_FLAGS "flags"
 #define KEY_REGISTER_ON "register"
 #define KEY_LAST_SEEN "lastseen"
@@ -330,6 +332,7 @@ static const struct message_entry msgtab[] = {
     { "NSMSG_SET_MAXLOGINS", "$bMAXLOGINS:    $b%d" },
     { "NSMSG_SET_LANGUAGE", "$bLANGUAGE:     $b%s" },
     { "NSMSG_SET_LEVEL", "$bLEVEL:        $b%d" },
+    { "NSMSG_SET_STAFFLEVEL", "$bSTAFF_LEVEL:    $b%d" },
     { "NSMSG_SET_EPITHET", "$bEPITHET:      $b%s" },
     { "NSMSG_SET_TITLE", "$bTITLE:        $b%s" },
     { "NSMSG_SET_FAKEHOST", "$bFAKEHOST:    $b%s" },
@@ -394,6 +397,7 @@ static struct {
     unsigned long handle_expire_delay;
     unsigned long nochan_handle_expire_delay;
     unsigned long modoper_level;
+    unsigned long modstaff_level;
     unsigned long set_epithet_level;
     unsigned long set_title_level;
     unsigned long set_fakehost_level;
@@ -690,6 +694,23 @@ oper_has_access(struct userNode *user, struct userNode *bot, unsigned int min_le
     return 1;
 }
 
+int
+staff_has_access(struct userNode *user, struct userNode *bot, unsigned int min_level, unsigned int quiet) {
+    if (!user->handle_info) {
+        if (!quiet)
+            send_message(user, bot, "MSG_AUTHENTICATE");
+        return 0;
+    }
+
+    if (user->handle_info->staff_level < min_level) {
+       if (!quiet)
+            send_message(user, bot, "NSMSG_NO_ACCESS");
+       return 0;
+    }
+
+    return 1;
+}
+
 static int
 is_valid_handle(const char *handle)
 {
@@ -1371,6 +1392,7 @@ static NICKSERV_FUNC(cmd_register)
     /* If they're the first to register, give them level 1000. */
     if (dict_size(nickserv_handle_dict) == 1) {
         hi->opserv_level = 1000;
+        hi->staff_level = 1000;
         reply("NSMSG_ROOT_HANDLE", argv[1]);
     }
 
@@ -2947,6 +2969,24 @@ oper_try_set_access(struct userNode *user, struct userNode *bot, struct handle_i
     return 1;
 }
 
+int
+oper_try_set_staff_access(struct userNode *user, struct userNode *bot, struct handle_info *target, unsigned int new_level) {
+    if (!oper_has_access(user, bot, nickserv_conf.modstaff_level, 0))
+        return 0;
+    if ((user->handle_info->opserv_level < target->opserv_level)
+        || ((user->handle_info->opserv_level == target->opserv_level)
+            && (user->handle_info->opserv_level < 1000))) {
+        send_message(user, bot, "MSG_USER_OUTRANKED", target->handle);
+        return 0;
+    }
+    if (target->staff_level == new_level)
+        return 0;
+    log_module(NS_LOG, LOG_INFO, "Account %s setting staff level for account %s to %d (from %d).",
+        user->handle_info->handle, target->handle, new_level, target->staff_level);
+    target->staff_level = new_level;
+    return 1;
+}
+
 static OPTION_FUNC(opt_level)
 {
     int res;
@@ -2961,6 +3001,20 @@ static OPTION_FUNC(opt_level)
     return res;
 }
 
+static OPTION_FUNC(opt_staff_level)
+{
+    int res;
+
+    if (!override) {
+       send_message(user, nickserv, "MSG_SETTING_PRIVILEGED", argv[0]);
+       return 0;
+    }
+
+    res = (argc > 1) ? oper_try_set_staff_access(user, nickserv, hi, strtoul(argv[1], NULL, 0)) : 0;
+    send_message(user, nickserv, "NSMSG_SET_STAFFLEVEL", hi->staff_level);
+    return res;
+}
+
 static OPTION_FUNC(opt_epithet)
 {
     if (!override) {
@@ -3469,6 +3523,8 @@ nickserv_saxdb_write(struct saxdb_context *ctx) {
         }
         if (hi->opserv_level)
             saxdb_write_int(ctx, KEY_OPSERV_LEVEL, hi->opserv_level);
+        if (hi->staff_level)
+            saxdb_write_int(ctx, KEY_STAFF_LEVEL, hi->staff_level);
         if (hi->language != lang_C)
             saxdb_write_string(ctx, KEY_LANGUAGE, hi->language->name);
         saxdb_write_string(ctx, KEY_PASSWD, hi->passwd);
@@ -3613,6 +3669,10 @@ static NICKSERV_FUNC(cmd_merge)
     if (hi_from->opserv_level > hi_to->opserv_level)
         hi_to->opserv_level = hi_from->opserv_level;
 
+    /* Do they get a staff level promotion? */
+    if (hi_from->staff_level > hi_to->staff_level)
+        hi_to->staff_level = hi_from->staff_level;
+
     /* What about last seen time? */
     if (hi_from->lastseen > hi_to->lastseen)
         hi_to->lastseen = hi_from->lastseen;
@@ -4259,6 +4319,8 @@ nickserv_db_read_handle(const char *handle, dict_t obj)
     hi->language = language_find(str ? str : "C");
     str = database_get_data(obj, KEY_OPSERV_LEVEL, RECDB_QSTRING);
     hi->opserv_level = str ? strtoul(str, NULL, 0) : 0;
+    str = database_get_data(obj, KEY_STAFF_LEVEL, RECDB_QSTRING);
+    hi->staff_level = str ? strtoul(str, NULL, 0) : 0;
     str = database_get_data(obj, KEY_INFO, RECDB_QSTRING);
     if (str)
         hi->infoline = strdup(str);
@@ -4547,6 +4609,8 @@ nickserv_conf_read(void)
     nickserv_conf.db_backup_frequency = str ? ParseInterval(str) : 7200;
     str = database_get_data(conf_node, KEY_MODOPER_LEVEL, RECDB_QSTRING);
     nickserv_conf.modoper_level = str ? strtoul(str, NULL, 0) : 900;
+    str = database_get_data(conf_node, KEY_MODSTAFF_LEVEL, RECDB_QSTRING);
+    nickserv_conf.modstaff_level = str ? strtoul(str, NULL, 0) : 800;
     str = database_get_data(conf_node, KEY_SET_EPITHET_LEVEL, RECDB_QSTRING);
     nickserv_conf.set_epithet_level = str ? strtoul(str, NULL, 0) : 1;
     str = database_get_data(conf_node, KEY_SET_TITLE_LEVEL, RECDB_QSTRING);
@@ -4948,6 +5012,8 @@ init_nickserv(const char *nick)
     dict_insert(nickserv_opt_dict, "DEVNULL", opt_devnull);
     dict_insert(nickserv_opt_dict, "ACCESS", opt_level);
     dict_insert(nickserv_opt_dict, "LEVEL", opt_level);
+    dict_insert(nickserv_opt_dict, "STAFF", opt_staff_level);
+    dict_insert(nickserv_opt_dict, "STAFF_LEVEL", opt_staff_level);
     dict_insert(nickserv_opt_dict, "EPITHET", opt_epithet);
     if (titlehost_suffix) {
         dict_insert(nickserv_opt_dict, "TITLE", opt_title);

diff --git a/src/nickserv.h b/src/nickserv.h
index ee0db3b32d5c46d45c36243469a1cf00a2cc3881..751e05988178c72f54ac9babd6fcfea7b39c05a2 100644 (file)
--- a/src/nickserv.h
+++ b/src/nickserv.h
@@ -120,6 +120,7 @@ struct handle_info {
     int karma;
     unsigned short flags;
     unsigned short opserv_level;
+    unsigned short staff_level;
     unsigned short screen_width;
     unsigned short table_width;
     unsigned char userlist_style;
@@ -151,6 +152,7 @@ struct nick_info *get_nick_info(const char *nick);
 struct modeNode *find_handle_in_channel(struct chanNode *channel, struct handle_info *handle, struct userNode *except);
 int nickserv_modify_handle_flags(struct userNode *user, struct userNode *bot, const char *str, unsigned long *add, unsigned long *remove);
 int oper_has_access(struct userNode *user, struct userNode *bot, unsigned int min_level, unsigned int quiet);
+int staff_has_access(struct userNode *user, struct userNode *bot, unsigned int min_level, unsigned int quiet);
 void nickserv_show_oper_accounts(struct userNode *user, struct svccmd *cmd);
 struct handle_info *checklogin(const char *user, const char *pass, const char *numeric, const char *hostmask, const char *ipmask);
 char *getfakehost(const char *user);

diff --git a/src/nickserv.help b/src/nickserv.help
index 15a7b9643a1a09c642e55e76dbfbec958cbff71d..dcc67cb2dee4e3a586877938faa45aa76421e434 100644 (file)
--- a/src/nickserv.help
+++ b/src/nickserv.help
@@ -341,6 +341,7 @@
         "$bPASSWORD$b: Sets user's password.",
         "$bFLAGS$b: Changes account flags for user.",
         "$bLEVEL$b: Sets $O access level.",
+        "$bSTAFF_LEVEL$b: Sets staff level.",
         "$bEPITHET$b: The description $C shows for the user's access.",
         "You may use *Account instead of Nick as the name argument; the * makes $N use the name of an account directly (useful if the user is not online).",
         "$uSee Also:$u accountinfo, account flags, set, userinfo"
@@ -351,6 +352,7 @@
         "$bPASSWORD$b: Sets user's password.",
         "$bFLAGS$b: Changes account flags for user.",
         "$bLEVEL$b: Sets $O access level.",
+        "$bSTAFF_LEVEL$b: Sets staff level.",
         "$bEPITHET$b: The description $C shows for the user's access.",
         "You may use *Account instead of Nick as the name argument; the * makes $N use the name of an account directly (useful if the user is not online).",
         "$uSee Also:$u accountinfo, account flags, nickinfo, set, userinfo"

diff --git a/srvx.conf.example b/srvx.conf.example
index 83ffb71c00a44b5a64c8bacb210b0f1d5d79c18e..373703381c0136ff87d60ade5bbc4e412eb3b86e 100644 (file)
--- a/srvx.conf.example
+++ b/srvx.conf.example
@@ -109,6 +109,8 @@
         "set_epithet_level" "800";
         // what opserv access level do you need to set somebody else's level?
         "modoper_level" "850";
+        // what opserv access level do you need to set somebody's staff level?
+        "modstaff_level" "750";
 
         // how often should accounts be expired?
         "account_expire_freq" "1d";