* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
- *
- * $Id: m_kline.c 3466 2007-05-19 23:36:51Z jilles $
*/
#include "stdinc.h"
-#include "tools.h"
#include "channel.h"
#include "class.h"
#include "client.h"
-#include "common.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
#include "ircd.h"
#include "hostmask.h"
#include "numeric.h"
-#include "commio.h"
#include "s_conf.h"
#include "s_newconf.h"
-#include "s_log.h"
+#include "logger.h"
#include "send.h"
#include "hash.h"
#include "s_serv.h"
#include "msg.h"
#include "parse.h"
#include "modules.h"
-#include "event.h"
#include "reject.h"
+#include "bandbi.h"
+#include "operhash.h"
+
+static const char kline_desc[] = "Provides the KLINE facility to ban users via hostmask";
-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 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: 3466 $");
+
+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 int valid_wild_card(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 *user, const char *host, const char *reason);
static void apply_kline(struct Client *source_p, struct ConfItem *aconf,
- const char *reason, const char *oper_reason, const char *current_date);
+ const char *reason, const char *oper_reason);
static void apply_tkline(struct Client *source_p, struct ConfItem *aconf,
- const char *, const char *, const char *, int);
-static int already_placed_kline(struct Client *, const char *, const char *, int);
+ const char *, const char *, int);
+static void apply_prop_kline(struct Client *source_p, struct ConfItem *aconf,
+ 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 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 flush_write(struct Client *, FILE *, const char *, const char *);
-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[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 buffer[IRCD_BUFSIZE];
+ char host_buf[HOSTLEN + 3], *host = host_buf + 1;
char *reason = def;
char *oper_reason;
- const char *current_date;
const char *target_server = NULL;
struct ConfItem *aconf;
int tkline_time = 0;
int loc = 1;
+ 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;
+ sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "kline");
+ 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++;
- if(parc >= loc+2 && !irccmp(parv[loc], "ON"))
+ if(parc >= loc + 2 && !irccmp(parv[loc], "ON"))
{
if(!IsOperRemoteBan(source_p))
{
sendto_one(source_p, form_str(ERR_NOPRIVS),
- me.name, source_p->name, "remoteban");
- return 0;
+ me.name, source_p->name, "remoteban");
+ return;
}
- target_server = parv[loc+1];
+ target_server = parv[loc + 1];
loc += 2;
}
{
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);
+ "%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 = false;
}
/* if we have cluster servers, send it to them.. */
- else if(rb_dlink_list_length(&cluster_conf_list) > 0)
- cluster_generic(source_p, "KLINE",
+ else if(!propagated && rb_dlink_list_length(&cluster_conf_list) > 0)
+ cluster_generic(source_p, "KLINE",
(tkline_time > 0) ? SHARED_TKLINE : SHARED_PKLINE, CAP_KLN,
- "%lu %s %s :%s",
- tkline_time, user, host, reason);
+ "%lu %s %s :%s", tkline_time, user, host, reason);
+
+ if(!valid_user_host(source_p, user, host))
+ return;
- if(!valid_user_host(source_p, user, host) ||
- !valid_wild_card(source_p, user, host) ||
- !valid_comment(source_p, reason))
- return 0;
+ if(!valid_wild_card(user, host))
+ {
+ sendto_one_notice(source_p,
+ ":Please include at least %d non-wildcard "
+ "characters with the user@host",
+ ConfigFileEntry.min_nonwildcard);
+ return;
+ }
+
+ if(propagated && tkline_time == 0)
+ {
+ sendto_one_notice(source_p, ":Cannot set a permanent global ban");
+ return;
+ }
if(already_placed_kline(source_p, user, host, tkline_time))
- return 0;
+ return;
- set_time();
- current_date = smalldate();
+ if (!propagated)
+ remove_superseded_klines(user, host);
+
+ rb_set_time();
aconf = make_conf();
aconf->status = CONF_KILL;
- DupString(aconf->host, host);
- DupString(aconf->user, user);
+ aconf->created = rb_current_time();
+ aconf->host = rb_strdup(host);
+ aconf->user = rb_strdup(user);
aconf->port = 0;
+ aconf->info.oper = operhash_add(get_oper_name(source_p));
/* Look for an oper reason */
if((oper_reason = strchr(reason, '|')) != NULL)
oper_reason++;
if(!EmptyString(oper_reason))
- DupString(aconf->spasswd, oper_reason);
+ aconf->spasswd = rb_strdup(oper_reason);
}
+ aconf->passwd = rb_strdup(reason);
- if(tkline_time > 0)
- {
- rb_snprintf(buffer, sizeof(buffer),
- "Temporary K-line %d min. - %s (%s)",
- (int) (tkline_time / 60), reason, current_date);
- DupString(aconf->passwd, buffer);
- apply_tkline(source_p, aconf, reason, oper_reason, current_date, tkline_time);
- }
+ if(propagated)
+ apply_prop_kline(source_p, aconf, reason, oper_reason, tkline_time);
+ else if(tkline_time > 0)
+ apply_tkline(source_p, aconf, reason, oper_reason, tkline_time);
else
- {
- rb_snprintf(buffer, sizeof(buffer), "%s (%s)", reason, current_date);
- DupString(aconf->passwd, buffer);
- apply_kline(source_p, aconf, reason, oper_reason, current_date);
- }
+ apply_kline(source_p, aconf, reason, oper_reason);
- if(ConfigFileEntry.kline_delay)
- {
- if(kline_queued == 0)
- {
- eventAddOnce("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]);
+ "%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
handle_remote_kline(struct Client *source_p, int tkline_time,
- const char *user, const char *host, const char *kreason)
+ const char *user, const char *host, const char *kreason)
{
- char buffer[BUFSIZE];
- const char *current_date;
char *reason = LOCAL_COPY(kreason);
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))
+ if(!valid_user_host(source_p, user, host))
return;
- if(!valid_user_host(source_p, user, host) ||
- !valid_wild_card(source_p, user, host) ||
- !valid_comment(source_p, reason))
+ if(!valid_wild_card(user, host))
+ {
+ sendto_one_notice(source_p,
+ ":Please include at least %d non-wildcard "
+ "characters with the user@host",
+ ConfigFileEntry.min_nonwildcard);
return;
+ }
if(already_placed_kline(source_p, user, host, tkline_time))
return;
+ remove_superseded_klines(user, host);
+
aconf = make_conf();
aconf->status = CONF_KILL;
- DupString(aconf->user, user);
- DupString(aconf->host, host);
+ aconf->created = rb_current_time();
+ aconf->user = rb_strdup(user);
+ 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)
oper_reason++;
if(!EmptyString(oper_reason))
- DupString(aconf->spasswd, oper_reason);
+ aconf->spasswd = rb_strdup(oper_reason);
}
-
- current_date = smalldate();
+ aconf->passwd = rb_strdup(reason);
if(tkline_time > 0)
- {
- rb_snprintf(buffer, sizeof(buffer),
- "Temporary K-line %d min. - %s (%s)",
- (int) (tkline_time / 60), reason, current_date);
- DupString(aconf->passwd, buffer);
- apply_tkline(source_p, aconf, reason, oper_reason, current_date, tkline_time);
- }
+ apply_tkline(source_p, aconf, reason, oper_reason, tkline_time);
else
- {
- rb_snprintf(buffer, sizeof(buffer), "%s (%s)", reason, current_date);
- DupString(aconf->passwd, buffer);
- apply_kline(source_p, aconf, reason, oper_reason, current_date);
- }
+ apply_kline(source_p, aconf, reason, oper_reason);
- if(ConfigFileEntry.kline_delay)
- {
- if(kline_queued == 0)
- {
- eventAddOnce("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;
+ bool propagated = true;
if(!IsOperUnkline(source_p))
{
- sendto_one(source_p, form_str(ERR_NOPRIVS),
- me.name, source_p->name, "unkline");
- return 0;
+ sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "unkline");
+ return;
}
if((host = strchr(h, '@')) || *h == '*' || strchr(h, '.') || strchr(h, ':'))
else
{
sendto_one_notice(source_p, ":Invalid parameters");
- return 0;
+ return;
}
/* possible remote kline.. */
if(!IsOperRemoteBan(source_p))
{
sendto_one(source_p, form_str(ERR_NOPRIVS),
- me.name, source_p->name, "remoteban");
- return 0;
+ me.name, source_p->name, "remoteban");
+ return;
}
- propagate_generic(source_p, "UNKLINE", parv[3], CAP_UNKLN,
- "%s %s", user, host);
+ 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 = false;
}
- else if(rb_dlink_list_length(&cluster_conf_list) > 0)
+
+ aconf = find_exact_conf_by_address(host, CONF_KILL, user);
+
+ /* No clustering for removing a propagated kline */
+ if(propagated && (aconf == NULL || !aconf->lifetime) &&
+ rb_dlink_list_length(&cluster_conf_list) > 0)
cluster_generic(source_p, "UNKLINE", SHARED_UNKLINE, CAP_UNKLN,
"%s %s", user, host);
- aconf = find_exact_conf_by_address(host, CONF_KILL, user);
- 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))
- return 0;
+ if(remove_temp_kline(source_p, aconf))
+ continue;
- remove_permkline_match(source_p, aconf);
+ remove_permkline_match(source_p, aconf);
+ }
- return 0;
+ aconf = find_exact_conf_by_address(host, CONF_KILL, user);
+ if (aconf)
+ {
+ 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);
+ }
+ 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]);
+ 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)
+ 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;
- }
+ 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
*/
static void
apply_kline(struct Client *source_p, struct ConfItem *aconf,
- const char *reason, const char *oper_reason, const char *current_date)
+ const char *reason, const char *oper_reason)
{
- add_conf_by_address(aconf->host, CONF_KILL, aconf->user, aconf);
- write_confitem(KLINE_TYPE, source_p, aconf->user, aconf->host,
- reason, oper_reason, current_date, 0);
+ add_conf_by_address(aconf->host, CONF_KILL, aconf->user, NULL, aconf);
+ bandb_add(BANDB_KLINE, source_p, aconf->user, aconf->host,
+ reason, EmptyString(oper_reason) ? NULL : oper_reason, 0);
+
+ /* no oper reason.. */
+ if(EmptyString(oper_reason))
+ {
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "%s added K-Line for [%s@%s] [%s]",
+ get_oper_name(source_p), aconf->user, aconf->host, reason);
+ ilog(L_KLINE, "K %s 0 %s %s %s",
+ get_oper_name(source_p), aconf->user, aconf->host, reason);
+ }
+ else
+ {
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "%s added K-Line for [%s@%s] [%s|%s]",
+ get_oper_name(source_p), aconf->user, aconf->host,
+ reason, oper_reason);
+ ilog(L_KLINE, "K %s 0 %s %s %s|%s",
+ get_oper_name(source_p), aconf->user, aconf->host, reason, oper_reason);
+ }
+
+ sendto_one_notice(source_p, ":Added K-Line [%s@%s]",
+ aconf->user, aconf->host);
}
/* apply_tkline()
*/
static void
apply_tkline(struct Client *source_p, struct ConfItem *aconf,
- const char *reason, const char *oper_reason, const char *current_date, int tkline_time)
+ const char *reason, const char *oper_reason, int tkline_time)
{
- aconf->hold = CurrentTime + tkline_time;
+ aconf->hold = rb_current_time() + tkline_time;
add_temp_kline(aconf);
/* no oper reason.. */
if(EmptyString(oper_reason))
{
sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "%s added temporary %d min. K-Line for [%s@%s] [%s]",
- get_oper_name(source_p), tkline_time / 60,
- aconf->user, aconf->host, reason);
+ "%s added temporary %d min. K-Line for [%s@%s] [%s]",
+ get_oper_name(source_p), tkline_time / 60,
+ aconf->user, aconf->host, reason);
ilog(L_KLINE, "K %s %d %s %s %s",
- get_oper_name(source_p), tkline_time / 60,
- aconf->user, aconf->host, reason);
+ get_oper_name(source_p), tkline_time / 60, aconf->user, aconf->host, reason);
}
else
{
sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "%s added temporary %d min. K-Line for [%s@%s] [%s|%s]",
- get_oper_name(source_p), tkline_time / 60,
- aconf->user, aconf->host, reason, oper_reason);
+ "%s added temporary %d min. K-Line for [%s@%s] [%s|%s]",
+ get_oper_name(source_p), tkline_time / 60,
+ aconf->user, aconf->host, reason, oper_reason);
ilog(L_KLINE, "K %s %d %s %s %s|%s",
- get_oper_name(source_p), tkline_time / 60,
- aconf->user, aconf->host, reason, oper_reason);
+ get_oper_name(source_p), tkline_time / 60,
+ aconf->user, aconf->host, reason, oper_reason);
}
sendto_one_notice(source_p, ":Added temporary %d min. K-Line [%s@%s]",
tkline_time / 60, aconf->user, aconf->host);
}
+static void
+apply_prop_kline(struct Client *source_p, struct ConfItem *aconf,
+ const char *reason, const char *oper_reason, int tkline_time)
+{
+ aconf->flags |= CONF_FLAGS_MYOPER | CONF_FLAGS_TEMPORARY;
+ aconf->hold = rb_current_time() + tkline_time;
+ aconf->lifetime = aconf->hold;
+
+ replace_old_ban(aconf);
+
+ add_prop_ban(aconf);
+ add_conf_by_address(aconf->host, CONF_KILL, aconf->user, NULL, aconf);
+
+ /* no oper reason.. */
+ if(EmptyString(oper_reason))
+ {
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "%s added global %d min. K-Line for [%s@%s] [%s]",
+ get_oper_name(source_p), tkline_time / 60,
+ aconf->user, aconf->host, reason);
+ ilog(L_KLINE, "K %s %d %s %s %s",
+ get_oper_name(source_p), tkline_time / 60, aconf->user, aconf->host, reason);
+ }
+ else
+ {
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "%s added global %d min. K-Line for [%s@%s] [%s|%s]",
+ get_oper_name(source_p), tkline_time / 60,
+ aconf->user, aconf->host, reason, oper_reason);
+ ilog(L_KLINE, "K %s %d %s %s %s|%s",
+ get_oper_name(source_p), tkline_time / 60,
+ aconf->user, aconf->host, reason, oper_reason);
+ }
+
+ sendto_one_notice(source_p, ":Added global %d min. K-Line [%s@%s]",
+ tkline_time / 60, aconf->user, aconf->host);
+
+ sendto_server(NULL, NULL, CAP_BAN|CAP_TS6, NOCAPS,
+ ":%s BAN K %s %s %lu %d %d * :%s%s%s",
+ source_p->id, aconf->user, aconf->host,
+ (unsigned long)aconf->created,
+ (int)(aconf->hold - aconf->created),
+ (int)(aconf->lifetime - aconf->created),
+ reason,
+ oper_reason ? "|" : "",
+ oper_reason ? 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;
hostp = strchr(userhost, '@');
-
+
if(hostp != NULL) /* I'm a little user@host */
{
*(hostp++) = '\0'; /* short and squat */
if(*userhost)
- strlcpy(luser, userhost, USERLEN + 1); /* here is my user */
+ rb_strlcpy(luser, userhost, USERLEN + 1); /* here is my user */
else
strcpy(luser, "*");
if(*hostp)
- strlcpy(lhost, hostp, HOSTLEN + 1); /* here is my host */
+ rb_strlcpy(lhost, hostp, HOSTLEN + 1); /* here is my host */
else
strcpy(lhost, "*");
- }
+ }
else
{
/* no '@', no '.', so its not a user@host or host, therefore
* its a nick, which support was removed for.
*/
if(strchr(userhost, '.') == NULL && strchr(userhost, ':') == NULL)
- return 0;
+ {
+ sendto_one_notice(source_p, ":K-Line must be a user@host or host");
+ return false;
+ }
luser[0] = '*'; /* no @ found, assume its *@somehost */
luser[1] = '\0';
- strlcpy(lhost, userhost, HOSTLEN + 1);
+ rb_strlcpy(lhost, userhost, HOSTLEN + 1);
+ }
+
+ /* would break the protocol */
+ if (*luser == ':' || *lhost == ':')
+ {
+ sendto_one_notice(source_p, ":Invalid K-Line");
+ return false;
}
- return 1;
+ 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 is '!' (n!u@h kline) */
- if(strchr(lhost, '#') || strchr(luser, '#') || strchr(luser, '!'))
+ /* # 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_wild_card()
- *
- * input - user buffer, host buffer
- * output - 0 if invalid, 1 if valid
- * side effects -
- */
-static int
-valid_wild_card(struct Client *source_p, const char *luser, const char *lhost)
-{
- const char *p;
- char tmpch;
- int nonwild = 0;
- int bitlen;
-
- /* user has no wildcards, always accept -- jilles */
- if (!strchr(luser, '?') && !strchr(luser, '*'))
- return 1;
-
- /* check there are enough non wildcard chars */
- p = luser;
- while ((tmpch = *p++))
- {
- if(!IsKWildChar(tmpch))
- {
- /* found enough chars, return */
- if(++nonwild >= ConfigFileEntry.min_nonwildcard)
- return 1;
- }
- }
-
- /* try host, as user didnt contain enough */
- /* special case for cidr masks -- jilles */
- if ((p = strrchr(lhost, '/')) != NULL && IsDigit(p[1]))
- {
- bitlen = atoi(p + 1);
- /* much like non-cidr for ipv6, rather arbitrary for ipv4 */
- if (bitlen > 0 && bitlen >= (strchr(lhost, ':') ? 4 * (ConfigFileEntry.min_nonwildcard - nonwild) : 6 - 2 * nonwild))
- return 1;
- }
- else
- {
- p = lhost;
- while ((tmpch = *p++))
- {
- if(!IsKWildChar(tmpch))
- if(++nonwild >= ConfigFileEntry.min_nonwildcard)
- return 1;
- }
- }
-
- sendto_one_notice(source_p,
- ":Please include at least %d non-wildcard "
- "characters with the user@host",
- ConfigFileEntry.min_nonwildcard);
- return 0;
-}
-
-/*
- * 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;
- struct irc_sockaddr_storage iphost, *piphost;
+ struct rb_sockaddr_storage iphost, *piphost;
struct ConfItem *aconf;
- int t, bits;
+ int t, bits;
aconf = find_exact_conf_by_address(lhost, CONF_KILL, luser);
- if (aconf == NULL && ConfigFileEntry.non_redundant_klines)
+ if(aconf == NULL && ConfigFileEntry.non_redundant_klines)
{
bits = 0;
- if((t = parse_netmask(lhost, (struct sockaddr *)&iphost, &bits)) != HM_HOST)
- {
-#ifdef 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 = find_conf_by_address(lhost, NULL, NULL, (struct sockaddr *)piphost, CONF_KILL, t, luser);
- if (aconf != NULL)
+ aconf = find_conf_by_address(lhost, NULL, NULL, (struct sockaddr *) piphost,
+ CONF_KILL, t, luser, NULL);
+ if(aconf != NULL)
{
/* The above was really a lookup of a single IP,
* so check if the new kline is wider than the
* -- jilles
*/
p = strchr(aconf->host, '/');
- if (bits > 0 && (p == NULL || bits < atoi(p + 1)))
+ if(bits > 0 && (p == NULL || bits < atoi(p + 1)))
aconf = NULL;
}
}
- if (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>";
- sendto_one_notice(source_p,
- ":[%s@%s] already K-Lined by [%s@%s] - %s",
- luser, lhost, aconf->user,
- aconf->host, reason);
- return 1;
- }
- }
+ 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>";
- return 0;
+ sendto_one_notice(source_p,
+ ":[%s@%s] already K-Lined by [%s@%s] - %s",
+ luser, lhost, aconf->user, aconf->host, reason);
+ return true;
}
-/* remove_permkline_match()
- *
- * hunts for a permanent kline, and removes it.
- */
static void
-remove_permkline_match(struct Client *source_p, struct ConfItem *aconf)
+remove_superseded_klines(const char *user, const char *host)
{
- FILE *in, *out;
- int pairme = 0;
- int error_on_write = NO;
- char buf[BUFSIZE];
- char matchbuf[BUFSIZE];
- char temppath[BUFSIZE];
- const char *filename;
- const char *host, *user;
- mode_t oldumask;
- int matchlen;
-
- host = aconf->host;
- user = aconf->user;
-
- rb_snprintf(temppath, sizeof(temppath),
- "%s.tmp", ConfigFileEntry.klinefile);
-
- filename = get_conf_name(KLINE_TYPE);
-
- if((in = fopen(filename, "r")) == 0)
- {
- sendto_one_notice(source_p, ":Cannot open %s", filename);
- return;
- }
-
- oldumask = umask(0);
- if((out = fopen(temppath, "w")) == 0)
- {
- sendto_one_notice(source_p, ":Cannot open %s", temppath);
- fclose(in);
- umask(oldumask);
- return;
- }
-
- umask(oldumask);
-
- snprintf(matchbuf, sizeof(matchbuf), "\"%s\",\"%s\"", user, host);
- matchlen = strlen(matchbuf);
+ struct ConfItem *aconf;
- while (fgets(buf, sizeof(buf), in))
+ while (aconf = find_exact_conf_by_address_filtered(host, CONF_KILL, user, is_temporary_kline), aconf != NULL)
{
- if(error_on_write)
- break;
+ rb_dlink_node *ptr;
+ int i;
- if(!strncasecmp(buf, matchbuf, matchlen))
+ for (i = 0; i < LAST_TEMP_TYPE; i++)
{
- pairme++;
- break;
- }
- else
- error_on_write = flush_write(source_p, out, buf, temppath);
- }
-
- /* we dropped out of the loop early because we found a match,
- * to drop into this somewhat faster loop as we presume we'll never
- * have two matching klines --anfl
- */
- if(pairme && !error_on_write)
- {
- while(fgets(buf, sizeof(buf), in))
- {
- if(error_on_write)
- break;
-
- error_on_write = flush_write(source_p, out, buf, temppath);
+ 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;
+ }
+ }
}
}
+}
- fclose(in);
- if (fclose(out))
- error_on_write = YES;
-
- /* The result of the rename should be checked too... oh well */
- /* If there was an error on a write above, then its been reported
- * and I am not going to trash the original kline /conf file
- */
- if(error_on_write)
- {
- sendto_one_notice(source_p, ":Couldn't write temp kline file, aborted");
- return;
- }
- else if(!pairme)
- {
- sendto_one_notice(source_p, ":Cannot find K-Line for %s@%s in file",
- user, host);
-
- if(temppath != NULL)
- (void) unlink(temppath);
-
- return;
- }
-
- if (rename(temppath, filename))
- {
- sendto_one_notice(source_p, ":Couldn't rename temp file, aborted");
- return;
- }
-
- sendto_one_notice(source_p, ":K-Line for [%s@%s] is removed",
- user, host);
+/* remove_permkline_match()
+ *
+ * hunts for a permanent kline, and removes it.
+ */
+static void
+remove_permkline_match(struct Client *source_p, struct ConfItem *aconf)
+{
+ sendto_one_notice(source_p, ":K-Line for [%s@%s] is removed", aconf->user, aconf->host);
sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "%s has removed the K-Line for: [%s@%s]",
- get_oper_name(source_p), user, host);
+ "%s has removed the K-Line for: [%s@%s]",
+ get_oper_name(source_p), aconf->user, aconf->host);
- ilog(L_KLINE, "UK %s %s %s",
- get_oper_name(source_p), user, host);
+ ilog(L_KLINE, "UK %s %s %s", get_oper_name(source_p), aconf->user, aconf->host);
remove_reject_mask(aconf->user, aconf->host);
+ bandb_del(BANDB_KLINE, aconf->user, aconf->host);
delete_one_address_conf(aconf->host, aconf);
-
- return;
-}
-
-/*
- * flush_write()
- *
- * inputs - pointer to client structure of oper requesting unkline
- * - out is the file descriptor
- * - buf is the buffer to write
- * - ntowrite is the expected number of character to be written
- * - temppath is the temporary file name to be written
- * output - YES for error on write
- * - NO for success
- * side effects - if successful, the buf is written to output file
- * if a write failure happesn, and the file pointed to
- * by temppath, if its non NULL, is removed.
- *
- * The idea here is, to be as robust as possible when writing to the
- * kline file.
- *
- * -Dianora
- */
-
-static int
-flush_write(struct Client *source_p, FILE * out, const char *buf, const char *temppath)
-{
- int error_on_write = (fputs(buf, out) < 0) ? YES : NO;
-
- if(error_on_write)
- {
- sendto_one_notice(source_p, ":Unable to write to %s",
- temppath);
- if(temppath != NULL)
- (void) unlink(temppath);
- }
- return (error_on_write);
}
/* 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;
int i;
- for (i = 0; i < LAST_TEMP_TYPE; i++)
+ for(i = 0; i < LAST_TEMP_TYPE; i++)
{
RB_DLINK_FOREACH(ptr, temp_klines[i].head)
{
- if (aconf == ptr->data)
+ if(aconf == ptr->data)
{
sendto_one_notice(source_p,
- ":Un-klined [%s@%s] from temporary k-lines",
- aconf->user, aconf->host);
+ ":Un-klined [%s@%s] from temporary k-lines",
+ aconf->user, aconf->host);
sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "%s has removed the temporary K-Line for: [%s@%s]",
- get_oper_name(source_p), aconf->user, aconf->host);
+ "%s has removed the temporary K-Line for: [%s@%s]",
+ get_oper_name(source_p), aconf->user,
+ aconf->host);
ilog(L_KLINE, "UK %s %s %s",
- get_oper_name(source_p),
- aconf->user, aconf->host);
- dlinkDestroy(ptr, &temp_klines[i]);
+ get_oper_name(source_p), aconf->user, aconf->host);
+ 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)
+{
+ time_t now;
+
+ if (!lookup_prop_ban(aconf))
+ return;
+ sendto_one_notice(source_p,
+ ":Un-klined [%s@%s] from global k-lines",
+ aconf->user, aconf->host);
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "%s has removed the global K-Line for: [%s@%s]",
+ get_oper_name(source_p), aconf->user,
+ aconf->host);
+
+ ilog(L_KLINE, "UK %s %s %s",
+ get_oper_name(source_p), aconf->user, aconf->host);
+ 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 K %s %s %lu %d %d * :*",
+ source_p->id, aconf->user, aconf->host,
+ (unsigned long)aconf->created,
+ 0,
+ (int)(aconf->lifetime - aconf->created));
+ remove_reject_mask(aconf->user, aconf->host);
+ deactivate_conf(aconf, now);
}
projects / solanum.git / blobdiff