* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
- *
- * $Id$
*/
#include "stdinc.h"
#include "hash.h"
#include "logger.h"
#include "bandbi.h"
+#include "operhash.h"
+
+static const char resv_desc[] =
+ "Provides management of reserved nicknames and channels using (UN)RESV";
-static int mo_resv(struct Client *, struct Client *, int, const char **);
-static int ms_resv(struct Client *, struct Client *, int, const char **);
-static int me_resv(struct Client *, struct Client *, int, const char **);
-static int mo_unresv(struct Client *, struct Client *, int, const char **);
-static int ms_unresv(struct Client *, struct Client *, int, const char **);
-static int me_unresv(struct Client *, struct Client *, int, const char **);
+static void mo_resv(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void ms_resv(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void me_resv(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void mo_unresv(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void ms_unresv(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void me_unresv(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
struct Message resv_msgtab = {
- "RESV", 0, 0, 0, MFLG_SLOW | MFLG_UNREG,
+ "RESV", 0, 0, 0, 0,
{mg_ignore, mg_not_oper, {ms_resv, 4}, {ms_resv, 4}, {me_resv, 5}, {mo_resv, 3}}
};
struct Message unresv_msgtab = {
- "UNRESV", 0, 0, 0, MFLG_SLOW | MFLG_UNREG,
+ "UNRESV", 0, 0, 0, 0,
{mg_ignore, mg_not_oper, {ms_unresv, 3}, {ms_unresv, 3}, {me_unresv, 2}, {mo_unresv, 2}}
};
mapi_clist_av1 resv_clist[] = { &resv_msgtab, &unresv_msgtab, NULL };
-DECLARE_MODULE_AV1(resv, NULL, NULL, resv_clist, NULL, NULL, "$Revision$");
+DECLARE_MODULE_AV2(resv, NULL, NULL, resv_clist, NULL, NULL, NULL, NULL, resv_desc);
static void parse_resv(struct Client *source_p, const char *name,
- const char *reason, int temp_time);
+ const char *reason, int temp_time, int propagated);
static void propagate_resv(struct Client *source_p, const char *target,
int temp_time, const char *name, const char *reason);
static void cluster_resv(struct Client *source_p, int temp_time,
const char *name, const char *reason);
-static void handle_remote_unresv(struct Client *source_p, const char *name);
-static void remove_resv(struct Client *source_p, const char *name);
+static void remove_resv(struct Client *source_p, const char *name, int propagated);
/*
* mo_resv()
- * parv[0] = sender prefix
* parv[1] = channel/nick to forbid
* parv[2] = reason
*/
-static int
-mo_resv(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+mo_resv(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
const char *name;
const char *reason;
const char *target_server = NULL;
int temp_time;
int loc = 1;
+ int propagated = ConfigFileEntry.use_propagated_bans;
if(!IsOperResv(source_p))
{
sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "resv");
- return 0;
+ return;
}
/* RESV [time] <name> [ON <server>] :<reason> */
{
sendto_one(source_p, form_str(ERR_NOPRIVS),
me.name, source_p->name, "remoteban");
- return 0;
+ return;
}
target_server = parv[loc + 1];
loc += 2;
+
+ /* Set as local-only. */
+ propagated = 0;
}
if(parc <= loc || EmptyString(parv[loc]))
{
sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS), me.name, source_p->name, "RESV");
- return 0;
+ return;
}
reason = parv[loc];
/* remote resv.. */
if(target_server)
{
+ if (temp_time)
+ sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s is adding a %d min. RESV for [%s] on %s [%s]",
+ get_oper_name(source_p), temp_time / 60, name, target_server, reason);
+ else
+ sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s is adding a permanent RESV for [%s] on %s [%s]",
+ get_oper_name(source_p), name, target_server, reason);
+
propagate_resv(source_p, target_server, temp_time, name, reason);
if(match(target_server, me.name) == 0)
- return 0;
+ return;
}
- else if(rb_dlink_list_length(&cluster_conf_list) > 0)
+ else if(!propagated && rb_dlink_list_length(&cluster_conf_list) > 0)
cluster_resv(source_p, temp_time, name, reason);
- parse_resv(source_p, name, reason, temp_time);
+ if(propagated && temp_time == 0)
+ {
+ sendto_one_notice(source_p, ":Cannot set a permanent global ban");
+ return;
+ }
- return 0;
+ parse_resv(source_p, name, reason, temp_time, propagated);
}
/* ms_resv()
- * parv[0] = sender prefix
* parv[1] = target server
* parv[2] = channel/nick to forbid
* parv[3] = reason
*/
-static int
-ms_resv(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+ms_resv(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
/* parv[0] parv[1] parv[2] parv[3]
* oper target server resv reason
propagate_resv(source_p, parv[1], 0, parv[2], parv[3]);
if(!match(parv[1], me.name))
- return 0;
+ return;
if(!IsPerson(source_p))
- return 0;
+ return;
- parse_resv(source_p, parv[2], parv[3], 0);
- return 0;
+ parse_resv(source_p, parv[2], parv[3], 0, 0);
}
-static int
-me_resv(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+me_resv(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
/* time name 0 :reason */
if(!IsPerson(source_p))
- return 0;
+ return;
- parse_resv(source_p, parv[2], parv[4], atoi(parv[1]));
- return 0;
+ parse_resv(source_p, parv[2], parv[4], atoi(parv[1]), 0);
}
/* parse_resv()
* side effects - will parse the resv and create it if valid
*/
static void
-parse_resv(struct Client *source_p, const char *name, const char *reason, int temp_time)
+parse_resv(struct Client *source_p, const char *name, const char *reason, int temp_time, int propagated)
{
struct ConfItem *aconf;
- if(!MyClient(source_p) &&
- !find_shared_conf(source_p->username, source_p->host,
- source_p->servptr->name,
- (temp_time > 0) ? SHARED_TRESV : SHARED_PRESV))
- return;
-
if(IsChannelName(name))
{
if(hash_find_resv(name))
return;
}
- if(strchr(reason, '"'))
- {
- sendto_one_notice(source_p, ":Invalid character '\"' in comment");
- return;
- }
-
aconf = make_conf();
aconf->status = CONF_RESV_CHANNEL;
aconf->port = 0;
+ aconf->created = rb_current_time();
aconf->host = rb_strdup(name);
aconf->passwd = rb_strdup(reason);
- add_to_resv_hash(aconf->host, aconf);
+ aconf->info.oper = operhash_add(get_oper_name(source_p));
- if(temp_time > 0)
+ if(propagated)
+ {
+ aconf->flags |= CONF_FLAGS_MYOPER | CONF_FLAGS_TEMPORARY;
+ aconf->hold = rb_current_time() + temp_time;
+ aconf->lifetime = aconf->hold;
+ replace_old_ban(aconf);
+ add_prop_ban(aconf);
+
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "%s added global %d min. RESV for [%s] [%s]",
+ get_oper_name(source_p), temp_time / 60,
+ name, reason);
+ ilog(L_KLINE, "R %s %d %s %s",
+ get_oper_name(source_p), temp_time / 60, name, reason);
+ sendto_one_notice(source_p, ":Added global %d min. RESV [%s]",
+ temp_time / 60, name);
+ sendto_server(NULL, NULL, CAP_BAN|CAP_TS6, NOCAPS,
+ ":%s BAN R * %s %lu %d %d * :%s",
+ source_p->id, aconf->host,
+ (unsigned long)aconf->created,
+ (int)(aconf->hold - aconf->created),
+ (int)(aconf->lifetime - aconf->created),
+ reason);
+ }
+ else if(temp_time > 0)
{
aconf->hold = rb_current_time() + temp_time;
bandb_add(BANDB_RESV, source_p, aconf->host, NULL, aconf->passwd, NULL, 0);
}
+
+ add_to_resv_hash(aconf->host, aconf);
+ resv_chan_forcepart(aconf->host, aconf->passwd, temp_time);
}
else if(clean_resv_nick(name))
{
return;
}
- if(strchr(reason, '"'))
- {
- sendto_one_notice(source_p, ":Invalid character '\"' in comment");
- return;
- }
-
if(!valid_wild_card_simple(name))
{
sendto_one_notice(source_p,
aconf = make_conf();
aconf->status = CONF_RESV_NICK;
aconf->port = 0;
+ aconf->created = rb_current_time();
aconf->host = rb_strdup(name);
aconf->passwd = rb_strdup(reason);
- rb_dlinkAddAlloc(aconf, &resv_conf_list);
+ aconf->info.oper = operhash_add(get_oper_name(source_p));
- if(temp_time > 0)
+ if(propagated)
+ {
+ aconf->flags |= CONF_FLAGS_MYOPER | CONF_FLAGS_TEMPORARY;
+ aconf->hold = rb_current_time() + temp_time;
+ aconf->lifetime = aconf->hold;
+ replace_old_ban(aconf);
+ add_prop_ban(aconf);
+
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "%s added global %d min. RESV for [%s] [%s]",
+ get_oper_name(source_p), temp_time / 60,
+ name, reason);
+ ilog(L_KLINE, "R %s %d %s %s",
+ get_oper_name(source_p), temp_time / 60, name, reason);
+ sendto_one_notice(source_p, ":Added global %d min. RESV [%s]",
+ temp_time / 60, name);
+ sendto_server(NULL, NULL, CAP_BAN|CAP_TS6, NOCAPS,
+ ":%s BAN R * %s %lu %d %d * :%s",
+ source_p->id, aconf->host,
+ (unsigned long)aconf->created,
+ (int)(aconf->hold - aconf->created),
+ (int)(aconf->lifetime - aconf->created),
+ reason);
+ }
+ else if(temp_time > 0)
{
aconf->hold = rb_current_time() + temp_time;
bandb_add(BANDB_RESV, source_p, aconf->host, NULL, aconf->passwd, NULL, 0);
}
+
+ rb_dlinkAddAlloc(aconf, &resv_conf_list);
+ resv_nick_fnc(aconf->host, aconf->passwd, temp_time);
}
else
sendto_one_notice(source_p, ":You have specified an invalid resv: [%s]", name);
/*
* mo_unresv()
- * parv[0] = sender prefix
* parv[1] = channel/nick to unforbid
*/
-static int
-mo_unresv(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+mo_unresv(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
+ int propagated = 1;
+
if(!IsOperResv(source_p))
{
sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "resv");
- return 0;
+ return;
}
if((parc == 4) && (irccmp(parv[2], "ON") == 0))
{
sendto_one(source_p, form_str(ERR_NOPRIVS),
me.name, source_p->name, "remoteban");
- return 0;
+ return;
}
propagate_generic(source_p, "UNRESV", parv[3], CAP_CLUSTER, "%s", parv[1]);
if(match(parv[3], me.name) == 0)
- return 0;
+ return;
+
+ propagated = 0;
}
+#if 0
else if(rb_dlink_list_length(&cluster_conf_list) > 0)
cluster_generic(source_p, "UNRESV", SHARED_UNRESV, CAP_CLUSTER, "%s", parv[1]);
+#endif
+ /* cluster{} moved to remove_resv */
- remove_resv(source_p, parv[1]);
- return 0;
+ remove_resv(source_p, parv[1], propagated);
}
/* ms_unresv()
- * parv[0] = sender prefix
* parv[1] = target server
* parv[2] = resv to remove
*/
-static int
-ms_unresv(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+ms_unresv(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
/* parv[0] parv[1] parv[2]
* oper target server resv to remove
propagate_generic(source_p, "UNRESV", parv[1], CAP_CLUSTER, "%s", parv[2]);
if(!match(parv[1], me.name))
- return 0;
+ return;
if(!IsPerson(source_p))
- return 0;
+ return;
- handle_remote_unresv(source_p, parv[2]);
- return 0;
+ remove_resv(source_p, parv[2], 0);
}
-static int
-me_unresv(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+me_unresv(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
/* name */
if(!IsPerson(source_p))
- return 0;
-
- handle_remote_unresv(source_p, parv[1]);
- return 0;
-}
-
-static void
-handle_remote_unresv(struct Client *source_p, const char *name)
-{
- if(!find_shared_conf(source_p->username, source_p->host,
- source_p->servptr->name, SHARED_UNRESV))
return;
- remove_resv(source_p, name);
-
- return;
+ remove_resv(source_p, parv[1], 0);
}
static void
-remove_resv(struct Client *source_p, const char *name)
+remove_resv(struct Client *source_p, const char *name, int propagated)
{
struct ConfItem *aconf = NULL;
+ rb_dlink_node *ptr;
+ time_t now;
if(IsChannelName(name))
{
if((aconf = hash_find_resv(name)) == NULL)
{
+ if(propagated && rb_dlink_list_length(&cluster_conf_list))
+ cluster_generic(source_p, "UNRESV", SHARED_UNRESV, CAP_CLUSTER, "%s", name);
+
sendto_one_notice(source_p, ":No RESV for %s", name);
return;
}
+ if(aconf->lifetime)
+ {
+ if(!propagated)
+ {
+ sendto_one_notice(source_p, ":Cannot remove global RESV %s on specific servers", name);
+ return;
+ }
+ if (!lookup_prop_ban(aconf))
+ return;
+ sendto_one_notice(source_p, ":RESV for [%s] is removed", name);
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "%s has removed the global RESV for: [%s]",
+ get_oper_name(source_p), name);
+ ilog(L_KLINE, "UR %s %s", get_oper_name(source_p), name);
+ now = rb_current_time();
+ if(aconf->created < now)
+ aconf->created = now;
+ else
+ aconf->created++;
+ aconf->hold = aconf->created;
+ operhash_delete(aconf->info.oper);
+ aconf->info.oper = operhash_add(get_oper_name(source_p));
+ aconf->flags |= CONF_FLAGS_MYOPER | CONF_FLAGS_TEMPORARY;
+ sendto_server(NULL, NULL, CAP_BAN|CAP_TS6, NOCAPS,
+ ":%s BAN R * %s %lu %d %d * :*",
+ source_p->id, aconf->host,
+ (unsigned long)aconf->created,
+ 0,
+ (int)(aconf->lifetime - aconf->created));
+ deactivate_conf(aconf, now);
+ return;
+ }
+ else if(propagated && rb_dlink_list_length(&cluster_conf_list) > 0)
+ cluster_generic(source_p, "UNRESV", SHARED_UNRESV, CAP_CLUSTER, "%s", name);
+
+ sendto_one_notice(source_p, ":RESV for [%s] is removed", name);
+ ilog(L_KLINE, "UR %s %s", get_oper_name(source_p), name);
if(!aconf->hold)
+ {
bandb_del(BANDB_RESV, aconf->host, NULL);
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "%s has removed the RESV for: [%s]",
+ get_oper_name(source_p), name);
+ }
else
{
- sendto_one_notice(source_p, ":RESV for [%s] is removed", name);
sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "%s has removed the RESV for: [%s]",
+ "%s has removed the temporary RESV for: [%s]",
get_oper_name(source_p), name);
- ilog(L_KLINE, "UR %s %s", get_oper_name(source_p), name);
}
del_from_resv_hash(name, aconf);
}
else
{
- rb_dlink_node *ptr;
-
RB_DLINK_FOREACH(ptr, resv_conf_list.head)
{
aconf = ptr->data;
if(aconf == NULL)
{
+ if(propagated && rb_dlink_list_length(&cluster_conf_list))
+ cluster_generic(source_p, "UNRESV", SHARED_UNRESV, CAP_CLUSTER, "%s", name);
+
sendto_one_notice(source_p, ":No RESV for %s", name);
return;
}
+ if(aconf->lifetime)
+ {
+ if(!propagated)
+ {
+ sendto_one_notice(source_p, ":Cannot remove global RESV %s on specific servers", name);
+ return;
+ }
+ if (!lookup_prop_ban(aconf))
+ return;
+ sendto_one_notice(source_p, ":RESV for [%s] is removed", name);
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "%s has removed the global RESV for: [%s]",
+ get_oper_name(source_p), name);
+ ilog(L_KLINE, "UR %s %s", get_oper_name(source_p), name);
+ now = rb_current_time();
+ if(aconf->created < now)
+ aconf->created = now;
+ else
+ aconf->created++;
+ aconf->hold = aconf->created;
+ operhash_delete(aconf->info.oper);
+ aconf->info.oper = operhash_add(get_oper_name(source_p));
+ aconf->flags |= CONF_FLAGS_MYOPER | CONF_FLAGS_TEMPORARY;
+ sendto_server(NULL, NULL, CAP_BAN|CAP_TS6, NOCAPS,
+ ":%s BAN R * %s %lu %d %d * :*",
+ source_p->id, aconf->host,
+ (unsigned long)aconf->created,
+ 0,
+ (int)(aconf->lifetime - aconf->created));
+ deactivate_conf(aconf, now);
+ return;
+ }
+ else if(propagated && rb_dlink_list_length(&cluster_conf_list) > 0)
+ cluster_generic(source_p, "UNRESV", SHARED_UNRESV, CAP_CLUSTER, "%s", name);
+
+ sendto_one_notice(source_p, ":RESV for [%s] is removed", name);
+ ilog(L_KLINE, "UR %s %s", get_oper_name(source_p), name);
if(!aconf->hold)
+ {
bandb_del(BANDB_RESV, aconf->host, NULL);
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "%s has removed the RESV for: [%s]",
+ get_oper_name(source_p), name);
+ }
else
{
- sendto_one_notice(source_p, ":RESV for [%s] is removed", name);
sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "%s has removed the RESV for: [%s]",
+ "%s has removed the temporary RESV for: [%s]",
get_oper_name(source_p), name);
- ilog(L_KLINE, "UR %s %s", get_oper_name(source_p), name);
}
/* already have ptr from the loop above.. */
rb_dlinkDestroy(ptr, &resv_conf_list);
projects / solanum.git / blobdiff