* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
- * $Id: chmode.c 3580 2007-11-07 23:45:14Z jilles $
*/
#include "stdinc.h"
#include "s_newconf.h"
#include "logger.h"
#include "chmode.h"
+#include "irc_dictionary.h"
+
/* bitmasks for error returns, so we send once per call */
#define SM_ERR_NOTS 0x00000001 /* No TS on channel */
#define SM_ERR_NOPRIVS 0x00000400
#define SM_ERR_RPL_Q 0x00000800
#define SM_ERR_RPL_F 0x00001000
+#define SM_ERR_MLOCK 0x00002000
#define MAXMODES_SIMPLE 46 /* a-zA-Z except bqeIov */
static int mode_limit;
static int mode_limit_simple;
static int mask_pos;
+static int no_override_deop;
char cflagsbuf[256];
char cflagsmyinfo[256];
+char cflagsparaminfo[256];
int chmode_flags[256];
/* OPTIMIZE ME! -- dwr */
void
-construct_noparam_modes(void)
+construct_cflags_strings(void)
{
int i;
char *ptr = cflagsbuf;
char *ptr2 = cflagsmyinfo;
- static int prev_chmode_flags[256];
*ptr = '\0';
*ptr2 = '\0';
!(chmode_table[i].set_func == chm_throttle) &&
!(chmode_table[i].set_func == chm_key) &&
!(chmode_table[i].set_func == chm_limit) &&
+ !(chmode_table[i].set_func == chm_admin) &&
!(chmode_table[i].set_func == chm_op) &&
+ !(chmode_table[i].set_func == chm_halfop) &&
!(chmode_table[i].set_func == chm_voice))
{
chmode_flags[i] = chmode_table[i].mode_type;
chmode_flags[i] = 0;
}
- if (prev_chmode_flags[i] != 0 && prev_chmode_flags[i] != chmode_flags[i])
- {
- if (chmode_flags[i] == 0)
- {
- chmode_table[i].set_func = chm_orphaned;
- sendto_realops_snomask(SNO_DEBUG, L_ALL, "Cmode +%c is now orphaned", i);
- }
- else
- {
- sendto_realops_snomask(SNO_DEBUG, L_ALL, "Orphaned cmode +%c is picked up by module", i);
- }
- chmode_flags[i] = prev_chmode_flags[i];
- }
- else
- prev_chmode_flags[i] = chmode_flags[i];
-
switch (chmode_flags[i])
{
case MODE_EXLIMIT:
break;
default:
- if(chmode_flags[i] != 0)
+ if(chmode_flags[i] != 0 && !(chmode_table[i].set_func == chm_orphaned))
{
*ptr++ = (char) i;
}
}
/* Should we leave orphaned check here? -- dwr */
- if(!(chmode_table[i].set_func == chm_nosuch) && !(chmode_table[i].set_func == chm_orphaned))
+ if( !(chmode_table[i].set_func == chm_nosuch) &&
+ !(chmode_table[i].set_func == chm_orphaned) &&
+ !(chmode_table[i].set_func == chm_admin && !ConfigChannel.use_admin) &&
+ !(chmode_table[i].set_func == chm_halfop && !ConfigChannel.use_halfop))
{
*ptr2++ = (char) i;
}
*ptr2++ = '\0';
}
+void
+construct_cflag_param_string(void)
+{
+
+ *cflagsparaminfo = '\0';
+ rb_snprintf(cflagsparaminfo, sizeof cflagsparaminfo, "%sb%s%s%s%sklov%s%s",
+ ConfigChannel.use_admin ? "a" : "",
+ ConfigChannel.use_except ? "e" : "",
+ ConfigChannel.use_forward ? "f" : "",
+ ConfigChannel.use_halfop ? "h" : "",
+ strcasecmp(ConfigChannel.disabledmodes, "j") ? "" : "j",
+ strcasecmp(ConfigChannel.disabledmodes, "q") ? "" : "q",
+ ConfigChannel.use_invex ? "I" : "");
+}
+
/*
* find_umode_slot
*
* 0 if no cflags are available
* side effects - NONE
*/
-unsigned int
+static unsigned int
find_cflag_slot(void)
{
unsigned int all_cflags = 0, my_cflag = 0, i;
return my_cflag;
}
+unsigned int
+cflag_add(char c_, ChannelModeFunc function)
+{
+ int c = (unsigned char)c_;
+
+ if (chmode_table[c].set_func != chm_nosuch &&
+ chmode_table[c].set_func != chm_orphaned)
+ return 0;
+
+ if (chmode_table[c].set_func == chm_nosuch)
+ chmode_table[c].mode_type = find_cflag_slot();
+ if (chmode_table[c].mode_type == 0)
+ return 0;
+ chmode_table[c].set_func = function;
+ construct_cflags_strings();
+ return chmode_table[c].mode_type;
+}
+
+void
+cflag_orphan(char c_)
+{
+ int c = (unsigned char)c_;
+
+ s_assert(chmode_flags[c] != 0);
+ chmode_table[c].set_func = chm_orphaned;
+ construct_cflags_strings();
+}
+
static int
get_channel_access(struct Client *source_p, struct membership *msptr)
{
- if(!MyClient(source_p) || is_chanop(msptr))
+ if(!MyClient(source_p) || is_admin(msptr))
+ return CHFL_ADMIN;
+ else if(is_chanop(msptr))
return CHFL_CHANOP;
+ else if(is_halfop(msptr))
+ return CHFL_HALFOP;
return CHFL_PEON;
}
int alevel, int parc, int *parn,
const char **parv, int *errors, int dir, char c, long mode_type)
{
- if(alevel != CHFL_CHANOP)
+
+ int override = 0;
+ struct Metadata *md;
+ struct DictionaryIter iter;
+
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
- if(!(*errors & SM_ERR_NOOPS))
- sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
- me.name, source_p->name, chptr->chname);
- *errors |= SM_ERR_NOOPS;
- return;
+ if (IsOverride(source_p))
+ override = 1;
+ else
+ {
+ if(!(*errors & SM_ERR_NOOPS))
+ sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+ me.name, source_p->name, chptr->chname);
+ *errors |= SM_ERR_NOOPS;
+ return;
+ }
}
if(MyClient(source_p) && (++mode_limit_simple > MAXMODES_SIMPLE))
mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].id = NULL;
mode_changes[mode_count].mems = ALL_MEMBERS;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].arg = NULL;
}
else if((dir == MODE_DEL) && (chptr->mode.mode & mode_type))
{
+ /* cleanup metadata when the related mode is removed */
+ if(c == 'J')
+ {
+ DICTIONARY_FOREACH(md, &iter, chptr->metadata)
+ {
+ if(!strcmp(md->value, "KICKNOREJOIN"))
+ channel_metadata_delete(chptr, md->name, 0);
+ }
+ }
+ if(c == 'K')
+ channel_metadata_delete(chptr, "NOREPEAT", 0);
+
chptr->mode.mode &= ~mode_type;
mode_changes[mode_count].letter = c;
mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = NULL;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].arg = NULL;
}
}
const char **parv, int *errors, int dir, char c, long mode_type)
{
if(MyClient(source_p))
+ {
+ sendto_one_numeric(source_p, 469, "Mode %c is disabled.", c);
return;
+ }
if((dir == MODE_ADD) && !(chptr->mode.mode & mode_type))
{
}
}
+void
+chm_hidden(struct Client *source_p, struct Channel *chptr,
+ int alevel, int parc, int *parn,
+ const char **parv, int *errors, int dir, char c, long mode_type)
+{
+ if(!IsOper(source_p) && !IsServer(source_p))
+ {
+ if(!(*errors & SM_ERR_NOPRIVS))
+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, form_str(ERR_NOPRIVILEGES));
+ *errors |= SM_ERR_NOPRIVS;
+ return;
+ }
+ if(MyClient(source_p) && !IsOperAdmin(source_p))
+ {
+ if(!(*errors & SM_ERR_NOPRIVS))
+ sendto_one(source_p, form_str(ERR_NOPRIVS), me.name,
+ source_p->name, "cmodes");
+ *errors |= SM_ERR_NOPRIVS;
+ return;
+ }
+
+ if(MyClient(source_p) && (++mode_limit_simple > MAXMODES_SIMPLE))
+ return;
+
+
+ /* setting + */
+ if((dir == MODE_ADD) && !(chptr->mode.mode & mode_type))
+ {
+ chptr->mode.mode |= mode_type;
+
+ mode_changes[mode_count].letter = c;
+ mode_changes[mode_count].dir = MODE_ADD;
+ mode_changes[mode_count].caps = 0;
+ mode_changes[mode_count].nocaps = 0;
+ mode_changes[mode_count].id = NULL;
+ mode_changes[mode_count].mems = ONLY_OPERS;
+ mode_changes[mode_count].override = 0;
+ mode_changes[mode_count++].arg = NULL;
+
+ /* A little ugly */
+ sendto_wallops_flags(UMODE_WALLOP, &me,
+ "+%c set on [%s] by %s!%s@%s",
+ c, chptr->chname, source_p->name, source_p->username, source_p->host);
+ ilog(L_MAIN, "+%c set on [%s] by %s",
+ c, chptr->chname, get_oper_name(source_p));
+
+ if(*chptr->chname != '&')
+ sendto_server(NULL, NULL, NOCAPS, NOCAPS,
+ ":%s WALLOPS :+%c set on [%s] by %s!%s@%s",
+ me.name, c, chptr->chname, source_p->name, source_p->username,
+ source_p->host);
+ }
+ else if((dir == MODE_DEL) && (chptr->mode.mode & mode_type))
+ {
+ chptr->mode.mode &= ~mode_type;
+
+ mode_changes[mode_count].letter = c;
+ mode_changes[mode_count].dir = MODE_DEL;
+ mode_changes[mode_count].caps = 0;
+ mode_changes[mode_count].nocaps = 0;
+ mode_changes[mode_count].mems = ONLY_OPERS;
+ mode_changes[mode_count].id = NULL;
+ mode_changes[mode_count].override = 0;
+ mode_changes[mode_count++].arg = NULL;
+
+ /* A little ugly */
+ sendto_wallops_flags(UMODE_WALLOP, &me,
+ "+%c unset from [%s] by %s!%s@%s",
+ c, chptr->chname, source_p->name, source_p->username, source_p->host);
+ ilog(L_MAIN, "+%c unset from [%s] by %s",
+ c, chptr->chname, get_oper_name(source_p));
+
+ if(*chptr->chname != '&')
+ sendto_server(NULL, NULL, NOCAPS, NOCAPS,
+ ":%s WALLOPS :+%c unset from [%s] by %s!%s@%s",
+ me.name, c, chptr->chname, source_p->name, source_p->username,
+ source_p->host);
+ }
+}
+
void
chm_staff(struct Client *source_p, struct Channel *chptr,
int alevel, int parc, int *parn,
const char **parv, int *errors, int dir, char c, long mode_type)
{
+ int override = 0;
+
if(!IsOper(source_p) && !IsServer(source_p))
{
if(!(*errors & SM_ERR_NOPRIVS))
return;
}
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
+ {
+ if (IsOverride(source_p))
+ override = 1;
+ else
+ {
+ if(!(*errors & SM_ERR_NOOPS))
+ sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+ me.name, source_p->name, chptr->chname);
+ *errors |= SM_ERR_NOOPS;
+ return;
+ }
+ }
+
if(MyClient(source_p) && (++mode_limit_simple > MAXMODES_SIMPLE))
return;
mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].id = NULL;
mode_changes[mode_count].mems = ALL_MEMBERS;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].arg = NULL;
}
else if((dir == MODE_DEL) && (chptr->mode.mode & mode_type))
mode_changes[mode_count].caps = 0;
mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count].id = NULL;
mode_changes[mode_count++].arg = NULL;
}
int rpl_endlist;
int caps;
int mems;
+ int override = 0;
switch (mode_type)
{
case CHFL_QUIET:
list = &chptr->quietlist;
errorval = SM_ERR_RPL_Q;
- rpl_list = RPL_BANLIST;
- rpl_endlist = RPL_ENDOFBANLIST;
+ rpl_list = RPL_QUIETLIST;
+ rpl_endlist = RPL_ENDOFQUIETLIST;
mems = ALL_MEMBERS;
caps = 0;
break;
*errors |= errorval;
/* non-ops cant see +eI lists.. */
- if(alevel != CHFL_CHANOP && mode_type != CHFL_BAN &&
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP && mode_type != CHFL_BAN &&
mode_type != CHFL_QUIET)
{
- if(!(*errors & SM_ERR_NOOPS))
- sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
- me.name, source_p->name, chptr->chname);
- *errors |= SM_ERR_NOOPS;
- return;
+ if(IsOverride(source_p))
+ {
+ sendto_wallops_flags(UMODE_WALLOP, &me,
+ "%s is overriding modes on %s: (%s list)",
+ get_oper_name(source_p), chptr->chname, mode_type == CHFL_INVEX ? "invex" : "exempt");
+ sendto_server(NULL, chptr, NOCAPS, NOCAPS,
+ ":%s WALLOPS :%s is overriding modes on %s: (%s list)",
+ me.name, get_oper_name(source_p), chptr->chname, mode_type == CHFL_INVEX ? "invex" : "exempt");
+ }
+ else
+ {
+
+ if(!(*errors & SM_ERR_NOOPS))
+ sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+ me.name, source_p->name, chptr->chname);
+ *errors |= SM_ERR_NOOPS;
+ return;
+ }
}
RB_DLINK_FOREACH(ptr, list->head)
me.name, source_p->name, chptr->chname,
banptr->banstr, banptr->who, banptr->when);
}
- if (mode_type == CHFL_QUIET)
- sendto_one(source_p, ":%s %d %s %s :End of Channel Quiet List", me.name, rpl_endlist, source_p->name, chptr->chname);
- else
- sendto_one(source_p, form_str(rpl_endlist), me.name, source_p->name, chptr->chname);
+ sendto_one(source_p, form_str(rpl_endlist), me.name, source_p->name, chptr->chname);
return;
}
- if(alevel != CHFL_CHANOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
- if(!(*errors & SM_ERR_NOOPS))
- sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
- me.name, source_p->name, chptr->chname);
- *errors |= SM_ERR_NOOPS;
- return;
+ if(IsOverride(source_p))
+ override = 1;
+ else
+ {
+
+ if(!(*errors & SM_ERR_NOOPS))
+ sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+ me.name, source_p->name, chptr->chname);
+ *errors |= SM_ERR_NOOPS;
+ return;
+ }
}
if(MyClient(source_p) && (++mode_limit > MAXMODEPARAMS))
mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = mems;
mode_changes[mode_count].id = NULL;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].arg = mask;
}
else if(dir == MODE_DEL)
mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = mems;
mode_changes[mode_count].id = NULL;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].arg = mask;
}
}
+void
+chm_admin(struct Client *source_p, struct Channel *chptr,
+ int alevel, int parc, int *parn,
+ const char **parv, int *errors, int dir, char c, long mode_type)
+{
+ struct membership *mstptr;
+ const char *adminnick;
+ struct Client *targ_p;
+ int override = 0;
+
+ if(!ConfigChannel.use_admin)
+ {
+ if(*errors & SM_ERR_UNKNOWN)
+ return;
+ *errors |= SM_ERR_UNKNOWN;
+ sendto_one(source_p, form_str(ERR_UNKNOWNMODE), me.name, source_p->name, c);
+ return;
+ }
+
+ if(alevel != CHFL_ADMIN)
+ {
+ if(IsOverride(source_p))
+ override = 1;
+ else
+ {
+
+ if(!(*errors & SM_ERR_NOOPS))
+ sendto_one(source_p, ":%s 482 %s %s :You're not a channel administrator", me.name, source_p->name, chptr->chname);
+ *errors |= SM_ERR_NOOPS;
+ return;
+ }
+ }
+
+ if((dir == MODE_QUERY) || (parc <= *parn))
+ return;
+
+ adminnick = parv[(*parn)];
+ (*parn)++;
+
+ /* empty nick */
+ if(EmptyString(adminnick))
+ {
+ sendto_one_numeric(source_p, ERR_NOSUCHNICK, form_str(ERR_NOSUCHNICK), "*");
+ return;
+ }
+
+ if((targ_p = find_chasing(source_p, adminnick, NULL)) == NULL)
+ {
+ return;
+ }
+
+ mstptr = find_channel_membership(chptr, targ_p);
+
+ if(mstptr == NULL)
+ {
+ if(!(*errors & SM_ERR_NOTONCHANNEL) && MyClient(source_p))
+ sendto_one_numeric(source_p, ERR_USERNOTINCHANNEL,
+ form_str(ERR_USERNOTINCHANNEL), adminnick, chptr->chname);
+ *errors |= SM_ERR_NOTONCHANNEL;
+ return;
+ }
+
+ if(MyClient(source_p) && (++mode_limit > MAXMODEPARAMS))
+ return;
+
+ if(dir == MODE_ADD)
+ {
+ if(targ_p == source_p)
+ {
+ no_override_deop = 1;
+ /* Don't reject modes from remote. It desyncs, and this is perfectly
+ * legitimate from a remote override oper.
+ if(!override)
+ return;
+ */
+ }
+
+ mode_changes[mode_count].letter = c;
+ mode_changes[mode_count].dir = MODE_ADD;
+ mode_changes[mode_count].caps = 0;
+ mode_changes[mode_count].nocaps = 0;
+ mode_changes[mode_count].mems = ALL_MEMBERS;
+ mode_changes[mode_count].id = targ_p->id;
+ mode_changes[mode_count].arg = targ_p->name;
+ mode_changes[mode_count].override = override;
+ mode_changes[mode_count++].client = targ_p;
+
+ mstptr->flags |= CHFL_ADMIN;
+ }
+ else
+ {
+ if(MyClient(source_p) && IsService(targ_p))
+ {
+ sendto_one(source_p, form_str(ERR_ISCHANSERVICE),
+ me.name, source_p->name, targ_p->name, chptr->chname);
+ return;
+ }
+
+ mode_changes[mode_count].letter = c;
+ mode_changes[mode_count].dir = MODE_DEL;
+ mode_changes[mode_count].caps = 0;
+ mode_changes[mode_count].nocaps = 0;
+ mode_changes[mode_count].mems = ALL_MEMBERS;
+ mode_changes[mode_count].id = targ_p->id;
+ mode_changes[mode_count].arg = targ_p->name;
+ mode_changes[mode_count].override = override;
+ mode_changes[mode_count++].client = targ_p;
+
+ mstptr->flags &= ~CHFL_ADMIN;
+ }
+}
+
void
chm_op(struct Client *source_p, struct Channel *chptr,
int alevel, int parc, int *parn,
struct membership *mstptr;
const char *opnick;
struct Client *targ_p;
+ int override = 0;
- if(alevel != CHFL_CHANOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN)
{
- if(!(*errors & SM_ERR_NOOPS))
- sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
- me.name, source_p->name, chptr->chname);
- *errors |= SM_ERR_NOOPS;
- return;
+ if(IsOverride(source_p))
+ override = 1;
+ else
+ {
+
+ if(!(*errors & SM_ERR_NOOPS))
+ sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+ me.name, source_p->name, chptr->chname);
+ *errors |= SM_ERR_NOOPS;
+ return;
+ }
}
if((dir == MODE_QUERY) || (parc <= *parn))
if(dir == MODE_ADD)
{
if(targ_p == source_p)
- return;
+ {
+ no_override_deop = 1;
+ /* Don't reject modes from remote. It desyncs, and this is perfectly
+ * legitimate from a remote override oper.
+ if(!override)
+ return;
+ */
+ }
mode_changes[mode_count].letter = c;
mode_changes[mode_count].dir = MODE_ADD;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = targ_p->id;
mode_changes[mode_count].arg = targ_p->name;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].client = targ_p;
mstptr->flags |= CHFL_CHANOP;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = targ_p->id;
mode_changes[mode_count].arg = targ_p->name;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].client = targ_p;
mstptr->flags &= ~CHFL_CHANOP;
}
}
+void
+chm_halfop(struct Client *source_p, struct Channel *chptr,
+ int alevel, int parc, int *parn,
+ const char **parv, int *errors, int dir, char c, long mode_type)
+{
+ struct membership *mstptr;
+ const char *halfopnick;
+ struct Client *targ_p;
+ int override = 0;
+
+ if(!ConfigChannel.use_halfop)
+ {
+ if(*errors & SM_ERR_UNKNOWN)
+ return;
+ *errors |= SM_ERR_UNKNOWN;
+ sendto_one(source_p, form_str(ERR_UNKNOWNMODE), me.name, source_p->name, c);
+ return;
+ }
+
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN)
+ {
+ if(IsOverride(source_p))
+ override = 1;
+ else
+ {
+
+ if(!(*errors & SM_ERR_NOOPS))
+ sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+ me.name, source_p->name, chptr->chname);
+ *errors |= SM_ERR_NOOPS;
+ return;
+ }
+ }
+
+ if((dir == MODE_QUERY) || (parc <= *parn))
+ return;
+
+ halfopnick = parv[(*parn)];
+ (*parn)++;
+
+ /* empty nick */
+ if(EmptyString(halfopnick))
+ {
+ sendto_one_numeric(source_p, ERR_NOSUCHNICK, form_str(ERR_NOSUCHNICK), "*");
+ return;
+ }
+
+ if((targ_p = find_chasing(source_p, halfopnick, NULL)) == NULL)
+ {
+ return;
+ }
+
+ mstptr = find_channel_membership(chptr, targ_p);
+
+ if(mstptr == NULL)
+ {
+ if(!(*errors & SM_ERR_NOTONCHANNEL) && MyClient(source_p))
+ sendto_one_numeric(source_p, ERR_USERNOTINCHANNEL,
+ form_str(ERR_USERNOTINCHANNEL), halfopnick, chptr->chname);
+ *errors |= SM_ERR_NOTONCHANNEL;
+ return;
+ }
+
+ if(MyClient(source_p) && (++mode_limit > MAXMODEPARAMS))
+ return;
+
+ if(dir == MODE_ADD)
+ {
+ if(targ_p == source_p)
+ {
+ no_override_deop = 1;
+ /* Don't reject modes from remote. It desyncs, and this is perfectly
+ * legitimate from a remote override oper.
+ if(!override)
+ return;
+ */
+ }
+
+ mode_changes[mode_count].letter = c;
+ mode_changes[mode_count].dir = MODE_ADD;
+ mode_changes[mode_count].caps = 0;
+ mode_changes[mode_count].nocaps = 0;
+ mode_changes[mode_count].mems = ALL_MEMBERS;
+ mode_changes[mode_count].id = targ_p->id;
+ mode_changes[mode_count].arg = targ_p->name;
+ mode_changes[mode_count].override = override;
+ mode_changes[mode_count++].client = targ_p;
+
+ mstptr->flags |= CHFL_HALFOP;
+ }
+ else
+ {
+ if(MyClient(source_p) && IsService(targ_p))
+ {
+ sendto_one(source_p, form_str(ERR_ISCHANSERVICE),
+ me.name, source_p->name, targ_p->name, chptr->chname);
+ return;
+ }
+
+ mode_changes[mode_count].letter = c;
+ mode_changes[mode_count].dir = MODE_DEL;
+ mode_changes[mode_count].caps = 0;
+ mode_changes[mode_count].nocaps = 0;
+ mode_changes[mode_count].mems = ALL_MEMBERS;
+ mode_changes[mode_count].id = targ_p->id;
+ mode_changes[mode_count].arg = targ_p->name;
+ mode_changes[mode_count].override = override;
+ mode_changes[mode_count++].client = targ_p;
+
+ mstptr->flags &= ~CHFL_HALFOP;
+ }
+}
+
void
chm_voice(struct Client *source_p, struct Channel *chptr,
int alevel, int parc, int *parn,
struct membership *mstptr;
const char *opnick;
struct Client *targ_p;
+ int override = 0;
- if(alevel != CHFL_CHANOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
- if(!(*errors & SM_ERR_NOOPS))
- sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
- me.name, source_p->name, chptr->chname);
- *errors |= SM_ERR_NOOPS;
- return;
+ if(IsOverride(source_p))
+ override = 1;
+ else
+ {
+
+ if(!(*errors & SM_ERR_NOOPS))
+ sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+ me.name, source_p->name, chptr->chname);
+ *errors |= SM_ERR_NOOPS;
+ return;
+ }
}
if((dir == MODE_QUERY) || parc <= *parn)
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = targ_p->id;
mode_changes[mode_count].arg = targ_p->name;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].client = targ_p;
mstptr->flags |= CHFL_VOICE;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = targ_p->id;
mode_changes[mode_count].arg = targ_p->name;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].client = targ_p;
mstptr->flags &= ~CHFL_VOICE;
const char *lstr;
static char limitstr[30];
int limit;
+ int override = 0;
- if(alevel != CHFL_CHANOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
- if(!(*errors & SM_ERR_NOOPS))
- sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
- me.name, source_p->name, chptr->chname);
- *errors |= SM_ERR_NOOPS;
- return;
+ if(IsOverride(source_p))
+ override = 1;
+ else
+ {
+ if(!(*errors & SM_ERR_NOOPS))
+ sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+ me.name, source_p->name, chptr->chname);
+ *errors |= SM_ERR_NOOPS;
+ return;
+ }
}
if(dir == MODE_QUERY)
mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = NULL;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].arg = limitstr;
chptr->mode.limit = limit;
mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = NULL;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].arg = NULL;
}
}
const char **parv, int *errors, int dir, char c, long mode_type)
{
int joins = 0, timeslice = 0;
+ int override = 0;
- if(alevel != CHFL_CHANOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
- if(!(*errors & SM_ERR_NOOPS))
- sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
- me.name, source_p->name, chptr->chname);
- *errors |= SM_ERR_NOOPS;
- return;
+ if(IsOverride(source_p))
+ override = 1;
+ else
+ {
+
+ if(!(*errors & SM_ERR_NOOPS))
+ sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+ me.name, source_p->name, chptr->chname);
+ *errors |= SM_ERR_NOOPS;
+ return;
+ }
}
if(dir == MODE_QUERY)
mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = NULL;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].arg = parv[(*parn)];
(*parn)++;
mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = NULL;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].arg = NULL;
}
}
struct Channel *targptr = NULL;
struct membership *msptr;
const char *forward;
+ int override = 0;
/* if +f is disabled, ignore local attempts to set it */
if(!ConfigChannel.use_forward && MyClient(source_p) &&
}
#ifndef FORWARD_OPERONLY
- if(alevel != CHFL_CHANOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
- if(!(*errors & SM_ERR_NOOPS))
- sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
- me.name, source_p->name, chptr->chname);
- *errors |= SM_ERR_NOOPS;
- return;
+ if(IsOverride(source_p))
+ override = 1;
+ else
+ {
+ if(!(*errors & SM_ERR_NOOPS))
+ sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+ me.name, source_p->name, chptr->chname);
+ *errors |= SM_ERR_NOOPS;
+ return;
+ }
}
#else
if(!IsOper(source_p) && !IsServer(source_p))
if(MyClient(source_p) && !(targptr->mode.mode & MODE_FREETARGET))
{
if((msptr = find_channel_membership(targptr, source_p)) == NULL ||
- get_channel_access(source_p, msptr) != CHFL_CHANOP)
+ !is_any_op(msptr))
{
- sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
- me.name, source_p->name, targptr->chname);
- return;
+ if(IsOverride(source_p))
+ override = 1;
+ else
+ {
+ sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+ me.name, source_p->name, targptr->chname);
+ return;
+ }
}
}
mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ConfigChannel.use_forward ? ALL_MEMBERS : ONLY_SERVERS;
mode_changes[mode_count].id = NULL;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].arg = forward;
}
else if(dir == MODE_DEL)
mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = NULL;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].arg = NULL;
}
}
const char **parv, int *errors, int dir, char c, long mode_type)
{
char *key;
+ int override = 0;
- if(alevel != CHFL_CHANOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
- if(!(*errors & SM_ERR_NOOPS))
- sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
- me.name, source_p->name, chptr->chname);
- *errors |= SM_ERR_NOOPS;
- return;
+ if(IsOverride(source_p))
+ override = 1;
+ else
+ {
+ if(!(*errors & SM_ERR_NOOPS))
+ sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+ me.name, source_p->name, chptr->chname);
+ *errors |= SM_ERR_NOOPS;
+ return;
+ }
}
if(dir == MODE_QUERY)
mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = NULL;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].arg = chptr->mode.key;
}
else if(dir == MODE_DEL)
mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = NULL;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].arg = "*";
}
}
-void
-chm_regonly(struct Client *source_p, struct Channel *chptr,
- int alevel, int parc, int *parn,
- const char **parv, int *errors, int dir, char c, long mode_type)
-{
- if(alevel != CHFL_CHANOP)
- {
- if(!(*errors & SM_ERR_NOOPS))
- sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
- me.name, source_p->name, chptr->chname);
- *errors |= SM_ERR_NOOPS;
- return;
- }
-
- if(dir == MODE_QUERY)
- return;
-
- if(((dir == MODE_ADD) && (chptr->mode.mode & mode_type)) ||
- ((dir == MODE_DEL) && !(chptr->mode.mode & mode_type)))
- return;
-
- if(MyClient(source_p) && (++mode_limit_simple > MAXMODES_SIMPLE))
- return;
-
- if(dir == MODE_ADD)
- chptr->mode.mode |= mode_type;
- else
- chptr->mode.mode &= ~mode_type;
-
- mode_changes[mode_count].letter = c;
- mode_changes[mode_count].dir = dir;
- mode_changes[mode_count].caps = CAP_SERVICE;
- mode_changes[mode_count].nocaps = 0;
- mode_changes[mode_count].mems = ALL_MEMBERS;
- mode_changes[mode_count].id = NULL;
- mode_changes[mode_count++].arg = NULL;
-}
-
/* *INDENT-OFF* */
struct ChannelMode chmode_table[256] =
{
{chm_nosuch, 0 }, /* B */
{chm_simple, MODE_NOCTCP }, /* C */
{chm_simple, MODE_NOACTION }, /* D */
- {chm_nosuch, 0 }, /* E */
+ {chm_simple, MODE_NOKICK }, /* E */
{chm_simple, MODE_FREETARGET }, /* F */
- {chm_nosuch, 0 }, /* G */
+ {chm_simple, MODE_NOCAPS }, /* G */
{chm_nosuch, 0 }, /* H */
{chm_ban, CHFL_INVEX }, /* I */
- {chm_nosuch, 0 }, /* J */
- {chm_nosuch, 0 }, /* K */
+ {chm_simple, MODE_NOREJOIN }, /* J */
+ {chm_simple, MODE_NOREPEAT }, /* K */
{chm_staff, MODE_EXLIMIT }, /* L */
- {chm_nosuch, 0 }, /* M */
- {chm_nosuch, 0 }, /* N */
+ {chm_hidden, MODE_NOOPERKICK }, /* M */
+ {chm_simple, MODE_NONICK }, /* N */
{chm_nosuch, 0 }, /* O */
{chm_staff, MODE_PERMANENT }, /* P */
{chm_simple, MODE_DISFORWARD }, /* Q */
{chm_nosuch, 0 },
{chm_nosuch, 0 },
{chm_nosuch, 0 },
- {chm_nosuch, 0 }, /* a */
+ {chm_admin, 0 }, /* a */
{chm_ban, CHFL_BAN }, /* b */
{chm_simple, MODE_NOCOLOR }, /* c */
{chm_nosuch, 0 }, /* d */
{chm_ban, CHFL_EXCEPTION }, /* e */
{chm_forward, 0 }, /* f */
{chm_simple, MODE_FREEINVITE }, /* g */
- {chm_nosuch, 0 }, /* h */
+ {chm_halfop, 0 }, /* h */
{chm_simple, MODE_INVITEONLY }, /* i */
{chm_throttle, 0 }, /* j */
{chm_key, 0 }, /* k */
{chm_op, 0 }, /* o */
{chm_simple, MODE_PRIVATE }, /* p */
{chm_ban, CHFL_QUIET }, /* q */
- {chm_regonly, MODE_REGONLY }, /* r */
+ {chm_simple, MODE_REGONLY }, /* r */
{chm_simple, MODE_SECRET }, /* s */
{chm_simple, MODE_TOPICLIMIT }, /* t */
{chm_nosuch, 0 }, /* u */
set_channel_mode(struct Client *client_p, struct Client *source_p,
struct Channel *chptr, struct membership *msptr, int parc, const char *parv[])
{
+ static char cmdbuf[BUFSIZE];
static char modebuf[BUFSIZE];
static char parabuf[BUFSIZE];
char *mbuf;
char *pbuf;
int cur_len, mlen, paralen, paracount, arglen, len;
- int i, j, flags;
+ int i, j, flags, override;
int dir = MODE_ADD;
int parn = 1;
int errors = 0;
const char *ml = parv[0];
char c;
struct Client *fakesource_p;
+ int flags_list[3] = { ALL_MEMBERS, ONLY_CHANOPS, ONLY_OPERS };
mask_pos = 0;
mode_count = 0;
alevel = get_channel_access(source_p, msptr);
+ no_override_deop = 0;
+
/* Hide connecting server on netburst -- jilles */
if (ConfigServerHide.flatten_links && IsServer(source_p) && !has_id(source_p) && !HasSentEob(source_p))
fakesource_p = &me;
dir = MODE_QUERY;
break;
default:
+ /* If this mode char is locked, don't allow local users to change it. */
+ if (MyClient(source_p) && chptr->mode_lock && strchr(chptr->mode_lock, c))
+ {
+ if (!(errors & SM_ERR_MLOCK))
+ sendto_one_numeric(source_p,
+ ERR_MLOCKRESTRICTED,
+ form_str(ERR_MLOCKRESTRICTED),
+ chptr->chname,
+ c,
+ chptr->mode_lock);
+ errors |= SM_ERR_MLOCK;
+ continue;
+ }
chmode_table[(unsigned char) c].set_func(fakesource_p, chptr, alevel,
parc, &parn, parv,
&errors, dir, c,
return;
if(IsServer(source_p))
- mlen = rb_sprintf(modebuf, ":%s MODE %s ", fakesource_p->name, chptr->chname);
+ rb_sprintf(cmdbuf, ":%s MODE %s ", fakesource_p->name, chptr->chname);
else
- mlen = rb_sprintf(modebuf, ":%s!%s@%s MODE %s ",
+ rb_sprintf(cmdbuf, ":%s!%s@%s MODE %s ",
source_p->name, source_p->username,
source_p->host, chptr->chname);
- for(j = 0, flags = ALL_MEMBERS; j < 2; j++, flags = ONLY_CHANOPS)
+ mlen = 0;
+
+ for (override = 0; override < (IsOverride(source_p) && alevel != CHFL_CHANOP ? 2 : 1); ++override)
{
- cur_len = mlen;
- mbuf = modebuf + mlen;
- pbuf = parabuf;
- parabuf[0] = '\0';
- paracount = paralen = 0;
- dir = MODE_QUERY;
+ int was_on_chan = 0;
- for(i = 0; i < mode_count; i++)
+ if(override)
{
- if(mode_changes[i].letter == 0 || mode_changes[i].mems != flags)
- continue;
-
- if(mode_changes[i].arg != NULL)
+ if(msptr)
{
- arglen = strlen(mode_changes[i].arg);
-
- if(arglen > MODEBUFLEN - 5)
- continue;
+ was_on_chan = 1;
+ msptr->flags |= CHFL_CHANOP;
}
else
- arglen = 0;
-
- /* if we're creeping over MAXMODEPARAMSSERV, or over
- * bufsize (4 == +/-,modechar,two spaces) send now.
- */
- if(mode_changes[i].arg != NULL &&
- ((paracount == MAXMODEPARAMSSERV) ||
- ((cur_len + paralen + arglen + 4) > (BUFSIZE - 3))))
+ add_user_to_channel(chptr, source_p, CHFL_CHANOP);
+ }
+
+ for(j = 0, flags = flags_list[0]; j < 3; j++, flags = flags_list[j])
+ {
+ cur_len = mlen;
+ mbuf = modebuf + mlen;
+ pbuf = parabuf;
+ parabuf[0] = '\0';
+ paracount = paralen = 0;
+ dir = MODE_QUERY;
+
+ for(i = 0; i < mode_count; i++)
{
- *mbuf = '\0';
+ if(mode_changes[i].letter == 0 || mode_changes[i].mems != flags)
+ continue;
- if(cur_len > mlen)
- sendto_channel_local(flags, chptr, "%s %s", modebuf,
- parabuf);
- else
+ if(mode_changes[i].override != override)
continue;
- paracount = paralen = 0;
- cur_len = mlen;
- mbuf = modebuf + mlen;
- pbuf = parabuf;
- parabuf[0] = '\0';
- dir = MODE_QUERY;
- }
+ if(mode_changes[i].arg != NULL)
+ {
+ arglen = strlen(mode_changes[i].arg);
- if(dir != mode_changes[i].dir)
- {
- *mbuf++ = (mode_changes[i].dir == MODE_ADD) ? '+' : '-';
+ if(arglen > MODEBUFLEN - 5)
+ continue;
+ }
+ else
+ arglen = 0;
+
+ /* if we're creeping over MAXMODEPARAMSSERV, or over
+ * bufsize (4 == +/-,modechar,two spaces) send now.
+ */
+ if(mode_changes[i].arg != NULL &&
+ ((paracount == MAXMODEPARAMSSERV) ||
+ ((cur_len + paralen + arglen + 4) > (BUFSIZE - 3))))
+ {
+ *mbuf = '\0';
+
+ if(cur_len > mlen)
+ {
+ sendto_channel_local(flags, chptr, "%s%s %s",
+ cmdbuf, modebuf, parabuf);
+ if(override)
+ {
+ sendto_wallops_flags(UMODE_WALLOP, &me,
+ "%s is overriding modes on %s: %s %s",
+ get_oper_name(source_p), chptr->chname, modebuf, parabuf);
+ sendto_server(NULL, chptr, NOCAPS, NOCAPS,
+ ":%s WALLOPS :%s is overriding modes on %s: %s %s",
+ me.name, get_oper_name(source_p), chptr->chname, modebuf, parabuf);
+ }
+ }
+ else
+ continue;
+
+ paracount = paralen = 0;
+ cur_len = mlen;
+ mbuf = modebuf + mlen;
+ pbuf = parabuf;
+ parabuf[0] = '\0';
+ dir = MODE_QUERY;
+ }
+
+ if(dir != mode_changes[i].dir)
+ {
+ *mbuf++ = (mode_changes[i].dir == MODE_ADD) ? '+' : '-';
+ cur_len++;
+ dir = mode_changes[i].dir;
+ }
+
+ *mbuf++ = mode_changes[i].letter;
cur_len++;
- dir = mode_changes[i].dir;
+
+ if(mode_changes[i].arg != NULL)
+ {
+ paracount++;
+ len = rb_sprintf(pbuf, "%s ", mode_changes[i].arg);
+ pbuf += len;
+ paralen += len;
+ }
}
- *mbuf++ = mode_changes[i].letter;
- cur_len++;
+ if(paralen && parabuf[paralen - 1] == ' ')
+ parabuf[paralen - 1] = '\0';
- if(mode_changes[i].arg != NULL)
+ *mbuf = '\0';
+ if(cur_len > mlen)
{
- paracount++;
- len = rb_sprintf(pbuf, "%s ", mode_changes[i].arg);
- pbuf += len;
- paralen += len;
+ sendto_channel_local(flags, chptr, "%s%s %s", cmdbuf, modebuf, parabuf);
+ if(override)
+ {
+ sendto_wallops_flags(UMODE_WALLOP, &me,
+ "%s is overriding modes on %s: %s %s",
+ get_oper_name(source_p), chptr->chname, modebuf, parabuf);
+ sendto_server(NULL, chptr, NOCAPS, NOCAPS,
+ ":%s WALLOPS :%s is overriding modes on %s: %s %s",
+ me.name, get_oper_name(source_p), chptr->chname, modebuf, parabuf);
+ }
}
}
-
- if(paralen && parabuf[paralen - 1] == ' ')
- parabuf[paralen - 1] = '\0';
-
- *mbuf = '\0';
- if(cur_len > mlen)
- sendto_channel_local(flags, chptr, "%s %s", modebuf, parabuf);
+ if(override)
+ {
+ if(!was_on_chan)
+ remove_user_from_channel(find_channel_membership(chptr, source_p));
+ else if (!no_override_deop)
+ msptr->flags &= ~CHFL_CHANOP;
+ }
}
/* only propagate modes originating locally, or if we're hubbing */
if(MyClient(source_p) || rb_dlink_list_length(&serv_list) > 1)
send_cap_mode_changes(client_p, source_p, chptr, mode_changes, mode_count);
}
+
+/* set_channel_mlock()
+ *
+ * inputs - client, source, channel, params
+ * output -
+ * side effects - channel mlock is changed / MLOCK is propagated
+ */
+void
+set_channel_mlock(struct Client *client_p, struct Client *source_p,
+ struct Channel *chptr, const char *newmlock, int propagate)
+{
+ rb_free(chptr->mode_lock);
+ chptr->mode_lock = newmlock ? rb_strdup(newmlock) : NULL;
+
+ if (propagate)
+ {
+ sendto_server(client_p, NULL, CAP_TS6 | CAP_MLOCK, NOCAPS, ":%s MLOCK %ld %s :%s",
+ source_p->id, (long) chptr->channelts, chptr->chname,
+ chptr->mode_lock ? chptr->mode_lock : "");
+ }
+}
projects / irc / rqf / shadowircd.git / blobdiff