X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/cc75db3f3f0d2968fa1ae5f59403af61abb41094..1608b0e70eccd97485af83cf5c80b4e09e95ba93:/extensions/override.c diff --git a/extensions/override.c b/extensions/override.c index 4e7667b1..5b1f60fb 100644 --- a/extensions/override.c +++ b/extensions/override.c @@ -1,5 +1,5 @@ /* - * oper-override for charybdis. + * oper-override for solanum. * * adds usermode +p and has a timer event that is iterated over to disable * usermode +p after a while... @@ -30,15 +30,17 @@ 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 hack_can_invite(void *data); static void handle_client_exit(void *data); 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 }, + { "umode_changed", check_umode_change }, + { "get_channel_access", hack_channel_access, HOOK_HIGHEST }, + { "can_join", hack_can_join, HOOK_HIGHEST }, + { "can_kick", hack_can_kick, HOOK_HIGHEST }, + { "can_send", hack_can_send, HOOK_HIGHEST }, + { "can_invite", hack_can_invite, HOOK_HIGHEST }, + { "client_exit", handle_client_exit }, { NULL, NULL } }; @@ -55,25 +57,27 @@ struct OverrideSession { rb_dlink_list overriding_opers = { NULL, NULL, 0 }; static void -update_session_deadline(struct Client *source_p, struct OverrideSession *session_p) +update_session_deadline(struct Client *source_p) { - if (session_p == NULL) + struct OverrideSession *session_p = NULL; + rb_dlink_node *n; + + RB_DLINK_FOREACH(n, overriding_opers.head) { - rb_dlink_node *n; + struct OverrideSession *s = n->data; - RB_DLINK_FOREACH(n, overriding_opers.head) + if (s->client == source_p) { - struct OverrideSession *s = n->data; - - if (s->client == source_p) - { - session_p = s; - break; - } + session_p = s; + break; } } - if (session_p == NULL) + if (session_p != NULL) + { + rb_dlinkDelete(&session_p->node, &overriding_opers); + } + else { session_p = rb_malloc(sizeof(struct OverrideSession)); session_p->client = source_p; @@ -81,8 +85,7 @@ update_session_deadline(struct Client *source_p, struct OverrideSession *session session_p->deadline = rb_current_time() + 1800; - rb_dlinkDelete(&session_p->node, &overriding_opers); - rb_dlinkAdd(session_p, &session_p->node, &overriding_opers); + rb_dlinkAddTail(session_p, &session_p->node, &overriding_opers); } static void @@ -94,9 +97,11 @@ expire_override_deadlines(void *unused) { struct OverrideSession *session_p = n->data; - if (session_p->deadline > rb_current_time()) + if (session_p->deadline >= rb_current_time()) + { break; - else if (session_p->deadline < rb_current_time()) + } + else { const char *parv[4] = {session_p->client->name, session_p->client->name, "-p", NULL}; user_mode(session_p->client, session_p->client, 3, parv); @@ -108,6 +113,7 @@ 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)) @@ -116,9 +122,7 @@ check_umode_change(void *vdata) if (data->oldumodes & UMODE_OPER && !IsOper(source_p)) source_p->umodes &= ~user_modes['p']; - /* didn't change +p umode, we don't need to do anything */ - if (!((data->oldumodes ^ source_p->umodes) & user_modes['p'])) - return; + changed = ((data->oldumodes ^ source_p->umodes) & user_modes['p']); if (source_p->umodes & user_modes['p']) { @@ -129,12 +133,12 @@ check_umode_change(void *vdata) return; } - update_session_deadline(source_p, NULL); - - 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); + } } - else if (!(source_p->umodes & user_modes['p'])) + else if (changed && !(source_p->umodes & user_modes['p'])) { rb_dlink_node *n, *tn; @@ -145,9 +149,6 @@ check_umode_change(void *vdata) if (session_p->client != source_p) continue; - sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s has disabled oper-override (+p)", - get_oper_name(session_p->client)); - rb_dlinkDelete(n, &overriding_opers); rb_free(session_p); } @@ -167,7 +168,7 @@ hack_channel_access(void *vdata) if (data->client->umodes & user_modes['p']) { - update_session_deadline(data->client, NULL); + update_session_deadline(data->client); data->approved = CHFL_OVERRIDE; /* we only want to report modehacks, which are always non-NULL */ @@ -187,7 +188,7 @@ hack_can_join(void *vdata) if (data->client->umodes & user_modes['p']) { - update_session_deadline(data->client, NULL); + update_session_deadline(data->client); data->approved = 0; sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s is using oper-override on %s (banwalking)", @@ -201,40 +202,13 @@ hack_can_kick(void *vdata) hook_data_channel_approval *data = (hook_data_channel_approval *) vdata; int alevel; - if (data->target->umodes & user_modes['p']) - { - if (data->client->umodes & user_modes['p']) - { - /* Using oper-override to kick an oper - * who's also using oper-override, better - * report what happened. - */ - 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); - } - else - { - /* Like cmode +M, let's report any attempt - * to kick the immune oper. - */ - update_session_deadline(data->target, NULL); - sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s attempted to kick %s from %s (who is +p)", - data->client->name, data->target->name, data->chptr->chname); - sendto_one_numeric(data->client, ERR_ISCHANSERVICE, "%s %s :Cannot kick immune IRC operators.", - data->target->name, data->chptr->chname); - data->approved = 0; - } - return; - } - 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); + update_session_deadline(data->client); 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); } @@ -257,13 +231,30 @@ hack_can_send(void *vdata) if (MyClient(data->client)) { - update_session_deadline(data->client, NULL); + update_session_deadline(data->client); sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s is using oper-override on %s (forcing message)", get_oper_name(data->client), data->chptr->chname); } } } +static void +hack_can_invite(void *vdata) +{ + hook_data_channel_approval *data = vdata; + + if (data->approved == 0) + return; + + if (data->client->umodes & user_modes['p']) + { + data->approved = 0; + update_session_deadline(data->client); + sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s is using oper-override on %s (invite: %s)", + get_oper_name(data->client), data->chptr->chname, data->target->name); + } +} + static void handle_client_exit(void *vdata) { @@ -298,7 +289,7 @@ _modinit(void) { struct Client *client_p = ptr->data; if (IsPerson(client_p) && (client_p->umodes & user_modes['p'])) - update_session_deadline(client_p, NULL); + update_session_deadline(client_p); } expire_override_deadlines_ev = rb_event_add("expire_override_deadlines", expire_override_deadlines, NULL, 60); @@ -309,10 +300,18 @@ _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); }