X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/169c767d3d68d3317def672087d5adc98bace917..72dee03d507dbcff6f865ff2c1660166cb4eef9e:/modules/m_services.c diff --git a/modules/m_services.c b/modules/m_services.c index a78cc7f2..a1c93be6 100644 --- a/modules/m_services.c +++ b/modules/m_services.c @@ -48,6 +48,12 @@ #include "whowas.h" #include "monitor.h" +static int _modinit(void); +static void _moddeinit(void); + +static void mark_services(void); +static void unmark_services(void); + static int me_su(struct Client *, struct Client *, int, const char **); static int me_login(struct Client *, struct Client *, int, const char **); static int me_rsfnc(struct Client *, struct Client *, int, const char **); @@ -56,6 +62,8 @@ static int me_nickdelay(struct Client *, struct Client *, int, const char **); static void h_svc_server_introduced(hook_data_client *); static void h_svc_whois(hook_data_client *); static void h_svc_stats(hook_data_int *); +static void h_svc_conf_read_start(void *); +static void h_svc_conf_read_end(void *); struct Message su_msgtab = { "SU", 0, 0, 0, MFLG_SLOW, @@ -74,7 +82,7 @@ struct Message nickdelay_msgtab = { {mg_unreg, mg_ignore, mg_ignore, mg_ignore, {me_nickdelay, 3}, mg_ignore} }; -mapi_clist_av1 services_clist[] = { +mapi_clist_av1 services_clist[] = { &su_msgtab, &login_msgtab, &rsfnc_msgtab, &nickdelay_msgtab, NULL }; mapi_hfn_list_av1 services_hfnlist[] = { @@ -82,10 +90,25 @@ mapi_hfn_list_av1 services_hfnlist[] = { { "doing_whois", (hookfn) h_svc_whois }, { "doing_whois_global", (hookfn) h_svc_whois }, { "server_introduced", (hookfn) h_svc_server_introduced }, + { "conf_read_start", (hookfn) h_svc_conf_read_start }, + { "conf_read_end", (hookfn) h_svc_conf_read_end }, { NULL, NULL } }; -DECLARE_MODULE_AV1(services, NULL, NULL, services_clist, NULL, services_hfnlist, "$Revision: 1907 $"); +DECLARE_MODULE_AV1(services, _modinit, _moddeinit, services_clist, NULL, services_hfnlist, "$Revision: 1907 $"); + +static int +_modinit(void) +{ + mark_services(); + return 0; +} + +static void +_moddeinit(void) +{ + unmark_services(); +} static int me_su(struct Client *client_p, struct Client *source_p, @@ -94,7 +117,11 @@ me_su(struct Client *client_p, struct Client *source_p, struct Client *target_p; if(!(source_p->flags & FLAGS_SERVICE)) + { + sendto_realops_snomask(SNO_GENERAL, L_ALL, + "Non-service server %s attempting to execute services-only command SU", source_p->name); return 0; + } if((target_p = find_client(parv[1])) == NULL) return 0; @@ -107,6 +134,10 @@ me_su(struct Client *client_p, struct Client *source_p, else rb_strlcpy(target_p->user->suser, parv[2], sizeof(target_p->user->suser)); + sendto_common_channels_local_butone(target_p, CLICAP_ACCOUNT_NOTIFY, NOCAPS, ":%s!%s@%s ACCOUNT %s", + target_p->name, target_p->username, target_p->host, + EmptyString(target_p->user->suser) ? "*" : target_p->user->suser); + invalidate_bancache_user(target_p); return 0; @@ -123,27 +154,6 @@ me_login(struct Client *client_p, struct Client *source_p, return 0; } -static int -clean_nick(const char *nick) -{ - int len = 0; - - if(EmptyString(nick) || *nick == '-' || IsDigit(*nick)) - return 0; - - for(; *nick; nick++) - { - len++; - if(!IsNickChar(*nick)) - return 0; - } - - if(len >= NICKLEN) - return 0; - - return 1; -} - static int me_rsfnc(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) @@ -154,7 +164,11 @@ me_rsfnc(struct Client *client_p, struct Client *source_p, char note[NICKLEN + 10]; if(!(source_p->flags & FLAGS_SERVICE)) + { + sendto_realops_snomask(SNO_GENERAL, L_ALL, + "Non-service server %s attempting to execute services-only command RSFNC", source_p->name); return 0; + } if((target_p = find_person(parv[1])) == NULL) return 0; @@ -162,7 +176,7 @@ me_rsfnc(struct Client *client_p, struct Client *source_p, if(!MyClient(target_p)) return 0; - if(!clean_nick(parv[2])) + if(!is_valid_nick(parv[2])) return 0; curts = atol(parv[4]); @@ -179,11 +193,11 @@ me_rsfnc(struct Client *client_p, struct Client *source_p, char buf[BUFSIZE]; /* this would be one hell of a race condition to trigger - * this one given the tsinfo check above, but its here for + * this one given the tsinfo check above, but its here for * safety --anfl */ if(target_p == exist_p) - return 0; + goto doit; if(MyClient(exist_p)) sendto_one(exist_p, ":%s KILL %s :(Nickname regained by services)", @@ -192,14 +206,20 @@ me_rsfnc(struct Client *client_p, struct Client *source_p, exist_p->flags |= FLAGS_KILLED; /* Do not send kills to servers for unknowns -- jilles */ if(IsClient(exist_p)) + { kill_client_serv_butone(NULL, exist_p, "%s (Nickname regained by services)", me.name); + sendto_realops_snomask(SNO_SKILL, L_ALL, + "Nick collision due to services forced nick change on %s", + parv[2]); + } - snprintf(buf, sizeof(buf), "Killed (%s (Nickname regained by services))", + rb_snprintf(buf, sizeof(buf), "Killed (%s (Nickname regained by services))", me.name); exit_client(NULL, exist_p, &me, buf); } +doit: newts = atol(parv[3]); /* timestamp is older than 15mins, ignore it */ @@ -217,7 +237,7 @@ me_rsfnc(struct Client *client_p, struct Client *source_p, target_p->name, parv[2], target_p->username, target_p->host); - sendto_common_channels_local(target_p, ":%s!%s@%s NICK :%s", + sendto_common_channels_local(target_p, NOCAPS, NOCAPS, ":%s!%s@%s NICK :%s", target_p->name, target_p->username, target_p->host, parv[2]); @@ -226,7 +246,7 @@ me_rsfnc(struct Client *client_p, struct Client *source_p, use_id(target_p), parv[2], (long) target_p->tsinfo); del_from_client_hash(target_p->name, target_p); - strcpy(target_p->name, parv[2]); + rb_strlcpy(target_p->name, parv[2], NICKLEN); add_to_client_hash(target_p->name, target_p); monitor_signon(target_p); @@ -240,7 +260,6 @@ me_rsfnc(struct Client *client_p, struct Client *source_p, /* ** me_nickdelay -** parv[0] = sender prefix ** parv[1] = duration in seconds (0 to remove) ** parv[2] = nick */ @@ -251,7 +270,11 @@ me_nickdelay(struct Client *client_p, struct Client *source_p, int parc, const c struct nd_entry *nd; if(!(source_p->flags & FLAGS_SERVICE)) + { + sendto_realops_snomask(SNO_GENERAL, L_ALL, + "Non-service server %s attempting to execute services-only command NICKDELAY", source_p->name); return 0; + } duration = atoi(parv[1]); if (duration <= 0) @@ -303,9 +326,8 @@ h_svc_whois(hook_data_client *data) if(*p == '\0') p = data->target->user->suser; - sendto_one(data->client, form_str(RPL_WHOISLOGGEDIN), - get_id(&me, data->client), - get_id(data->client, data->client), + sendto_one_numeric(data->client, RPL_WHOISLOGGEDIN, + form_str(RPL_WHOISLOGGEDIN), data->target->name, p); } } @@ -322,7 +344,48 @@ h_svc_stats(hook_data_int *data) { sendto_one_numeric(data->client, RPL_STATSULINE, form_str(RPL_STATSULINE), - ptr->data, "*", "*", "s"); + (const char *)ptr->data, "*", "*", "s"); } } } + +static void +h_svc_conf_read_start(void *dummy) +{ + unmark_services(); +} + +static void +unmark_services(void) +{ + struct Client *target_p; + rb_dlink_node *ptr; + + RB_DLINK_FOREACH(ptr, global_serv_list.head) + { + target_p = ptr->data; + + target_p->flags &= ~FLAGS_SERVICE; + } +} + +static void +h_svc_conf_read_end(void *dummy) +{ + mark_services(); +} + +static void +mark_services(void) +{ + struct Client *target_p; + rb_dlink_node *ptr; + + RB_DLINK_FOREACH(ptr, service_list.head) + { + target_p = find_server(NULL, (const char *)ptr->data); + + if (target_p) + target_p->flags |= FLAGS_SERVICE; + } +}