ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/src/user.c

Comparing ircd-hybrid/trunk/src/s_user.c (file contents):
Revision 1618 by michael, Tue Oct 30 21:04:38 2012 UTC vs.
Revision 2125 by michael, Sun May 26 18:41:13 2013 UTC

#	Line 32 | Line 32
32		#include "fdlist.h"
33		#include "hash.h"
34		#include "irc_string.h"
35	–	#include "sprintf_irc.h"
35		#include "s_bsd.h"
36		#include "ircd.h"
37		#include "listener.h"
#	Line 54 | Line 53
53		#include "watch.h"
54
55
57	–	struct Callback *entering_umode_cb = NULL;
58	–	struct Callback *umode_cb = NULL;
59	–
56		static char umode_buffer[IRCD_BUFSIZE];
57
58		static void user_welcome(struct Client *);
59	<	static void report_and_set_user_flags(struct Client *, const struct AccessItem *);
59	>	static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
60		static int check_xline(struct Client *);
61		static void introduce_client(struct Client *);
62		static const char *uid_get(void);
#	Line 81 | Line 77 | static dlink_list support_list = { NULL,
77		MessageFile *isupportFile;
78
79		/* memory is cheap. map 0-255 to equivalent mode */
80	<	unsigned int user_modes[256] =
80	>	const unsigned int user_modes[256] =
81		{
82		/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
83		/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
#	Line 93 | Line 89 | unsigned int user_modes[256] =
89		UMODE_CCONN_FULL,   /* C */
90		UMODE_DEAF,         /* D */
91		0,                  /* E */
92	<	0,                  /* F */
92	>	UMODE_FARCONNECT,   /* F */
93		UMODE_SOFTCALLERID, /* G */
94		UMODE_HIDDEN,       /* H */
95		0,                  /* I */
#	Line 120 | Line 116 | unsigned int user_modes[256] =
116		UMODE_BOTS,         /* b */
117		UMODE_CCONN,        /* c */
118		UMODE_DEBUG,        /* d */
119	<	0,                  /* e */
119	>	UMODE_EXTERNAL,     /* e */
120		UMODE_FULL,         /* f */
121		UMODE_CALLERID,     /* g */
122		0,                  /* h */
#	Line 139 | Line 135 | unsigned int user_modes[256] =
135		UMODE_UNAUTH,       /* u */
136		0,                  /* v */
137		UMODE_WALLOP,       /* w */
138	<	UMODE_EXTERNAL,     /* x */
138	>	0,                  /* x */
139		UMODE_SPY,          /* y */
140		UMODE_OPERWALL,     /* z      0x7A */
141		0,0,0,0,0,          /* 0x7B - 0x7F */
#	Line 214 | Line 210 | show_lusers(struct Client *source_p)
210		sendto_one(source_p, form_str(RPL_LUSERME),
211		from, to, Count.local, Count.myserver);
212		sendto_one(source_p, form_str(RPL_LOCALUSERS),
213	<	from, to, Count.local, Count.max_loc,
218	<	Count.local, Count.max_loc);
213	>	from, to, Count.local, Count.max_loc);
214		}
215		else
216		{
217		sendto_one(source_p, form_str(RPL_LUSERME),
218		from, to, Count.total, 0);
219		sendto_one(source_p, form_str(RPL_LOCALUSERS),
220	<	from, to, Count.total, Count.max_tot,
226	<	Count.total, Count.max_tot);
220	>	from, to, Count.total, Count.max_tot);
221		}
222
223		sendto_one(source_p, form_str(RPL_GLOBALUSERS),
224	<	from, to, Count.total, Count.max_tot,
231	<	Count.total, Count.max_tot);
224	>	from, to, Count.total, Count.max_tot);
225
226		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
227		sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
#	Line 280 | Line 273 | void
273		register_local_user(struct Client *source_p)
274		{
275		const char *id = NULL;
276	<	const struct AccessItem *aconf = NULL;
284	<	dlink_node *ptr = NULL;
276	>	const struct MaskItem *conf = NULL;
277
278		assert(source_p != NULL);
279		assert(source_p == source_p->from);
#	Line 312 | Line 304 | register_local_user(struct Client *sourc
304		/* Straight up the maximum rate of flooding... */
305		source_p->localClient->allow_read = MAX_FLOOD_BURST;
306
307	<	if (!execute_callback(client_check_cb, source_p, source_p->username))
307	>	if (!check_client(source_p))
308		return;
309
310		if (valid_hostname(source_p->host) == 0)
#	Line 323 | Line 315 | register_local_user(struct Client *sourc
315		sizeof(source_p->host));
316		}
317
318	<	ptr   = source_p->localClient->confs.head;
327	<	aconf = map_to_conf(ptr->data);
318	>	conf = source_p->localClient->confs.head->data;
319
320		if (!IsGotId(source_p))
321		{
#	Line 332 | Line 323 | register_local_user(struct Client *sourc
323		const char *p = username;
324		unsigned int i = 0;
325
326	<	if (IsNeedIdentd(aconf))
326	>	if (IsNeedIdentd(conf))
327		{
328		++ServerStats.is_ref;
329		sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
#	Line 343 | Line 334 | register_local_user(struct Client *sourc
334
335		strlcpy(username, source_p->username, sizeof(username));
336
337	<	if (!IsNoTilde(aconf))
337	>	if (!IsNoTilde(conf))
338		source_p->username[i++] = '~';
339
340		for (; *p && i < USERLEN; ++p)
#	Line 354 | Line 345 | register_local_user(struct Client *sourc
345		}
346
347		/* password check */
348	<	if (!EmptyString(aconf->passwd))
348	>	if (!EmptyString(conf->passwd))
349		{
350		const char *pass = source_p->localClient->passwd;
351
352	<	if (!match_conf_password(pass, aconf))
352	>	if (!match_conf_password(pass, conf))
353		{
354		++ServerStats.is_ref;
355		sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
#	Line 374 | Line 365 | register_local_user(struct Client *sourc
365		*/
366
367		/* report if user has &^>= etc. and set flags as needed in source_p */
368	<	report_and_set_user_flags(source_p, aconf);
368	>	report_and_set_user_flags(source_p, conf);
369
370		if (IsDead(source_p))
371		return;
#	Line 399 | Line 390 | register_local_user(struct Client *sourc
390		}
391
392		/* valid user name check */
393	<	if (valid_username(source_p->username) == 0)
393	>	if (valid_username(source_p->username, 1) == 0)
394		{
395		char tmpstr2[IRCD_BUFSIZE];
396
#	Line 427 | Line 418 | register_local_user(struct Client *sourc
418		source_p->name, source_p->username, source_p->host,
419		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
420		"255.255.255.255" : source_p->sockhost,
421	<	get_client_class(source_p),
421	>	get_client_class(&source_p->localClient->confs),
422		source_p->info, source_p->id);
423
424		sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
#	Line 435 | Line 426 | register_local_user(struct Client *sourc
426		source_p->name, source_p->username, source_p->host,
427		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
428		"255.255.255.255" : source_p->sockhost,
429	<	get_client_class(source_p),
429	>	get_client_class(&source_p->localClient->confs),
430		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
431		"<hidden>" : source_p->localClient->client_host,
432		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
#	Line 560 | Line 551 | register_remote_user(struct Client *sour
551		add_user_host(source_p->username, source_p->host, 1);
552		SetUserHost(source_p);
553
554	+	if (HasFlag(source_p->servptr, FLAGS_EOB))
555	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
556	+	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
557	+	source_p->servptr->name,
558	+	source_p->name, source_p->username, source_p->host,
559	+	source_p->info, source_p->id);
560	+
561		introduce_client(source_p);
562		}
563
#	Line 661 | Line 659 | valid_hostname(const char *hostname)
659		if (!IsHostChar(*p))
660		return 0;
661
662	<	return 1;
662	>	return p - hostname <= HOSTLEN;
663		}
664
665		/* valid_username()
#	Line 676 | Line 674 | valid_hostname(const char *hostname)
674		* style of username
675		*/
676		int
677	<	valid_username(const char *username)
677	>	valid_username(const char *username, const int local)
678		{
679		int dots      = 0;
680		const char *p = username;
#	Line 686 | Line 684 | valid_username(const char *username)
684		if (*p == '~')
685		++p;
686
687	<	/* reject usernames that don't start with an alphanum
687	>	/*
688	>	* Reject usernames that don't start with an alphanum
689		* i.e. reject jokers who have '-@somehost' or '.@somehost'
690		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
691		*/
692		if (!IsAlNum(*p))
693		return 0;
694
695	<	while (*++p)
695	>	if (local)
696		{
697	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
697	>	while (*++p)
698		{
699	<	if (++dots > ConfigFileEntry.dots_in_ident)
700	<	return 0;
701	<	if (!IsUserChar(*(p + 1)))
699	>	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
700	>	{
701	>	if (++dots > ConfigFileEntry.dots_in_ident)
702	>	return 0;
703	>	if (!IsUserChar(*(p + 1)))
704	>	return 0;
705	>	}
706	>	else if (!IsUserChar(*p))
707		return 0;
708		}
709	<	else if (!IsUserChar(*p))
710	<	return 0;
709	>	}
710	>	else
711	>	{
712	>	while (*++p)
713	>	if (!IsUserChar(*p))
714	>	return 0;
715		}
716
717	<	return 1;
717	>	return  p - username <= USERLEN;;
718		}
719
720		/* clean_nick_name()
#	Line 737 | Line 745 | valid_nickname(const char *nickname, con
745		/* report_and_set_user_flags()
746		*
747		* inputs       - pointer to source_p
748	<	*              - pointer to aconf for this user
748	>	*              - pointer to conf for this user
749		* output       - NONE
750		* side effects - Report to user any special flags
751		*                they are getting, and set them.
752		*/
753		static void
754	<	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
754	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
755		{
756		/* If this user is being spoofed, tell them so */
757	<	if (IsConfDoSpoofIp(aconf))
757	>	if (IsConfDoSpoofIp(conf))
758		{
759		sendto_one(source_p,
760	<	":%s NOTICE %s :*** Spoofing your IP. congrats.",
760	>	":%s NOTICE %s :*** Spoofing your IP. Congrats.",
761		me.name, source_p->name);
762		}
763
764		/* If this user is in the exception class, Set it "E lined" */
765	<	if (IsConfExemptKline(aconf))
765	>	if (IsConfExemptKline(conf))
766		{
767		SetExemptKline(source_p);
768		sendto_one(source_p,
769	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
769	>	":%s NOTICE %s :*** You are exempt from K/D/G lines. Congrats.",
770		me.name, source_p->name);
771		}
772
773		/* The else here is to make sure that G line exempt users
774		* do not get noticed twice.
775		*/
776	<	else if (IsConfExemptGline(aconf))
776	>	else if (IsConfExemptGline(conf))
777		{
778		SetExemptGline(source_p);
779	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
779	>	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines. Congrats.",
780		me.name, source_p->name);
781		}
782
783	<	if (IsConfExemptResv(aconf))
783	>	if (IsConfExemptResv(conf))
784		{
785		SetExemptResv(source_p);
786	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
786	>	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs. Congrats.",
787		me.name, source_p->name);
788		}
789
790		/* If this user is exempt from user limits set it "F lined" */
791	<	if (IsConfExemptLimits(aconf))
791	>	if (IsConfExemptLimits(conf))
792		{
793		SetExemptLimits(source_p);
794		sendto_one(source_p,
795	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
795	>	":%s NOTICE %s :*** You are exempt from user limits. Congrats.",
796		me.name,source_p->name);
797		}
798
799	<	if (IsConfCanFlood(aconf))
799	>	if (IsConfCanFlood(conf))
800		{
801		SetCanFlood(source_p);
802		sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
#	Line 797 | Line 805 | report_and_set_user_flags(struct Client
805		}
806		}
807
800	–	/* change_simple_umode()
801	–	*
802	–	* this callback can be hooked to allow special handling of
803	–	* certain usermodes
804	–	*/
805	–	static void *
806	–	change_simple_umode(va_list args)
807	–	{
808	–	struct Client *client_p;
809	–	struct Client *source_p;
810	–	int what;
811	–	unsigned int flag;
812	–
813	–	client_p = va_arg(args, struct Client *);
814	–	source_p = va_arg(args, struct Client *);
815	–	what = va_arg(args, int);
816	–	flag = va_arg(args, unsigned int);
817	–
818	–	if (what == MODE_ADD)
819	–	AddUMode(source_p, flag);
820	–	else
821	–	DelUMode(source_p, flag);
822	–
823	–	return NULL;
824	–	}
825	–
808		/* set_user_mode()
809		*
810		* added 15/10/91 By Darren Reed.
#	Line 832 | Line 814 | change_simple_umode(va_list args)
814		*/
815		void
816		set_user_mode(struct Client *client_p, struct Client *source_p,
817	<	int parc, char *parv[])
817	>	const int parc, char *parv[])
818		{
819		unsigned int flag, setflags;
820		char **p, *m, buf[IRCD_BUFSIZE];
#	Line 849 | Line 831 | set_user_mode(struct Client *client_p, s
831		return;
832		}
833
852	–	if (IsServer(source_p))
853	–	{
854	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
855	–	"*** Mode for User %s from %s",
856	–	parv[1], source_p->name);
857	–	return;
858	–	}
859	–
834		if (source_p != target_p)
835		{
836		sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
#	Line 879 | Line 853 | set_user_mode(struct Client *client_p, s
853		return;
854		}
855
882	–	execute_callback(entering_umode_cb, client_p, source_p);
883	–
856		/* find flags already set for user */
857		setflags = source_p->umodes;
858
#	Line 921 | Line 893 | set_user_mode(struct Client *client_p, s
893		{
894		dlink_node *dm;
895
896	<	detach_conf(source_p, OPER_TYPE);
896	>	detach_conf(source_p, CONF_OPER);
897		ClrOFlag(source_p);
898		DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
899
#	Line 932 | Line 904 | set_user_mode(struct Client *client_p, s
904
905		break;
906
907	<	/* we may not get these,
936	<	* but they shouldnt be in default
937	<	*/
938	<	case 'r':
939	<	case ' ' :
940	<	case '\n':
941	<	case '\r':
942	<	case '\t':
907	>	case 'r':  /* Only services may set +r */
908		break;
909
910		default:
#	Line 947 | Line 912 | set_user_mode(struct Client *client_p, s
912		{
913		if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
914		(ConfigFileEntry.oper_only_umodes & flag))
950	–	{
915		badflag = 1;
952	–	}
916		else
917	<	execute_callback(umode_cb, client_p, source_p, what, flag);
917	>	{
918	>	if (what == MODE_ADD)
919	>	AddUMode(source_p, flag);
920	>	else
921	>	DelUMode(source_p, flag);
922	>	}
923		}
924		else
925		{
#	Line 968 | Line 936 | set_user_mode(struct Client *client_p, s
936		sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
937		me.name, source_p->name);
938
971	–	if (HasUMode(source_p, UMODE_NCHANGE) && !HasOFlag(source_p, OPER_FLAG_N))
972	–	{
973	–	sendto_one(source_p, ":%s NOTICE %s :*** You have no nchange flag;",
974	–	me.name, source_p->name);
975	–	DelUMode(source_p, UMODE_NCHANGE);
976	–	}
977	–
939		if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
940		!HasOFlag(source_p, OPER_FLAG_ADMIN))
941		{
#	Line 1092 | Line 1053 | send_umode_out(struct Client *client_p,
1053		send_umode(client_p, source_p, old, 0xffffffff, buf);
1054		}
1055
1056	+	void
1057	+	user_set_hostmask(struct Client *target_p, const char *hostname)
1058	+	{
1059	+	if (!valid_hostname(hostname))
1060	+	return;
1061	+
1062	+	if (IsUserHostIp(target_p))
1063	+	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1064	+
1065	+	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1066	+	SetIPSpoof(target_p);
1067	+
1068	+	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1069	+	SetUserHost(target_p);
1070	+
1071	+	if (MyClient(target_p))
1072	+	clear_ban_cache_client(target_p);
1073	+	}
1074	+
1075		/* user_welcome()
1076		*
1077		* inputs       - client pointer to client to welcome
#	Line 1158 | Line 1138 | user_welcome(struct Client *source_p)
1138		static int
1139		check_xline(struct Client *source_p)
1140		{
1141	<	struct ConfItem *conf = NULL;
1141	>	struct MaskItem *conf = NULL;
1142		const char *reason = NULL;
1143
1144	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1165	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
1144	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1145		{
1146	<	struct MatchItem *reg = map_to_conf(conf);
1168	<
1169	<	++reg->count;
1146	>	++conf->count;
1147
1148	<	if (reg->reason != NULL)
1149	<	reason = reg->reason;
1148	>	if (conf->reason != NULL)
1149	>	reason = conf->reason;
1150		else
1151		reason = "No Reason";
1152
#	Line 1191 | Line 1168 | check_xline(struct Client *source_p)
1168		*
1169		* inputs       - pointer to given client to oper
1170		* output       - NONE
1171	<	* side effects - Blindly opers up given source_p, using aconf info
1171	>	* side effects - Blindly opers up given source_p, using conf info
1172		*                all checks on passwords have already been done.
1173		*                This could also be used by rsa oper routines.
1174		*/
#	Line 1199 | Line 1176 | void
1176		oper_up(struct Client *source_p)
1177		{
1178		const unsigned int old = source_p->umodes;
1179	<	const struct AccessItem *oconf = NULL;
1179	>	const struct MaskItem *conf = source_p->localClient->confs.head->data;
1180
1181		assert(source_p->localClient->confs.head);
1205	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
1182
1183		++Count.oper;
1184		SetOper(source_p);
1185
1186	<	if (oconf->modes)
1187	<	AddUMode(source_p, oconf->modes);
1186	>	if (conf->modes)
1187	>	AddUMode(source_p, conf->modes);
1188		else if (ConfigFileEntry.oper_umodes)
1189		AddUMode(source_p, ConfigFileEntry.oper_umodes);
1190
#	Line 1220 | Line 1196 | oper_up(struct Client *source_p)
1196		assert(dlinkFind(&oper_list, source_p) == NULL);
1197		dlinkAdd(source_p, make_dlink_node(), &oper_list);
1198
1199	<	AddOFlag(source_p, oconf->port);
1199	>	AddOFlag(source_p, conf->port);
1200
1201		if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1202		AddUMode(source_p, UMODE_ADMIN);
1227	–	if (!HasOFlag(source_p, OPER_FLAG_N))
1228	–	DelUMode(source_p, UMODE_NCHANGE);
1203
1204		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1205		get_oper_name(source_p));
#	Line 1258 | Line 1232 | valid_sid(const char *sid)
1232		void
1233		init_uid(void)
1234		{
1235	<	int i;
1235	>	unsigned int i;
1236
1237		memset(new_uid, 0, sizeof(new_uid));
1238
#	Line 1275 | Line 1249 | init_uid(void)
1249		* -Dianora
1250		*/
1251		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1278	–
1279	–	entering_umode_cb = register_callback("entering_umode", NULL);
1280	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1252		}
1253
1254		/*
#	Line 1344 | Line 1315 | init_isupport(void)
1315		add_isupport("DEAF", "D", -1);
1316		add_isupport("KICKLEN", NULL, KICKLEN);
1317		add_isupport("MODES", NULL, MAXMODEPARAMS);
1347	–	add_isupport("NICKLEN", NULL, NICKLEN);
1318		#ifdef HALFOPS
1319		add_isupport("PREFIX", "(ohv)@%+", -1);
1320		add_isupport("STATUSMSG", "@%+", -1);
#	Line 1352 | Line 1322 | init_isupport(void)
1322		add_isupport("PREFIX", "(ov)@+", -1);
1323		add_isupport("STATUSMSG", "@+", -1);
1324		#endif
1355	–	add_isupport("TOPICLEN", NULL, TOPICLEN);
1325		}
1326
1327		/*
#	Line 1387 | Line 1356 | add_isupport(const char *name, const cha
1356		dlinkAddTail(support, &support->node, &support_list);
1357		}
1358
1359	<	DupString(support->name, name);
1359	>	support->name = xstrdup(name);
1360		if (options != NULL)
1361	<	DupString(support->options, options);
1361	>	support->options = xstrdup(options);
1362		support->number = n;
1363
1364		rebuild_isupport_message_line();
#	Line 1448 | Line 1417 | rebuild_isupport_message_line(void)
1417		{
1418		struct Isupport *support = ptr->data;
1419
1420	<	p += (n = ircsprintf(p, "%s", support->name));
1420	>	p += (n = sprintf(p, "%s", support->name));
1421		len += n;
1422
1423		if (support->options != NULL)
1424		{
1425	<	p += (n = ircsprintf(p, "=%s", support->options));
1425	>	p += (n = sprintf(p, "=%s", support->options));
1426		len += n;
1427		}
1428
1429		if (support->number > 0)
1430		{
1431	<	p += (n = ircsprintf(p, "=%d", support->number));
1431	>	p += (n = sprintf(p, "=%d", support->number));
1432		len += n;
1433		}
1434

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)