X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/3ea5fee7ededf856288148f63cdca633c072f7a1..8097430a810ac1535fe5304f74991b16ff58b064:/modules/m_testline.c

diff --git a/modules/m_testline.c b/modules/m_testline.c
index a261d41..05b7148 100644
--- a/modules/m_testline.c
+++ b/modules/m_testline.c
@@ -39,18 +39,18 @@
 #include "numeric.h"
 #include "s_conf.h"
 #include "s_newconf.h"
-#include "sprintf_irc.h"
+#include "reject.h"
 
 static int mo_testline(struct Client *, struct Client *, int, const char **);
 static int mo_testgecos(struct Client *, struct Client *, int, const char **);
 
 struct Message testline_msgtab = {
 	"TESTLINE", 0, 0, 0, MFLG_SLOW,
-	{mg_unreg, mg_ignore, mg_ignore, mg_ignore, mg_ignore, {mo_testline, 2}}
+	{mg_unreg, mg_not_oper, mg_ignore, mg_ignore, mg_ignore, {mo_testline, 2}}
 };
 struct Message testgecos_msgtab = {
 	"TESTGECOS", 0, 0, 0, MFLG_SLOW,
-	{mg_unreg, mg_ignore, mg_ignore, mg_ignore, mg_ignore, {mo_testgecos, 2}}
+	{mg_unreg, mg_not_oper, mg_ignore, mg_ignore, mg_ignore, {mo_testgecos, 2}}
 };
 
 mapi_clist_av1 testline_clist[] = { &testline_msgtab, &testgecos_msgtab, NULL };
@@ -70,6 +70,9 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 	char *p;
 	int host_mask;
 	int type;
+	int duration;
+	char *puser, *phost, *reason, *operreason;
+	char reasonbuf[BUFSIZE];
 
 	mask = LOCAL_COPY(parv[1]);
 
@@ -82,7 +85,7 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 					me.name, source_p->name,
 					resv_p->hold ? 'q' : 'Q',
 					resv_p->hold ? (long) ((resv_p->hold - rb_current_time()) / 60) : 0L,
-					resv_p->name, resv_p->passwd);
+					resv_p->host, resv_p->passwd);
 			/* this is a false positive, so make sure it isn't counted in stats q
 			 * --nenolod
 			 */
@@ -119,7 +122,7 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 	/* parses as an IP, check for a dline */
 	if((type = parse_netmask(host, (struct sockaddr *)&ip, &host_mask)) != HM_HOST)
 	{
-#ifdef IPV6
+#ifdef RB_IPV6
 		if(type == HM_IPV6)
 			aconf = find_dline((struct sockaddr *)&ip, AF_INET6);
 		else
@@ -128,58 +131,69 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 
 		if(aconf && aconf->status & CONF_DLINE)
 		{
+			get_printable_kline(source_p, aconf, &phost, &reason, &puser, &operreason);
+			rb_snprintf(reasonbuf, sizeof(reasonbuf), "%s%s%s", reason,
+				operreason ? "|" : "", operreason ? operreason : "");
 			sendto_one(source_p, form_str(RPL_TESTLINE),
 				me.name, source_p->name,
 				(aconf->flags & CONF_FLAGS_TEMPORARY) ? 'd' : 'D',
 				(aconf->flags & CONF_FLAGS_TEMPORARY) ? 
 				 (long) ((aconf->hold - rb_current_time()) / 60) : 0L, 
-				aconf->host, aconf->passwd);
+				phost, reasonbuf);
 
 			return 0;
 		}
