X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ircd%2Fm_mode.c;h=e85398d26646e57790efc55f261ebbaaeeb5e04f;hb=refs%2Fheads%2Fupstream;hp=e3c6a21a4d9e35744732c1d131b8186cdd5fa6b0;hpb=a30376ba71c16ef1a13d78a8485afa9a30270740;p=ircu2.10.12-pk.git diff --git a/ircd/m_mode.c b/ircd/m_mode.c index e3c6a21..e85398d 100644 --- a/ircd/m_mode.c +++ b/ircd/m_mode.c @@ -79,11 +79,15 @@ * note: it is guaranteed that parv[0]..parv[parc-1] are all * non-NULL pointers. */ +#include "config.h" + #include "handlers.h" #include "channel.h" #include "client.h" #include "hash.h" #include "ircd.h" +#include "ircd_features.h" +#include "ircd_log.h" #include "ircd_reply.h" #include "ircd_string.h" #include "msg.h" @@ -94,11 +98,10 @@ #include "s_user.h" #include "send.h" -#include +/* #include -- Now using assert in ircd_log.h */ #include #include -#ifdef CONFIG_NEW_MODE int m_mode(struct Client *cptr, struct Client *sptr, int parc, char *parv[]) { @@ -109,13 +112,27 @@ m_mode(struct Client *cptr, struct Client *sptr, int parc, char *parv[]) if (parc < 2) return need_more_params(sptr, "MODE"); - clean_channelname(parv[1]); + if (!IsChannelName(parv[1]) || !(chptr = FindChannel(parv[1]))) + { + struct Client *acptr; + + acptr = FindUser(parv[1]); + if (!acptr) + { + send_reply(sptr, ERR_NOSUCHCHANNEL, parv[1]); + return 0; + } + else if (sptr != acptr) + { + send_reply(sptr, ERR_USERSDONTMATCH); + return 0; + } + return set_user_mode(cptr, sptr, parc, parv, ALLOWMODES_ANY); + } - if (('#' != *parv[1] && '&' != *parv[1] && '+' != *parv[1]) || - !(chptr = FindChannel(parv[1]))) - return set_user_mode(cptr, sptr, parc, parv); + ClrFlag(sptr, FLAG_TS8); - sptr->flags &= ~FLAGS_TS8; + member = find_member_link(chptr, sptr); if (parc < 3) { char modebuf[MODEBUFLEN]; @@ -123,33 +140,32 @@ m_mode(struct Client *cptr, struct Client *sptr, int parc, char *parv[]) *modebuf = *parabuf = '\0'; modebuf[1] = '\0'; - channel_modes(sptr, modebuf, parabuf, chptr); + channel_modes(sptr, modebuf, parabuf, sizeof(parabuf), chptr, member); send_reply(sptr, RPL_CHANNELMODEIS, chptr->chname, modebuf, parabuf); send_reply(sptr, RPL_CREATIONTIME, chptr->chname, chptr->creationtime); return 0; } - if (!(member = find_member_link(chptr, sptr)) || !IsChanOp(member)) { -#ifdef OPER_MODE_LCHAN - if (IsOperOnLocalChannel(sptr, chptr->chname)) { + if (!member || !IsChanOp(member)) { + if (IsLocalChannel(chptr->chname) && HasPriv(sptr, PRIV_MODE_LCHAN)) { modebuf_init(&mbuf, sptr, cptr, chptr, (MODEBUF_DEST_CHANNEL | /* Send mode to channel */ MODEBUF_DEST_HACK4)); /* Send HACK(4) notice */ mode_parse(&mbuf, cptr, sptr, chptr, parc - 2, parv + 2, (MODE_PARSE_SET | /* Set the mode */ - MODE_PARSE_FORCE)); /* Force it to take */ + MODE_PARSE_FORCE), /* Force it to take */ + member); return modebuf_flush(&mbuf); } else -#endif mode_parse(0, cptr, sptr, chptr, parc - 2, parv + 2, - (member ? MODE_PARSE_NOTOPER : MODE_PARSE_NOTMEMBER)); + (member ? MODE_PARSE_NOTOPER : MODE_PARSE_NOTMEMBER), member); return 0; } modebuf_init(&mbuf, sptr, cptr, chptr, (MODEBUF_DEST_CHANNEL | /* Send mode to channel */ MODEBUF_DEST_SERVER)); /* Send mode to servers */ - mode_parse(&mbuf, cptr, sptr, chptr, parc - 2, parv + 2, MODE_PARSE_SET); + mode_parse(&mbuf, cptr, sptr, chptr, parc - 2, parv + 2, MODE_PARSE_SET, member); return modebuf_flush(&mbuf); } @@ -166,27 +182,51 @@ ms_mode(struct Client *cptr, struct Client *sptr, int parc, char *parv[]) if (IsLocalChannel(parv[1])) return 0; - if (('#' != *parv[1] && '+' != *parv[1])|| !(chptr = FindChannel(parv[1]))) - return set_user_mode(cptr, sptr, parc, parv); + if (!(chptr = FindChannel(parv[1]))) + { + struct Client *acptr; - sptr->flags &= ~FLAGS_TS8; + acptr = FindUser(parv[1]); + if (!acptr) + { + return 0; + } + else if (sptr != acptr) + { + sendwallto_group_butone(&me, WALL_WALLOPS, 0, + "MODE for User %s from %s!%s", parv[1], + cli_name(cptr), cli_name(sptr)); + return 0; + } + return set_user_mode(cptr, sptr, parc, parv, ALLOWMODES_ANY); + } + + ClrFlag(sptr, FLAG_TS8); if (IsServer(sptr)) { - if (find_conf_byhost(cptr->confs, sptr->name, CONF_UWORLD)) + if (find_conf_byhost(cli_confs(cptr), cli_name(sptr), CONF_UWORLD)) modebuf_init(&mbuf, sptr, cptr, chptr, (MODEBUF_DEST_CHANNEL | /* Send mode to clients */ MODEBUF_DEST_SERVER | /* Send mode to servers */ MODEBUF_DEST_HACK4)); /* Send a HACK(4) message */ - else + else if (!feature_bool(FEAT_OPLEVELS)) modebuf_init(&mbuf, sptr, cptr, chptr, (MODEBUF_DEST_CHANNEL | /* Send mode to clients */ MODEBUF_DEST_SERVER | /* Send mode to servers */ MODEBUF_DEST_HACK3)); /* Send a HACK(3) message */ + else + /* Servers need to be able to op people who join using the Apass + * or upass, as well as people joining a zannel, therefore we do + * not generate HACK3 when oplevels are on. */ + modebuf_init(&mbuf, sptr, cptr, chptr, + (MODEBUF_DEST_CHANNEL | /* Send mode to clients */ + MODEBUF_DEST_SERVER)); /* Send mode to servers */ mode_parse(&mbuf, cptr, sptr, chptr, parc - 2, parv + 2, (MODE_PARSE_SET | /* Set the mode */ MODE_PARSE_STRICT | /* Interpret it strictly */ - MODE_PARSE_FORCE)); /* And force it to be accepted */ + MODE_PARSE_FORCE), /* And force it to be accepted */ + NULL); } else { if (!(member = find_member_link(chptr, sptr)) || !IsChanOp(member)) { modebuf_init(&mbuf, sptr, cptr, chptr, @@ -196,7 +236,8 @@ ms_mode(struct Client *cptr, struct Client *sptr, int parc, char *parv[]) MODEBUF_DEST_BOUNCE)); /* And bounce the MODE */ mode_parse(&mbuf, cptr, sptr, chptr, parc - 2, parv + 2, (MODE_PARSE_STRICT | /* Interpret it strictly */ - MODE_PARSE_BOUNCE)); /* And bounce the MODE */ + MODE_PARSE_BOUNCE), /* And bounce the MODE */ + member); } else { modebuf_init(&mbuf, sptr, cptr, chptr, (MODEBUF_DEST_CHANNEL | /* Send mode to clients */ @@ -204,320 +245,10 @@ ms_mode(struct Client *cptr, struct Client *sptr, int parc, char *parv[]) mode_parse(&mbuf, cptr, sptr, chptr, parc - 2, parv + 2, (MODE_PARSE_SET | /* Set the mode */ MODE_PARSE_STRICT | /* Interpret it strictly */ - MODE_PARSE_FORCE)); /* And force it to be accepted */ + MODE_PARSE_FORCE), /* And force it to be accepted */ + member); } } return modebuf_flush(&mbuf); } -#else /* CONFIG_NEW_MODE */ -/* - * m_mode - generic message handler - */ -int m_mode(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) -{ - int badop; - int sendts; - struct Channel* chptr = 0; - char modebuf[MODEBUFLEN]; - char parabuf[MODEBUFLEN]; - char nparabuf[MODEBUFLEN]; - - - if (parc < 2) - return need_more_params(sptr, "MODE"); - - /* - * if local user, cleanup channel name, don't allow local channel operations - * for remote clients - */ - if (MyUser(sptr)) - clean_channelname(parv[1]); - else if (IsLocalChannel(parv[1])) - return 0; - - /* - * try to find the channel - */ - if ('#' == *parv[1] || '&' == *parv[1] || '+' == *parv[1]) - chptr = FindChannel(parv[1]); - if (!chptr) - return set_user_mode(cptr, sptr, parc, parv); - - sptr->flags &= ~FLAGS_TS8; - /* - * sending an error wasnt good, lets just send an empty mode reply.. poptix - */ - if (IsModelessChannel(chptr->chname)) { - if (IsUser(sptr)) - send_reply(sptr, RPL_CHANNELMODEIS, chptr->chname, "+nt", ""); - return 0; - } - - if (parc < 3) { - /* - * no parameters, send channel modes - */ - *modebuf = *parabuf = '\0'; - modebuf[1] = '\0'; - channel_modes(sptr, modebuf, parabuf, chptr); - send_reply(sptr, RPL_CHANNELMODEIS, chptr->chname, modebuf, parabuf); - send_reply(sptr, RPL_CREATIONTIME, chptr->chname, chptr->creationtime); - return 0; - } - - LocalChanOperMode = 0; - - if (!(sendts = set_mode(cptr, sptr, chptr, parc - 2, parv + 2, - modebuf, parabuf, nparabuf, &badop))) { - send_reply(sptr, (find_channel_member(sptr, chptr) ? - ERR_CHANOPRIVSNEEDED : ERR_NOTONCHANNEL), chptr->chname); - return 0; - } - - if (badop >= 2) - send_hack_notice(cptr, sptr, parc, parv, badop, 1); /* XXX DYING */ - - if (strlen(modebuf) > 1 || sendts > 0) { - if (badop != 2 && strlen(modebuf) > 1) { -#ifdef OPER_MODE_LCHAN - if (LocalChanOperMode) { - sendcmdto_channel_butserv(&me, CMD_MODE, chptr, "%H %s %s", chptr, - modebuf, parabuf); - sendto_opmask_butone(0, SNO_HACK4, "OPER MODE: %C MODE %H %s %s", - sptr, chptr, modebuf, parabuf); - } - else -#endif - sendcmdto_channel_butserv(sptr, CMD_MODE, chptr, "%H %s %s", chptr, - modebuf, parabuf); - } - if (IsLocalChannel(chptr->chname)) - return 0; - /* We send a creationtime of 0, to mark it as a hack --Run */ - if (IsServer(sptr) && (badop == 2 || sendts > 0)) { - if (*modebuf == '\0') - strcpy(modebuf, "+"); - if (badop != 2) { - sendcmdto_serv_butone(sptr, CMD_MODE, cptr, "%H %s %s %Tu", chptr, - modebuf, nparabuf, (badop == 4) ? (time_t) 0 : - chptr->creationtime); - } - } - else { - sendcmdto_serv_butone(sptr, CMD_MODE, cptr, "%H %s %s", chptr, modebuf, - nparabuf); - } - } - return 0; -} - -/* - * ms_mode - server message handler - */ -int ms_mode(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) -{ - int badop; - int sendts; - struct Channel* chptr = 0; - char modebuf[MODEBUFLEN]; - char parabuf[MODEBUFLEN]; - char nparabuf[MODEBUFLEN]; - - if (parc < 2) - return need_more_params(sptr, "MODE"); - - /* - * if local user, cleanup channel name, don't allow local channel operations - * for remote clients - */ - if (MyUser(sptr)) - clean_channelname(parv[1]); - else if (IsLocalChannel(parv[1])) - return 0; - - /* - * try to find the channel - */ - if ('#' == *parv[1] || '&' == *parv[1] || '+' == *parv[1]) - chptr = FindChannel(parv[1]); - if (!chptr) - return set_user_mode(cptr, sptr, parc, parv); - - sptr->flags &= ~FLAGS_TS8; - /* - * sending an error wasnt good, lets just send an empty mode reply.. poptix - */ - if (IsModelessChannel(chptr->chname)) { - if (IsUser(sptr)) - send_reply(sptr, RPL_CHANNELMODEIS, chptr->chname, "+nt", ""); - return 0; - } - - if (parc < 3) { - /* - * no parameters, send channel modes - */ - *modebuf = *parabuf = '\0'; - modebuf[1] = '\0'; - channel_modes(sptr, modebuf, parabuf, chptr); - send_reply(sptr, RPL_CHANNELMODEIS, chptr->chname, modebuf, parabuf); - send_reply(sptr, RPL_CREATIONTIME, chptr->chname, chptr->creationtime); - return 0; - } - - LocalChanOperMode = 0; - - if (!(sendts = set_mode(cptr, sptr, chptr, parc - 2, parv + 2, - modebuf, parabuf, nparabuf, &badop))) { - send_reply(sptr, (find_channel_member(sptr, chptr) ? - ERR_CHANOPRIVSNEEDED : ERR_NOTONCHANNEL), chptr->chname); - return 0; - } - - if (badop >= 2) - send_hack_notice(cptr, sptr, parc, parv, badop, 1); /* XXX DYING */ - - if (strlen(modebuf) > 1 || sendts > 0) { - if (badop != 2 && strlen(modebuf) > 1) { -#ifdef OPER_MODE_LCHAN - if (LocalChanOperMode) { - sendcmdto_channel_butserv(&me, CMD_MODE, chptr, "%H %s %s", chptr, - modebuf, parabuf); - sendto_opmask_butone(0, SNO_HACK4, "OPER MODE: %C MODE %H %s %s", - sptr, chptr, modebuf, parabuf); - } - else -#endif - sendcmdto_channel_butserv(sptr, CMD_MODE, chptr, "%H %s %s", chptr, - modebuf, parabuf); - } - if (IsLocalChannel(chptr->chname)) - return 0; - /* We send a creationtime of 0, to mark it as a hack --Run */ - if (IsServer(sptr) && (badop == 2 || sendts > 0)) { - if (*modebuf == '\0') - strcpy(modebuf, "+"); - if (badop != 2) { - sendcmdto_serv_butone(sptr, CMD_MODE, cptr, "%H %s %s %Tu", chptr, - modebuf, nparabuf, (badop == 4) ? (time_t) 0 : - chptr->creationtime); - } - } - else { - sendcmdto_serv_butone(sptr, CMD_MODE, cptr, "%H %s %s", chptr, modebuf, - nparabuf); - } - } - return 0; -} -#endif /* CONFIG_NEW_MODE */ - -#if 0 -/* - * m_mode - * parv[0] - sender - * parv[1] - channel - */ -int m_mode(struct Client *cptr, struct Client *sptr, int parc, char *parv[]) -{ - int badop; - int sendts; - struct Channel* chptr = 0; - - if (parc < 2) - return need_more_params(sptr, "MODE"); - - /* - * if local user, cleanup channel name, don't allow local channel operations - * for remote clients - */ - if (MyUser(sptr)) - clean_channelname(parv[1]); - else if (IsLocalChannel(parv[1])) - return 0; - - /* - * try to find the channel - */ - if ('#' == *parv[1] || '&' == *parv[1] || '+' == *parv[1]) - chptr = FindChannel(parv[1]); - if (!chptr) - return set_user_mode(cptr, sptr, parc, parv); - - sptr->flags &= ~FLAGS_TS8; - /* - * sending an error wasnt good, lets just send an empty mode reply.. poptix - */ - if (IsModelessChannel(chptr->chname)) { - if (IsUser(sptr)) - sendto_one(sptr, rpl_str(RPL_CHANNELMODEIS), me.name, parv[0], /* XXX DEAD */ - chptr->chname, "+nt", ""); - return 0; - } - - if (parc < 3) { - /* - * no parameters, send channel modes - */ - *modebuf = *parabuf = '\0'; - modebuf[1] = '\0'; - channel_modes(sptr, modebuf, parabuf, chptr); - sendto_one(sptr, rpl_str(RPL_CHANNELMODEIS), me.name, parv[0], /* XXX DEAD */ - chptr->chname, modebuf, parabuf); - sendto_one(sptr, rpl_str(RPL_CREATIONTIME), me.name, parv[0], /* XXX DEAD */ - chptr->chname, chptr->creationtime); - return 0; - } - - LocalChanOperMode = 0; - - if (!(sendts = set_mode(cptr, sptr, chptr, parc - 2, parv + 2, - modebuf, parabuf, nparabuf, &badop))) { - sendto_one(sptr, err_str(find_channel_member(sptr, chptr) ? ERR_CHANOPRIVSNEEDED : /* XXX DEAD */ - ERR_NOTONCHANNEL), me.name, parv[0], chptr->chname); - return 0; - } - - if (badop >= 2) - send_hack_notice(cptr, sptr, parc, parv, badop, 1); - - if (strlen(modebuf) > 1 || sendts > 0) { - if (badop != 2 && strlen(modebuf) > 1) { -#ifdef OPER_MODE_LCHAN - if (LocalChanOperMode) { - sendto_channel_butserv(chptr, &me, ":%s MODE %s %s %s", /* XXX DEAD */ - me.name, chptr->chname, modebuf, parabuf); - sendto_op_mask(SNO_HACK4,"OPER MODE: %s MODE %s %s %s", /* XXX DEAD */ - me.name, chptr->chname, modebuf, parabuf); - } - else -#endif - sendto_channel_butserv(chptr, sptr, ":%s MODE %s %s %s", /* XXX DEAD */ - parv[0], chptr->chname, modebuf, parabuf); - } - if (IsLocalChannel(chptr->chname)) - return 0; - /* We send a creationtime of 0, to mark it as a hack --Run */ - if (IsServer(sptr) && (badop == 2 || sendts > 0)) { - if (*modebuf == '\0') - strcpy(modebuf, "+"); - if (badop != 2) { - sendto_highprot_butone(cptr, 10, "%s " TOK_MODE " %s %s %s " TIME_T_FMT, /* XXX DEAD */ - NumServ(sptr), chptr->chname, modebuf, nparabuf, - (badop == 4) ? (time_t) 0 : chptr->creationtime); - } - } - else { - if (IsServer(sptr)) - sendto_highprot_butone(cptr, 10, "%s " TOK_MODE " %s %s %s", /* XXX DEAD */ - NumServ(sptr), chptr->chname, modebuf, nparabuf); - else - sendto_highprot_butone(cptr, 10, "%s%s " TOK_MODE " %s %s %s", /* XXX DEAD */ - NumNick(sptr), chptr->chname, modebuf, nparabuf); - } - } - return 0; -} - -#endif /* 0 */