ViewVC Help

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

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

Comparing:
ircd-hybrid-7.2/src/s_auth.c (file contents), Revision 992 by michael, Mon Aug 17 19:19:16 2009 UTC vs.
ircd-hybrid/trunk/src/auth.c (file contents), Revision 6478 by michael, Thu Sep 3 14:02:53 2015 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  s_auth.c: Functions for querying a users ident.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2015 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file auth.c
23	>	* \brief Functions for querying a users ident.
24	>	* \version $Id$
25		*/
26
27		/*
#	Line 32 | Line 34
34		*     any messages from it.
35		*     --Bleep  Thomas Helvey <tomh@inxpress.net>
36		*/
37	+
38		#include "stdinc.h"
36	–	#include "tools.h"
39		#include "list.h"
40	<	#include "s_auth.h"
41	<	#include "s_conf.h"
40	>	#include "ircd_defs.h"
41	>	#include "fdlist.h"
42	>	#include "auth.h"
43	>	#include "conf.h"
44		#include "client.h"
41	–	#include "common.h"
45		#include "event.h"
43	–	#include "fdlist.h"              /* fdlist_add */
44	–	#include "hook.h"
46		#include "irc_string.h"
46	–	#include "sprintf_irc.h"
47		#include "ircd.h"
48	–	#include "numeric.h"
48		#include "packet.h"
49	<	#include "irc_res.h"
49	>	#include "res.h"
50		#include "s_bsd.h"
51	<	#include "s_log.h"
51	>	#include "log.h"
52		#include "send.h"
53	<	#include "memory.h"
53	>	#include "mempool.h"
54
56	–	static const char *HeaderMessages[] = {
57	–	":%s NOTICE AUTH :*** Looking up your hostname...",
58	–	":%s NOTICE AUTH :*** Found your hostname",
59	–	":%s NOTICE AUTH :*** Couldn't look up your hostname",
60	–	":%s NOTICE AUTH :*** Checking Ident",
61	–	":%s NOTICE AUTH :*** Got Ident response",
62	–	":%s NOTICE AUTH :*** No Ident response",
63	–	":%s NOTICE AUTH :*** Your forward and reverse DNS do not match, ignoring hostname.",
64	–	":%s NOTICE AUTH :*** Your hostname is too long, ignoring hostname"
65	–	};
55
56	<	enum {
56	>	enum
57	>	{
58		REPORT_DO_DNS,
59		REPORT_FIN_DNS,
60		REPORT_FAIL_DNS,
#	Line 75 | Line 65 | enum {
65		REPORT_HOST_TOOLONG
66		};
67
68	<	#define sendheader(c, i) sendto_one((c), HeaderMessages[(i)], me.name)
69	<
70	<	static dlink_list auth_doing_list = { NULL, NULL, 0 };
71	<
72	<	static EVH timeout_auth_queries_event;
68	>	static const char *const HeaderMessages[] =
69	>	{
70	>	[REPORT_DO_DNS] = ":*** Looking up your hostname",
71	>	[REPORT_FIN_DNS] = ":*** Found your hostname",
72	>	[REPORT_FAIL_DNS] = ":*** Couldn't look up your hostname",
73	>	[REPORT_DO_ID] = ":*** Checking Ident",
74	>	[REPORT_FIN_ID] = ":*** Got Ident response",
75	>	[REPORT_FAIL_ID] = ":*** No Ident response",
76	>	[REPORT_IP_MISMATCH] = ":*** Your forward and reverse DNS do not match, ignoring hostname",
77	>	[REPORT_HOST_TOOLONG] = ":*** Your hostname is too long, ignoring hostname"
78	>	};
79
80	<	static PF read_auth_reply;
85	<	static CNCB auth_connect_callback;
86	<	static CBFUNC start_auth;
80	>	#define sendheader(c, i) sendto_one_notice((c), &me, "%s", HeaderMessages[(i)])
81
82	<	struct Callback *auth_cb = NULL;
82	>	static dlink_list auth_list;
83	>	static void read_auth_reply(fde_t *, void *);
84	>	static void auth_connect_callback(fde_t *, int, void *);
85
90	–	/* init_auth()
91	–	*
92	–	* Initialise the auth code
93	–	*/
94	–	void
95	–	init_auth(void)
96	–	{
97	–	auth_cb = register_callback("start_auth", start_auth);
98	–	eventAddIsh("timeout_auth_queries_event", timeout_auth_queries_event, NULL, 1);
99	–	}
86
87		/*
88		* make_auth_request - allocate a new auth request
#	Line 104 | Line 90 | init_auth(void)
90		static struct AuthRequest *
91		make_auth_request(struct Client *client)
92		{
93	<	struct AuthRequest *request = MyMalloc(sizeof(struct AuthRequest));
93	>	struct AuthRequest *const request = &client->connection->auth;
94
95	<	client->localClient->auth = request;
96	<	request->client           = client;
97	<	request->timeout          = CurrentTime + CONNECTTIMEOUT;
95	>	memset(request, 0, sizeof(*request));
96	>
97	>	request->client  = client;
98	>	request->timeout = CurrentTime + CONNECTTIMEOUT;
99
100		return request;
101		}
#	Line 121 | Line 108 | make_auth_request(struct Client *client)
108		void
109		release_auth_client(struct AuthRequest *auth)
110		{
111	<	struct Client *client = auth->client;
111	>	struct Client *const client = auth->client;
112
113		if (IsDoingAuth(auth) || IsDNSPending(auth))
114		return;
115
116	<	client->localClient->auth = NULL;
117	<	dlinkDelete(&auth->node, &auth_doing_list);
116	>	if (IsInAuth(auth))
117	>	{
118	>	dlinkDelete(&auth->node, &auth_list);
119	>	ClearInAuth(auth);
120	>	}
121
122		/*
123		* When a client has auth'ed, we want to start reading what it sends
124		* us. This is what read_packet() does.
125		*     -- adrian
126		*/
127	<	client->localClient->allow_read = MAX_FLOOD;
128	<	comm_setflush(&client->localClient->fd, 1000, flood_recalc, client);
139	<
140	<	dlinkAdd(client, &client->node, &global_client_list);
127	>	client->connection->allow_read = MAX_FLOOD;
128	>	comm_setflush(&client->connection->fd, 1000, flood_recalc, client);
129
130	<	client->since  = client->lasttime = client->firsttime = CurrentTime;
130	>	client->connection->since     = CurrentTime;
131	>	client->connection->lasttime  = CurrentTime;
132	>	client->connection->firsttime = CurrentTime;
133		client->flags |= FLAGS_FINISHED_AUTH;
134
135	<	read_packet(&client->localClient->fd, client);
135	>	read_packet(&client->connection->fd, client);
136		}
137	<
137	>
138		/*
139		* auth_dns_callback - called when resolver query finishes
140	<	* if the query resulted in a successful search, hp will contain
141	<	* a non-null pointer, otherwise hp will be null.
140	>	* if the query resulted in a successful search, name will contain
141	>	* a non-NULL pointer, otherwise name will be NULL.
142		* set the client on it's way to a connection completion, regardless
143		* of success of failure
144		*/
145		static void
146	<	auth_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
146	>	auth_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name, size_t namelength)
147		{
148	<	struct AuthRequest *auth = vptr;
148	>	struct AuthRequest *const auth = vptr;
149
150		ClearDNSPending(auth);
151
152	<	if (name != NULL)
152	>	if (!EmptyString(name))
153		{
154	<	const struct sockaddr_in *v4, *v4dns;
165	<	#ifdef IPV6
166	<	const struct sockaddr_in6 *v6, *v6dns;
167	<	#endif
168	<	int good = 1;
169	<
170	<	#ifdef IPV6
171	<	if (auth->client->localClient->ip.ss.ss_family == AF_INET6)
154	>	if (auth->client->connection->ip.ss.ss_family == AF_INET6)
155		{
156	<	v6 = (const struct sockaddr_in6 *)&auth->client->localClient->ip;
157	<	v6dns = (const struct sockaddr_in6 *)addr;
158	<	if (memcmp(&v6->sin6_addr, &v6dns->sin6_addr, sizeof(struct in6_addr)) != 0)
156	>	const struct sockaddr_in6 *const v6 = (const struct sockaddr_in6 *)&auth->client->connection->ip;
157	>	const struct sockaddr_in6 *const v6dns = (const struct sockaddr_in6 *)addr;
158	>
159	>	if (memcmp(&v6->sin6_addr, &v6dns->sin6_addr, sizeof(struct in6_addr)))
160		{
161		sendheader(auth->client, REPORT_IP_MISMATCH);
162	<	good = 0;
162	>	release_auth_client(auth);
163	>	return;
164		}
165		}
166		else
182	–	#endif
167		{
168	<	v4 = (const struct sockaddr_in *)&auth->client->localClient->ip;
169	<	v4dns = (const struct sockaddr_in *)addr;
170	<	if(v4->sin_addr.s_addr != v4dns->sin_addr.s_addr)
168	>	const struct sockaddr_in *const v4 = (const struct sockaddr_in *)&auth->client->connection->ip;
169	>	const struct sockaddr_in *const v4dns = (const struct sockaddr_in *)addr;
170	>
171	>	if (v4->sin_addr.s_addr != v4dns->sin_addr.s_addr)
172		{
173		sendheader(auth->client, REPORT_IP_MISMATCH);
174	<	good = 0;
174	>	release_auth_client(auth);
175	>	return;
176		}
177		}
178	<	if (good && strlen(name) <= HOSTLEN)
178	>
179	>	if (namelength > HOSTLEN)
180	>	sendheader(auth->client, REPORT_HOST_TOOLONG);
181	>	else
182		{
183	<	strlcpy(auth->client->host, name,
195	<	sizeof(auth->client->host));
183	>	strlcpy(auth->client->host, name, sizeof(auth->client->host));
184		sendheader(auth->client, REPORT_FIN_DNS);
185		}
198	–	else if (strlen(name) > HOSTLEN)
199	–	sendheader(auth->client, REPORT_HOST_TOOLONG);
186		}
187		else
188		sendheader(auth->client, REPORT_FAIL_DNS);
#	Line 222 | Line 208 | auth_error(struct AuthRequest *auth)
208		}
209
210		/*
211	<	* start_auth_query - Flag the client to show that an attempt to
211	>	* start_auth_query - Flag the client to show that an attempt to
212		* contact the ident server on
213		* the client's host.  The connect and subsequently the socket are all put
214		* into 'non-blocking' mode.  Should the connect or any later phase of the
#	Line 234 | Line 220 | start_auth_query(struct AuthRequest *aut
220		{
221		struct irc_ssaddr localaddr;
222		socklen_t locallen = sizeof(struct irc_ssaddr);
237	–	#ifdef IPV6
223		struct sockaddr_in6 *v6;
239	–	#else
240	–	struct sockaddr_in *v4;
241	–	#endif
224
225		/* open a socket of the same type as the client socket */
226	<	if (comm_open(&auth->fd, auth->client->localClient->ip.ss.ss_family,
226	>	if (comm_open(&auth->fd, auth->client->connection->ip.ss.ss_family,
227		SOCK_STREAM, 0, "ident") == -1)
228		{
229	<	report_error(L_ALL, "creating auth stream socket %s:%s",
230	<	get_client_name(auth->client, SHOW_IP), errno);
249	<	ilog(L_ERROR, "Unable to create auth socket for %s",
250	<	get_client_name(auth->client, SHOW_IP));
229	>	report_error(L_ALL, "creating auth stream socket %s:%s",
230	>	get_client_name(auth->client, SHOW_IP), errno);
231		++ServerStats.is_abad;
232		return 0;
233		}
234
235		sendheader(auth->client, REPORT_DO_ID);
236
237	<	/*
238	<	* get the local address of the client and bind to that to
239	<	* make the auth request.  This used to be done only for
260	<	* ifdef VIRTUAL_HOST, but needs to be done for all clients
261	<	* since the ident request must originate from that same address--
262	<	* and machines with multiple IP addresses are common now
237	>	/*
238	>	* Get the local address of the client and bind to that to
239	>	* make the auth request.
240		*/
241		memset(&localaddr, 0, locallen);
242	<	getsockname(auth->client->localClient->fd.fd, (struct sockaddr*)&localaddr,
242	>	getsockname(auth->client->connection->fd.fd, (struct sockaddr*)&localaddr,
243		&locallen);
244
268	–	#ifdef IPV6
245		remove_ipv6_mapping(&localaddr);
246		v6 = (struct sockaddr_in6 *)&localaddr;
247		v6->sin6_port = htons(0);
272	–	#else
273	–	localaddr.ss_len = locallen;
274	–	v4 = (struct sockaddr_in *)&localaddr;
275	–	v4->sin_port = htons(0);
276	–	#endif
248		localaddr.ss_port = htons(0);
249
250	<	comm_connect_tcp(&auth->fd, auth->client->sockhost, 113,
251	<	(struct sockaddr *)&localaddr, localaddr.ss_len, auth_connect_callback,
252	<	auth, auth->client->localClient->ip.ss.ss_family,
250	>	comm_connect_tcp(&auth->fd, auth->client->sockhost, RFC1413_PORT,
251	>	(struct sockaddr *)&localaddr, localaddr.ss_len, auth_connect_callback,
252	>	auth, auth->client->connection->ip.ss.ss_family,
253		GlobalSetOptions.ident_timeout);
254		return 1; /* We suceed here for now */
255		}
256
257		/*
258	<	* GetValidIdent - parse ident query reply from identd server
288	<	*
289	<	* Inputs        - pointer to ident buf
290	<	* Output        - NULL if no valid ident found, otherwise pointer to name
291	<	* Side effects  -
292	<	*/
293	<	/*
294	<	* A few questions have been asked about this mess, obviously
295	<	* it should have been commented better the first time.
296	<	* The original idea was to remove all references to libc from ircd-hybrid.
297	<	* Instead of having to write a replacement for sscanf(), I did a
298	<	* rather gruseome parser here so we could remove this function call.
299	<	* Note, that I had also removed a few floating point printfs as well (though
300	<	* now we are still stuck with a few...)
301	<	* Remember, we have a replacement ircd sprintf, we have bleeps fputs lib
302	<	* it would have been nice to remove some unneeded code.
303	<	* Oh well. If we don't remove libc stuff totally, then it would be
304	<	* far cleaner to use sscanf()
305	<	*
306	<	* - Dianora
307	<	*/
308	<	static char *
309	<	GetValidIdent(char *buf)
310	<	{
311	<	int   remp = 0;
312	<	int   locp = 0;
313	<	char* colon1Ptr;
314	<	char* colon2Ptr;
315	<	char* colon3Ptr;
316	<	char* commaPtr;
317	<	char* remotePortString;
318	<
319	<	/* All this to get rid of a sscanf() fun. */
320	<	remotePortString = buf;
321	<
322	<	if ((colon1Ptr = strchr(remotePortString,':')) == NULL)
323	<	return 0;
324	<	*colon1Ptr = '\0';
325	<	colon1Ptr++;
326	<
327	<	if ((colon2Ptr = strchr(colon1Ptr,':')) == NULL)
328	<	return 0;
329	<	*colon2Ptr = '\0';
330	<	colon2Ptr++;
331	<
332	<	if ((commaPtr = strchr(remotePortString, ',')) == NULL)
333	<	return 0;
334	<	*commaPtr = '\0';
335	<	commaPtr++;
336	<
337	<	if ((remp = atoi(remotePortString)) == 0)
338	<	return 0;
339	<
340	<	if ((locp = atoi(commaPtr)) == 0)
341	<	return 0;
342	<
343	<	/* look for USERID bordered by first pair of colons */
344	<	if (strstr(colon1Ptr, "USERID") == NULL)
345	<	return 0;
346	<
347	<	if ((colon3Ptr = strchr(colon2Ptr,':')) == NULL)
348	<	return 0;
349	<	*colon3Ptr = '\0';
350	<	colon3Ptr++;
351	<	return (colon3Ptr);
352	<	}
353	<
354	<	/*
355	<	* start_auth
258	>	* start_auth
259		*
260		* inputs       - pointer to client to auth
261		* output       - NONE
262		* side effects - starts auth (identd) and dns queries for a client
263		*/
264	<	static void *
265	<	start_auth(va_list args)
264	>	void
265	>	start_auth(struct Client *client_p)
266		{
267	<	struct Client *client = va_arg(args, struct Client *);
365	<	struct AuthRequest *auth = NULL;
366	<
367	<	assert(client != NULL);
267	>	struct AuthRequest *const auth = make_auth_request(client_p);
268
269	<	auth = make_auth_request(client);
269	>	SetInAuth(auth);
270	>	dlinkAddTail(auth, &auth->node, &auth_list);
271
272	<	sendheader(client, REPORT_DO_DNS);
272	>	sendheader(client_p, REPORT_DO_DNS);
273
274		SetDNSPending(auth);
275
276	<	if (ConfigFileEntry.disable_auth == 0)
276	>	if (ConfigGeneral.disable_auth == 0)
277		{
278		SetDoingAuth(auth);
279		start_auth_query(auth);
280		}
281
282	<	dlinkAdd(auth, &auth->node, &auth_doing_list);
382	<
383	<	gethost_byaddr(auth_dns_callback, auth, &client->localClient->ip);
384	<
385	<	return NULL;
282	>	gethost_byaddr(auth_dns_callback, auth, &client_p->connection->ip);
283		}
284
285		/*
#	Line 392 | Line 289 | start_auth(va_list args)
289		static void
290		timeout_auth_queries_event(void *notused)
291		{
292	<	dlink_node *ptr = NULL, *next_ptr = NULL;
292	>	dlink_node *node = NULL, *node_next = NULL;
293
294	<	DLINK_FOREACH_SAFE(ptr, next_ptr, auth_doing_list.head)
294	>	DLINK_FOREACH_SAFE(node, node_next, auth_list.head)
295		{
296	<	struct AuthRequest *auth = ptr->data;
296	>	struct AuthRequest *auth = node->data;
297
298		if (auth->timeout > CurrentTime)
299	<	continue;
403	<
404	<	fd_close(&auth->fd);
299	>	break;
300
301		if (IsDoingAuth(auth))
302	<	{
302	>	{
303		++ServerStats.is_abad;
304	+	fd_close(&auth->fd);
305	+	ClearAuth(auth);
306		sendheader(auth->client, REPORT_FAIL_ID);
307		}
308
309		if (IsDNSPending(auth))
310		{
311		delete_resolver_queries(auth);
312	+	ClearDNSPending(auth);
313		sendheader(auth->client, REPORT_FAIL_DNS);
314		}
315
418	–	ilog(L_INFO, "DNS/AUTH timeout %s",
419	–	get_client_name(auth->client, SHOW_IP));
316		release_auth_client(auth);
317		}
318		}
#	Line 435 | Line 331 | timeout_auth_queries_event(void *notused
331		static void
332		auth_connect_callback(fde_t *fd, int error, void *data)
333		{
334	<	struct AuthRequest *auth = data;
334	>	struct AuthRequest *const auth = data;
335		struct irc_ssaddr us;
336		struct irc_ssaddr them;
337	<	char authbuf[32];
337	>	char authbuf[16];
338	>	ssize_t len = 0;
339		socklen_t ulen = sizeof(struct irc_ssaddr);
340		socklen_t tlen = sizeof(struct irc_ssaddr);
341	<	u_int16_t uport, tport;
445	<	#ifdef IPV6
341	>	uint16_t uport, tport;
342		struct sockaddr_in6 *v6;
447	–	#else
448	–	struct sockaddr_in *v4;
449	–	#endif
343
344		if (error != COMM_OK)
345		{
#	Line 454 | Line 347 | auth_connect_callback(fde_t *fd, int err
347		return;
348		}
349
350	<	if (getsockname(auth->client->localClient->fd.fd, (struct sockaddr *) &us,
351	<	(socklen_t *) &ulen) ||
459	<	getpeername(auth->client->localClient->fd.fd, (struct sockaddr *) &them,
460	<	(socklen_t *) &tlen))
350	>	if (getsockname(auth->client->connection->fd.fd, (struct sockaddr *)&us, &ulen) ||
351	>	getpeername(auth->client->connection->fd.fd, (struct sockaddr *)&them, &tlen))
352		{
353	<	ilog(L_INFO, "auth get{sock,peer}name error for %s",
354	<	get_client_name(auth->client, SHOW_IP));
353	>	report_error(L_ALL, "auth get{sock,peer}name error %s:%s",
354	>	get_client_name(auth->client, SHOW_IP), errno);
355		auth_error(auth);
356		return;
357		}
358
468	–	#ifdef IPV6
359		v6 = (struct sockaddr_in6 *)&us;
360		uport = ntohs(v6->sin6_port);
361		v6 = (struct sockaddr_in6 *)&them;
362		tport = ntohs(v6->sin6_port);
363		remove_ipv6_mapping(&us);
364		remove_ipv6_mapping(&them);
475	–	#else
476	–	v4 = (struct sockaddr_in *)&us;
477	–	uport = ntohs(v4->sin_port);
478	–	v4 = (struct sockaddr_in *)&them;
479	–	tport = ntohs(v4->sin_port);
480	–	us.ss_len = ulen;
481	–	them.ss_len = tlen;
482	–	#endif
483	–
484	–	ircsprintf(authbuf, "%u , %u\r\n", tport, uport);
365
366	<	if (send(fd->fd, authbuf, strlen(authbuf), 0) == -1)
366	>	len = snprintf(authbuf, sizeof(authbuf), "%u, %u\r\n", tport, uport);
367	>
368	>	if (send(fd->fd, authbuf, len, 0) != len)
369		{
370		auth_error(auth);
371		return;
372		}
373
374	<	read_auth_reply(&auth->fd, auth);
374	>	comm_setselect(fd, COMM_SELECT_READ, read_auth_reply, auth, 0);
375	>	}
376	>
377	>	/** Enum used to index ident reply fields in a human-readable way. */
378	>	enum IdentReplyFields
379	>	{
380	>	IDENT_PORT_NUMBERS,
381	>	IDENT_REPLY_TYPE,
382	>	IDENT_OS_TYPE,
383	>	IDENT_INFO,
384	>	USERID_TOKEN_COUNT
385	>	};
386	>
387	>	/** Parse an ident reply line and extract the userid from it.
388	>	* \param reply The ident reply line.
389	>	* \return The userid, or NULL on parse failure.
390	>	*/
391	>	static const char *
392	>	check_ident_reply(char *const reply)
393	>	{
394	>	char *token = NULL, *end = NULL;
395	>	char *vector[USERID_TOKEN_COUNT];
396	>	const int count = token_vector(reply, ':', vector, USERID_TOKEN_COUNT);
397	>
398	>	if (USERID_TOKEN_COUNT != count)
399	>	return NULL;
400	>
401	>	/*
402	>	* Second token is the reply type
403	>	*/
404	>	token = vector[IDENT_REPLY_TYPE];
405	>
406	>	if (EmptyString(token))
407	>	return NULL;
408	>
409	>	while (IsSpace(*token))
410	>	++token;
411	>
412	>	if (strncmp(token, "USERID", 6))
413	>	return NULL;
414	>
415	>	/*
416	>	* Third token is the os type
417	>	*/
418	>	token = vector[IDENT_OS_TYPE];
419	>
420	>	if (EmptyString(token))
421	>	return NULL;
422	>
423	>	while (IsSpace(*token))
424	>	++token;
425	>
426	>	/*
427	>	* Unless "OTHER" is specified as the operating system type, the server
428	>	* is expected to return the "normal" user identification of the owner
429	>	* of this connection. "Normal" in this context may be taken to mean a
430	>	* string of characters which uniquely identifies the connection owner
431	>	* such as a user identifier assigned by the system administrator and
432	>	* used by such user as a mail identifier, or as the "user" part of a
433	>	* user/password pair used to gain access to system resources. When an
434	>	* operating system is specified (e.g., anything but "OTHER"), the user
435	>	* identifier is expected to be in a more or less immediately useful
436	>	* form - e.g., something that could be used as an argument to "finger"
437	>	* or as a mail address.
438	>	*/
439	>	if (!strncmp(token, "OTHER", 5))
440	>	return NULL;
441	>
442	>	/*
443	>	* Fourth token is the username
444	>	*/
445	>	token = vector[IDENT_INFO];
446	>
447	>	if (EmptyString(token))
448	>	return NULL;
449	>
450	>	while (IsSpace(*token))
451	>	++token;
452	>
453	>	while (*token == '~' || *token == '^')
454	>	++token;
455	>
456	>	/*
457	>	* Look for the end of the username, terminators are '\0, @, <SPACE>, :'
458	>	*/
459	>	for (end = token; *end; ++end)
460	>	if (IsSpace(*end) || '@' == *end || ':' == *end)
461	>	break;
462	>	*end = '\0';
463	>
464	>	return token;
465		}
466
467		/*
468	<	* read_auth_reply - read the reply (if any) from the ident server
468	>	* read_auth_reply - read the reply (if any) from the ident server
469		* we connected to.
470		* We only give it one shot, if the reply isn't good the first time
471		* fail the authentication entirely. --Bleep
472		*/
501	–	#define AUTH_BUFSIZ 128
502	–
473		static void
474		read_auth_reply(fde_t *fd, void *data)
475		{
476	<	struct AuthRequest *auth = data;
477	<	char *s = NULL;
478	<	char *t = NULL;
479	<	int len;
510	<	int count;
511	<	char buf[AUTH_BUFSIZ + 1]; /* buffer to read auth reply into */
512	<
513	<	/* Why?
514	<	* Well, recv() on many POSIX systems is a per-packet operation,
515	<	* and we do not necessarily want this, because on lowspec machines,
516	<	* the ident response may come back fragmented, thus resulting in an
517	<	* invalid ident response, even if the ident response was really OK.
518	<	*
519	<	* So PLEASE do not change this code to recv without being aware of the
520	<	* consequences.
521	<	*
522	<	*    --nenolod
523	<	*/
524	<	#ifndef _WIN32
525	<	len = read(fd->fd, buf, AUTH_BUFSIZ);
526	<	#else
527	<	len = recv(fd->fd, buf, AUTH_BUFSIZ, 0);
528	<	#endif
529	<
530	<	if (len < 0)
531	<	{
532	<	#ifdef _WIN32
533	<	errno = WSAGetLastError();
534	<	#endif
535	<	if (ignoreErrno(errno))
536	<	comm_setselect(fd, COMM_SELECT_READ, read_auth_reply, auth, 0);
537	<	else
538	<	auth_error(auth);
539	<	return;
540	<	}
476	>	struct AuthRequest *const auth = data;
477	>	const char *username = NULL;
478	>	ssize_t len = 0;
479	>	char buf[RFC1413_BUFSIZ + 1];
480
481	<	if (len > 0)
481	>	if ((len = recv(fd->fd, buf, RFC1413_BUFSIZ, 0)) > 0)
482		{
483		buf[len] = '\0';
484	<
546	<	if ((s = GetValidIdent(buf)))
547	<	{
548	<	t = auth->client->username;
549	<
550	<	while (*s == '~' || *s == '^')
551	<	s++;
552	<
553	<	for (count = USERLEN; *s && count; s++)
554	<	{
555	<	if (*s == '@')
556	<	break;
557	<	if (!IsSpace(*s) && *s != ':' && *s != '[')
558	<	{
559	<	*t++ = *s;
560	<	count--;
561	<	}
562	<	}
563	<
564	<	*t = '\0';
565	<	}
484	>	username = check_ident_reply(buf);
485		}
486
487		fd_close(fd);
488
489		ClearAuth(auth);
490
491	<	if (s == NULL)
491	>	if (EmptyString(username))
492		{
493		sendheader(auth->client, REPORT_FAIL_ID);
494		++ServerStats.is_abad;
495		}
496		else
497		{
498	+	strlcpy(auth->client->username, username, sizeof(auth->client->username));
499		sendheader(auth->client, REPORT_FIN_ID);
500		++ServerStats.is_asuc;
501	<	SetGotId(auth->client);
501	>	AddFlag(auth->client, FLAGS_GOTID);
502		}
503
504		release_auth_client(auth);
#	Line 587 | Line 507 | read_auth_reply(fde_t *fd, void *data)
507		/*
508		* delete_auth()
509		*/
510	<	void
510	>	void
511		delete_auth(struct AuthRequest *auth)
512		{
513		if (IsDNSPending(auth))
514		delete_resolver_queries(auth);
515
516	<	fd_close(&auth->fd);
517	<	dlinkDelete(&auth->node, &auth_doing_list);
518	<	MyFree(auth);
516	>	if (IsDoingAuth(auth))
517	>	fd_close(&auth->fd);
518	>
519	>	if (IsInAuth(auth))
520	>	{
521	>	dlinkDelete(&auth->node, &auth_list);
522	>	ClearInAuth(auth);
523	>	}
524	>	}
525	>
526	>	/* auth_init
527	>	*
528	>	* Initialise the auth code
529	>	*/
530	>	void
531	>	auth_init(void)
532	>	{
533	>	static struct event timeout_auth_queries =
534	>	{
535	>	.name = "timeout_auth_queries_event",
536	>	.handler = timeout_auth_queries_event,
537	>	.when = 1
538	>	};
539	>
540	>	event_add(&timeout_auth_queries, NULL);
541		}

Diff Legend

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