X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/e7c8892297beaacafd755b2b3a70140a66cf9bfc..67537fefa47cd78458af177f79d7e40e3a009ba4:/src/s_user.c

diff --git a/src/s_user.c b/src/s_user.c
index 667873e..e78b741 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -68,12 +68,12 @@ int user_modes[256] = {
 	/* 0x30 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x3F */
 	0,			/* @ */
 	0,			/* A */
-	0,			/* B */
-	0,			/* C */
+	UMODE_BOT,		/* B */
+	UMODE_NOCTCP,		/* C */
 	UMODE_DEAF,		/* D */
 	0,			/* E */
 	0,			/* F */
-	0,			/* G */
+	UMODE_SCALLERID,	/* G */
 	0,			/* H */
 	0,			/* I */
 	0,			/* J */
@@ -88,7 +88,7 @@ int user_modes[256] = {
 	UMODE_SERVICE,		/* S */
 	0,			/* T */
 	0,			/* U */
-	0,			/* V */
+	UMODE_NOINVITE,		/* V */
 	0,			/* W */
 	0,			/* X */
 	0,			/* Y */
@@ -109,7 +109,7 @@ int user_modes[256] = {
 	0,			/* m */
 	0,			/* n */
 	UMODE_OPER,		/* o */
-	0,			/* p */
+	UMODE_OVERRIDE,		/* p */
 	0,			/* q */
 	0,			/* r */
 	UMODE_SERVNOTICE,	/* s */
@@ -336,7 +336,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 		}
 
 		/* dont replace username if its supposed to be spoofed --fl */
-		if(!IsConfDoSpoofIp(aconf) || !strchr(aconf->name, '@'))
+		if(!IsConfDoSpoofIp(aconf) || !strchr(aconf->info.name, '@'))
 		{
 			p = username;
 
@@ -420,7 +420,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 	   (xconf = find_xline(source_p->info, 1)) != NULL)
 	{
 		ServerStats.is_ref++;
-		add_reject(source_p, xconf->name, NULL);
+		add_reject(source_p, xconf->host, NULL);
 		exit_client(client_p, source_p, &me, "Bad user info");
 		return CLIENT_EXITED;
 	}
@@ -561,7 +561,9 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 
 	/* they get a reduced limit */
 	if(find_tgchange(source_p->sockhost))
-		USED_TARGETS(source_p) = 6;
+		source_p->localClient->targets_free = TGCHANGE_INITIAL_LOW;
+	else
+		source_p->localClient->targets_free = TGCHANGE_INITIAL;
 
 	monitor_signon(source_p);
 	user_welcome(source_p);
@@ -589,6 +591,7 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
 	hook_data_umode_changed hdata;
 	hook_data_client hdata2;
 	char sockhost[HOSTLEN];
+	struct ConfItem *aconf;
 
 	if(MyClient(source_p))
 		send_umode(source_p, source_p, 0, 0, ubuf);
@@ -633,6 +636,11 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
 		      IsIPSpoof(source_p) ? "0" : sockhost,
 		      source_p->id, source_p->info);
 
+	if(!EmptyString(source_p->certfp))
+		sendto_server(client_p, NULL, CAP_TS6, NOCAPS,
+				":%s ENCAP * CERTFP :%s",
+				use_id(source_p), source_p->certfp);
+
 	if (IsDynSpoof(source_p))
 	{
 		sendto_server(client_p, NULL, CAP_TS6, use_euid ? CAP_EUID : NOCAPS, ":%s ENCAP * REALHOST %s",
@@ -696,6 +704,17 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
 	hdata2.target = source_p;
 	call_hook(h_introduce_client, &hdata2);
 
+	/* Do all the auth::autojoin wizardry once we're connected */
+	if(MyConnect(source_p))
+	{
+		aconf = source_p->localClient->att_conf;
+
+		if(aconf->autojoin != NULL)
+		{
+			user_join(client_p, source_p, aconf->autojoin, NULL);
+		}
+	}
+
 	return 0;
 }
 
@@ -712,7 +731,7 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
 int
 valid_hostname(const char *hostname)
 {
-	const char *p = hostname;
+	const char *p = hostname, *last_slash = 0;
 	int found_sep = 0;
 
 	s_assert(NULL != p);
@@ -720,7 +739,7 @@ valid_hostname(const char *hostname)
 	if(hostname == NULL)
 		return NO;
 
-	if('.' == *p || ':' == *p)
+	if('.' == *p || ':' == *p || '/' == *p)
 		return NO;
 
 	while (*p)
@@ -729,13 +748,21 @@ valid_hostname(const char *hostname)
 			return NO;
                 if(*p == '.' || *p == ':')
   			found_sep++;
+		else if(*p == '/')
+		{
+			found_sep++;
+			last_slash = p;
+		}
 		p++;
 	}
 
 	if(found_sep == 0)
-		return(NO);
+		return NO;
+
+	if(last_slash && IsDigit(last_slash[1]))
+		return NO;
 
-	return (YES);
+	return YES;
 }
 
 /* 
@@ -854,11 +881,43 @@ report_and_set_user_flags(struct Client *source_p, struct ConfItem *aconf)
 	}
 }
 
+static void
+show_other_user_mode(struct Client *source_p, struct Client *target_p)
+{
+	int i;
+	char buf[BUFSIZE];
+	char *m;
+
+	m = buf;
+	*m++ = '+';
+
+	for (i = 0; i < 128; i++) /* >= 127 is extended ascii */
+		if (target_p->umodes & user_modes[i])
+			*m++ = (char) i;
+	*m = '\0';
+
+	if (MyConnect(target_p) && target_p->snomask != 0)
+		sendto_one_notice(source_p, ":Modes for %s are %s %s",
+				target_p->name, buf,
+				construct_snobuf(target_p->snomask));
+	else
+		sendto_one_notice(source_p, ":Modes for %s are %s",
+				target_p->name, buf);
+}
+
+static void
+expire_umode_p(void *data)
+{
+	struct Client *source_p = data;
+	char *parv[4] = {source_p->name, source_p->name, "-p", NULL};
+	source_p->localClient->override_timeout_event = NULL;
+	user_mode(source_p, source_p, 3, parv);
+}
+
 /*
  * user_mode - set get current users mode
  *
  * m_umode() added 15/10/91 By Darren Reed.
- * parv[0] - sender
  * parv[1] - username to change mode for
  * parv[2] - modes to change
  */
