cadey
/
elemental-ircd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add propagated resvs, like klines and xlines.

This commit is contained in:
Jilles Tjoelker 2010-03-27 16:13:57 +01:00
parent d0cf872a95
commit 9b9d818b32
6 changed files with 245 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/reference.conf
View File

@ -1198,7 +1198,7 @@ general {
*/ */
warn_no_nline = yes; warn_no_nline = yes;
/* use propagated bans: KLINE and XLINE set fully propagated bans. /* use propagated bans: KLINE, XLINE and RESV set fully propagated bans.
* That means the bans are part of the netburst and restarted/split * That means the bans are part of the netburst and restarted/split
* servers will get them, but they will not apply to 3.2 and older * servers will get them, but they will not apply to 3.2 and older
* servers at all. * servers at all.

2
help/opers/stats
View File

@ -29,7 +29,7 @@ X f - Shows File Descriptors
^ o - Shows operator blocks (Old O: lines) ^ o - Shows operator blocks (Old O: lines)
^ P - Shows configured ports ^ P - Shows configured ports
p - Shows online opers p - Shows online opers
* q - Shows temporary resv'd nicks and channels * q - Shows temporary and global resv'd nicks and channels
* Q - Shows resv'd nicks and channels * Q - Shows resv'd nicks and channels
* r - Shows resource usage by ircd * r - Shows resource usage by ircd
* t - Shows generic server stats * t - Shows generic server stats

2
include/channel.h
View File

@ -277,6 +277,8 @@ extern void unset_chcap_usage_counts(struct Client *serv_p);
extern void send_cap_mode_changes(struct Client *client_p, struct Client *source_p, extern void send_cap_mode_changes(struct Client *client_p, struct Client *source_p,
struct Channel *chptr, struct ChModeChange foo[], int); struct Channel *chptr, struct ChModeChange foo[], int);
void resv_chan_forcepart(const char *name, const char *reason, int temp_time);
extern void set_channel_mode(struct Client *client_p, struct Client *source_p, extern void set_channel_mode(struct Client *client_p, struct Client *source_p,
struct Channel *chptr, struct membership *msptr, int parc, const char *parv[]); struct Channel *chptr, struct membership *msptr, int parc, const char *parv[]);

35
modules/core/m_ban.c
View File

@ -29,6 +29,7 @@
#include "stdinc.h" #include "stdinc.h"
#include "send.h" #include "send.h"
#include "channel.h"
#include "client.h" #include "client.h"
#include "common.h" #include "common.h"
#include "config.h" #include "config.h"
@ -75,6 +76,7 @@ ms_ban(struct Client *client_p, struct Client *source_p, int parc, const char *p
time_t created, hold, lifetime; time_t created, hold, lifetime;
char *p; char *p;
int act; int act;
int valid;
if (strlen(parv[1]) != 1) if (strlen(parv[1]) != 1)
{ {
@ -93,6 +95,11 @@ ms_ban(struct Client *client_p, struct Client *source_p, int parc, const char *p
ntype = CONF_XLINE; ntype = CONF_XLINE;
stype = "X-Line"; stype = "X-Line";
break; break;
case 'R':
ntype = IsChannelName(parv[3]) ? CONF_RESV_CHANNEL :
CONF_RESV_NICK;
stype = "RESV";
break;
default: default:
sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
"Unknown BAN type %s from %s", "Unknown BAN type %s from %s",
@ -164,10 +171,19 @@ ms_ban(struct Client *client_p, struct Client *source_p, int parc, const char *p
aconf->passwd = rb_strndup(parv[parc - 1], p - parv[parc - 1] + 1); aconf->passwd = rb_strndup(parv[parc - 1], p - parv[parc - 1] + 1);
aconf->spasswd = rb_strdup(p + 1); aconf->spasswd = rb_strdup(p + 1);
} }
if (act && hold != created && switch (ntype)
!(ntype == CONF_KILL ? {
valid_wild_card(aconf->user, aconf->host) : case CONF_KILL:
valid_wild_card_simple(aconf->host))) valid = valid_wild_card(aconf->user, aconf->host);
break;
case CONF_RESV_CHANNEL:
valid = 1;
break;
default:
valid = valid_wild_card_simple(aconf->host);
break;
}
if (act && hold != created && !valid)
{ {
sendto_realops_snomask(SNO_GENERAL, L_ALL, sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Ignoring global %d min. %s from %s%s%s for [%s%s%s]: too few non-wildcard characters", "Ignoring global %d min. %s from %s%s%s for [%s%s%s]: too few non-wildcard characters",
@ -260,6 +276,17 @@ ms_ban(struct Client *client_p, struct Client *source_p, int parc, const char *p
check_xlines(); check_xlines();
} }
break; break;
case CONF_RESV_CHANNEL:
if (!(aconf->status & CONF_ILLEGAL))
{
add_to_resv_hash(aconf->host, aconf);
resv_chan_forcepart(aconf->host, aconf->passwd, hold - rb_current_time());
}
break;
case CONF_RESV_NICK:
if (!(aconf->status & CONF_ILLEGAL))
rb_dlinkAddAlloc(aconf, &resv_conf_list);
break;
} }
sendto_server(client_p, NULL, CAP_BAN|CAP_TS6, NOCAPS, sendto_server(client_p, NULL, CAP_BAN|CAP_TS6, NOCAPS,
":%s BAN %s %s %s %s %s %s %s :%s", ":%s BAN %s %s %s %s %s %s %s :%s",

228
modules/m_resv.c
View File

@ -62,15 +62,14 @@ mapi_clist_av1 resv_clist[] = { &resv_msgtab, &unresv_msgtab, NULL };
DECLARE_MODULE_AV1(resv, NULL, NULL, resv_clist, NULL, NULL, "$Revision$"); DECLARE_MODULE_AV1(resv, NULL, NULL, resv_clist, NULL, NULL, "$Revision$");
static void parse_resv(struct Client *source_p, const char *name, 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, static void propagate_resv(struct Client *source_p, const char *target,
int temp_time, const char *name, const char *reason); int temp_time, const char *name, const char *reason);
static void cluster_resv(struct Client *source_p, int temp_time, static void cluster_resv(struct Client *source_p, int temp_time,
const char *name, const char *reason); const char *name, const char *reason);
static void handle_remote_unresv(struct Client *source_p, const char *name); 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);
static void resv_chan_forcepart(const char *name, const char *reason, int temp_time);
/* /*
* mo_resv() * mo_resv()
@ -86,6 +85,7 @@ mo_resv(struct Client *client_p, struct Client *source_p, int parc, const char *
const char *target_server = NULL; const char *target_server = NULL;
int temp_time; int temp_time;
int loc = 1; int loc = 1;
int propagated = ConfigFileEntry.use_propagated_bans;
if(!IsOperResv(source_p)) if(!IsOperResv(source_p))
{ {
@ -115,6 +115,9 @@ mo_resv(struct Client *client_p, struct Client *source_p, int parc, const char *
target_server = parv[loc + 1]; target_server = parv[loc + 1];
loc += 2; loc += 2;
/* Set as local-only. */
propagated = 0;
} }
if(parc <= loc || EmptyString(parv[loc])) if(parc <= loc || EmptyString(parv[loc]))
@ -133,10 +136,16 @@ mo_resv(struct Client *client_p, struct Client *source_p, int parc, const char *
if(match(target_server, me.name) == 0) if(match(target_server, me.name) == 0)
return 0; return 0;
} }
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); 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 0;
}
parse_resv(source_p, name, reason, temp_time, propagated);
return 0; return 0;
} }
@ -161,7 +170,7 @@ ms_resv(struct Client *client_p, struct Client *source_p, int parc, const char *
if(!IsPerson(source_p)) if(!IsPerson(source_p))
return 0; return 0;
parse_resv(source_p, parv[2], parv[3], 0); parse_resv(source_p, parv[2], parv[3], 0, 0);
return 0; return 0;
} }
@ -172,7 +181,7 @@ me_resv(struct Client *client_p, struct Client *source_p, int parc, const char *
if(!IsPerson(source_p)) if(!IsPerson(source_p))
return 0; return 0;
parse_resv(source_p, parv[2], parv[4], atoi(parv[1])); parse_resv(source_p, parv[2], parv[4], atoi(parv[1]), 0);
return 0; return 0;
} }
@ -185,7 +194,7 @@ me_resv(struct Client *client_p, struct Client *source_p, int parc, const char *
* side effects - will parse the resv and create it if valid * side effects - will parse the resv and create it if valid
*/ */
static void 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; struct ConfItem *aconf;
@ -223,10 +232,32 @@ parse_resv(struct Client *source_p, const char *name, const char *reason, int te
aconf->host = rb_strdup(name); aconf->host = rb_strdup(name);
aconf->passwd = rb_strdup(reason); aconf->passwd = rb_strdup(reason);
aconf->info.oper = operhash_add(get_oper_name(source_p)); aconf->info.oper = operhash_add(get_oper_name(source_p));
add_to_resv_hash(aconf->host, aconf);
resv_chan_forcepart(aconf->host, aconf->passwd, temp_time);
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);
rb_dlinkAddAlloc(aconf, &prop_bans);
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; aconf->hold = rb_current_time() + temp_time;
@ -250,6 +281,9 @@ parse_resv(struct Client *source_p, const char *name, const char *reason, int te
bandb_add(BANDB_RESV, source_p, aconf->host, NULL, aconf->passwd, NULL, 0); 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)) else if(clean_resv_nick(name))
{ {
@ -288,9 +322,32 @@ parse_resv(struct Client *source_p, const char *name, const char *reason, int te
aconf->host = rb_strdup(name); aconf->host = rb_strdup(name);
aconf->passwd = rb_strdup(reason); aconf->passwd = rb_strdup(reason);
aconf->info.oper = operhash_add(get_oper_name(source_p)); aconf->info.oper = operhash_add(get_oper_name(source_p));
rb_dlinkAddAlloc(aconf, &resv_conf_list);
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);
rb_dlinkAddAlloc(aconf, &prop_bans);
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; aconf->hold = rb_current_time() + temp_time;
@ -314,6 +371,8 @@ parse_resv(struct Client *source_p, const char *name, const char *reason, int te
bandb_add(BANDB_RESV, source_p, aconf->host, NULL, aconf->passwd, NULL, 0); bandb_add(BANDB_RESV, source_p, aconf->host, NULL, aconf->passwd, NULL, 0);
} }
rb_dlinkAddAlloc(aconf, &resv_conf_list);
} }
else else
sendto_one_notice(source_p, ":You have specified an invalid resv: [%s]", name); sendto_one_notice(source_p, ":You have specified an invalid resv: [%s]", name);
@ -380,6 +439,8 @@ cluster_resv(struct Client *source_p, int temp_time, const char *name, const cha
static int static int
mo_unresv(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) mo_unresv(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{ {
int propagated = 1;
if(!IsOperResv(source_p)) if(!IsOperResv(source_p))
{ {
sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "resv"); sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "resv");
@ -399,11 +460,16 @@ mo_unresv(struct Client *client_p, struct Client *source_p, int parc, const char
if(match(parv[3], me.name) == 0) if(match(parv[3], me.name) == 0)
return 0; return 0;
propagated = 0;
} }
#if 0
else if(rb_dlink_list_length(&cluster_conf_list) > 0) else if(rb_dlink_list_length(&cluster_conf_list) > 0)
cluster_generic(source_p, "UNRESV", SHARED_UNRESV, CAP_CLUSTER, "%s", parv[1]); cluster_generic(source_p, "UNRESV", SHARED_UNRESV, CAP_CLUSTER, "%s", parv[1]);
#endif
/* cluster{} moved to remove_resv */
remove_resv(source_p, parv[1]); remove_resv(source_p, parv[1], propagated);
return 0; return 0;
} }
@ -448,24 +514,63 @@ handle_remote_unresv(struct Client *source_p, const char *name)
source_p->servptr->name, SHARED_UNRESV)) source_p->servptr->name, SHARED_UNRESV))
return; return;
remove_resv(source_p, name); remove_resv(source_p, name, 0);
return; return;
} }
static void 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; struct ConfItem *aconf = NULL;
rb_dlink_node *ptr;
if(IsChannelName(name)) if(IsChannelName(name))
{ {
if((aconf = hash_find_resv(name)) == NULL) if((aconf = hash_find_resv(name)) == NULL)
{ {
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 RESV for %s", name); sendto_one_notice(source_p, ":No RESV for %s", name);
return; return;
} }
if(aconf->lifetime)
{
if(!propagated)
{
sendto_one_notice(source_p, ":Cannot remove global RESV %s on specific servers", name);
return;
}
ptr = rb_dlinkFind(aconf, &prop_bans);
if(ptr == NULL)
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);
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 R * %s %lu %d %d * :*",
source_p->id, aconf->host,
(unsigned long)aconf->created,
0,
(int)(aconf->lifetime - aconf->created));
deactivate_conf(aconf, ptr);
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); sendto_one_notice(source_p, ":RESV for [%s] is removed", name);
ilog(L_KLINE, "UR %s %s", get_oper_name(source_p), name); ilog(L_KLINE, "UR %s %s", get_oper_name(source_p), name);
if(!aconf->hold) if(!aconf->hold)
@ -485,8 +590,6 @@ remove_resv(struct Client *source_p, const char *name)
} }
else else
{ {
rb_dlink_node *ptr;
RB_DLINK_FOREACH(ptr, resv_conf_list.head) RB_DLINK_FOREACH(ptr, resv_conf_list.head)
{ {
aconf = ptr->data; aconf = ptr->data;
@ -499,10 +602,48 @@ remove_resv(struct Client *source_p, const char *name)
if(aconf == NULL) if(aconf == NULL)
{ {
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 RESV for %s", name); sendto_one_notice(source_p, ":No RESV for %s", name);
return; return;
} }
if(aconf->lifetime)
{
if(!propagated)
{
sendto_one_notice(source_p, ":Cannot remove global RESV %s on specific servers", name);
return;
}
ptr = rb_dlinkFind(aconf, &prop_bans);
if(ptr == NULL)
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);
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 R * %s %lu %d %d * :*",
source_p->id, aconf->host,
(unsigned long)aconf->created,
0,
(int)(aconf->lifetime - aconf->created));
deactivate_conf(aconf, ptr);
return;
}
else if(propagated && rb_dlink_list_length(&cluster_conf_list) > 0)
cluster_generic(source_p, "UNRESV", SHARED_UNRESV, CAP_CLUSTER, "%s", name);
if(!aconf->hold) if(!aconf->hold)
bandb_del(BANDB_RESV, aconf->host, NULL); bandb_del(BANDB_RESV, aconf->host, NULL);
else else
@ -520,54 +661,3 @@ remove_resv(struct Client *source_p, const char *name)
return; return;
} }
static void
resv_chan_forcepart(const char *name, const char *reason, int temp_time)
{
rb_dlink_node *ptr;
rb_dlink_node *next_ptr;
struct Channel *chptr;
struct membership *msptr;
struct Client *target_p;
if(!ConfigChannel.resv_forcepart)
return;
/* for each user on our server in the channel list
* send them a PART, and notify opers.
*/
chptr = find_channel(name);
if(chptr != NULL)
{
RB_DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->locmembers.head)
{
msptr = ptr->data;
target_p = msptr->client_p;
if(IsExemptResv(target_p))
continue;
sendto_server(target_p, chptr, CAP_TS6, NOCAPS,
":%s PART %s", target_p->id, chptr->chname);
sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s PART %s :%s",
target_p->name, target_p->username,
target_p->host, chptr->chname, target_p->name);
remove_user_from_channel(msptr);
/* notify opers & user they were removed from the channel */
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Forced PART for %s!%s@%s from %s (%s)",
target_p->name, target_p->username,
target_p->host, name, reason);
if(temp_time > 0)
sendto_one_notice(target_p, ":*** Channel %s is temporarily unavailable on this server.",
name);
else
sendto_one_notice(target_p, ":*** Channel %s is no longer available on this server.",
name);
}
}
}

