X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/68876ea24b3d1782d404a39989ad855b328e5304..cea2bc8499f1d250587228330ab4336452bf1a6f:/modules/core/m_nick.c

diff --git a/modules/core/m_nick.c b/modules/core/m_nick.c
index 02c2787..352de58 100644
--- a/modules/core/m_nick.c
+++ b/modules/core/m_nick.c
@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_conf.h"
@@ -38,7 +38,7 @@
 #include "s_serv.h"
 #include "send.h"
 #include "channel.h"
-#include "s_log.h"
+#include "logger.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
@@ -64,6 +64,7 @@ static int ms_euid(struct Client *, struct Client *, int, const char **);
 static int ms_save(struct Client *, struct Client *, int, const char **);
 static int can_save(struct Client *);
 static void save_user(struct Client *, struct Client *, struct Client *);
+static void bad_nickname(struct Client *, const char *);
 
 struct Message nick_msgtab = {
 	"NICK", 0, 0, 0, MFLG_SLOW,
@@ -138,7 +139,7 @@ mr_nick(struct Client *client_p, struct Client *source_p, int parc, const char *
 		*s = '\0';
 
 	/* copy the nick and terminate it */
-	strlcpy(nick, parv[1], sizeof(nick));
+	rb_strlcpy(nick, parv[1], sizeof(nick));
 
 	/* check the nickname is ok */
 	if(!clean_nick(nick, 1))
@@ -202,7 +203,7 @@ m_nick(struct Client *client_p, struct Client *source_p, int parc, const char *p
 		flood_endgrace(source_p);
 
 	/* terminate nick to NICKLEN, we dont want clean_nick() to error! */
-	strlcpy(nick, parv[1], sizeof(nick));
+	rb_strlcpy(nick, parv[1], sizeof(nick));
 
 	/* check the nickname is ok */
 	if(!clean_nick(nick, 1))
@@ -281,18 +282,7 @@ mc_nick(struct Client *client_p, struct Client *source_p, int parc, const char *
 	/* if nicks erroneous, or too long, kill */
 	if(!clean_nick(parv[1], 0))
 	{
-		ServerStats->is_kill++;
-		sendto_realops_snomask(SNO_DEBUG, L_ALL,
-				     "Bad Nick: %s From: %s(via %s)",
-				     parv[1], source_p->servptr->name, client_p->name);
-		sendto_one(client_p, ":%s KILL %s :%s (Bad Nickname)", me.name, parv[1], me.name);
-
-		/* bad nick change, issue kill for the old nick to the rest
-		 * of the network.
-		 */
-		kill_client_serv_butone(client_p, source_p, "%s (Bad Nickname)", me.name);
-		source_p->flags |= FLAGS_KILLED;
-		exit_client(client_p, source_p, &me, "Bad Nickname");
+		bad_nickname(client_p, parv[1]);
 		return 0;
 	}
 
@@ -343,18 +333,14 @@ ms_nick(struct Client *client_p, struct Client *source_p, int parc, const char *
 	/* if nicks empty, erroneous, or too long, kill */
 	if(!clean_nick(parv[1], 0))
 	{
-		ServerStats->is_kill++;
-		sendto_realops_snomask(SNO_DEBUG, L_ALL,
-				     "Bad Nick: %s From: %s(via %s)",
-				     parv[1], parv[7], client_p->name);
-		sendto_one(client_p, ":%s KILL %s :%s (Bad Nickname)", me.name, parv[1], me.name);
+		bad_nickname(client_p, parv[1]);
 		return 0;
 	}
 
 	/* invalid username or host? */
 	if(!clean_username(parv[5]) || !clean_host(parv[6]))
 	{
-		ServerStats->is_kill++;
+		ServerStats.is_kill++;
 		sendto_realops_snomask(SNO_DEBUG, L_ALL,
 				     "Bad user@host: %s@%s From: %s(via %s)",
 				     parv[5], parv[6], parv[7], client_p->name);
@@ -435,17 +421,13 @@ ms_uid(struct Client *client_p, struct Client *source_p, int parc, const char *p
 	/* if nicks erroneous, or too long, kill */
 	if(!clean_nick(parv[1], 0))
 	{
-		ServerStats->is_kill++;
-		sendto_realops_snomask(SNO_DEBUG, L_ALL,
-				     "Bad Nick: %s From: %s(via %s)",
-				     parv[1], source_p->name, client_p->name);
-		sendto_one(client_p, ":%s KILL %s :%s (Bad Nickname)", me.id, parv[8], me.name);
+		bad_nickname(client_p, parv[1]);
 		return 0;
 	}
 
 	if(!clean_username(parv[5]) || !clean_host(parv[6]))
 	{
-		ServerStats->is_kill++;
+		ServerStats.is_kill++;
 		sendto_realops_snomask(SNO_DEBUG, L_ALL,
 				     "Bad user@host: %s@%s From: %s(via %s)",
 				     parv[5], parv[6], source_p->name, client_p->name);
@@ -455,7 +437,7 @@ ms_uid(struct Client *client_p, struct Client *source_p, int parc, const char *p
 
 	if(!clean_uid(parv[8]))
 	{
-		ServerStats->is_kill++;
+		ServerStats.is_kill++;
 		sendto_realops_snomask(SNO_DEBUG, L_ALL,
 				     "Bad UID: %s From: %s(via %s)",
 				     parv[8], source_p->name, client_p->name);
@@ -527,17 +509,13 @@ ms_euid(struct Client *client_p, struct Client *source_p, int parc, const char *
 	/* if nicks erroneous, or too long, kill */
 	if(!clean_nick(parv[1], 0))
 	{
-		ServerStats->is_kill++;
-		sendto_realops_snomask(SNO_DEBUG, L_ALL,
-				     "Bad Nick: %s From: %s(via %s)",
-				     parv[1], source_p->name, client_p->name);
-		sendto_one(client_p, ":%s KILL %s :%s (Bad Nickname)", me.id, parv[8], me.name);
+		bad_nickname(client_p, parv[1]);
 		return 0;
 	}
 
 	if(!clean_username(parv[5]) || !clean_host(parv[6]))
 	{
-		ServerStats->is_kill++;
+		ServerStats.is_kill++;
 		sendto_realops_snomask(SNO_DEBUG, L_ALL,
 				     "Bad user@host: %s@%s From: %s(via %s)",
 				     parv[5], parv[6], source_p->name, client_p->name);
@@ -547,7 +525,7 @@ ms_euid(struct Client *client_p, struct Client *source_p, int parc, const char *
 
 	if(!clean_uid(parv[8]))
 	{
-		ServerStats->is_kill++;
+		ServerStats.is_kill++;
 		sendto_realops_snomask(SNO_DEBUG, L_ALL,
 				     "Bad UID: %s From: %s(via %s)",
 				     parv[8], source_p->name, client_p->name);
@@ -557,7 +535,7 @@ ms_euid(struct Client *client_p, struct Client *source_p, int parc, const char *
 
 	if(strcmp(parv[9], "*") && !clean_host(parv[9]))
 	{
-		ServerStats->is_kill++;
+		ServerStats.is_kill++;
 		sendto_realops_snomask(SNO_DEBUG, L_ALL,
 				     "Bad realhost: %s From: %s(via %s)",
 				     parv[9], source_p->name, client_p->name);
@@ -746,7 +724,7 @@ set_initial_nick(struct Client *client_p, struct Client *source_p, char *nick)
 
 	if(source_p->flags & FLAGS_SENTUSER)
 	{
-		strlcpy(buf, source_p->username, sizeof(buf));
+		rb_strlcpy(buf, source_p->username, sizeof(buf));
 
 		/* got user, heres nick. */
 		register_local_user(client_p, source_p, buf);
@@ -930,7 +908,7 @@ perform_nick_collides(struct Client *source_p, struct Client *client_p,
 		if (use_save)
 		{
 			save_user(&me, &me, target_p);
-			ServerStats->is_save++;
+			ServerStats.is_save++;
 			sendto_one(client_p, ":%s SAVE %s %ld", me.id,
 					uid, (long)newts);
 			register_client(client_p, source_p,
@@ -950,7 +928,7 @@ perform_nick_collides(struct Client *source_p, struct Client *client_p,
 
 			/* we then need to KILL the old client everywhere */
 			kill_client_serv_butone(NULL, target_p, "%s (Nick collision (new))", me.name);
-			ServerStats->is_kill++;
+			ServerStats.is_kill++;
 
 			target_p->flags |= FLAGS_KILLED;
 			exit_client(client_p, target_p, &me, "Nick collision (new)");
@@ -998,12 +976,12 @@ perform_nick_collides(struct Client *source_p, struct Client *client_p,
 
 			if (use_save)
 			{
-				ServerStats->is_save++;
+				ServerStats.is_save++;
 				save_user(&me, &me, target_p);
 			}
 			else
 			{
-				ServerStats->is_kill++;
+				ServerStats.is_kill++;
 				sendto_one_numeric(target_p, ERR_NICKCOLLISION,
 						form_str(ERR_NICKCOLLISION), target_p->name);
 
@@ -1047,7 +1025,7 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p,
 
 		if (use_save)
 		{
-			ServerStats->is_save += 2;
+			ServerStats.is_save += 2;
 			save_user(&me, &me, target_p);
 			sendto_one(client_p, ":%s SAVE %s %ld", me.id,
 					source_p->id, (long)newts);
@@ -1057,13 +1035,13 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p,
 		}
 		else
 		{
-			ServerStats->is_kill++;
+			ServerStats.is_kill++;
 			sendto_one_numeric(target_p, ERR_NICKCOLLISION,
 					form_str(ERR_NICKCOLLISION), target_p->name);
 
 			kill_client_serv_butone(NULL, source_p, "%s (Nick change collision)", me.name);
 
-			ServerStats->is_kill++;
+			ServerStats.is_kill++;
 
 			kill_client_serv_butone(NULL, target_p, "%s (Nick change collision)", me.name);
 
@@ -1095,7 +1073,7 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p,
 
 			if (use_save)
 			{
-				ServerStats->is_save++;
+				ServerStats.is_save++;
 				/* can't broadcast a SAVE because the
 				 * nickchange has happened at client_p
 				 * but not in other directions -- jilles */
@@ -1107,7 +1085,7 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p,
 			}
 			else
 			{
-				ServerStats->is_kill++;
+				ServerStats.is_kill++;
 
 				sendto_one_numeric(target_p, ERR_NICKCOLLISION,
 						form_str(ERR_NICKCOLLISION), target_p->name);
@@ -1140,7 +1118,7 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p,
 
 			if (use_save)
 			{
-				ServerStats->is_save++;
+				ServerStats.is_save++;
 				save_user(&me, &me, target_p);
 			}
 			else
@@ -1151,7 +1129,7 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p,
 				/* kill the client who existed before hand */
 				kill_client_serv_butone(client_p, target_p, "%s (Nick collision)", me.name);
 
-				ServerStats->is_kill++;
+				ServerStats.is_kill++;
 
 				target_p->flags |= FLAGS_KILLED;
 				(void) exit_client(client_p, target_p, &me, "Nick collision");
@@ -1195,35 +1173,35 @@ register_client(struct Client *client_p, struct Client *server,
 	source_p->tsinfo = newts;
 
 	strcpy(source_p->name, nick);
-	strlcpy(source_p->username, parv[5], sizeof(source_p->username));
-	strlcpy(source_p->host, parv[6], sizeof(source_p->host));
-	strlcpy(source_p->orighost, source_p->host, sizeof(source_p->orighost));
+	rb_strlcpy(source_p->username, parv[5], sizeof(source_p->username));
+	rb_strlcpy(source_p->host, parv[6], sizeof(source_p->host));
+	rb_strlcpy(source_p->orighost, source_p->host, sizeof(source_p->orighost));
 
 	if(parc == 12)
 	{
-		strlcpy(source_p->info, parv[11], sizeof(source_p->info));
-		strlcpy(source_p->sockhost, parv[7], sizeof(source_p->sockhost));
-		strlcpy(source_p->id, parv[8], sizeof(source_p->id));
+		rb_strlcpy(source_p->info, parv[11], sizeof(source_p->info));
+		rb_strlcpy(source_p->sockhost, parv[7], sizeof(source_p->sockhost));
+		rb_strlcpy(source_p->id, parv[8], sizeof(source_p->id));
 		add_to_id_hash(source_p->id, source_p);
 		if (strcmp(parv[9], "*"))
 		{
-			strlcpy(source_p->orighost, parv[9], sizeof(source_p->orighost));
+			rb_strlcpy(source_p->orighost, parv[9], sizeof(source_p->orighost));
 			if (irccmp(source_p->host, source_p->orighost))
 				SetDynSpoof(source_p);
 		}
 		if (strcmp(parv[10], "*"))
-			strlcpy(source_p->user->suser, parv[10], sizeof(source_p->user->suser));
+			rb_strlcpy(source_p->user->suser, parv[10], sizeof(source_p->user->suser));
 	}
 	else if(parc == 10)
 	{
-		strlcpy(source_p->info, parv[9], sizeof(source_p->info));
-		strlcpy(source_p->sockhost, parv[7], sizeof(source_p->sockhost));
-		strlcpy(source_p->id, parv[8], sizeof(source_p->id));
+		rb_strlcpy(source_p->info, parv[9], sizeof(source_p->info));
+		rb_strlcpy(source_p->sockhost, parv[7], sizeof(source_p->sockhost));
+		rb_strlcpy(source_p->id, parv[8], sizeof(source_p->id));
 		add_to_id_hash(source_p->id, source_p);
 	}
 	else
 	{
-		strlcpy(source_p->info, parv[8], sizeof(source_p->info));
+		rb_strlcpy(source_p->info, parv[8], sizeof(source_p->info));
 	}
 
 	/* remove any nd entries for this nick */
@@ -1339,7 +1317,7 @@ save_user(struct Client *client_p, struct Client *source_p,
 				"Killed %s!%s@%s for nick collision detected by %s (%s does not support SAVE)",
 				target_p->name, target_p->username, target_p->host, source_p->name, target_p->from->name);
 		kill_client_serv_butone(NULL, target_p, "%s (Nick collision (no SAVE support))", me.name);
-		ServerStats->is_kill++;
+		ServerStats.is_kill++;
 
 		target_p->flags |= FLAGS_KILLED;
 		(void) exit_client(NULL, target_p, &me, "Nick collision (no SAVE support)");
@@ -1365,3 +1343,22 @@ save_user(struct Client *client_p, struct Client *source_p,
 	else
 		change_remote_nick(target_p, target_p, SAVE_NICKTS, target_p->id, 0);
 }
+
+static void bad_nickname(struct Client *client_p, const char *nick)
+{
+	char squitreason[100];
+
+	sendto_wallops_flags(UMODE_WALLOP, &me,
+			"Squitting %s because of bad nickname %s (NICKLEN mismatch?)",
+			client_p->name, nick);
+	sendto_server(NULL, NULL, CAP_TS6, NOCAPS,
+			":%s WALLOPS :Squitting %s because of bad nickname %s (NICKLEN mismatch?)",
+			me.id, client_p->name, nick);
+	sendto_server(NULL, NULL, NOCAPS, CAP_TS6,
+			":%s WALLOPS :Squitting %s because of bad nickname %s (NICKLEN mismatch?)",
+			me.name, client_p->name, nick);
+
+	rb_snprintf(squitreason, sizeof squitreason,
+			"Bad nickname introduced [%s]", nick);
+	exit_client(client_p, client_p, &me, squitreason);
+}