@@ -904,9 +963,12 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
 		return 0;
 	}
 
-	if(source_p != target_p || target_p->from != source_p->from)
+	if(source_p != target_p)
 	{
-		sendto_one(source_p, form_str(ERR_USERSDONTMATCH), me.name, source_p->name);
+		if (MyOper(source_p) && parc < 3)
+			show_other_user_mode(source_p, target_p);
+		else
+			sendto_one(source_p, form_str(ERR_USERSDONTMATCH), me.name, source_p->name);
 		return 0;
 	}
 
@@ -969,6 +1031,9 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
 
 				Count.oper--;
 
+				user_metadata_delete(source_p, "OPERSTRING", 1);
+				user_metadata_delete(source_p, "SWHOIS", 1);
+
 				if(MyConnect(source_p))
 				{
 					source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
@@ -1085,6 +1150,12 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
 		source_p->umodes &= ~UMODE_ADMIN;
 	}
 
+	if(MyConnect(source_p) && (source_p->umodes & UMODE_OVERRIDE) && (!IsOperOverride(source_p)))
+	{
+		sendto_one_notice(source_p, ":*** You need oper and the override flag for +p");
+		source_p->umodes &= ~UMODE_OVERRIDE;
+	}
+
 	/* let modules providing usermodes know that we've changed our usermode --nenolod */
 	hdata.client = source_p;
 	hdata.oldumodes = setflags;
@@ -1104,6 +1175,19 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
 		sendto_one_numeric(source_p, RPL_SNOMASK, form_str(RPL_SNOMASK),
 			construct_snobuf(source_p->snomask));
 
+		/* If we're setting +p, expire it, but only from local clients */
+		if(ConfigFileEntry.expire_override_time && MyClient(source_p) && (source_p->umodes & ~setflags) & UMODE_OVERRIDE)
+		{
+			source_p->localClient->override_timeout_event =
+				rb_event_addonce("expire_override", expire_umode_p, source_p, ConfigFileEntry.expire_override_time);
+		}
+		else if(MyClient(source_p) && source_p->localClient->override_timeout_event && (setflags & ~source_p->umodes) & UMODE_OVERRIDE)
+		{
+			rb_event_delete(source_p->localClient->override_timeout_event);
+			source_p->localClient->override_timeout_event = NULL;
+		}
+
+
 	return (0);
 }
 