51
src/channel.c
View File

@ -1532,6 +1532,57 @@ send_cap_mode_changes(struct Client *client_p, struct Client *source_p,
} }
} }
void
resv_chan_forcepart(const char *name, const char *reason, int temp_time)
{
rb_dlink_node *ptr;
rb_dlink_node *next_ptr;
struct Channel *chptr;
struct membership *msptr;
struct Client *target_p;
if(!ConfigChannel.resv_forcepart)
return;
/* for each user on our server in the channel list
* send them a PART, and notify opers.
*/
chptr = find_channel(name);
if(chptr != NULL)
{
RB_DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->locmembers.head)
{
msptr = ptr->data;
target_p = msptr->client_p;
if(IsExemptResv(target_p))
continue;
sendto_server(target_p, chptr, CAP_TS6, NOCAPS,
":%s PART %s", target_p->id, chptr->chname);
sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s PART %s :%s",
target_p->name, target_p->username,
target_p->host, chptr->chname, target_p->name);
remove_user_from_channel(msptr);
/* notify opers & user they were removed from the channel */
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Forced PART for %s!%s@%s from %s (%s)",
target_p->name, target_p->username,
target_p->host, name, reason);
if(temp_time > 0)
sendto_one_notice(target_p, ":*** Channel %s is temporarily unavailable on this server.",
name);
else
sendto_one_notice(target_p, ":*** Channel %s is no longer available on this server.",
name);
}
}
}
/* Check what we will forward to, without sending any notices to the user /* Check what we will forward to, without sending any notices to the user
* -- jilles * -- jilles
*/ */