#include "s_newconf.h"
#include "reject.h"
#include "bandbi.h"
+#include "operhash.h"
static int mo_xline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
static int ms_xline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
static int valid_xline(struct Client *, const char *, const char *);
static void apply_xline(struct Client *client_p, const char *name,
- const char *reason, int temp_time);
+ const char *reason, int temp_time, int propagated);
static void propagate_xline(struct Client *source_p, const char *target,
int temp_time, const char *name, const char *type, const char *reason);
static void cluster_xline(struct Client *source_p, int temp_time,
const char *name, const char *reason);
static void handle_remote_unxline(struct Client *source_p, const char *name);
-static void remove_xline(struct Client *source_p, const char *name);
+static void remove_xline(struct Client *source_p, const char *name,
+ int propagated);
/* m_xline()
const char *target_server = NULL;
int temp_time;
int loc = 1;
+ int propagated = ConfigFileEntry.use_propagated_bans;
if(!IsOperXline(source_p))
{
if(!match(target_server, me.name))
return 0;
+
+ /* Set as local-only. */
+ propagated = 0;
}
- else if(rb_dlink_list_length(&cluster_conf_list) > 0)
+ else if(!propagated && rb_dlink_list_length(&cluster_conf_list) > 0)
cluster_xline(source_p, temp_time, name, reason);
if((aconf = find_xline_mask(name)) != NULL)
{
sendto_one(source_p, ":%s NOTICE %s :[%s] already X-Lined by [%s] - %s",
- me.name, source_p->name, name, aconf->name, aconf->passwd);
+ me.name, source_p->name, name, aconf->host, aconf->passwd);
return 0;
}
if(!valid_xline(source_p, name, reason))
return 0;
- apply_xline(source_p, name, reason, temp_time);
+ if(propagated && temp_time == 0)
+ {
+ sendto_one_notice(source_p, ":Cannot set a permanent global ban");
+ return 0;
+ }
+
+ apply_xline(source_p, name, reason, temp_time, propagated);
return 0;
}
/* already xlined */
if((aconf = find_xline_mask(name)) != NULL)
{
- sendto_one_notice(source_p, ":[%s] already X-Lined by [%s] - %s", name, aconf->name,
+ sendto_one_notice(source_p, ":[%s] already X-Lined by [%s] - %s", name, aconf->host,
aconf->passwd);
return;
}
- apply_xline(source_p, name, reason, temp_time);
+ apply_xline(source_p, name, reason, temp_time, 0);
}
/* valid_xline()
return 0;
}
- if(strchr(reason, ':') != NULL)
- {
- sendto_one_notice(source_p, ":Invalid character ':' in comment");
- return 0;
- }
-
- if(strchr(reason, '"'))
- {
- sendto_one_notice(source_p, ":Invalid character '\"' in comment");
- return 0;
- }
-
if(!valid_wild_card_simple(gecos))
{
sendto_one_notice(source_p,
}
void
-apply_xline(struct Client *source_p, const char *name, const char *reason, int temp_time)
+apply_xline(struct Client *source_p, const char *name, const char *reason, int temp_time, int propagated)
{
struct ConfItem *aconf;
aconf = make_conf();
aconf->status = CONF_XLINE;
+ aconf->created = rb_current_time();
+ aconf->host = rb_strdup(name);
+ aconf->passwd = rb_strdup(reason);
+ collapse(aconf->host);
+
+ aconf->info.oper = operhash_add(get_oper_name(source_p));
- if(strstr(name, "\\s"))
+ if(propagated)
{
- char *tmp = LOCAL_COPY(name);
- char *orig = tmp;
- char *new = tmp;
+ aconf->flags |= CONF_FLAGS_MYOPER | CONF_FLAGS_TEMPORARY;
+ aconf->hold = rb_current_time() + temp_time;
+ aconf->lifetime = aconf->hold;
- while(*orig)
- {
- if(*orig == '\\' && *(orig + 1) != '\0')
- {
- if(*(orig + 1) == 's')
- {
- *new++ = ' ';
- orig += 2;
- }
- /* otherwise skip that and the escaped
- * character after it, so we dont mistake
- * \\s as \s --fl
- */
- else
- {
- *new++ = *orig++;
- *new++ = *orig++;
- }
- }
- else
- *new++ = *orig++;
- }
+ replace_old_ban(aconf);
+ rb_dlinkAddAlloc(aconf, &prop_bans);
- *new = '\0';
- aconf->name = rb_strdup(tmp);
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "%s added global %d min. X-Line for [%s] [%s]",
+ get_oper_name(source_p), temp_time / 60,
+ aconf->host, reason);
+ ilog(L_KLINE, "X %s %d %s %s",
+ get_oper_name(source_p), temp_time / 60, name, reason);
+ sendto_one_notice(source_p, ":Added global %d min. X-Line [%s]",
+ temp_time / 60, aconf->host);
+ sendto_server(NULL, NULL, CAP_BAN|CAP_TS6, NOCAPS,
+ ":%s BAN X * %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
- aconf->name = rb_strdup(name);
-
- aconf->passwd = rb_strdup(reason);
- collapse(aconf->name);
-
- if(temp_time > 0)
+ else if(temp_time > 0)
{
aconf->hold = rb_current_time() + temp_time;
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"%s added temporary %d min. X-Line for [%s] [%s]",
get_oper_name(source_p), temp_time / 60,
- aconf->name, reason);
+ aconf->host, reason);
ilog(L_KLINE, "X %s %d %s %s",
get_oper_name(source_p), temp_time / 60, name, reason);
sendto_one_notice(source_p, ":Added temporary %d min. X-Line [%s]",
- temp_time / 60, aconf->name);
+ temp_time / 60, aconf->host);
}
else
{
sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s added X-Line for [%s] [%s]",
- get_oper_name(source_p), aconf->name, aconf->passwd);
+ get_oper_name(source_p), aconf->host, aconf->passwd);
sendto_one_notice(source_p, ":Added X-Line for [%s] [%s]",
- aconf->name, aconf->passwd);
+ aconf->host, aconf->passwd);
- bandb_add(BANDB_XLINE, source_p, aconf->host, NULL, reason, NULL, 0);
- ilog(L_KLINE, "X %s 0 %s %s", get_oper_name(source_p), name, reason);
+ bandb_add(BANDB_XLINE, source_p, aconf->host, NULL, aconf->passwd, NULL, 0);
+ ilog(L_KLINE, "X %s 0 %s %s", get_oper_name(source_p), name, aconf->passwd);
}
rb_dlinkAddAlloc(aconf, &xline_conf_list);
static int
mo_unxline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
+ int propagated = 1;
+
if(!IsOperXline(source_p))
{
sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "xline");
if(match(parv[3], me.name) == 0)
return 0;
+
+ propagated = 0;
}
- else if(rb_dlink_list_length(&cluster_conf_list))
- cluster_generic(source_p, "UNXLINE", SHARED_UNXLINE, CAP_CLUSTER, "%s", parv[1]);
+ /* cluster{} moved to remove_xline */
- remove_xline(source_p, parv[1]);
+ remove_xline(source_p, parv[1], propagated);
return 0;
}
source_p->servptr->name, SHARED_UNXLINE))
return;
- remove_xline(source_p, name);
+ remove_xline(source_p, name, 0);
return;
}
static void
-remove_xline(struct Client *source_p, const char *name)
+remove_xline(struct Client *source_p, const char *name, int propagated)
{
struct ConfItem *aconf;
rb_dlink_node *ptr;
{
aconf = ptr->data;
- if(!irccmp(aconf->name, name))
+ if(!irccmp(aconf->host, name))
{
+ if(aconf->lifetime)
+ {
+ if(!propagated)
+ {
+ sendto_one_notice(source_p, ":Cannot remove global X-Line %s on specific servers", name);
+ return;
+ }
+ ptr = rb_dlinkFind(aconf, &prop_bans);
+ if(ptr == NULL)
+ return;
+ sendto_one_notice(source_p, ":X-Line for [%s] is removed", name);
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "%s has removed the global X-Line for: [%s]",
+ get_oper_name(source_p), name);
+ ilog(L_KLINE, "UX %s %s", get_oper_name(source_p), name);
+ if(aconf->created < rb_current_time())
+ aconf->created = rb_current_time();
+ 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 X * %s %lu %d %d * :*",
+ source_p->id, aconf->host,
+ (unsigned long)aconf->created,
+ 0,
+ (int)(aconf->lifetime - aconf->created));
+ remove_reject_mask(aconf->host, NULL);
+ deactivate_conf(aconf, ptr);
+ return;
+ }
+ else if(propagated && rb_dlink_list_length(&cluster_conf_list))
+ cluster_generic(source_p, "UNXLINE", SHARED_UNXLINE, CAP_CLUSTER, "%s", name);
if(!aconf->hold)
{
bandb_del(BANDB_XLINE, aconf->host, NULL);
ilog(L_KLINE, "UX %s %s", get_oper_name(source_p), name);
}
- remove_reject_mask(aconf->name, NULL);
+ remove_reject_mask(aconf->host, NULL);
free_conf(aconf);
rb_dlinkDestroy(ptr, &xline_conf_list);
return;
}
}
+ if(propagated && rb_dlink_list_length(&cluster_conf_list))
+ cluster_generic(source_p, "UNXLINE", SHARED_UNXLINE, CAP_CLUSTER, "%s", name);
+
sendto_one_notice(source_p, ":No X-Line for %s", name);
return;