ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/s_user.c (file contents), Revision 1549 by michael, Mon Oct 1 18:11:11 2012 UTC vs.
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 1899 by michael, Sat Apr 27 18:55:28 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 60 | Line 59 | struct Callback *umode_cb = NULL;
59		static char umode_buffer[IRCD_BUFSIZE];
60
61		static void user_welcome(struct Client *);
62	<	static void report_and_set_user_flags(struct Client *, const struct AccessItem *);
62	>	static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
63		static int check_xline(struct Client *);
64		static void introduce_client(struct Client *);
65		static const char *uid_get(void);
#	Line 120 | Line 119 | unsigned int user_modes[256] =
119		UMODE_BOTS,         /* b */
120		UMODE_CCONN,        /* c */
121		UMODE_DEBUG,        /* d */
122	<	0,                  /* e */
122	>	UMODE_EXTERNAL,     /* e */
123		UMODE_FULL,         /* f */
124		UMODE_CALLERID,     /* g */
125		0,                  /* h */
#	Line 139 | Line 138 | unsigned int user_modes[256] =
138		UMODE_UNAUTH,       /* u */
139		0,                  /* v */
140		UMODE_WALLOP,       /* w */
141	<	UMODE_EXTERNAL,     /* x */
141	>	0,                  /* x */
142		UMODE_SPY,          /* y */
143		UMODE_OPERWALL,     /* z      0x7A */
144		0,0,0,0,0,          /* 0x7B - 0x7F */
#	Line 214 | Line 213 | show_lusers(struct Client *source_p)
213		sendto_one(source_p, form_str(RPL_LUSERME),
214		from, to, Count.local, Count.myserver);
215		sendto_one(source_p, form_str(RPL_LOCALUSERS),
216	<	from, to, Count.local, Count.max_loc,
218	<	Count.local, Count.max_loc);
216	>	from, to, Count.local, Count.max_loc);
217		}
218		else
219		{
220		sendto_one(source_p, form_str(RPL_LUSERME),
221		from, to, Count.total, 0);
222		sendto_one(source_p, form_str(RPL_LOCALUSERS),
223	<	from, to, Count.total, Count.max_tot,
226	<	Count.total, Count.max_tot);
223	>	from, to, Count.total, Count.max_tot);
224		}
225
226		sendto_one(source_p, form_str(RPL_GLOBALUSERS),
227	<	from, to, Count.total, Count.max_tot,
231	<	Count.total, Count.max_tot);
227	>	from, to, Count.total, Count.max_tot);
228
229		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
230		sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
#	Line 280 | Line 276 | void
276		register_local_user(struct Client *source_p)
277		{
278		const char *id = NULL;
279	<	const struct AccessItem *aconf = NULL;
284	<	dlink_node *ptr = NULL;
279	>	const struct MaskItem *conf = NULL;
280
281		assert(source_p != NULL);
282		assert(source_p == source_p->from);
#	Line 312 | Line 307 | register_local_user(struct Client *sourc
307		/* Straight up the maximum rate of flooding... */
308		source_p->localClient->allow_read = MAX_FLOOD_BURST;
309
310	<	if (!execute_callback(client_check_cb, source_p, source_p->username))
310	>	if (!check_client(source_p))
311		return;
312
313		if (valid_hostname(source_p->host) == 0)
#	Line 323 | Line 318 | register_local_user(struct Client *sourc
318		sizeof(source_p->host));
319		}
320
321	<	ptr   = source_p->localClient->confs.head;
327	<	aconf = map_to_conf(ptr->data);
321	>	conf = source_p->localClient->confs.head->data;
322
323		if (!IsGotId(source_p))
324		{
#	Line 332 | Line 326 | register_local_user(struct Client *sourc
326		const char *p = username;
327		unsigned int i = 0;
328
329	<	if (IsNeedIdentd(aconf))
329	>	if (IsNeedIdentd(conf))
330		{
331		++ServerStats.is_ref;
332		sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
#	Line 343 | Line 337 | register_local_user(struct Client *sourc
337
338		strlcpy(username, source_p->username, sizeof(username));
339
340	<	if (!IsNoTilde(aconf))
340	>	if (!IsNoTilde(conf))
341		source_p->username[i++] = '~';
342
343		for (; *p && i < USERLEN; ++p)
#	Line 354 | Line 348 | register_local_user(struct Client *sourc
348		}
349
350		/* password check */
351	<	if (!EmptyString(aconf->passwd))
351	>	if (!EmptyString(conf->passwd))
352		{
353		const char *pass = source_p->localClient->passwd;
354
355	<	if (!match_conf_password(pass, aconf))
355	>	if (!match_conf_password(pass, conf))
356		{
357		++ServerStats.is_ref;
358		sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
#	Line 374 | Line 368 | register_local_user(struct Client *sourc
368		*/
369
370		/* report if user has &^>= etc. and set flags as needed in source_p */
371	<	report_and_set_user_flags(source_p, aconf);
371	>	report_and_set_user_flags(source_p, conf);
372
373		if (IsDead(source_p))
374		return;
#	Line 390 | Line 384 | register_local_user(struct Client *sourc
384		if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
385		(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
386		{
387	<	sendto_realops_flags(UMODE_FULL, L_ALL,
387	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
388		"Too many clients, rejecting %s[%s].",
389		source_p->name, source_p->host);
390		++ServerStats.is_ref;
#	Line 403 | Line 397 | register_local_user(struct Client *sourc
397		{
398		char tmpstr2[IRCD_BUFSIZE];
399
400	<	sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
400	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
401	>	"Invalid username: %s (%s@%s)",
402		source_p->name, source_p->username, source_p->host);
403		++ServerStats.is_ref;
404		snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
#	Line 421 | Line 416 | register_local_user(struct Client *sourc
416		strlcpy(source_p->id, id, sizeof(source_p->id));
417		hash_add_id(source_p);
418
419	<	sendto_realops_flags(UMODE_CCONN, L_ALL,
419	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
420		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
421		source_p->name, source_p->username, source_p->host,
422		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
423		"255.255.255.255" : source_p->sockhost,
424	<	get_client_class(source_p),
424	>	get_client_class(&source_p->localClient->confs),
425		source_p->info, source_p->id);
426
427	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL,
427	>	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
428		"CLICONN %s %s %s %s %s %s %s 0 %s",
429		source_p->name, source_p->username, source_p->host,
430		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
431		"255.255.255.255" : source_p->sockhost,
432	<	get_client_class(source_p),
432	>	get_client_class(&source_p->localClient->confs),
433		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
434		"<hidden>" : source_p->localClient->client_host,
435		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
#	Line 453 | Line 448 | register_local_user(struct Client *sourc
448		Count.max_loc = Count.local;
449
450		if (!(Count.max_loc % 10))
451	<	sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
451	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
452	>	"New Max Local Clients: %d",
453		Count.max_loc);
454		}
455
#	Line 509 | Line 505 | register_remote_user(struct Client *sour
505		*/
506		source_p->servptr = hash_find_server(server);
507
508	<	/* Super GhostDetect:
508	>	/*
509	>	* Super GhostDetect:
510		* If we can't find the server the user is supposed to be on,
511		* then simply blow the user away.        -Taner
512		*/
513		if (source_p->servptr == NULL)
514		{
515	<	sendto_realops_flags(UMODE_ALL, L_ALL,
515	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
516		"No server %s for user %s[%s@%s] from %s",
517		server, source_p->name, source_p->username,
518		source_p->host, source_p->from->name);
#	Line 528 | Line 525 | register_remote_user(struct Client *sour
525
526		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
527		{
528	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
528	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
529		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
530		source_p->from->name, source_p->name, source_p->username,
531		source_p->host, source_p->servptr->name,
#	Line 597 | Line 594 | introduce_client(struct Client *source_p
594		if (IsCapable(server, CAP_SVS))
595		{
596		if (IsCapable(server, CAP_TS6) && HasID(source_p))
597	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %lu :%s",
597	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
598		source_p->servptr->id,
599		source_p->name, source_p->hopcount+1,
600		(unsigned long)source_p->tsinfo,
601		ubuf, source_p->username, source_p->host,
602		(MyClient(source_p) && IsIPSpoof(source_p)) ?
603		"0" : source_p->sockhost, source_p->id,
604	<	(unsigned long)source_p->servicestamp,
604	>	source_p->svid,
605		source_p->info);
606		else
607	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s %lu :%s",
607	>	sendto_one(server, "NICK %s %d %lu %s %s %s %s %s :%s",
608		source_p->name, source_p->hopcount+1,
609		(unsigned long)source_p->tsinfo,
610		ubuf, source_p->username, source_p->host,
611	<	source_p->servptr->name, (unsigned long)source_p->servicestamp,
611	>	source_p->servptr->name, source_p->svid,
612		source_p->info);
613
614		}
#	Line 658 | Line 655 | valid_hostname(const char *hostname)
655		if (!IsHostChar(*p))
656		return 0;
657
658	<	return 1;
658	>	return p - hostname <= HOSTLEN;
659		}
660
661		/* valid_username()
#	Line 734 | Line 731 | valid_nickname(const char *nickname, con
731		/* report_and_set_user_flags()
732		*
733		* inputs       - pointer to source_p
734	<	*              - pointer to aconf for this user
734	>	*              - pointer to conf for this user
735		* output       - NONE
736		* side effects - Report to user any special flags
737		*                they are getting, and set them.
738		*/
739		static void
740	<	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
740	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
741		{
742		/* If this user is being spoofed, tell them so */
743	<	if (IsConfDoSpoofIp(aconf))
743	>	if (IsConfDoSpoofIp(conf))
744		{
745		sendto_one(source_p,
746		":%s NOTICE %s :*** Spoofing your IP. congrats.",
#	Line 751 | Line 748 | report_and_set_user_flags(struct Client
748		}
749
750		/* If this user is in the exception class, Set it "E lined" */
751	<	if (IsConfExemptKline(aconf))
751	>	if (IsConfExemptKline(conf))
752		{
753		SetExemptKline(source_p);
754		sendto_one(source_p,
#	Line 762 | Line 759 | report_and_set_user_flags(struct Client
759		/* The else here is to make sure that G line exempt users
760		* do not get noticed twice.
761		*/
762	<	else if (IsConfExemptGline(aconf))
762	>	else if (IsConfExemptGline(conf))
763		{
764		SetExemptGline(source_p);
765		sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
766		me.name, source_p->name);
767		}
768
769	<	if (IsConfExemptResv(aconf))
769	>	if (IsConfExemptResv(conf))
770		{
771		SetExemptResv(source_p);
772		sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
#	Line 777 | Line 774 | report_and_set_user_flags(struct Client
774		}
775
776		/* If this user is exempt from user limits set it "F lined" */
777	<	if (IsConfExemptLimits(aconf))
777	>	if (IsConfExemptLimits(conf))
778		{
779		SetExemptLimits(source_p);
780		sendto_one(source_p,
#	Line 785 | Line 782 | report_and_set_user_flags(struct Client
782		me.name,source_p->name);
783		}
784
785	<	if (IsConfCanFlood(aconf))
785	>	if (IsConfCanFlood(conf))
786		{
787		SetCanFlood(source_p);
788		sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
#	Line 829 | Line 826 | change_simple_umode(va_list args)
826		*/
827		void
828		set_user_mode(struct Client *client_p, struct Client *source_p,
829	<	int parc, char *parv[])
829	>	const int parc, char *parv[])
830		{
831		unsigned int flag, setflags;
832		char **p, *m, buf[IRCD_BUFSIZE];
#	Line 846 | Line 843 | set_user_mode(struct Client *client_p, s
843		return;
844		}
845
849	–	if (IsServer(source_p))
850	–	{
851	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
852	–	parv[1], source_p->name);
853	–	return;
854	–	}
855	–
846		if (source_p != target_p)
847		{
848		sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
#	Line 917 | Line 907 | set_user_mode(struct Client *client_p, s
907		{
908		dlink_node *dm;
909
910	<	detach_conf(source_p, OPER_TYPE);
910	>	detach_conf(source_p, CONF_OPER);
911		ClrOFlag(source_p);
912		DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
913
#	Line 1088 | Line 1078 | send_umode_out(struct Client *client_p,
1078		send_umode(client_p, source_p, old, 0xffffffff, buf);
1079		}
1080
1081	+	void
1082	+	user_set_hostmask(struct Client *target_p, const char *hostname)
1083	+	{
1084	+	if (!valid_hostname(hostname))
1085	+	return;
1086	+
1087	+	if (IsUserHostIp(target_p))
1088	+	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1089	+
1090	+	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1091	+	SetIPSpoof(target_p);
1092	+
1093	+	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1094	+	SetUserHost(target_p);
1095	+
1096	+	if (MyClient(target_p))
1097	+	clear_ban_cache_client(target_p);
1098	+	}
1099	+
1100		/* user_welcome()
1101		*
1102		* inputs       - client pointer to client to welcome
#	Line 1111 | Line 1120 | user_welcome(struct Client *source_p)
1120		#endif
1121
1122		sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1123	<	ServerInfo.network_name, source_p->name);
1123	>	ServerInfo.network_name, source_p->name,
1124	>	source_p->username, source_p->host);
1125		sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1126		get_listener_name(source_p->localClient->listener), ircd_version);
1127		sendto_one(source_p, form_str(RPL_CREATED),
#	Line 1154 | Line 1164 | user_welcome(struct Client *source_p)
1164		static int
1165		check_xline(struct Client *source_p)
1166		{
1167	<	struct ConfItem *conf = NULL;
1167	>	struct MaskItem *conf = NULL;
1168		const char *reason = NULL;
1169
1170	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1171	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
1170	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)) ||
1171	>	(conf = find_matching_name_conf(CONF_RXLINE, source_p->info, NULL, NULL, 0)))
1172		{
1173	<	struct MatchItem *reg = map_to_conf(conf);
1173	>	++conf->count;
1174
1175	<	++reg->count;
1176	<
1167	<	if (reg->reason != NULL)
1168	<	reason = reg->reason;
1175	>	if (conf->reason != NULL)
1176	>	reason = conf->reason;
1177		else
1178		reason = "No Reason";
1179
1180	<	sendto_realops_flags(UMODE_REJ, L_ALL,
1180	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1181		"X-line Rejecting [%s] [%s], user %s [%s]",
1182		source_p->info, reason,
1183		get_client_name(source_p, HIDE_IP),
#	Line 1187 | Line 1195 | check_xline(struct Client *source_p)
1195		*
1196		* inputs       - pointer to given client to oper
1197		* output       - NONE
1198	<	* side effects - Blindly opers up given source_p, using aconf info
1198	>	* side effects - Blindly opers up given source_p, using conf info
1199		*                all checks on passwords have already been done.
1200		*                This could also be used by rsa oper routines.
1201		*/
#	Line 1195 | Line 1203 | void
1203		oper_up(struct Client *source_p)
1204		{
1205		const unsigned int old = source_p->umodes;
1206	<	const struct AccessItem *oconf = NULL;
1206	>	const struct MaskItem *conf = source_p->localClient->confs.head->data;
1207
1208		assert(source_p->localClient->confs.head);
1201	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
1209
1210		++Count.oper;
1211		SetOper(source_p);
1212
1213	<	if (oconf->modes)
1214	<	AddUMode(source_p, oconf->modes);
1213	>	if (conf->modes)
1214	>	AddUMode(source_p, conf->modes);
1215		else if (ConfigFileEntry.oper_umodes)
1216		AddUMode(source_p, ConfigFileEntry.oper_umodes);
1217
#	Line 1216 | Line 1223 | oper_up(struct Client *source_p)
1223		assert(dlinkFind(&oper_list, source_p) == NULL);
1224		dlinkAdd(source_p, make_dlink_node(), &oper_list);
1225
1226	<	AddOFlag(source_p, oconf->port);
1226	>	AddOFlag(source_p, conf->port);
1227
1228		if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1229		AddUMode(source_p, UMODE_ADMIN);
1230		if (!HasOFlag(source_p, OPER_FLAG_N))
1231		DelUMode(source_p, UMODE_NCHANGE);
1232
1233	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s is now an operator",
1233	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1234		get_oper_name(source_p));
1235		send_umode_out(source_p, source_p, old);
1236		sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
#	Line 1254 | Line 1261 | valid_sid(const char *sid)
1261		void
1262		init_uid(void)
1263		{
1264	<	int i;
1264	>	unsigned int i;
1265
1266		memset(new_uid, 0, sizeof(new_uid));
1267
#	Line 1340 | Line 1347 | init_isupport(void)
1347		add_isupport("DEAF", "D", -1);
1348		add_isupport("KICKLEN", NULL, KICKLEN);
1349		add_isupport("MODES", NULL, MAXMODEPARAMS);
1343	–	add_isupport("NICKLEN", NULL, NICKLEN);
1350		#ifdef HALFOPS
1351		add_isupport("PREFIX", "(ohv)@%+", -1);
1352		add_isupport("STATUSMSG", "@%+", -1);
#	Line 1348 | Line 1354 | init_isupport(void)
1354		add_isupport("PREFIX", "(ov)@+", -1);
1355		add_isupport("STATUSMSG", "@+", -1);
1356		#endif
1351	–	add_isupport("TOPICLEN", NULL, TOPICLEN);
1357		}
1358
1359		/*
#	Line 1383 | Line 1388 | add_isupport(const char *name, const cha
1388		dlinkAddTail(support, &support->node, &support_list);
1389		}
1390
1391	<	DupString(support->name, name);
1391	>	support->name = xstrdup(name);
1392		if (options != NULL)
1393	<	DupString(support->options, options);
1393	>	support->options = xstrdup(options);
1394		support->number = n;
1395
1396		rebuild_isupport_message_line();
#	Line 1444 | Line 1449 | rebuild_isupport_message_line(void)
1449		{
1450		struct Isupport *support = ptr->data;
1451
1452	<	p += (n = ircsprintf(p, "%s", support->name));
1452	>	p += (n = sprintf(p, "%s", support->name));
1453		len += n;
1454
1455		if (support->options != NULL)
1456		{
1457	<	p += (n = ircsprintf(p, "=%s", support->options));
1457	>	p += (n = sprintf(p, "=%s", support->options));
1458		len += n;
1459		}
1460
1461		if (support->number > 0)
1462		{
1463	<	p += (n = ircsprintf(p, "=%d", support->number));
1463	>	p += (n = sprintf(p, "=%d", support->number));
1464		len += n;
1465		}
1466

Diff Legend

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