X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/5cb843c6a5a514496a8d1ffe2b9b0a0515f22f75..b2c208be091670e3c5259eba77187bae6ac6eece:/modules/core/m_join.c diff --git a/modules/core/m_join.c b/modules/core/m_join.c index 6f28e139..bba9eaf1 100644 --- a/modules/core/m_join.c +++ b/modules/core/m_join.c @@ -41,6 +41,7 @@ #include "modules.h" #include "packet.h" #include "chmode.h" +#include "ratelimit.h" static int m_join(struct Client *, struct Client *, int, const char **); static int ms_join(struct Client *, struct Client *, int, const char **); @@ -89,17 +90,26 @@ static int pargs; */ static struct Channel * check_forward(struct Client *source_p, struct Channel *chptr, - char *key) + char *key, int *err) { int depth = 0, i; + const char *next = NULL; - /* User is +Q */ - if (IsNoForward(source_p)) + /* The caller (m_join) is only interested in the reason + * for the original channel. + */ + if ((*err = can_join(source_p, chptr, key, &next)) == 0) + return chptr; + + /* User is +Q, or forwarding disabled */ + if (IsNoForward(source_p) || !ConfigChannel.use_forward) return NULL; while (depth < 16) { - chptr = find_channel(chptr->mode.forward); + if (next == NULL) + return NULL; + chptr = find_channel(next); /* Can only forward to existing channels */ if (chptr == NULL) return NULL; @@ -112,11 +122,9 @@ check_forward(struct Client *source_p, struct Channel *chptr, /* Don't forward to +Q channel */ if (chptr->mode.mode & MODE_DISFORWARD) return NULL; - i = can_join(source_p, chptr, key); + i = can_join(source_p, chptr, key, &next); if (i == 0) return chptr; - if (i != ERR_INVITEONLYCHAN && i != ERR_NEEDREGGEDNICK && i != ERR_THROTTLE && i != ERR_CHANNELISFULL) - return NULL; depth++; } @@ -125,7 +133,6 @@ check_forward(struct Client *source_p, struct Channel *chptr, /* * m_join - * parv[0] = sender prefix * parv[1] = channel * parv[2] = channel password (key) */ @@ -133,7 +140,7 @@ static int m_join(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { static char jbuf[BUFSIZE]; - struct Channel *chptr = NULL; + struct Channel *chptr = NULL, *chptr2 = NULL; struct ConfItem *aconf; char *name; char *key = NULL; @@ -142,7 +149,6 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p char *p = NULL, *p2 = NULL; char *chanlist; char *mykey; - int successful_join_count = 0; /* Number of channels successfully joined */ jbuf[0] = '\0'; @@ -168,7 +174,8 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p } /* check it begins with # or &, and local chans are disabled */ - else if(!IsChannelName(name)) + else if(!IsChannelName(name) || + ( ConfigChannel.disable_local_channels && name[0] == '&')) { sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL, form_str(ERR_NOSUCHCHANNEL), name); @@ -249,8 +256,10 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p if(moduledata.approved != 0) { +#ifdef XXX_NOTYET sendto_one(source_p, form_str(moduledata.approved), me.name, source_p->name, name); +#endif continue; } @@ -273,14 +282,9 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p { sendto_one(source_p, form_str(ERR_TOOMANYCHANNELS), me.name, source_p->name, name); - if(successful_join_count) - source_p->localClient->last_join_time = rb_current_time(); - return 0; + continue; } - if(flags == 0) /* if channel doesn't exist, don't penalize */ - successful_join_count++; - if(chptr == NULL) /* If I already have a chptr, no point doing this */ { chptr = get_or_create_channel(source_p, name, NULL); @@ -289,35 +293,31 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p { sendto_one(source_p, form_str(ERR_UNAVAILRESOURCE), me.name, source_p->name, name); - if(successful_join_count > 0) - successful_join_count--; continue; } } - if(!IsOper(source_p) && !IsExemptSpambot(source_p)) - check_spambot_warning(source_p, name); - - /* can_join checks for +i key, bans etc */ - if((i = can_join(source_p, chptr, key))) + /* If check_forward returns NULL, they couldn't join and there wasn't a usable forward channel. */ + if(!(chptr2 = check_forward(source_p, chptr, key, &i))) { - if ((i != ERR_NEEDREGGEDNICK && i != ERR_THROTTLE && i != ERR_INVITEONLYCHAN && i != ERR_CHANNELISFULL) || - (!ConfigChannel.use_forward || (chptr = check_forward(source_p, chptr, key)) == NULL)) - { - /* might be wrong, but is there any other better location for such? - * see extensions/chm_operonly.c for other comments on this - * -- dwr - */ - if(i != ERR_CUSTOM) - sendto_one(source_p, form_str(i), me.name, source_p->name, name); + /* might be wrong, but is there any other better location for such? + * see extensions/chm_operonly.c for other comments on this + * -- dwr + */ +#ifdef XXX_NOTYET + if(i != ERR_CUSTOM) + sendto_one(source_p, form_str(i), me.name, source_p->name, name); +#endif + continue; + } + else if(chptr != chptr2) + sendto_one_numeric(source_p, ERR_LINKCHANNEL, form_str(ERR_LINKCHANNEL), name, chptr2->chname); - if(successful_join_count > 0) - successful_join_count--; - continue; - } + chptr = chptr2; - sendto_one_numeric(source_p, ERR_LINKCHANNEL, form_str(ERR_LINKCHANNEL), name, chptr->chname); - } + if(flags == 0 && + !IsOper(source_p) && !IsExemptSpambot(source_p)) + check_spambot_warning(source_p, name); /* add the user to the channel */ add_user_to_channel(chptr, source_p, flags); @@ -329,12 +329,13 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p } chptr->join_count++; + /* credit user for join */ + credit_client_join(source_p); + /* we send the user their join here, because we could have to * send a mode out next. */ - sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN :%s", - source_p->name, - source_p->username, source_p->host, chptr->chname); + send_channel_join(chptr, source_p); /* its a new channel, set +nt and burst. */ if(flags & CHFL_CHANOP) @@ -369,14 +370,12 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p sendto_one(source_p, form_str(RPL_TOPICWHOTIME), me.name, source_p->name, chptr->chname, - chptr->topic_info, chptr->topic_time); + chptr->topic_info, + (unsigned long)chptr->topic_time); } channel_member_names(chptr, source_p, 1); - if(successful_join_count) - source_p->localClient->last_join_time = rb_current_time(); - hook_info.client = source_p; hook_info.chptr = chptr; hook_info.key = key; @@ -388,7 +387,6 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p /* * ms_join - * parv[0] = sender prefix * parv[1] = channel TS * parv[2] = channel * parv[3] = "+", formerly channel modes but now unused @@ -403,7 +401,6 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char * time_t newts; int isnew; int keep_our_modes = YES; - int keep_new_modes = YES; rb_dlink_node *ptr, *next_ptr; /* special case for join 0 */ @@ -465,8 +462,6 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char * keep_our_modes = NO; chptr->channelts = newts; } - else - keep_new_modes = NO; /* Lost the TS, other side wins, so remove modes on this side */ if(!keep_our_modes) @@ -493,6 +488,9 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char * source_p->servptr->name, chptr->chname, modebuf, parabuf); *modebuf = *parabuf = '\0'; + + /* since we're dropping our modes, we want to clear the mlock as well. --nenolod */ + set_channel_mlock(client_p, source_p, chptr, NULL, FALSE); } if(!IsMember(source_p, chptr)) @@ -505,9 +503,7 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char * chptr->join_delta = rb_current_time(); } chptr->join_count++; - sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN :%s", - source_p->name, source_p->username, - source_p->host, chptr->chname); + send_channel_join(chptr, source_p); } sendto_server(client_p, chptr, CAP_TS6, NOCAPS, @@ -653,12 +649,15 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char { /* If configured, kick people trying to join +i/+k * channels by recreating them on split servers. - * Don't kick if the source has sent EOB (services - * deopping everyone by TS-1 SJOIN). + * If the source has sent EOB, assume this is some + * sort of hack by services. If cmode +i is set, + * services can send kicks if needed; if the key + * differs, services cannot kick in a race-free + * manner so do so here. * -- jilles */ if (ConfigChannel.kick_on_split_riding && - !HasSentEob(source_p) && - ((mode.mode & MODE_INVITEONLY) || + ((!HasSentEob(source_p) && + mode.mode & MODE_INVITEONLY) || (mode.key[0] != 0 && irccmp(mode.key, oldmode->key) != 0))) { struct membership *msptr; @@ -753,6 +752,9 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char /* Update capitalization in channel name, this makes the * capitalization timestamped like modes are -- jilles */ strcpy(chptr->chname, parv[2]); + + /* since we're dropping our modes, we want to clear the mlock as well. --nenolod */ + set_channel_mlock(client_p, source_p, chptr, NULL, FALSE); } if(*modebuf != '\0') @@ -847,9 +849,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char if(!IsMember(target_p, chptr)) { add_user_to_channel(chptr, target_p, fl); - sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN :%s", - target_p->name, - target_p->username, target_p->host, parv[2]); + send_channel_join(chptr, target_p); joins++; } @@ -958,8 +958,6 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char * output - NONE * side effects - Use has decided to join 0. This is legacy * from the days when channels were numbers not names. *sigh* - * There is a bunch of evilness necessary here due to - * anti spambot code. */ static void do_join_0(struct Client *client_p, struct Client *source_p) @@ -974,12 +972,12 @@ do_join_0(struct Client *client_p, struct Client *source_p) sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s JOIN 0", use_id(source_p)); - if(source_p->user->channel.head && MyConnect(source_p) && - !IsOper(source_p) && !IsExemptSpambot(source_p)) - check_spambot_warning(source_p, NULL); - while((ptr = source_p->user->channel.head)) { + if(MyConnect(source_p) && + !IsOper(source_p) && !IsExemptSpambot(source_p)) + check_spambot_warning(source_p, NULL); + msptr = ptr->data; chptr = msptr->chptr; sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s PART %s", @@ -992,27 +990,36 @@ do_join_0(struct Client *client_p, struct Client *source_p) static int check_channel_name_loc(struct Client *source_p, const char *name) { + const char *p; + s_assert(name != NULL); if(EmptyString(name)) return 0; if(ConfigFileEntry.disable_fake_channels && !IsOper(source_p)) { - for(; *name; ++name) + for(p = name; *p; ++p) { - if(!IsChanChar(*name) || IsFakeChanChar(*name)) + if(!IsChanChar(*p) || IsFakeChanChar(*p)) return 0; } } else { - for(; *name; ++name) + for(p = name; *p; ++p) { - if(!IsChanChar(*name)) + if(!IsChanChar(*p)) return 0; } } + if(ConfigChannel.only_ascii_channels) + { + for(p = name; *p; ++p) + if(*p < 33 || *p > 126) + return 0; + } + return 1; } @@ -1123,7 +1130,8 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode) len = rb_sprintf(pbuf, "%d:%d ", mode->join_num, mode->join_time); pbuf += len; } - if(mode->forward[0] && strcmp(oldmode->forward, mode->forward) && ConfigChannel.use_forward) + if(mode->forward[0] && strcmp(oldmode->forward, mode->forward) && + ConfigChannel.use_forward) { if(dir != MODE_ADD) { @@ -1264,7 +1272,8 @@ remove_ban_list(struct Channel *chptr, struct Client *source_p, banptr = ptr->data; /* trailing space, and the mode letter itself */ - plen = strlen(banptr->banstr) + 2; + plen = strlen(banptr->banstr) + + (banptr->forward ? strlen(banptr->forward) + 1 : 0) + 2; if(count >= MAXMODEPARAMS || (cur_len + plen) > BUFSIZE - 4) { @@ -1282,7 +1291,10 @@ remove_ban_list(struct Channel *chptr, struct Client *source_p, *mbuf++ = c; cur_len += plen; - pbuf += rb_sprintf(pbuf, "%s ", banptr->banstr); + if (banptr->forward) + pbuf += rb_sprintf(pbuf, "%s$%s ", banptr->banstr, banptr->forward); + else + pbuf += rb_sprintf(pbuf, "%s ", banptr->banstr); count++; free_ban(banptr);