+		/* Otherwise, aconf is an exempt{} */
+		if(aconf == NULL &&
+				(duration = is_reject_ip((struct sockaddr *)&ip)))
+			sendto_one(source_p, form_str(RPL_TESTLINE),
+					me.name, source_p->name,
+					'!',
+					duration / 60,
+					host, "Reject cache");
+		if(aconf == NULL &&
+				(duration = is_throttle_ip((struct sockaddr *)&ip)))
+			sendto_one(source_p, form_str(RPL_TESTLINE),
+					me.name, source_p->name,
+					'!',
+					duration / 60,
+					host, "Throttled");
 	}
 
 	if (username != NULL)
 	{
-		strlcpy(user_trunc, username, sizeof user_trunc);
-		strlcpy(notildeuser_trunc, *username == '~' ? username + 1 : username, sizeof notildeuser_trunc);
+		rb_strlcpy(user_trunc, username, sizeof user_trunc);
+		rb_strlcpy(notildeuser_trunc, *username == '~' ? username + 1 : username, sizeof notildeuser_trunc);
 	}
 	else
 	{
-		strlcpy(user_trunc, "dummy", sizeof user_trunc);
-		strlcpy(notildeuser_trunc, "dummy", sizeof notildeuser_trunc);
+		rb_strlcpy(user_trunc, "dummy", sizeof user_trunc);
+		rb_strlcpy(notildeuser_trunc, "dummy", sizeof notildeuser_trunc);
 	}
 	/* now look for a matching I/K/G */
 	if((aconf = find_address_conf(host, NULL, user_trunc, notildeuser_trunc,
 				(type != HM_HOST) ? (struct sockaddr *)&ip : NULL,
 				(type != HM_HOST) ? (
-#ifdef IPV6
+#ifdef RB_IPV6
 				 (type == HM_IPV6) ? AF_INET6 : 
 #endif
-				  AF_INET) : 0)))
+				  AF_INET) : 0, NULL)))
 	{
 		static char buf[HOSTLEN+USERLEN+2];
 
 		if(aconf->status & CONF_KILL)
 		{
+			get_printable_kline(source_p, aconf, &phost, &reason, &puser, &operreason);
 			rb_snprintf(buf, sizeof(buf), "%s@%s", 
-					aconf->user, aconf->host);
+					puser, phost);
+			rb_snprintf(reasonbuf, sizeof(reasonbuf), "%s%s%s", reason,
+				operreason ? "|" : "", operreason ? operreason : "");
 			sendto_one(source_p, form_str(RPL_TESTLINE),
 				me.name, source_p->name,
 				(aconf->flags & CONF_FLAGS_TEMPORARY) ? 'k' : 'K',
 				(aconf->flags & CONF_FLAGS_TEMPORARY) ? 
 				 (long) ((aconf->hold - rb_current_time()) / 60) : 0L,
-				buf, aconf->passwd);
-			return 0;
-		}
-		else if(aconf->status & CONF_GLINE)
-		{
-			rb_snprintf(buf, sizeof(buf), "%s@%s",
-					aconf->user, aconf->host);
-			sendto_one(source_p, form_str(RPL_TESTLINE),
-				me.name, source_p->name,
-				'G', (long) ((aconf->hold - rb_current_time()) / 60),
-				buf, aconf->passwd);
+				buf, reasonbuf);
 			return 0;
 		}
 	}
@@ -191,7 +205,7 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 				me.name, source_p->name,
 				resv_p->hold ? 'q' : 'Q',
 				resv_p->hold ? (long) ((resv_p->hold - rb_current_time()) / 60) : 0L,
-				resv_p->name, resv_p->passwd);
+				resv_p->host, resv_p->passwd);
 
 		/* this is a false positive, so make sure it isn't counted in stats q
 		 * --nenolod
@@ -204,7 +218,8 @@ mo_testline(struct Client *client_p, struct Client *source_p, int parc, const ch
 	if(aconf && aconf->status & CONF_CLIENT)
 	{
 		sendto_one_numeric(source_p, RPL_STATSILINE, form_str(RPL_STATSILINE),
-				aconf->name, show_iline_prefix(source_p, aconf, aconf->user),
+				aconf->info.name, EmptyString(aconf->spasswd) ? "<NULL>" : aconf->spasswd,
+				show_iline_prefix(source_p, aconf, aconf->user),
 				aconf->host, aconf->port, aconf->className);
 		return 0;
 	}
@@ -231,6 +246,6 @@ mo_testgecos(struct Client *client_p, struct Client *source_p, int parc, const c
 			me.name, source_p->name,
 			aconf->hold ? 'x' : 'X',
 			aconf->hold ? (long) ((aconf->hold - rb_current_time()) / 60) : 0L,
-			aconf->name, aconf->passwd);
+			aconf->host, aconf->passwd);
 	return 0;
 }