X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/6d61f90fd6a7432da406e88a6e1c8866c25494e8..d09c55338feb5627da978058432a15dccec16907:/extensions/override.c diff --git a/extensions/override.c b/extensions/override.c index 844be47b..2d86f738 100644 --- a/extensions/override.c +++ b/extensions/override.c @@ -22,9 +22,13 @@ #include "privilege.h" #include "s_newconf.h" +static const char override_desc[] = + "Adds user mode +p, an operator-only user mode that grants temporary privileges to override anything"; + static void check_umode_change(void *data); static void hack_channel_access(void *data); static void hack_can_join(void *data); +static void hack_can_kick(void *data); static void hack_can_send(void *data); static void handle_client_exit(void *data); @@ -32,11 +36,13 @@ mapi_hfn_list_av1 override_hfnlist[] = { { "umode_changed", (hookfn) check_umode_change }, { "get_channel_access", (hookfn) hack_channel_access }, { "can_join", (hookfn) hack_can_join }, + { "can_kick", (hookfn) hack_can_kick }, { "can_send", (hookfn) hack_can_send }, { "client_exit", (hookfn) handle_client_exit }, { NULL, NULL } }; +#define CHFL_OVERRIDE 0x0004 #define IsOperOverride(x) (HasPrivilege((x), "oper:override")) struct OverrideSession { @@ -92,7 +98,7 @@ expire_override_deadlines(void *unused) break; else if (session_p->deadline < rb_current_time()) { - const char *parv[4] = {session_p->client->name, session_p->client->name, "-p", NULL}; + const char *parv[4] = {session_p->client->name, session_p->client->name, "-p", NULL}; user_mode(session_p->client, session_p->client, 3, parv); } } @@ -102,30 +108,34 @@ static void check_umode_change(void *vdata) { hook_data_umode_changed *data = (hook_data_umode_changed *)vdata; + bool changed = false; struct Client *source_p = data->client; if (!MyClient(source_p)) return; - /* didn't change +p umode, we don't need to do anything */ - if (!((data->oldumodes ^ source_p->umodes) & user_modes['p'])) - return; - - if (!IsOperOverride(source_p)) - { - sendto_one_notice(source_p, ":*** You need oper:override privilege for +p"); + if (data->oldumodes & UMODE_OPER && !IsOper(source_p)) source_p->umodes &= ~user_modes['p']; - return; - } + + changed = ((data->oldumodes ^ source_p->umodes) & user_modes['p']); if (source_p->umodes & user_modes['p']) { - update_session_deadline(source_p, NULL); + if (!IsOperOverride(source_p)) + { + sendto_one_notice(source_p, ":*** You need oper:override privilege for +p"); + source_p->umodes &= ~user_modes['p']; + return; + } - sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s has enabled oper-override (+p)", - get_oper_name(source_p)); + if (changed) + { + update_session_deadline(source_p, NULL); + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s has enabled oper-override (+p)", + get_oper_name(source_p)); + } } - else if (!(source_p->umodes & user_modes['p'])) + else if (changed && !(source_p->umodes & user_modes['p'])) { rb_dlink_node *n, *tn; @@ -150,16 +160,21 @@ hack_channel_access(void *vdata) { hook_data_channel_approval *data = (hook_data_channel_approval *) vdata; + if (data->dir == MODE_QUERY) + return; + if (data->approved == CHFL_CHANOP) return; if (data->client->umodes & user_modes['p']) { update_session_deadline(data->client, NULL); - data->approved = CHFL_CHANOP; + data->approved = CHFL_OVERRIDE; - sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s is using oper-override on %s (modehacking)", - get_oper_name(data->client), data->chptr->chname); + /* we only want to report modehacks, which are always non-NULL */ + if (data->modestr) + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s is using oper-override on %s (modehacking: %s)", + get_oper_name(data->client), data->chptr->chname, data->modestr); } } @@ -181,23 +196,45 @@ hack_can_join(void *vdata) } } +static void +hack_can_kick(void *vdata) +{ + hook_data_channel_approval *data = (hook_data_channel_approval *) vdata; + int alevel; + + alevel = get_channel_access(data->client, data->chptr, data->msptr, data->dir, NULL); + if (alevel != CHFL_OVERRIDE) + return; + + if (data->client->umodes & user_modes['p']) + { + update_session_deadline(data->client, NULL); + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s is using oper-override on %s (KICK %s)", + get_oper_name(data->client), data->chptr->chname, data->target->name); + } +} + static void hack_can_send(void *vdata) { hook_data_channel_approval *data = (hook_data_channel_approval *) vdata; + if (data->dir == MODE_QUERY) + return; + if (data->approved == CAN_SEND_NONOP || data->approved == CAN_SEND_OPV) return; if (data->client->umodes & user_modes['p']) { - update_session_deadline(data->client, NULL); - data->approved = CAN_SEND_OPV; + data->approved = CAN_SEND_NONOP; -#ifdef XXX_UNSURE_IF_WANT - sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s is using oper-override on %s (banwalking)", - get_oper_name(data->client), data->chptr->chname); -#endif + if (MyClient(data->client)) + { + update_session_deadline(data->client, NULL); + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s is using oper-override on %s (forcing message)", + get_oper_name(data->client), data->chptr->chname); + } } } @@ -217,7 +254,7 @@ handle_client_exit(void *vdata) rb_dlinkDelete(n, &overriding_opers); rb_free(session_p); - } + } } struct ev_entry *expire_override_deadlines_ev = NULL; @@ -225,11 +262,20 @@ struct ev_entry *expire_override_deadlines_ev = NULL; static int _modinit(void) { + rb_dlink_node *ptr; + /* add the usermode to the available slot */ user_modes['p'] = find_umode_slot(); construct_umodebuf(); - expire_override_deadlines_ev = rb_event_add("expire_override_deadlines", expire_override_deadlines, NULL, 60); + RB_DLINK_FOREACH(ptr, lclient_list.head) + { + struct Client *client_p = ptr->data; + if (IsPerson(client_p) && (client_p->umodes & user_modes['p'])) + update_session_deadline(client_p, NULL); + } + + expire_override_deadlines_ev = rb_event_add("expire_override_deadlines", expire_override_deadlines, NULL, 60); return 0; } @@ -237,12 +283,20 @@ _modinit(void) static void _moddeinit(void) { + rb_dlink_node *n, *tn; + /* disable the umode and remove it from the available list */ user_modes['p'] = 0; construct_umodebuf(); + RB_DLINK_FOREACH_SAFE(n, tn, overriding_opers.head) + { + rb_dlinkDelete(n, &overriding_opers); + rb_free(n->data); + } + rb_event_delete(expire_override_deadlines_ev); } -DECLARE_MODULE_AV1(override, _modinit, _moddeinit, NULL, NULL, - override_hfnlist, "$Revision: 3526 $"); +DECLARE_MODULE_AV2(override, _modinit, _moddeinit, NULL, NULL, + override_hfnlist, NULL, NULL, override_desc);