@@ -1240,6 +1324,7 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p)
 {
 	unsigned int old = source_p->umodes, oldsnomask = source_p->snomask;
 	hook_data_umode_changed hdata;
+	struct ConfItem *aconf;
 
 	SetOper(source_p);
 
@@ -1250,6 +1335,32 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p)
 	else
 		source_p->umodes |= DEFAULT_OPER_UMODES;
 
+	if(oper_p->swhois)
+		user_metadata_add(source_p, "SWHOIS", oper_p->swhois, 1);
+
+	if(oper_p->operstring)
+		user_metadata_add(source_p, "OPERSTRING", oper_p->operstring, 1);
+
+	if(oper_p->vhost || !EmptyString(GlobalSetOptions.operhost))
+	{
+		if(oper_p->vhost)
+			change_nick_user_host(source_p, source_p->name, source_p->username, oper_p->vhost, 0, "Changing host");
+		else
+			change_nick_user_host(source_p, source_p->name, source_p->username, GlobalSetOptions.operhost, 0, "Changing host");
+		
+		sendto_one_numeric(source_p, RPL_HOSTHIDDEN, "%s :is now your hidden host (set by %s)", source_p->host, source_p->servptr->name);
+
+		sendto_server(NULL, NULL,
+			CAP_EUID | CAP_TS6, NOCAPS, ":%s CHGHOST %s :%s",
+			use_id(&me), use_id(source_p), source_p->host);
+		sendto_server(NULL, NULL,
+			CAP_TS6, CAP_EUID, ":%s ENCAP * CHGHOST %s :%s",
+			use_id(&me), use_id(source_p), source_p->host);
+
+		if (!IsDynSpoof(source_p))
+			SetDynSpoof(source_p);
+	}
+
 	if (oper_p->snomask)
 	{
 		source_p->snomask |= oper_p->snomask;
@@ -1287,7 +1398,7 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p)
 	call_hook(h_umode_changed, &hdata);
 
 	sendto_realops_snomask(SNO_GENERAL, L_ALL,
-			     "%s (%s@%s) is now an operator", source_p->name,
+			     "%s (%s!%s@%s) is now an operator", oper_p->name, source_p->name,
 			     source_p->username, source_p->host);
 	if(!(old & UMODE_INVISIBLE) && IsInvisible(source_p))
 		++Count.invisi;
@@ -1301,6 +1412,18 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p)
 	sendto_one_notice(source_p, ":*** Oper privs are %s", oper_p->privset->privs);
 	send_oper_motd(source_p);
 
+	aconf = source_p->localClient->att_conf;
+
+	/* Do the auth::autojoin_opers wizardry here */
+	if(aconf->autojoin_opers != NULL)
+	{
+		/* opers should never be banned from the opers channel.
+		 * Plus this is post-umode being set so you'll pass +I $o or +O.
+		 * Hence why we're making this a normal clean join. --jdhore
+		 */
+		user_join(&me, source_p, aconf->autojoin_opers, NULL);
+	}
+
 	return (1);
 }
 
@@ -1369,7 +1492,7 @@ change_nick_user_host(struct Client *target_p,	const char *nick, const char *use
 	struct membership *mscptr;
 	int changed = irccmp(target_p->name, nick);
 	int changed_case = strcmp(target_p->name, nick);
-	int do_qjm = irccmp(target_p->username, user) || irccmp(target_p->host, host);
+	int do_qjm = irccmp(target_p->username, user) || (irccmp(target_p->host, host) && ConfigChannel.cycle_host_change);
 	char mode[10], modeval[NICKLEN * 2 + 2], reason[256], *mptr;
 	va_list ap;
 
@@ -1398,6 +1521,13 @@ change_nick_user_host(struct Client *target_p,	const char *nick, const char *use
 			chptr = mscptr->chptr;
 			mptr = mode;
 
+			if(is_admin(mscptr))
+			{
+				*mptr++ = 'a';
+				strcat(modeval, nick);
+				strcat(modeval, " ");
+			}
+
 			if(is_chanop(mscptr))
 			{
 				*mptr++ = 'o';
@@ -1405,6 +1535,13 @@ change_nick_user_host(struct Client *target_p,	const char *nick, const char *use
 				strcat(modeval, " ");
 			}
 
+			if(is_halfop(mscptr))
+			{
+				*mptr++ = 'h';
+				strcat(modeval, nick);
+				strcat(modeval, " ");
+			}
+
 			if(is_voiced(mscptr))
 			{
 				*mptr++ = 'v';