return ping;
}
+/*
+ * client_get_default_umode
+ * returns default usermode in attached client connection class
+ */
+const char* client_get_default_umode(const struct Client* sptr)
+{
+ struct ConfItem* aconf;
+ struct SLink* link;
+
+ assert(cli_verify(sptr));
+
+ for (link = cli_confs(sptr); link; link = link->next) {
+ aconf = link->value.aconf;
+ if ((aconf->status & CONF_CLIENT) && ConfUmode(aconf))
+ return ConfUmode(aconf);
+ }
+ return NULL;
+}
+
/*
* client_drop_sendq
* removes the client's connection from the list of connections with
}
}
-static struct {
- unsigned int priv;
- enum Feature feat;
- unsigned int flag;
-} feattab[] = {
- { PRIV_WHOX, FEAT_LAST_F, (FLAGS_OPER | FLAGS_LOCOP) },
- { PRIV_DISPLAY, FEAT_LAST_F, (FLAGS_OPER | FLAGS_LOCOP) },
- { PRIV_CHAN_LIMIT, FEAT_OPER_NO_CHAN_LIMIT, (FLAGS_OPER | FLAGS_LOCOP) },
- { PRIV_MODE_LCHAN, FEAT_OPER_MODE_LCHAN, (FLAGS_OPER | FLAGS_LOCOP) },
- { PRIV_LOCAL_OPMODE, FEAT_OPER_MODE_LCHAN, (FLAGS_OPER | FLAGS_LOCOP) },
- { PRIV_WALK_LCHAN, FEAT_OPER_WALK_THROUGH_LMODES,
- (FLAGS_OPER | FLAGS_LOCOP) },
- { PRIV_DEOP_LCHAN, FEAT_NO_OPER_DEOP_LCHAN, (FLAGS_OPER | FLAGS_LOCOP) },
- { PRIV_SHOW_INVIS, FEAT_SHOW_INVISIBLE_USERS, (FLAGS_OPER | FLAGS_LOCOP) },
- { PRIV_SHOW_ALL_INVIS, FEAT_SHOW_ALL_INVISIBLE_USERS,
- (FLAGS_OPER | FLAGS_LOCOP) },
- { PRIV_UNLIMIT_QUERY, FEAT_UNLIMIT_OPER_QUERY, (FLAGS_OPER | FLAGS_LOCOP) },
- { PRIV_LIST_CHAN, FEAT_LIST_CHAN, (FLAGS_OPER | FLAGS_LOCOP) },
-
- { PRIV_KILL, FEAT_LOCAL_KILL_ONLY, 0 },
- { PRIV_GLINE, FEAT_CONFIG_OPERCMDS, ~0 },
- { PRIV_JUPE, FEAT_CONFIG_OPERCMDS, ~0 },
- { PRIV_OPMODE, FEAT_CONFIG_OPERCMDS, ~0 },
- { PRIV_BADCHAN, FEAT_CONFIG_OPERCMDS, ~0 },
-
- { PRIV_PROPAGATE, FEAT_LAST_F, FLAGS_OPER },
- { PRIV_SEE_OPERS, FEAT_LAST_F, FLAGS_OPER },
- { PRIV_KILL, FEAT_OPER_KILL, FLAGS_OPER },
- { PRIV_LOCAL_KILL, FEAT_OPER_KILL, FLAGS_OPER },
- { PRIV_REHASH, FEAT_OPER_REHASH, FLAGS_OPER },
- { PRIV_RESTART, FEAT_OPER_RESTART, FLAGS_OPER },
- { PRIV_DIE, FEAT_OPER_DIE, FLAGS_OPER },
- { PRIV_GLINE, FEAT_OPER_GLINE, FLAGS_OPER },
- { PRIV_LOCAL_GLINE, FEAT_OPER_LGLINE, FLAGS_OPER },
- { PRIV_JUPE, FEAT_OPER_JUPE, FLAGS_OPER },
- { PRIV_LOCAL_JUPE, FEAT_OPER_LJUPE, FLAGS_OPER },
- { PRIV_OPMODE, FEAT_OPER_OPMODE, FLAGS_OPER },
- { PRIV_LOCAL_OPMODE, FEAT_OPER_LOPMODE, FLAGS_OPER },
- { PRIV_BADCHAN, FEAT_OPER_BADCHAN, FLAGS_OPER },
- { PRIV_LOCAL_BADCHAN, FEAT_OPER_LBADCHAN, FLAGS_OPER },
- { PRIV_SET, FEAT_OPER_SET, FLAGS_OPER },
- { PRIV_SEE_CHAN, FEAT_OPERS_SEE_IN_SECRET_CHANNELS, FLAGS_OPER },
- { PRIV_WIDE_GLINE, FEAT_OPER_WIDE_GLINE, FLAGS_OPER },
- { PRIV_LIST_CHAN, FEAT_OPER_LIST_CHAN, FLAGS_OPER },
-
- { PRIV_LOCAL_KILL, FEAT_LOCOP_KILL, FLAGS_LOCOP },
- { PRIV_REHASH, FEAT_LOCOP_REHASH, FLAGS_LOCOP },
- { PRIV_RESTART, FEAT_LOCOP_RESTART, FLAGS_LOCOP },
- { PRIV_DIE, FEAT_LOCOP_DIE, FLAGS_LOCOP },
- { PRIV_LOCAL_GLINE, FEAT_LOCOP_LGLINE, FLAGS_LOCOP },
- { PRIV_LOCAL_JUPE, FEAT_LOCOP_LJUPE, FLAGS_LOCOP },
- { PRIV_LOCAL_OPMODE, FEAT_LOCOP_LOPMODE, FLAGS_LOCOP },
- { PRIV_LOCAL_BADCHAN, FEAT_LOCOP_LBADCHAN, FLAGS_LOCOP },
- { PRIV_SET, FEAT_LOCOP_SET, FLAGS_LOCOP },
- { PRIV_SEE_CHAN, FEAT_LOCOP_SEE_IN_SECRET_CHANNELS, FLAGS_LOCOP },
- { PRIV_WIDE_GLINE, FEAT_LOCOP_WIDE_GLINE, FLAGS_LOCOP },
- { PRIV_LIST_CHAN, FEAT_LOCOP_LIST_CHAN, FLAGS_LOCOP },
- { 0, FEAT_LAST_F, 0 }
+enum FeatureFlag {
+ FEATFLAG_NULL,
+ FEATFLAG_DISABLES_PRIV,
+ FEATFLAG_ENABLES_PRIV,
+ FEATFLAG_GLOBAL_OPERS,
+ FEATFLAG_LOCAL_OPERS,
+ FEATFLAG_ALL_OPERS
};
+static struct
+{
+ enum Priv priv;
+ enum Feature feat;
+ enum FeatureFlag flag;
+} feattab[] =
+ {
+ { PRIV_WHOX, FEAT_LAST_F, FEATFLAG_ALL_OPERS },
+ { PRIV_DISPLAY, FEAT_LAST_F, FEATFLAG_ALL_OPERS },
+ { PRIV_CHAN_LIMIT, FEAT_OPER_NO_CHAN_LIMIT, FEATFLAG_ALL_OPERS },
+ { PRIV_MODE_LCHAN, FEAT_OPER_MODE_LCHAN, FEATFLAG_ALL_OPERS },
+ { PRIV_LOCAL_OPMODE, FEAT_OPER_MODE_LCHAN, FEATFLAG_ALL_OPERS },
+ { PRIV_WALK_LCHAN, FEAT_OPER_WALK_THROUGH_LMODES, FEATFLAG_ALL_OPERS },
+ { PRIV_DEOP_LCHAN, FEAT_NO_OPER_DEOP_LCHAN, FEATFLAG_ALL_OPERS },
+ { PRIV_SHOW_INVIS, FEAT_SHOW_INVISIBLE_USERS, FEATFLAG_ALL_OPERS },
+ { PRIV_SHOW_ALL_INVIS, FEAT_SHOW_ALL_INVISIBLE_USERS, FEATFLAG_ALL_OPERS },
+ { PRIV_UNLIMIT_QUERY, FEAT_UNLIMIT_OPER_QUERY, FEATFLAG_ALL_OPERS },
+
+ { PRIV_KILL, FEAT_LOCAL_KILL_ONLY, FEATFLAG_DISABLES_PRIV },
+ { PRIV_GLINE, FEAT_CONFIG_OPERCMDS, FEATFLAG_ENABLES_PRIV },
+ { PRIV_JUPE, FEAT_CONFIG_OPERCMDS, FEATFLAG_ENABLES_PRIV },
+ { PRIV_OPMODE, FEAT_CONFIG_OPERCMDS, FEATFLAG_ENABLES_PRIV },
+ { PRIV_BADCHAN, FEAT_CONFIG_OPERCMDS, FEATFLAG_ENABLES_PRIV },
+
+ { PRIV_PROPAGATE, FEAT_LAST_F, FEATFLAG_GLOBAL_OPERS },
+ { PRIV_SEE_OPERS, FEAT_LAST_F, FEATFLAG_GLOBAL_OPERS },
+ { PRIV_KILL, FEAT_OPER_KILL, FEATFLAG_GLOBAL_OPERS },
+ { PRIV_LOCAL_KILL, FEAT_OPER_KILL, FEATFLAG_GLOBAL_OPERS },
+ { PRIV_REHASH, FEAT_OPER_REHASH, FEATFLAG_GLOBAL_OPERS },
+ { PRIV_RESTART, FEAT_OPER_RESTART, FEATFLAG_GLOBAL_OPERS },
+ { PRIV_DIE, FEAT_OPER_DIE, FEATFLAG_GLOBAL_OPERS },
+ { PRIV_GLINE, FEAT_OPER_GLINE, FEATFLAG_GLOBAL_OPERS },
+ { PRIV_LOCAL_GLINE, FEAT_OPER_LGLINE, FEATFLAG_GLOBAL_OPERS },
+ { PRIV_JUPE, FEAT_OPER_JUPE, FEATFLAG_GLOBAL_OPERS },
+ { PRIV_LOCAL_JUPE, FEAT_OPER_LJUPE, FEATFLAG_GLOBAL_OPERS },
+ { PRIV_OPMODE, FEAT_OPER_OPMODE, FEATFLAG_GLOBAL_OPERS },
+ { PRIV_LOCAL_OPMODE, FEAT_OPER_LOPMODE, FEATFLAG_GLOBAL_OPERS },
+ { PRIV_FORCE_OPMODE, FEAT_OPER_FORCE_OPMODE, FEATFLAG_GLOBAL_OPERS },
+ { PRIV_FORCE_LOCAL_OPMODE, FEAT_OPER_FORCE_LOPMODE, FEATFLAG_GLOBAL_OPERS },
+ { PRIV_BADCHAN, FEAT_OPER_BADCHAN, FEATFLAG_GLOBAL_OPERS },
+ { PRIV_LOCAL_BADCHAN, FEAT_OPER_LBADCHAN, FEATFLAG_GLOBAL_OPERS },
+ { PRIV_SET, FEAT_OPER_SET, FEATFLAG_GLOBAL_OPERS },
+ { PRIV_SEE_CHAN, FEAT_OPERS_SEE_IN_SECRET_CHANNELS, FEATFLAG_GLOBAL_OPERS },
+ { PRIV_WIDE_GLINE, FEAT_OPER_WIDE_GLINE, FEATFLAG_GLOBAL_OPERS },
+
+ { PRIV_LOCAL_KILL, FEAT_LOCOP_KILL, FEATFLAG_LOCAL_OPERS },
+ { PRIV_REHASH, FEAT_LOCOP_REHASH, FEATFLAG_LOCAL_OPERS },
+ { PRIV_RESTART, FEAT_LOCOP_RESTART, FEATFLAG_LOCAL_OPERS },
+ { PRIV_DIE, FEAT_LOCOP_DIE, FEATFLAG_LOCAL_OPERS },
+ { PRIV_LOCAL_GLINE, FEAT_LOCOP_LGLINE, FEATFLAG_LOCAL_OPERS },
+ { PRIV_LOCAL_JUPE, FEAT_LOCOP_LJUPE, FEATFLAG_LOCAL_OPERS },
+ { PRIV_LOCAL_OPMODE, FEAT_LOCOP_LOPMODE, FEATFLAG_LOCAL_OPERS },
+ { PRIV_FORCE_LOCAL_OPMODE, FEAT_LOCOP_FORCE_LOPMODE, FEATFLAG_LOCAL_OPERS },
+ { PRIV_LOCAL_BADCHAN, FEAT_LOCOP_LBADCHAN, FEATFLAG_LOCAL_OPERS },
+ { PRIV_SET, FEAT_LOCOP_SET, FEATFLAG_LOCAL_OPERS },
+ { PRIV_SEE_CHAN, FEAT_LOCOP_SEE_IN_SECRET_CHANNELS, FEATFLAG_LOCAL_OPERS },
+ { PRIV_WIDE_GLINE, FEAT_LOCOP_WIDE_GLINE, FEATFLAG_LOCAL_OPERS },
+
+ { PRIV_LAST_PRIV, FEAT_LAST_F, FEATFLAG_NULL }
+ };
+
/* client_set_privs(struct Client* client)
*
* Sets the privileges for opers.
*/
void
-client_set_privs(struct Client* client)
+client_set_privs(struct Client *client, struct ConfItem *oper)
{
- struct Privs privs;
- struct Privs antiprivs;
int i;
- memset(&privs, 0, sizeof(struct Privs));
- memset(&antiprivs, 0, sizeof(struct Privs));
+ memset(&(cli_privs(client)), 0, sizeof(struct Privs));
- if (!IsAnOper(client)) { /* clear privilege mask */
- memset(&(cli_privs(client)), 0, sizeof(struct Privs));
+ if (!IsAnOper(client))
return;
- } else if (!MyConnect(client)) {
+ else if (!MyConnect(client))
+ {
memset(&(cli_privs(client)), 255, sizeof(struct Privs));
PrivClr(&(cli_privs(client)), PRIV_SET);
return;
}
+ else if (oper == NULL)
+ return;
- /* This sequence is temporary until the .conf is carefully rewritten */
+ /* Copy across privs from the config. */
+ cli_privs(client) = oper->privs;
- for (i = 0; feattab[i].priv; i++) {
- if (feattab[i].flag == 0) {
- if (feature_bool(feattab[i].feat))
- PrivSet(&antiprivs, feattab[i].priv);
- } else if (feattab[i].flag == ~0) {
+ /* Now go through the features and set the non-dirty flags to their feature
+ * determined defaults...
+ */
+ for (i = 0; feattab[i].priv != PRIV_LAST_PRIV; i++)
+ {
+ if (PrivHas(&oper->privs_dirty, feattab[i].priv))
+ continue;
+ if (feattab[i].feat != FEAT_LAST_F && !feature_bool(feattab[i].feat))
+ continue;
+ switch (feattab[i].flag)
+ {
+ case FEATFLAG_ENABLES_PRIV:
if (!feature_bool(feattab[i].feat))
- PrivSet(&antiprivs, feattab[i].priv);
- } else if (cli_flags(client) & feattab[i].flag) {
- if (feattab[i].feat == FEAT_LAST_F ||
- feature_bool(feattab[i].feat))
- PrivSet(&privs, feattab[i].priv);
+ continue;
+ PrivSet(&cli_privs(client), feattab[i].priv);
+ continue;
+ case FEATFLAG_DISABLES_PRIV:
+ PrivClr(&cli_privs(client), feattab[i].priv);
+ continue;
+ case FEATFLAG_ALL_OPERS:
+ if (IsAnOper(client))
+ PrivSet(&cli_privs(client), feattab[i].priv);
+ continue;
+ case FEATFLAG_GLOBAL_OPERS:
+ if (IsOper(client))
+ PrivSet(&cli_privs(client), feattab[i].priv);
+ continue;
+ case FEATFLAG_LOCAL_OPERS:
+ if (IsLocOp(client))
+ PrivSet(&cli_privs(client), feattab[i].priv);
+ continue;
+ default:
+ continue; /* ?? */
}
}
- /* This is the end of the gross section */
-
- if (PrivHas(&privs, PRIV_PROPAGATE))
- PrivSet(&privs, PRIV_DISPLAY); /* force propagating opers to display */
- else { /* if they don't propagate oper status, prevent desyncs */
- PrivSet(&antiprivs, PRIV_KILL);
- PrivSet(&antiprivs, PRIV_GLINE);
- PrivSet(&antiprivs, PRIV_JUPE);
- PrivSet(&antiprivs, PRIV_OPMODE);
- PrivSet(&antiprivs, PRIV_BADCHAN);
+ /* This should be handled in the config, but lets be sure... */
+ if (PrivHas(&cli_privs(client), PRIV_PROPAGATE))
+ /* force propagating opers to display */
+ PrivSet(&cli_privs(client), PRIV_DISPLAY);
+ else
+ {
+ /* if they don't propagate oper status, prevent desyncs */
+ PrivClr(&cli_privs(client), PRIV_KILL);
+ PrivClr(&cli_privs(client), PRIV_GLINE);
+ PrivClr(&cli_privs(client), PRIV_JUPE);
+ PrivClr(&cli_privs(client), PRIV_OPMODE);
+ PrivClr(&cli_privs(client), PRIV_BADCHAN);
}
-
- for (i = 0; i <= _PRIV_IDX(PRIV_LAST_PRIV); i++)
- privs.priv_mask[i] &= ~antiprivs.priv_mask[i];
-
- cli_privs(client) = privs;
}
static struct {
P(GLINE), P(LOCAL_GLINE), P(JUPE), P(LOCAL_JUPE),
P(OPMODE), P(LOCAL_OPMODE), P(SET), P(WHOX),
P(BADCHAN), P(LOCAL_BADCHAN), P(SEE_CHAN), P(PROPAGATE),
- P(DISPLAY), P(SEE_OPERS), P(WIDE_GLINE),
+ P(DISPLAY), P(SEE_OPERS), P(FORCE_OPMODE), P(FORCE_LOCAL_OPMODE),
+ P(WIDE_GLINE),
#undef P
{ 0, 0 }
};
projects / ircu2.10.12-pk.git / blobdiff