X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/1fbf6db6629fd4b6d66ebf09b654572559432a7e..90728edb58caf951f87d11d73390a7b39f3a48fb:/modules/core/m_message.c diff --git a/modules/core/m_message.c b/modules/core/m_message.c index b53a42e..6f93117 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" @@ -45,6 +44,7 @@ #include "s_stats.h" #include "tgchange.h" #include "inline/stringops.h" +#include "irc_dictionary.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 **); @@ -361,7 +361,7 @@ build_target_list(int p_or_n, const char *command, struct Client *client_p, msptr = find_channel_membership(chptr, source_p); - if(!IsServer(source_p) && !IsService(source_p) && !is_chanop_voiced(msptr) && !IsOverride(source_p)) + if(!IsServer(source_p) && !IsService(source_p) && !is_chanop_voiced(msptr)) { sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED), get_id(&me, source_p), @@ -484,10 +484,11 @@ msg_channel(int p_or_n, const char *command, { int result; char text2[BUFSIZE]; - int contor; + 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)) { @@ -496,6 +497,24 @@ msg_channel(int p_or_n, const char *command, source_p->localClient->last = rb_current_time(); } + if(chptr->mode.mode & 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 & MODE_NOCOLOR && (!ConfigChannel.exempt_cmode_c || !is_any_op(msptr))) { rb_strlcpy(text2, text, BUFSIZE); @@ -519,31 +538,30 @@ msg_channel(int p_or_n, const char *command, { if (strlen(text) > 10 && chptr->mode.mode & MODE_NOCAPS && (!ConfigChannel.exempt_cmode_G || !is_any_op(msptr))) { - for(contor=0; contor < strlen(text); contor++) + rb_strlcpy(text2, text, BUFSIZE); + strip_unprintable(text2); + for(contor=0; contor < strlen(text2); contor++) { - if(IsUpper(text[contor]) && !isdigit(text[contor])) + if(IsUpper(text2[contor]) && !isdigit(text2[contor])) caps++; len++; } if(((caps*100)/(len)) >= 50) { - sendto_one_numeric(source_p, ERR_CANNOTSENDTOCHAN, - form_str(ERR_CANNOTSENDTOCHAN), chptr->chname); + 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 & MODE_NONOTICE && (!ConfigChannel.exempt_cmode_T || !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 - Notices are disallowed (+T set)", chptr->chname); return; } if (p_or_n != NOTICE && chptr->mode.mode & MODE_NOACTION && !strncasecmp(text + 1, "ACTION", 6) && (!ConfigChannel.exempt_cmode_D || !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 - ACTIONs are disallowed (+D set)", chptr->chname); return; } if (p_or_n != NOTICE && *text == '\001' && @@ -551,8 +569,7 @@ msg_channel(int p_or_n, const char *command, { if (chptr->mode.mode & 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)) @@ -713,6 +730,9 @@ msg_client(int p_or_n, const char *command, { int do_floodcount = 0; struct Metadata *md; + struct DictionaryIter iter; + int oaccept = 0; + char text3[10]; if(MyClient(source_p)) { @@ -769,13 +789,24 @@ msg_client(int p_or_n, const char *command, target_p->name); } /* If opers want to go through +g, they should load oaccept.*/ - else if(!IsServer(source_p) && (IsSetCallerId(target_p) || + 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]))) { - md = user_metadata_find(target_p, "OACCEPT"); + 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)) + 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", @@ -783,18 +814,6 @@ msg_client(int p_or_n, const char *command, source_p->username, source_p->host, command, target_p->name, text); } - /* slightly ugly, meh. if anyone can think of a cleaner way to do this, by all means, do it. */ - else if(md) - { - if(!strcmp(md->value, source_p->name)) - { - add_reply_target(target_p, source_p); - sendto_one(target_p, ":%s!%s@%s %s %s :%s", - source_p->name, - source_p->username, - source_p->host, command, target_p->name, text); - } - } else if (IsSetRegOnlyMsg(target_p) && !source_p->user->suser[0]) { if (p_or_n != NOTICE) @@ -867,7 +886,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()) { @@ -922,7 +941,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()) {