* 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 "channel.h"
#include "class.h"
#include "client.h"
-#include "common.h"
#include "match.h"
#include "ircd.h"
#include "hostmask.h"
#include "bandbi.h"
#include "operhash.h"
-static int mo_kline(struct Client *, struct Client *, int, const char **);
-static int ms_kline(struct Client *, struct Client *, int, const char **);
-static int me_kline(struct Client *, struct Client *, int, const char **);
-static int mo_unkline(struct Client *, struct Client *, int, const char **);
-static int ms_unkline(struct Client *, struct Client *, int, const char **);
-static int me_unkline(struct Client *, struct Client *, int, const char **);
+static const char kline_desc[] = "Provides the KLINE facility to ban users via hostmask";
+
+static void mo_kline(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void ms_kline(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void me_kline(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void mo_unkline(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void ms_unkline(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void me_unkline(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
struct Message kline_msgtab = {
- "KLINE", 0, 0, 0, MFLG_SLOW,
+ "KLINE", 0, 0, 0, 0,
{mg_unreg, mg_not_oper, {ms_kline, 5}, {ms_kline, 5}, {me_kline, 5}, {mo_kline, 3}}
};
struct Message unkline_msgtab = {
- "UNKLINE", 0, 0, 0, MFLG_SLOW,
+ "UNKLINE", 0, 0, 0, 0,
{mg_unreg, mg_not_oper, {ms_unkline, 4}, {ms_unkline, 4}, {me_unkline, 3}, {mo_unkline, 2}}
};
mapi_clist_av1 kline_clist[] = { &kline_msgtab, &unkline_msgtab, NULL };
-DECLARE_MODULE_AV1(kline, NULL, NULL, kline_clist, NULL, NULL, "$Revision$");
+DECLARE_MODULE_AV2(kline, NULL, NULL, kline_clist, NULL, NULL, NULL, NULL, kline_desc);
/* Local function prototypes */
-static int find_user_host(struct Client *source_p, const char *userhost, char *user, char *host);
-static int valid_comment(struct Client *source_p, char *comment);
-static int valid_user_host(struct Client *source_p, const char *user, const char *host);
+static bool find_user_host(struct Client *source_p, const char *userhost, char *user, char *host);
+static bool valid_user_host(struct Client *source_p, const char *user, const char *host);
static void handle_remote_kline(struct Client *source_p, int tkline_time,
const char *user, const char *host, const char *reason);
const char *, const char *, int);
static void apply_prop_kline(struct Client *source_p, struct ConfItem *aconf,
const char *, const char *, int);
-static int already_placed_kline(struct Client *, const char *, const char *, int);
+static bool already_placed_kline(struct Client *, const char *, const char *, int);
static void handle_remote_unkline(struct Client *source_p, const char *user, const char *host);
+static void remove_superseded_klines(const char *user, const char *host);
static void remove_permkline_match(struct Client *, struct ConfItem *);
-static int remove_temp_kline(struct Client *, struct ConfItem *);
+static bool remove_temp_kline(struct Client *, struct ConfItem *);
static void remove_prop_kline(struct Client *, struct ConfItem *);
+static bool
+is_local_kline(struct ConfItem *aconf)
+{
+ return aconf->lifetime == 0;
+}
+
+static bool
+is_temporary_kline(struct ConfItem *aconf)
+{
+ return aconf->lifetime == 0 && (aconf->flags & CONF_FLAGS_TEMPORARY);
+}
+
+
/* mo_kline()
*
* parv[1] - temp time or user@host
* parv[4] - server to target, or reason
* parv[5] - reason
*/
-static int
-mo_kline(struct Client *client_p, struct Client *source_p, int parc, const char **parv)
+static void
+mo_kline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char **parv)
{
char def[] = "No Reason";
char user[USERLEN + 2];
- char host[HOSTLEN + 2];
+ char host_buf[HOSTLEN + 3], *host = host_buf + 1;
char *reason = def;
char *oper_reason;
const char *target_server = NULL;
struct ConfItem *aconf;
int tkline_time = 0;
int loc = 1;
- int propagated = ConfigFileEntry.use_propagated_bans;
+ bool propagated = ConfigFileEntry.use_propagated_bans;
if(!IsOperK(source_p))
{
sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "kline");
- return 0;
+ return;
}
if((tkline_time = valid_temp_time(parv[loc])) >= 0)
tkline_time = 0;
if(find_user_host(source_p, parv[loc], user, host) == 0)
- return 0;
+ return;
+
+ if (*host == ':')
+ {
+ host--;
+ *host = '0';
+ }
loc++;
{
sendto_one(source_p, form_str(ERR_NOPRIVS),
me.name, source_p->name, "remoteban");
- return 0;
+ return;
}
target_server = parv[loc + 1];
{
sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
me.name, source_p->name, "KLINE");
- return 0;
+ return;
}
reason = LOCAL_COPY(parv[loc]);
+ if(strlen(reason) > BANREASONLEN)
+ {
+ sendto_one_notice(source_p, ":K-Line reason exceeds %d characters", BANREASONLEN);
+ return;
+ }
+
+ if(parse_netmask_strict(host, NULL, NULL) == HM_ERROR)
+ {
+ sendto_one_notice(source_p,
+ ":[%s@%s] looks like an ill-formed IP K-line, refusing to set it",
+ user, host);
+ return;
+ }
if(target_server != NULL)
{
+ if (tkline_time)
+ sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
+ "%s is adding a temporary %d min. K-Line for [%s@%s] on %s [%s]",
+ get_oper_name(source_p), tkline_time / 60, user, host, target_server, reason);
+ else
+ sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
+ "%s is adding a K-Line for [%s@%s] on %s [%s]",
+ get_oper_name(source_p), user, host, target_server, reason);
+
propagate_generic(source_p, "KLINE", target_server, CAP_KLN,
"%d %s %s :%s", tkline_time, user, host, reason);
/* If we are sending it somewhere that doesnt include us, stop */
if(!match(target_server, me.name))
- return 0;
+ return;
/* Set as local-only. */
- propagated = 0;
+ propagated = false;
}
/* if we have cluster servers, send it to them.. */
else if(!propagated && rb_dlink_list_length(&cluster_conf_list) > 0)
(tkline_time > 0) ? SHARED_TKLINE : SHARED_PKLINE, CAP_KLN,
"%lu %s %s :%s", tkline_time, user, host, reason);
- if(!valid_user_host(source_p, user, host) ||
- !valid_comment(source_p, reason))
- return 0;
+ if(!valid_user_host(source_p, user, host))
+ return;
if(!valid_wild_card(user, host))
{
":Please include at least %d non-wildcard "
"characters with the user@host",
ConfigFileEntry.min_nonwildcard);
- return 0;
+ return;
}
if(propagated && tkline_time == 0)
{
sendto_one_notice(source_p, ":Cannot set a permanent global ban");
- return 0;
+ return;
}
if(already_placed_kline(source_p, user, host, tkline_time))
- return 0;
+ return;
+
+ if (!propagated)
+ remove_superseded_klines(user, host);
rb_set_time();
aconf = make_conf();
else
apply_kline(source_p, aconf, reason, oper_reason);
- if(ConfigFileEntry.kline_delay)
- {
- if(kline_queued == 0)
- {
- rb_event_addonce("check_klines", check_klines_event, NULL,
- ConfigFileEntry.kline_delay);
- kline_queued = 1;
- }
- }
- else
- check_klines();
-
- return 0;
+ check_one_kline(aconf);
}
/* ms_kline()
* parv[4] - host
* parv[5] - reason
*/
-static int
-ms_kline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+ms_kline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
int tkline_time = atoi(parv[2]);
* but its not worth dropping the link over.. --anfl
*/
if(parc < 6 || EmptyString(parv[5]))
- return 0;
+ return;
propagate_generic(source_p, "KLINE", parv[1], CAP_KLN,
"%d %s %s :%s", tkline_time, parv[3], parv[4], parv[5]);
if(!match(parv[1], me.name))
- return 0;
+ return;
if(!IsPerson(source_p))
- return 0;
+ return;
handle_remote_kline(source_p, tkline_time, parv[3], parv[4], parv[5]);
- return 0;
}
-static int
-me_kline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+me_kline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
/* <tkline_time> <user> <host> :<reason> */
if(!IsPerson(source_p))
- return 0;
+ return;
handle_remote_kline(source_p, atoi(parv[1]), parv[2], parv[3], parv[4]);
- return 0;
}
static void
struct ConfItem *aconf = NULL;
char *oper_reason;
- if(!find_shared_conf(source_p->username, source_p->host,
- source_p->servptr->name,
- (tkline_time > 0) ? SHARED_TKLINE : SHARED_PKLINE))
- return;
-
- if(!valid_user_host(source_p, user, host) ||
- !valid_comment(source_p, reason))
+ if(!valid_user_host(source_p, user, host))
return;
if(!valid_wild_card(user, host))
if(already_placed_kline(source_p, user, host, tkline_time))
return;
+ remove_superseded_klines(user, host);
+
aconf = make_conf();
aconf->status = CONF_KILL;
aconf->host = rb_strdup(host);
aconf->info.oper = operhash_add(get_oper_name(source_p));
+ if(strlen(reason) > BANREASONLEN)
+ reason[BANREASONLEN] = '\0';
+
/* Look for an oper reason */
if((oper_reason = strchr(reason, '|')) != NULL)
{
else
apply_kline(source_p, aconf, reason, oper_reason);
- if(ConfigFileEntry.kline_delay)
- {
- if(kline_queued == 0)
- {
- rb_event_addonce("check_klines", check_klines_event, NULL,
- ConfigFileEntry.kline_delay);
- kline_queued = 1;
- }
- }
- else
- check_klines();
-
- return;
+ check_one_kline(aconf);
}
/* mo_unkline()
* parv[2] - optional "ON"
* parv[3] - optional target server
*/
-static int
-mo_unkline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+mo_unkline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
const char *user;
char *host;
char splat[] = "*";
char *h = LOCAL_COPY(parv[1]);
struct ConfItem *aconf;
- int propagated = 1;
+ bool propagated = true;
if(!IsOperUnkline(source_p))
{
sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "unkline");
- return 0;
+ return;
}
if((host = strchr(h, '@')) || *h == '*' || strchr(h, '.') || strchr(h, ':'))
else
{
sendto_one_notice(source_p, ":Invalid parameters");
- return 0;
+ return;
}
/* possible remote kline.. */
{
sendto_one(source_p, form_str(ERR_NOPRIVS),
me.name, source_p->name, "remoteban");
- return 0;
+ return;
}
+ sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s is removing the K-Line for [%s@%s] on %s",
+ get_oper_name(source_p), user, host, parv[3]);
+
propagate_generic(source_p, "UNKLINE", parv[3], CAP_UNKLN, "%s %s", user, host);
if(match(parv[3], me.name) == 0)
- return 0;
+ return;
- propagated = 0;
+ propagated = false;
}
aconf = find_exact_conf_by_address(host, CONF_KILL, user);
cluster_generic(source_p, "UNKLINE", SHARED_UNKLINE, CAP_UNKLN,
"%s %s", user, host);
- if(aconf == NULL)
+ bool removed_kline = false;
+
+ while (aconf = find_exact_conf_by_address_filtered(host, CONF_KILL, user, is_local_kline), aconf != NULL)
{
- sendto_one_notice(source_p, ":No K-Line for %s@%s", user, host);
- return 0;
+ removed_kline = true;
+
+ if(remove_temp_kline(source_p, aconf))
+ continue;
+
+ remove_permkline_match(source_p, aconf);
}
-
- if(aconf->lifetime)
+
+ aconf = find_exact_conf_by_address(host, CONF_KILL, user);
+ if (aconf)
{
- if(propagated)
+ if (propagated)
remove_prop_kline(source_p, aconf);
else
sendto_one_notice(source_p, ":Cannot remove global K-Line %s@%s on specific servers", user, host);
- return 0;
}
-
- if(remove_temp_kline(source_p, aconf))
- return 0;
-
- remove_permkline_match(source_p, aconf);
-
- return 0;
+ else if (!removed_kline)
+ {
+ sendto_one_notice(source_p, ":No K-Line for %s@%s", user, host);
+ }
}
/* ms_unkline()
* parv[2] - user to unkline
* parv[3] - host to unkline
*/
-static int
-ms_unkline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+ms_unkline(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 user host */
propagate_generic(source_p, "UNKLINE", parv[1], CAP_UNKLN, "%s %s", parv[2], parv[3]);
if(!match(parv[1], me.name))
- return 0;
+ return;
if(!IsPerson(source_p))
- return 0;
+ return;
handle_remote_unkline(source_p, parv[2], parv[3]);
- return 0;
}
-static int
-me_unkline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+me_unkline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
/* user host */
if(!IsPerson(source_p))
- return 0;
+ return;
handle_remote_unkline(source_p, parv[1], parv[2]);
- return 0;
}
static void
handle_remote_unkline(struct Client *source_p, const char *user, const char *host)
{
struct ConfItem *aconf;
+ bool removed_kline = false;
- if(!find_shared_conf(source_p->username, source_p->host,
- source_p->servptr->name, SHARED_UNKLINE))
- return;
-
- aconf = find_exact_conf_by_address(host, CONF_KILL, user);
- if(aconf == NULL)
- {
- sendto_one_notice(source_p, ":No K-Line for %s@%s", user, host);
- return;
- }
- if(aconf->lifetime)
+ while (aconf = find_exact_conf_by_address_filtered(host, CONF_KILL, user, is_local_kline), aconf != NULL)
{
- sendto_one_notice(source_p, ":Cannot remove global K-Line %s@%s on specific servers", user, host);
- return;
- }
+ removed_kline = true;
- if(remove_temp_kline(source_p, aconf))
- return;
+ if(remove_temp_kline(source_p, aconf))
+ continue;
+
+ remove_permkline_match(source_p, aconf);
+ }
- remove_permkline_match(source_p, aconf);
+ if (find_exact_conf_by_address(host, CONF_KILL, user))
+ sendto_one_notice(source_p, ":Cannot remove global K-Line %s@%s on specific servers", user, host);
+ else if (!removed_kline)
+ sendto_one_notice(source_p, ":No K-Line for %s@%s", user, host);
}
/* apply_kline()
*
- * inputs -
+ * inputs -
* output - NONE
* side effects - kline as given, is added to the hashtable
* and conf file
replace_old_ban(aconf);
- rb_dlinkAddAlloc(aconf, &prop_bans);
+ add_prop_ban(aconf);
add_conf_by_address(aconf->host, CONF_KILL, aconf->user, NULL, aconf);
/* no oper reason.. */
}
/* find_user_host()
- *
+ *
* inputs - client placing kline, user@host, user buffer, host buffer
- * output - 0 if not ok to kline, 1 to kline i.e. if valid user host
+ * output - false if not ok to kline, true to kline i.e. if valid user host
* side effects -
*/
-static int
+static bool
find_user_host(struct Client *source_p, const char *userhost, char *luser, char *lhost)
{
char *hostp;
if(strchr(userhost, '.') == NULL && strchr(userhost, ':') == NULL)
{
sendto_one_notice(source_p, ":K-Line must be a user@host or host");
- return 0;
+ return false;
}
luser[0] = '*'; /* no @ found, assume its *@somehost */
rb_strlcpy(lhost, userhost, HOSTLEN + 1);
}
- return 1;
+ /* would break the protocol */
+ if (*luser == ':' || *lhost == ':')
+ {
+ sendto_one_notice(source_p, ":Invalid K-Line");
+ return false;
+ }
+
+ return true;
}
/* valid_user_host()
*
* inputs - user buffer, host buffer
- * output - 0 if invalid, 1 if valid
+ * output - false if invalid, true if valid
* side effects -
*/
-static int
+static bool
valid_user_host(struct Client *source_p, const char *luser, const char *lhost)
{
/* # is invalid, as are '!' (n!u@h kline) and '@' (u@@h kline) */
if(strchr(lhost, '#') || strchr(luser, '#') || strchr(luser, '!') || strchr(lhost, '@'))
{
sendto_one_notice(source_p, ":Invalid K-Line");
- return 0;
+ return false;
}
- return 1;
-}
-
-/*
- * valid_comment
- * inputs - pointer to client
- * - pointer to comment
- * output - 0 if no valid comment, 1 if valid
- * side effects - NONE
- */
-static int
-valid_comment(struct Client *source_p, char *comment)
-{
- if(strchr(comment, '"'))
- {
- sendto_one_notice(source_p, ":Invalid character '\"' in comment");
- return 0;
- }
-
- if(strlen(comment) > BANREASONLEN)
- comment[BANREASONLEN] = '\0';
-
- return 1;
+ return true;
}
/* already_placed_kline()
*
* inputs - source to notify, user@host to check, tkline time
- * outputs - 1 if a perm kline or a tkline when a tkline is being
- * set exists, else 0
+ * outputs - true if a perm kline or a tkline when a tkline is being
+ * set exists, else false
* side effects - notifies source_p kline exists
*/
/* Note: This currently works if the new K-line is a special case of an
* existing K-line, but not the other way round. To do that we would
* have to walk the hash and check every existing K-line. -A1kmm.
*/
-static int
+static bool
already_placed_kline(struct Client *source_p, const char *luser, const char *lhost, int tkline)
{
const char *reason, *p;
if(aconf == NULL && ConfigFileEntry.non_redundant_klines)
{
bits = 0;
- if((t = parse_netmask(lhost, (struct sockaddr *) &iphost, &bits)) != HM_HOST)
- {
-#ifdef RB_IPV6
- if(t == HM_IPV6)
- t = AF_INET6;
- else
-#endif
- t = AF_INET;
-
- piphost = &iphost;
- }
+ t = parse_netmask_strict(lhost, &iphost, &bits);
+ piphost = &iphost;
+ if (t == HM_IPV4)
+ t = AF_INET;
+ else if (t == HM_IPV6)
+ t = AF_INET6;
else
piphost = NULL;
aconf = NULL;
}
}
- if(aconf != NULL)
+
+ if (aconf == NULL)
+ return false;
+
+ /* allow klines to be duplicated by longer ones */
+ if ((aconf->flags & CONF_FLAGS_TEMPORARY) &&
+ (tkline == 0 || tkline > aconf->hold - rb_current_time()))
+ return false;
+
+ reason = aconf->passwd ? aconf->passwd : "<No Reason>";
+
+ sendto_one_notice(source_p,
+ ":[%s@%s] already K-Lined by [%s@%s] - %s",
+ luser, lhost, aconf->user, aconf->host, reason);
+ return true;
+}
+
+static void
+remove_superseded_klines(const char *user, const char *host)
+{
+ struct ConfItem *aconf;
+
+ while (aconf = find_exact_conf_by_address_filtered(host, CONF_KILL, user, is_temporary_kline), aconf != NULL)
{
- /* setting a tkline, or existing one is perm */
- if(tkline || ((aconf->flags & CONF_FLAGS_TEMPORARY) == 0))
- {
- reason = aconf->passwd ? aconf->passwd : "<No Reason>";
+ rb_dlink_node *ptr;
+ int i;
- sendto_one_notice(source_p,
- ":[%s@%s] already K-Lined by [%s@%s] - %s",
- luser, lhost, aconf->user, aconf->host, reason);
- return 1;
+ for (i = 0; i < LAST_TEMP_TYPE; i++)
+ {
+ RB_DLINK_FOREACH(ptr, temp_klines[i].head)
+ {
+ if (aconf == ptr->data)
+ {
+ rb_dlinkDestroy(ptr, &temp_klines[i]);
+ delete_one_address_conf(aconf->host, aconf);
+ break;
+ }
+ }
}
}
-
- return 0;
}
/* remove_permkline_match()
remove_reject_mask(aconf->user, aconf->host);
bandb_del(BANDB_KLINE, aconf->user, aconf->host);
delete_one_address_conf(aconf->host, aconf);
-
- return;
}
/* remove_temp_kline()
* outputs -
* side effects - tries to unkline anything that matches
*/
-static int
+static bool
remove_temp_kline(struct Client *source_p, struct ConfItem *aconf)
{
rb_dlink_node *ptr;
rb_dlinkDestroy(ptr, &temp_klines[i]);
remove_reject_mask(aconf->user, aconf->host);
delete_one_address_conf(aconf->host, aconf);
- return YES;
+ return true;
}
}
}
- return NO;
+ return false;
}
static void
remove_prop_kline(struct Client *source_p, struct ConfItem *aconf)
{
- rb_dlink_node *ptr;
+ time_t now;
- ptr = rb_dlinkFind(aconf, &prop_bans);
- if (!ptr)
+ if (!lookup_prop_ban(aconf))
return;
sendto_one_notice(source_p,
":Un-klined [%s@%s] from global k-lines",
ilog(L_KLINE, "UK %s %s %s",
get_oper_name(source_p), aconf->user, aconf->host);
- if(aconf->created < rb_current_time())
- aconf->created = rb_current_time();
+ now = rb_current_time();
+ if(aconf->created < now)
+ aconf->created = now;
else
aconf->created++;
aconf->hold = aconf->created;
0,
(int)(aconf->lifetime - aconf->created));
remove_reject_mask(aconf->user, aconf->host);
- deactivate_conf(aconf, ptr);
+ deactivate_conf(aconf, now);
}
projects / solanum.git / blobdiff