X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/c88cdb00957d1bafae4587343b5ab7df14b75f8b..8e43b0b4146cdbacec61e83e8b8251c0b5a090c9:/modules/m_kline.c

diff --git a/modules/m_kline.c b/modules/m_kline.c
index ff1eaed..66a3b7f 100644
--- a/modules/m_kline.c
+++ b/modules/m_kline.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "channel.h"
 #include "class.h"
 #include "client.h"
@@ -35,7 +34,6 @@
 #include "ircd.h"
 #include "hostmask.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "s_log.h"
@@ -45,7 +43,7 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "event.h"
+#include "reject.h"
 
 static int mo_kline(struct Client *, struct Client *, int, const char **);
 static int ms_kline(struct Client *, struct Client *, int, const char **);
@@ -83,9 +81,9 @@ static int 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_permkline_match(struct Client *, const char *, const char *);
+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(const char *, const char *);
+static int remove_temp_kline(struct Client *, struct ConfItem *);
 
 /* mo_kline()
  *
@@ -162,7 +160,7 @@ mo_kline(struct Client *client_p, struct Client *source_p,
 			return 0;
 	}
 	/* if we have cluster servers, send it to them.. */
-	else if(dlink_list_length(&cluster_conf_list) > 0)
+	else if(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",
@@ -196,7 +194,7 @@ mo_kline(struct Client *client_p, struct Client *source_p,
 
 	if(tkline_time > 0)
 	{
-		ircsnprintf(buffer, sizeof(buffer),
+		rb_snprintf(buffer, sizeof(buffer),
 			   "Temporary K-line %d min. - %s (%s)",
 			   (int) (tkline_time / 60), reason, current_date);
 		DupString(aconf->passwd, buffer);
@@ -204,7 +202,7 @@ mo_kline(struct Client *client_p, struct Client *source_p,
 	}
 	else
 	{
-		ircsnprintf(buffer, sizeof(buffer), "%s (%s)", reason, current_date);
+		rb_snprintf(buffer, sizeof(buffer), "%s (%s)", reason, current_date);
 		DupString(aconf->passwd, buffer);
 		apply_kline(source_p, aconf, reason, oper_reason, current_date);
 	}
@@ -213,7 +211,7 @@ mo_kline(struct Client *client_p, struct Client *source_p,
 	{
 		if(kline_queued == 0)
 		{
-			eventAddOnce("check_klines", check_klines_event, NULL,
+			rb_event_addonce("check_klines", check_klines_event, NULL,
 				     ConfigFileEntry.kline_delay);
 			kline_queued = 1;
 		}
@@ -312,7 +310,7 @@ handle_remote_kline(struct Client *source_p, int tkline_time,
 
 	if(tkline_time > 0)
 	{
-		ircsnprintf(buffer, sizeof(buffer),
+		rb_snprintf(buffer, sizeof(buffer),
 			   "Temporary K-line %d min. - %s (%s)",
 			   (int) (tkline_time / 60), reason, current_date);
 		DupString(aconf->passwd, buffer);
@@ -320,7 +318,7 @@ handle_remote_kline(struct Client *source_p, int tkline_time,
 	}
 	else
 	{
-		ircsnprintf(buffer, sizeof(buffer), "%s (%s)", reason, current_date);
+		rb_snprintf(buffer, sizeof(buffer), "%s (%s)", reason, current_date);
 		DupString(aconf->passwd, buffer);
 		apply_kline(source_p, aconf, reason, oper_reason, current_date);
 	}
@@ -329,7 +327,7 @@ handle_remote_kline(struct Client *source_p, int tkline_time,
 	{
 		if(kline_queued == 0)
 		{
-			eventAddOnce("check_klines", check_klines_event, NULL,
+			rb_event_addonce("check_klines", check_klines_event, NULL,
 				     ConfigFileEntry.kline_delay);
 			kline_queued = 1;
 		}
@@ -353,6 +351,7 @@ mo_unkline(struct Client *client_p, struct Client *source_p, int parc, const cha
 	char *host;
 	char splat[] = "*";
 	char *h = LOCAL_COPY(parv[1]);
+	struct ConfItem *aconf;
 
 	if(!IsOperUnkline(source_p))
 	{
@@ -407,22 +406,21 @@ mo_unkline(struct Client *client_p, struct Client *source_p, int parc, const cha
 		if(match(parv[3], me.name) == 0)
 			return 0;
 	}
-	else if(dlink_list_length(&cluster_conf_list) > 0)
+	else if(rb_dlink_list_length(&cluster_conf_list) > 0)
 		cluster_generic(source_p, "UNKLINE", SHARED_UNKLINE, CAP_UNKLN,
 				"%s %s", user, host);
 
-	if(remove_temp_kline(user, host))
+	aconf = find_exact_conf_by_address(host, CONF_KILL, user);
+	if(aconf == NULL)
 	{
-		sendto_one_notice(source_p, ":Un-klined [%s@%s] from temporary k-lines", user, host);
-		sendto_realops_snomask(SNO_GENERAL, L_ALL,
-				     "%s has removed the temporary K-Line for: [%s@%s]",
-				     get_oper_name(source_p), user, host);
-		ilog(L_KLINE, "UK %s %s %s",
-			get_oper_name(source_p), user, host);
+		sendto_one_notice(source_p, ":No K-Line for %s@%s", user, host);
 		return 0;
 	}
 
-	remove_permkline_match(source_p, host, user);
+	if(remove_temp_kline(source_p, aconf))
+		return 0;
+
+	remove_permkline_match(source_p, aconf);
 
 	return 0;
 }
@@ -465,26 +463,23 @@ me_unkline(struct Client *client_p, struct Client *source_p, int parc, const cha
 static void
 handle_remote_unkline(struct Client *source_p, const char *user, const char *host)
 {
+	struct ConfItem *aconf;
+
 	if(!find_shared_conf(source_p->username, source_p->host,
 				source_p->servptr->name, SHARED_UNKLINE))
 		return;
 
-	if(remove_temp_kline(user, host))
+	aconf = find_exact_conf_by_address(host, CONF_KILL, user);
+	if(aconf == NULL)
 	{
-		sendto_one_notice(source_p,
-				":Un-klined [%s@%s] from temporary k-lines",
-				user, host);
-
-		sendto_realops_snomask(SNO_GENERAL, L_ALL,
-				"%s has removed the temporary K-Line for: [%s@%s]",
-				get_oper_name(source_p), user, host);
-
-		ilog(L_KLINE, "UK %s %s %s",
-			get_oper_name(source_p), user, host);
+		sendto_one_notice(source_p, ":No K-Line for %s@%s", user, host);
 		return;
 	}
 
-	remove_permkline_match(source_p, host, user);
+	if(remove_temp_kline(source_p, aconf))
+		return;
+
+	remove_permkline_match(source_p, aconf);
 }
 
 /* apply_kline()
@@ -695,13 +690,16 @@ valid_comment(struct Client *source_p, char *comment)
 static int
 already_placed_kline(struct Client *source_p, const char *luser, const char *lhost, int tkline)
 {
-	const char *reason;
+	const char *reason, *p;
 	struct irc_sockaddr_storage iphost, *piphost;
 	struct ConfItem *aconf;
-        int t;
-	if(ConfigFileEntry.non_redundant_klines)
+        int t, bits;
+
+	aconf = find_exact_conf_by_address(lhost, CONF_KILL, luser);
+	if (aconf == NULL && ConfigFileEntry.non_redundant_klines)
 	{
-		if((t = parse_netmask(lhost, (struct sockaddr *)&iphost, NULL)) != HM_HOST)
+		bits = 0;
+		if((t = parse_netmask(lhost, (struct sockaddr *)&iphost, &bits)) != HM_HOST)
 		{
 #ifdef IPV6
 			if(t == HM_IPV6)
@@ -715,19 +713,31 @@ already_placed_kline(struct Client *source_p, const char *luser, const char *lho
 		else
 			piphost = NULL;
 
-		if((aconf = find_conf_by_address(lhost, NULL, NULL, (struct sockaddr *)piphost, CONF_KILL, t, luser)))
+		aconf = find_conf_by_address(lhost, NULL, NULL, (struct sockaddr *)piphost, CONF_KILL, t, luser);
+		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>";
+			/* The above was really a lookup of a single IP,
+			 * so check if the new kline is wider than the
+			 * existing one.
+			 * -- jilles
+			 */
+			p = strchr(aconf->host, '/');
+			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;
-			}
+			sendto_one_notice(source_p,
+					  ":[%s@%s] already K-Lined by [%s@%s] - %s",
+					  luser, lhost, aconf->user,
+					  aconf->host, reason);
+			return 1;
 		}
 	}
 
@@ -739,7 +749,7 @@ already_placed_kline(struct Client *source_p, const char *luser, const char *lho
  * hunts for a permanent kline, and removes it.
  */
 static void
-remove_permkline_match(struct Client *source_p, const char *host, const char *user)
+remove_permkline_match(struct Client *source_p, struct ConfItem *aconf)
 {
 	FILE *in, *out;
 	int pairme = 0;
@@ -748,10 +758,14 @@ remove_permkline_match(struct Client *source_p, const char *host, const char *us
 	char matchbuf[BUFSIZE];
 	char temppath[BUFSIZE];
 	const char *filename;
+	const char *host, *user;
 	mode_t oldumask;
 	int matchlen;
 
-	ircsnprintf(temppath, sizeof(temppath),
+	host = aconf->host;
+	user = aconf->user;
+
+	rb_snprintf(temppath, sizeof(temppath),
 		 "%s.tmp", ConfigFileEntry.klinefile);
 
 	filename = get_conf_name(KLINE_TYPE);
@@ -820,7 +834,7 @@ remove_permkline_match(struct Client *source_p, const char *host, const char *us
 	}
 	else if(!pairme)
 	{
-		sendto_one_notice(source_p, ":No K-Line for %s@%s",
+		sendto_one_notice(source_p, ":Cannot find K-Line for %s@%s in file",
 				  user, host);
 
 		if(temppath != NULL)
@@ -834,7 +848,6 @@ remove_permkline_match(struct Client *source_p, const char *host, const char *us
 		sendto_one_notice(source_p, ":Couldn't rename temp file, aborted");
 		return;
 	}
-	rehash_bans(0);
 
 	sendto_one_notice(source_p, ":K-Line for [%s@%s] is removed",
 			  user, host);
@@ -845,6 +858,10 @@ remove_permkline_match(struct Client *source_p, const char *host, const char *us
 
 	ilog(L_KLINE, "UK %s %s %s",
 		get_oper_name(source_p), user, host);
+
+	remove_reject_mask(aconf->user, aconf->host);
+	delete_one_address_conf(aconf->host, aconf);
+
 	return;
 }
 
@@ -890,41 +907,32 @@ flush_write(struct Client *source_p, FILE * out, const char *buf, const char *te
  * side effects - tries to unkline anything that matches
  */
 static int
-remove_temp_kline(const char *user, const char *host)
+remove_temp_kline(struct Client *source_p, struct ConfItem *aconf)
 {
-	struct ConfItem *aconf;
-	dlink_node *ptr;
-	struct irc_sockaddr_storage addr, caddr;
-	int bits, cbits;
-	int mtype, ktype;
+	rb_dlink_node *ptr;
 	int i;
 
-	mtype = parse_netmask(host, (struct sockaddr *)&addr, &bits);
-
 	for (i = 0; i < LAST_TEMP_TYPE; i++)
 	{
-		DLINK_FOREACH(ptr, temp_klines[i].head)
+		RB_DLINK_FOREACH(ptr, temp_klines[i].head)
 		{
-			aconf = ptr->data;
-
-			ktype = parse_netmask(aconf->host, (struct sockaddr *)&caddr, &cbits);
-
-			if(ktype != mtype || (user && irccmp(user, aconf->user)))
-				continue;
-
-			if(ktype == HM_HOST)
+			if (aconf == ptr->data)
 			{
-				if(irccmp(aconf->host, host))
-					continue;
+				sendto_one_notice(source_p,
+						":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);
+
+				ilog(L_KLINE, "UK %s %s %s",
+					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;
 			}
-			else if(bits != cbits || 
-				!comp_with_mask_sock((struct sockaddr *)&addr,
-						(struct sockaddr *)&caddr, bits))
-				continue;
-
-			dlinkDestroy(ptr, &temp_klines[i]);
-			delete_one_address_conf(aconf->host, aconf);
-			return YES;
 		}
 	}