X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/7e8e21a41af94ee0865c71f61c7ba2ee3d4b1b4a..fcda56627d08f75aa3dba0a557dbce38f3bfd42a:/modules/core/m_message.c diff --git a/modules/core/m_message.c b/modules/core/m_message.c index b65527e..c893250 100644 --- a/modules/core/m_message.c +++ b/modules/core/m_message.c @@ -90,15 +90,19 @@ static int build_target_list(int p_or_n, const char *command, struct Client *client_p, struct Client *source_p, const char *nicks_channels, const char *text); +static struct Channel *find_allowing_channel(struct Client *source_p, struct Client *target_p); static int flood_attack_client(int p_or_n, struct Client *source_p, struct Client *target_p); static int flood_attack_channel(int p_or_n, struct Client *source_p, struct Channel *chptr, char *chname); -static struct Client *find_userhost(const char *, const char *, int *); + +/* Fifteen seconds should be plenty for a client to reply a ctcp */ +#define LARGE_CTCP_TIME 15 #define ENTITY_NONE 0 #define ENTITY_CHANNEL 1 -#define ENTITY_CHANOPS_ON_CHANNEL 2 -#define ENTITY_CLIENT 3 +#define ENTITY_CHANNEL_OPMOD 2 +#define ENTITY_CHANOPS_ON_CHANNEL 3 +#define ENTITY_CLIENT 4 static struct entity targets[512]; static int ntargets = 0; @@ -109,6 +113,11 @@ static void msg_channel(int p_or_n, const char *command, struct Client *client_p, struct Client *source_p, struct Channel *chptr, const char *text); +static void msg_channel_opmod(int p_or_n, const char *command, + struct Client *client_p, + struct Client *source_p, struct Channel *chptr, + const char *text); + static void msg_channel_flags(int p_or_n, const char *command, struct Client *client_p, struct Client *source_p, @@ -204,6 +213,11 @@ m_message(int p_or_n, (struct Channel *) targets[i].ptr, parv[2]); break; + case ENTITY_CHANNEL_OPMOD: + msg_channel_opmod(p_or_n, command, client_p, source_p, + (struct Channel *) targets[i].ptr, parv[2]); + break; + case ENTITY_CHANOPS_ON_CHANNEL: msg_channel_flags(p_or_n, command, client_p, source_p, (struct Channel *) targets[i].ptr, @@ -350,7 +364,9 @@ build_target_list(int p_or_n, const char *command, struct Client *client_p, if(!IsServer(source_p) && !IsService(source_p) && !is_chanop_voiced(msptr)) { sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED), - me.name, source_p->name, with_prefix); + get_id(&me, source_p), + get_id(source_p, source_p), + with_prefix); return (-1); } @@ -382,6 +398,32 @@ build_target_list(int p_or_n, const char *command, struct Client *client_p, continue; } + if(IsServer(client_p) && *nick == '=' && nick[1] == '#') + { + nick++; + if((chptr = find_channel(nick)) != NULL) + { + if(!duplicate_ptr(chptr)) + { + if(ntargets >= ConfigFileEntry.max_targets) + { + sendto_one(source_p, form_str(ERR_TOOMANYTARGETS), + me.name, source_p->name, nick); + return (1); + } + targets[ntargets].ptr = (void *) chptr; + targets[ntargets++].type = ENTITY_CHANNEL_OPMOD; + } + } + + /* non existant channel */ + else if(p_or_n != NOTICE) + sendto_one_numeric(source_p, ERR_NOSUCHNICK, + form_str(ERR_NOSUCHNICK), nick); + + continue; + } + /* no matching anything found - error if not NOTICE */ if(p_or_n != NOTICE) { @@ -473,18 +515,71 @@ msg_channel(int p_or_n, const char *command, { sendto_channel_flags(client_p, ALL_MEMBERS, source_p, chptr, "%s %s :%s", command, chptr->chname, text); + if (p_or_n != NOTICE && *text == '\001' && + rb_dlink_list_length(&chptr->locmembers) > (unsigned)(GlobalSetOptions.floodcount / 2)) + source_p->large_ctcp_sent = rb_current_time(); } } else if(chptr->mode.mode & MODE_OPMODERATE && - chptr->mode.mode & MODE_MODERATED && - IsMember(source_p, chptr)) + (!(chptr->mode.mode & MODE_NOPRIVMSGS) || + IsMember(source_p, chptr))) { - /* only do +z for +m channels for now, as bans/quiets - * aren't tested for remote clients -- jilles */ if(!flood_attack_channel(p_or_n, source_p, chptr, chptr->chname)) { - sendto_channel_flags(client_p, ONLY_CHANOPS, source_p, chptr, - "%s %s :%s", command, chptr->chname, text); + sendto_channel_opmod(client_p, source_p, chptr, + command, text); + } + } + else + { + if(p_or_n != NOTICE) + sendto_one_numeric(source_p, ERR_CANNOTSENDTOCHAN, + form_str(ERR_CANNOTSENDTOCHAN), chptr->chname); + } +} +/* + * msg_channel_opmod + * + * inputs - flag privmsg or notice + * - pointer to command "PRIVMSG" or "NOTICE" + * - pointer to client_p + * - pointer to source_p + * - pointer to channel + * output - NONE + * side effects - message given channel ops + * + * XXX - We need to rework this a bit, it's a tad ugly. --nenolod + */ +static void +msg_channel_opmod(int p_or_n, const char *command, + struct Client *client_p, struct Client *source_p, + struct Channel *chptr, const char *text) +{ + char text2[BUFSIZE]; + + if(chptr->mode.mode & MODE_NOCOLOR) + { + rb_strlcpy(text2, text, BUFSIZE); + strip_colour(text2); + text = text2; + if (EmptyString(text)) + { + /* could be empty after colour stripping and + * that would cause problems later */ + if(p_or_n != NOTICE) + sendto_one(source_p, form_str(ERR_NOTEXTTOSEND), me.name, source_p->name); + return; + } + } + + if(chptr->mode.mode & MODE_OPMODERATE && + (!(chptr->mode.mode & MODE_NOPRIVMSGS) || + IsMember(source_p, chptr))) + { + if(!flood_attack_channel(p_or_n, source_p, chptr, chptr->chname)) + { + sendto_channel_opmod(client_p, source_p, chptr, + command, text); } } else @@ -649,6 +744,8 @@ static void msg_client(int p_or_n, const char *command, struct Client *source_p, struct Client *target_p, const char *text) { + int do_floodcount = 0; + if(MyClient(source_p)) { /* reset idle time for message only if its not to self @@ -656,12 +753,16 @@ msg_client(int p_or_n, const char *command, if(p_or_n != NOTICE) source_p->localClient->last = rb_current_time(); + /* auto cprivmsg/cnotice */ + do_floodcount = !IsOper(source_p) && + !find_allowing_channel(source_p, target_p); + /* target change stuff, dont limit ctcp replies as that * would allow people to start filling up random users * targets just by ctcping them */ if((p_or_n != NOTICE || *text != '\001') && - ConfigFileEntry.target_change && !IsOper(source_p)) + ConfigFileEntry.target_change && do_floodcount) { if(!add_target(source_p, target_p)) { @@ -670,6 +771,14 @@ msg_client(int p_or_n, const char *command, return; } } + + if (do_floodcount && p_or_n == NOTICE && *text == '\001' && + target_p->large_ctcp_sent + LARGE_CTCP_TIME >= rb_current_time()) + do_floodcount = 0; + + if (do_floodcount && + flood_attack_client(p_or_n, source_p, target_p)) + return; } else if(source_p->from == target_p->from) { @@ -703,8 +812,6 @@ msg_client(int p_or_n, const char *command, sendto_one_numeric(source_p, ERR_NONONREG, form_str(ERR_NONONREG), target_p->name); - /* Only so opers can watch for floods */ - (void) flood_attack_client(p_or_n, source_p, target_p); } else { @@ -730,29 +837,32 @@ msg_client(int p_or_n, const char *command, target_p->localClient->last_caller_id_time = rb_current_time(); } - /* Only so opers can watch for floods */ - (void) flood_attack_client(p_or_n, source_p, target_p); } } else - { - /* If the client is remote, we dont perform a special check for - * flooding.. as we wouldnt block their message anyway.. this means - * we dont give warnings.. we then check if theyre opered - * (to avoid flood warnings), lastly if theyre our client - * and flooding -- fl */ - if(!MyClient(source_p) || IsOper(source_p) || - !flood_attack_client(p_or_n, source_p, target_p)) - sendto_anywhere(target_p, source_p, command, ":%s", text); - } + sendto_anywhere(target_p, source_p, command, ":%s", text); } - else if(!MyClient(source_p) || IsOper(source_p) || - !flood_attack_client(p_or_n, source_p, target_p)) + else sendto_anywhere(target_p, source_p, command, ":%s", text); return; } +static struct Channel * +find_allowing_channel(struct Client *source_p, struct Client *target_p) +{ + rb_dlink_node *ptr; + struct membership *msptr; + + RB_DLINK_FOREACH(ptr, source_p->user->channel.head) + { + msptr = ptr->data; + if (is_chanop_voiced(msptr) && IsMember(target_p, msptr->chptr)) + return msptr->chptr; + } + return NULL; +} + /* * flood_attack_client * inputs - flag 0 if PRIVMSG 1 if NOTICE. RFC @@ -767,33 +877,38 @@ flood_attack_client(int p_or_n, struct Client *source_p, struct Client *target_p { int delta; - if(GlobalSetOptions.floodcount && MyConnect(target_p) && IsClient(source_p)) + /* Services could get many messages legitimately and + * can be messaged without rate limiting via aliases + * and msg user@server. + * -- jilles + */ + if(GlobalSetOptions.floodcount && IsClient(source_p) && source_p != target_p && !IsService(target_p)) { - if((target_p->localClient->first_received_message_time + 1) < rb_current_time()) + if((target_p->first_received_message_time + 1) < rb_current_time()) { - delta = rb_current_time() - target_p->localClient->first_received_message_time; - target_p->localClient->received_number_of_privmsgs -= delta; - target_p->localClient->first_received_message_time = rb_current_time(); - if(target_p->localClient->received_number_of_privmsgs <= 0) + delta = rb_current_time() - target_p->first_received_message_time; + target_p->received_number_of_privmsgs -= delta; + target_p->first_received_message_time = rb_current_time(); + if(target_p->received_number_of_privmsgs <= 0) { - target_p->localClient->received_number_of_privmsgs = 0; - target_p->localClient->flood_noticed = 0; + target_p->received_number_of_privmsgs = 0; + target_p->flood_noticed = 0; } } - if((target_p->localClient->received_number_of_privmsgs >= - GlobalSetOptions.floodcount) || target_p->localClient->flood_noticed) + if((target_p->received_number_of_privmsgs >= + GlobalSetOptions.floodcount) || target_p->flood_noticed) { - if(target_p->localClient->flood_noticed == 0) + if(target_p->flood_noticed == 0) { sendto_realops_snomask(SNO_BOTS, L_NETWIDE, "Possible Flooder %s[%s@%s] on %s target: %s", source_p->name, source_p->username, source_p->orighost, source_p->servptr->name, target_p->name); - target_p->localClient->flood_noticed = 1; + target_p->flood_noticed = 1; /* add a bit of penalty */ - target_p->localClient->received_number_of_privmsgs += 2; + target_p->received_number_of_privmsgs += 2; } if(MyClient(source_p) && (p_or_n != NOTICE)) sendto_one(source_p, @@ -802,7 +917,7 @@ flood_attack_client(int p_or_n, struct Client *source_p, struct Client *target_p return 1; } else - target_p->localClient->received_number_of_privmsgs++; + target_p->received_number_of_privmsgs++; } return 0; @@ -886,10 +1001,8 @@ handle_special(int p_or_n, const char *command, struct Client *client_p, struct Client *source_p, const char *nick, const char *text) { struct Client *target_p; - char *host; char *server; char *s; - int count; /* user[%host]@server addressed? * NOTE: users can send to user@server, but not user%host@server @@ -904,8 +1017,6 @@ handle_special(int p_or_n, const char *command, struct Client *client_p, return; } - count = 0; - if(!IsOper(source_p)) { if(strchr(nick, '%') || (strncmp(nick, "opers", 5) == 0)) @@ -924,39 +1035,23 @@ handle_special(int p_or_n, const char *command, struct Client *client_p, return; } - *server = '\0'; - - if((host = strchr(nick, '%')) != NULL) - *host++ = '\0'; - /* Check if someones msg'ing opers@our.server */ - if(strcmp(nick, "opers") == 0) + if(strncmp(nick, "opers@", 6) == 0) { sendto_realops_snomask(SNO_GENERAL, L_ALL, "To opers: From: %s: %s", source_p->name, text); return; } - /* - * Look for users which match the destination host - * (no host == wildcard) and if one and one only is - * found connected to me, deliver message! + /* This was not very useful except for bypassing certain + * restrictions. Note that we still allow sending to + * remote servers this way, for messaging pseudoservers + * securely whether they have a service{} block or not. + * -- jilles */ - target_p = find_userhost(nick, host, &count); - - if(target_p != NULL) - { - if(server != NULL) - *server = '@'; - if(host != NULL) - *--host = '%'; - - if(count == 1) - sendto_anywhere(target_p, source_p, command, ":%s", text); - else - sendto_one(source_p, form_str(ERR_TOOMANYTARGETS), - get_id(&me, source_p), get_id(source_p, source_p), nick); - } + sendto_one_numeric(source_p, ERR_NOSUCHNICK, + form_str(ERR_NOSUCHNICK), nick); + return; } /* @@ -1004,41 +1099,8 @@ handle_special(int p_or_n, const char *command, struct Client *client_p, nick + 1, (*nick == '#') ? MATCH_HOST : MATCH_SERVER, "%s $%s :%s", command, nick, text); + if (p_or_n != NOTICE && *text == '\001') + source_p->large_ctcp_sent = rb_current_time(); return; } } - -/* - * find_userhost - find a user@host (server or user). - * inputs - user name to look for - * - host name to look for - * - pointer to count of number of matches found - * outputs - pointer to client if found - * - count is updated - * side effects - none - * - */ -static struct Client * -find_userhost(const char *user, const char *host, int *count) -{ - struct Client *c2ptr; - struct Client *res = NULL; - char *u = LOCAL_COPY(user); - rb_dlink_node *ptr; - *count = 0; - if(collapse(u) != NULL) - { - RB_DLINK_FOREACH(ptr, global_client_list.head) - { - c2ptr = ptr->data; - if(!MyClient(c2ptr)) /* implies mine and an user */ - continue; - if((!host || match(host, c2ptr->host)) && irccmp(u, c2ptr->username) == 0) - { - (*count)++; - res = c2ptr; - } - } - } - return (res); -}