X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/436cf01700f2b2e11397fe0695d73d29073da196..1fe75e33ccfe31692f20633945cea14db888118a:/modules/core/m_message.c diff --git a/modules/core/m_message.c b/modules/core/m_message.c index 66ddace..c5d852b 100644 --- a/modules/core/m_message.c +++ b/modules/core/m_message.c @@ -21,7 +21,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA * - * $Id: m_message.c 3173 2007-01-31 23:57:18Z jilles $ */ #include "stdinc.h" @@ -43,7 +42,10 @@ #include "send.h" #include "s_newconf.h" #include "s_stats.h" +#include "tgchange.h" #include "inline/stringops.h" +#include "irc_dictionary.h" +#include "channel.h" static int m_message(int, const char *, struct Client *, struct Client *, int, const char **); static int m_privmsg(struct Client *, struct Client *, int, const char **); @@ -52,6 +54,8 @@ static int m_notice(struct Client *, struct Client *, int, const char **); static void expire_tgchange(void *unused); static struct ev_entry *expire_tgchange_event; +struct module_modes ModuleModes; + static int modinit(void) { @@ -90,7 +94,6 @@ 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); @@ -484,6 +487,11 @@ msg_channel(int p_or_n, const char *command, { int result; char text2[BUFSIZE]; + size_t contor; + int caps = 0; + int len = 0; + struct membership *msptr = find_channel_membership(chptr, source_p); + struct Metadata *md; if(MyClient(source_p)) { @@ -492,7 +500,25 @@ msg_channel(int p_or_n, const char *command, source_p->localClient->last = rb_current_time(); } - if(chptr->mode.mode & MODE_NOCOLOR) + if(chptr->mode.mode & ModuleModes.MODE_NOREPEAT) + { + rb_strlcpy(text2, text, BUFSIZE); + strip_unprintable(text2); + md = channel_metadata_find(chptr, "NOREPEAT"); + if(md && (!ConfigChannel.exempt_cmode_K || !is_any_op(msptr))) + { + if(!(strcmp(md->value, text2))) + { + if(p_or_n != NOTICE) + sendto_one_numeric(source_p, 404, "%s :Cannot send to channel - Message blocked due to repeating (+K set)", chptr->chname); + return; + } + } + channel_metadata_delete(chptr, "NOREPEAT", 0); + channel_metadata_add(chptr, "NOREPEAT", text2, 0); + } + + if(chptr->mode.mode & ModuleModes.MODE_NOCOLOR && (!ConfigChannel.exempt_cmode_c || !is_any_op(msptr))) { rb_strlcpy(text2, text, BUFSIZE); strip_colour(text2); @@ -513,13 +539,40 @@ msg_channel(int p_or_n, const char *command, if(result == CAN_SEND_OPV || !flood_attack_channel(p_or_n, source_p, chptr, chptr->chname)) { + if (strlen(text) > 10 && chptr->mode.mode & ModuleModes.MODE_NOCAPS && (!ConfigChannel.exempt_cmode_G || !is_any_op(msptr))) + { + rb_strlcpy(text2, text, BUFSIZE); + strip_unprintable(text2); + for(contor=0; contor < strlen(text2); contor++) + { + if(IsUpper(text2[contor]) && !isdigit(text2[contor])) + caps++; + len++; + } + if(((caps*100)/(len)) >= 50) + { + sendto_one_numeric(source_p, 404, "%s :Cannot send to channel - Your message contains mostly capital letters (+G set)", chptr->chname); + return; + } + } + if (p_or_n != PRIVMSG && chptr->mode.mode & ModuleModes.MODE_NONOTICE && (!ConfigChannel.exempt_cmode_T || !is_any_op(msptr))) + { + sendto_one_numeric(source_p, 404, "%s :Cannot send to channel - Notices are disallowed (+T set)", chptr->chname); + return; + } + if (p_or_n != NOTICE && chptr->mode.mode & ModuleModes.MODE_NOACTION && + !strncasecmp(text + 1, "ACTION", 6) && + (!ConfigChannel.exempt_cmode_D || !is_any_op(msptr))) + { + sendto_one_numeric(source_p, 404, "%s :Cannot send to channel - ACTIONs are disallowed (+D set)", chptr->chname); + return; + } if (p_or_n != NOTICE && *text == '\001' && strncasecmp(text + 1, "ACTION", 6)) { - if (chptr->mode.mode & MODE_NOCTCP) + if (chptr->mode.mode & ModuleModes.MODE_NOCTCP && (!ConfigChannel.exempt_cmode_C || !is_any_op(msptr))) { - sendto_one_numeric(source_p, ERR_CANNOTSENDTOCHAN, - form_str(ERR_CANNOTSENDTOCHAN), chptr->chname); + sendto_one_numeric(source_p, 404, "%s :Cannot send to channel - CTCPs to this channel are disallowed (+C set)", chptr->chname); return; } else if (rb_dlink_list_length(&chptr->locmembers) > (unsigned)(GlobalSetOptions.floodcount / 2)) @@ -529,7 +582,7 @@ msg_channel(int p_or_n, const char *command, "%s %s :%s", command, chptr->chname, text); } } - else if(chptr->mode.mode & MODE_OPMODERATE && + else if(chptr->mode.mode & ModuleModes.MODE_OPMODERATE && (!(chptr->mode.mode & MODE_NOPRIVMSGS) || IsMember(source_p, chptr))) { @@ -566,7 +619,7 @@ msg_channel_opmod(int p_or_n, const char *command, { char text2[BUFSIZE]; - if(chptr->mode.mode & MODE_NOCOLOR) + if(chptr->mode.mode & ModuleModes.MODE_NOCOLOR) { rb_strlcpy(text2, text, BUFSIZE); strip_colour(text2); @@ -581,7 +634,7 @@ msg_channel_opmod(int p_or_n, const char *command, } } - if(chptr->mode.mode & MODE_OPMODERATE && + if(chptr->mode.mode & ModuleModes.MODE_OPMODERATE && (!(chptr->mode.mode & MODE_NOPRIVMSGS) || IsMember(source_p, chptr))) { @@ -642,10 +695,6 @@ msg_channel_flags(int p_or_n, const char *command, struct Client *client_p, command, c, chptr->chname, text); } -#define PREV_FREE_TARGET(x) ((FREE_TARGET(x) == 0) ? 9 : FREE_TARGET(x) - 1) -#define PREV_TARGET(i) ((i == 0) ? i = 9 : --i) -#define NEXT_TARGET(i) ((i == 9) ? i = 0 : ++i) - static void expire_tgchange(void *unused) { @@ -666,77 +715,6 @@ expire_tgchange(void *unused) } } -static int -add_target(struct Client *source_p, struct Client *target_p) -{ - int i, j; - uint32_t hashv; - - /* can msg themselves or services without using any target slots */ - if(source_p == target_p || IsService(target_p)) - return 1; - - /* special condition for those who have had PRIVMSG crippled to allow them - * to talk to IRCops still. - * - * XXX: is this controversial? - */ - if(source_p->localClient->target_last > rb_current_time() && IsOper(target_p)) - return 1; - - hashv = fnv_hash_upper((const unsigned char *)use_id(target_p), 32); - - if(USED_TARGETS(source_p)) - { - /* hunt for an existing target */ - for(i = PREV_FREE_TARGET(source_p), j = USED_TARGETS(source_p); - j; --j, PREV_TARGET(i)) - { - if(source_p->localClient->targets[i] == hashv) - return 1; - } - - /* first message after connect, we may only start clearing - * slots after this message --anfl - */ - if(!IsTGChange(source_p)) - { - SetTGChange(source_p); - source_p->localClient->target_last = rb_current_time(); - } - /* clear as many targets as we can */ - else if((i = (rb_current_time() - source_p->localClient->target_last) / 60)) - { - if(i > USED_TARGETS(source_p)) - USED_TARGETS(source_p) = 0; - else - USED_TARGETS(source_p) -= i; - - source_p->localClient->target_last = rb_current_time(); - } - /* cant clear any, full target list */ - else if(USED_TARGETS(source_p) == 10) - { - ServerStats.is_tgch++; - add_tgchange(source_p->sockhost); - return 0; - } - } - /* no targets in use, reset their target_last so that they cant - * abuse a long idle to get targets back more quickly - */ - else - { - source_p->localClient->target_last = rb_current_time(); - SetTGChange(source_p); - } - - source_p->localClient->targets[FREE_TARGET(source_p)] = hashv; - NEXT_TARGET(FREE_TARGET(source_p)); - ++USED_TARGETS(source_p); - return 1; -} - /* * msg_client * @@ -754,6 +732,10 @@ msg_client(int p_or_n, const char *command, struct Client *source_p, struct Client *target_p, const char *text) { int do_floodcount = 0; + struct Metadata *md; + struct DictionaryIter iter; + int oaccept = 0; + char text3[10]; if(MyClient(source_p)) { @@ -803,13 +785,33 @@ msg_client(int p_or_n, const char *command, if(MyClient(target_p)) { - /* XXX Controversial? allow opers always to send through a +g */ - if(!IsServer(source_p) && (IsSetCallerId(target_p) || + if (IsSetNoCTCP(target_p) && p_or_n != NOTICE && *text == '\001' && strncasecmp(text + 1, "ACTION", 6)) + { + sendto_one_numeric(source_p, ERR_NOCTCP, + form_str(ERR_NOCTCP), + target_p->name); + } + /* If opers want to go through +g, they should load oaccept.*/ + else if(!IsServer(source_p) && !IsService(source_p) && (IsSetCallerId(target_p) || + (IsSetSCallerId(target_p) && !has_common_channel(source_p, target_p)) || (IsSetRegOnlyMsg(target_p) && !source_p->user->suser[0]))) { + if (IsOper(source_p)) + { + rb_snprintf(text3, sizeof(text3), "O%s", source_p->id); + DICTIONARY_FOREACH(md, &iter, target_p->user->metadata) + { + if(!strcmp(md->value, "OACCEPT") && !strcmp(md->name, text3)) + { + oaccept = 1; + break; + } + } + } /* Here is the anti-flood bot/spambot code -db */ - if(accept_message(source_p, target_p) || IsOper(source_p)) + if(accept_message(source_p, target_p) || oaccept) { + add_reply_target(target_p, source_p); sendto_one(target_p, ":%s!%s@%s %s %s :%s", source_p->name, source_p->username, @@ -822,6 +824,13 @@ msg_client(int p_or_n, const char *command, form_str(ERR_NONONREG), target_p->name); } + else if (IsSetSCallerId(target_p) && !has_common_channel(source_p, target_p)) + { + if (p_or_n != NOTICE) + sendto_one_numeric(source_p, ERR_NOCOMMONCHAN, + form_str(ERR_NOCOMMONCHAN), + target_p->name); + } else { /* check for accept, flag recipient incoming message */ @@ -840,6 +849,7 @@ msg_client(int p_or_n, const char *command, form_str(RPL_TARGNOTIFY), target_p->name); + add_reply_target(target_p, source_p); sendto_one(target_p, form_str(RPL_UMODEGMSG), me.name, target_p->name, source_p->name, source_p->username, source_p->host); @@ -849,7 +859,10 @@ msg_client(int p_or_n, const char *command, } } else + { + add_reply_target(target_p, source_p); sendto_anywhere(target_p, source_p, command, ":%s", text); + } } else sendto_anywhere(target_p, source_p, command, ":%s", text); @@ -857,21 +870,6 @@ msg_client(int p_or_n, const char *command, 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 @@ -891,7 +889,7 @@ flood_attack_client(int p_or_n, struct Client *source_p, struct Client *target_p * and msg user@server. * -- jilles */ - if(GlobalSetOptions.floodcount && IsClient(source_p) && source_p != target_p && !IsService(target_p)) + if(GlobalSetOptions.floodcount && IsClient(source_p) && source_p != target_p && !IsService(target_p) && (!IsOper(source_p) || !ConfigFileEntry.true_no_oper_flood)) { if((target_p->first_received_message_time + 1) < rb_current_time()) { @@ -946,7 +944,7 @@ flood_attack_channel(int p_or_n, struct Client *source_p, struct Channel *chptr, { int delta; - if(GlobalSetOptions.floodcount && MyClient(source_p)) + if(GlobalSetOptions.floodcount && MyClient(source_p) && (!IsOper(source_p) || !ConfigFileEntry.true_no_oper_flood)) { if((chptr->first_received_message_time + 1) < rb_current_time()) {