X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Flocate_host.c;h=64879eefbb797115d5037b89572205a702977611;hb=a112ae0472a232be5484c7a9aafc5a880a361c34;hp=0e5e1fff83b3d2a0b450cbf75c569e5e1c6cd660;hpb=a9bc7038d1488c90b220bca219ca93603ef9a086;p=citadel.git

diff --git a/citadel/locate_host.c b/citadel/locate_host.c
index 0e5e1fff8..64879eefb 100644
--- a/citadel/locate_host.c
+++ b/citadel/locate_host.c
@@ -1,34 +1,28 @@
 /*
- * $Id$
- *
  * Functions which handle hostname/address lookups and resolution
  *
+ * Copyright (c) 1987-2019 by the citadel.org team
+ *
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 #include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
+#include <string.h>
 #include <stdio.h>
+#include <syslog.h>
 #include <ctype.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+#include <netdb.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <limits.h>
-#include <netdb.h>
-#include <string.h>
-#include <errno.h>
 #include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "locate_host.h"
-#include "sysdep_decls.h"
-#include "config.h"
-#include "domain.h"
-#include "context.h"
-#include "ctdl_module.h"
 
+#include "context.h"
 #ifdef HAVE_RESOLV_H
 #include <arpa/nameser.h>
 #ifdef HAVE_ARPA_NAMESER_COMPAT_H
@@ -37,6 +31,25 @@
 #include <resolv.h>
 #endif
 
+#include "domain.h"
+#include "locate_host.h"
+
+/* START: some missing macros on OpenBSD 3.9 */
+#ifndef NS_CMPRSFLGS
+#define NS_CMPRSFLGS   0xc0
+#endif
+#if !defined(NS_MAXCDNAME) && defined (MAXCDNAME)
+#define NS_MAXCDNAME MAXCDNAME
+#endif
+#if !defined(NS_INT16SZ) && defined(INT16SZ)
+#define NS_INT16SZ INT16SZ
+#define NS_INT32SZ INT32SZ
+#endif
+#ifndef NS_GET16
+#  define NS_GET16 GETSHORT
+#endif
+/* END: some missing macros on OpenBSD 3.9 */
+
 
 /*
  * Given an open client socket, return the host name and IP address at the other end.
@@ -60,6 +73,7 @@ void locate_host(char *tbuf, size_t n, char *abuf, size_t na, int client_socket)
 	 * as dotted-quad, even if they come in over a hybrid IPv6/IPv4 socket.
 	 */
 	if ( (strlen(abuf) > 7) && (!strncasecmp(abuf, "::ffff:", 7)) ) {
+		if (!strcmp(abuf, tbuf)) strcpy(tbuf, &tbuf[7]);
 		strcpy(abuf, &abuf[7]);
 	}
 }
@@ -90,8 +104,7 @@ int rblcheck_backend(char *domain, char *txtbuf, int txtbufsize) {
 
 	/* Make our DNS query. */
 	answer = fixedans;
-	if (CtdlThreadCheckStop())
-	{
+	if (server_shutting_down) {
 		if (txtbuf != NULL) {
 			snprintf(txtbuf, txtbufsize, "System shutting down");
 		}
@@ -107,39 +120,35 @@ int rblcheck_backend(char *domain, char *txtbuf, int txtbufsize) {
 		return(0);
 	}
 
-	if( len > PACKETSZ )
-	{
+	if (len > PACKETSZ) {
 		answer = malloc(len);
 		need_to_free_answer = 1;
 		len = res_query(domain, C_IN, T_A, answer, len);
 		if( len == -1 ) {
 			if (txtbuf != NULL) {
-				snprintf(txtbuf, txtbufsize,
-					"Message rejected due to known spammer source IP address");
+				snprintf(txtbuf, txtbufsize, "Message rejected due to known spammer source IP address");
 			}
 			if (need_to_free_answer) free(answer);
 			return(1);
 		}
 	}
-	if (CtdlThreadCheckStop())
-	{
-		if (txtbuf != NULL)
+	if (server_shutting_down) {
+		if (txtbuf != NULL) {
 			snprintf(txtbuf, txtbufsize, "System shutting down");
+		}
 		if (need_to_free_answer) free(answer);
 		return (1);
 	}
 
 	result = (char *) malloc(RESULT_SIZE);
-	result[ 0 ] = '\0';
-
+	result[0] = '\0';
 
 	/* Make another DNS query for textual data; this shouldn't
 	 * be a performance hit, since it'll now be cached at the
 	 * nameserver we're using.
 	 */
 	len = res_query(domain, C_IN, T_TXT, answer, PACKETSZ);
-	if (CtdlThreadCheckStop())
-	{
+	if (server_shutting_down) {
 		if (txtbuf != NULL) {
 			snprintf(txtbuf, txtbufsize, "System shutting down");
 		}
@@ -149,11 +158,9 @@ int rblcheck_backend(char *domain, char *txtbuf, int txtbufsize) {
 	}
 
 	/* Just in case there's no TXT record... */
-	if (len ==(-1))
-	{
+	if (len ==(-1)) {
 		if (txtbuf != NULL) {
-			snprintf(txtbuf, txtbufsize,
-				"Message rejected due to known spammer source IP address");
+			snprintf(txtbuf, txtbufsize, "Message rejected due to known spammer source IP address");
 		}
 		if (need_to_free_answer) free(answer);
 		free(result);
@@ -162,8 +169,7 @@ int rblcheck_backend(char *domain, char *txtbuf, int txtbufsize) {
 
 	/* Skip the header and the address we queried. */
 	cp = answer + sizeof( HEADER );
-	while( *cp != '\0' )
-	{
+	while( *cp != '\0' ) {
 		a = *cp++;
 		while( a-- )
 			cp++;
@@ -189,26 +195,30 @@ int rblcheck_backend(char *domain, char *txtbuf, int txtbufsize) {
 	 */
 	rp = (u_char *) result;
 	rend = (u_char *) result + RESULT_SIZE - 1;
-	while (cp < cend && rp < rend)
-	{
+	while (cp < cend && rp < rend) {
 		a = *cp++;
-		if( a != 0 )
-			for (b = a; b > 0 && cp < cend && rp < rend; b--)
-			{
-				if (*cp == '\n' || *cp == '"' || *cp == '\\')
-				{
+		if (a != 0) {
+			for (b = a; b > 0 && cp < cend && rp < rend; b--) {
+				if (*cp == '\n' || *cp == '"' || *cp == '\\') {
 					*rp++ = '\\';
 				}
 				*rp++ = *cp++;
 			}
+		}
 	}
 	*rp = '\0';
 	if (txtbuf != NULL) {
-		snprintf(txtbuf, txtbufsize, "%s", result);
-	}
-	/* Remove nonprintable characters */
-	for (p=txtbuf; *p; ++p) {
-		if (!isprint(*p)) strcpy(p, p+1);
+		long len;
+		len = snprintf(txtbuf, txtbufsize, "%s", result);
+	
+		/* Remove nonprintable characters */
+		for (p = txtbuf; *p != '\0'; p++) {
+			if (!isprint(*p)) {
+				memmove (p,
+					 p + 1,
+					 len - (p - txtbuf) - 1);
+			}
+		}
 	}
 	if (need_to_free_answer) free(answer);
 	free(result);
@@ -219,44 +229,117 @@ int rblcheck_backend(char *domain, char *txtbuf, int txtbufsize) {
 /*
  * Check to see if the client host is on some sort of spam list (RBL)
  * If spammer, returns nonzero and places reason in 'message_to_spammer'
- *
- * FIXME: support IPv6 RBL as specified in http://tools.ietf.org/html/draft-irtf-asrg-dnsbl-08
  */
-int rbl_check(char *message_to_spammer)
+int rbl_check(char *cs_addr, char *message_to_spammer)
 {
-	int a1, a2, a3, a4;
-	char tbuf[256];
+	char tbuf[256] = "";
+	int suffix_pos = 0;
 	int rbl;
+	int rc;
 	int num_rbl;
 	char rbl_domains[SIZ];
 	char txt_answer[1024];
+	struct timeval tx_start;
+	struct timeval tx_finish;
 
+	rc = 0;
 	strcpy(message_to_spammer, "ok");
-	sscanf(CC->cs_addr, "%d.%d.%d.%d", &a1, &a2, &a3, &a4);
+	gettimeofday(&tx_start, NULL);		/* start a stopwatch for performance timing */
+
+	if ((strchr(cs_addr, '.')) && (!strchr(cs_addr, ':'))) {
+		int a1, a2, a3, a4;
+
+		sscanf(cs_addr, "%d.%d.%d.%d", &a1, &a2, &a3, &a4);
+		snprintf(tbuf, sizeof tbuf, "%d.%d.%d.%d.", a4, a3, a2, a1);
+		suffix_pos = strlen(tbuf);
+	}
+	else if ((!strchr(cs_addr, '.')) && (strchr(cs_addr, ':'))) {
+		int num_colons = 0;
+		int i = 0;
+		char workbuf[sizeof tbuf];
+		char *ptr;
+
+		/* tedious code to expand and reverse an IPv6 address */
+		safestrncpy(tbuf, cs_addr, sizeof tbuf);
+		num_colons = haschar(tbuf, ':');
+		if ((num_colons < 2) || (num_colons > 7))
+			goto finish_rbl;	/* badly formed address */
+
+		/* expand the "::" shorthand */
+		while (num_colons < 7) {
+			ptr = strstr(tbuf, "::");
+			if (!ptr)
+				goto finish_rbl;				/* badly formed address */
+
+			++ptr;
+			strcpy(workbuf, ptr);
+			strcpy(ptr, ":");
+			strcat(ptr, workbuf);
+			++num_colons;
+		}
+
+		/* expand to 32 hex characters with no colons */
+		strcpy(workbuf, tbuf);
+		strcpy(tbuf, "00000000000000000000000000000000");
+		for (i=0; i<8; ++i) {
+			char tokbuf[5];
+			extract_token(tokbuf, workbuf, i, ':', sizeof tokbuf);
+			memcpy(&tbuf[ (i*4) + (4-strlen(tokbuf)) ], tokbuf, strlen(tokbuf) );
+		}
+		if (strlen(tbuf) != 32) {
+			goto finish_rbl;
+		}
+
+		/* now reverse it and add dots */
+		strcpy(workbuf, tbuf);
+		for (i=0; i<32; ++i) {
+			tbuf[i*2] = workbuf[31-i];
+			tbuf[(i*2)+1] = '.';
+		}
+		tbuf[64] = 0;
+		suffix_pos = 64;
+	}
+	else {
+		goto finish_rbl;	/* unknown address format */
+	}
 
 	/* See if we have any RBL domains configured */
 	num_rbl = get_hosts(rbl_domains, "rbl");
-	if (num_rbl < 1) return(0);
+	if (num_rbl < 1)
+	{
+		goto finish_rbl;
+	}
 
 	/* Try all configured RBL's */
         for (rbl=0; rbl<num_rbl; ++rbl) {
-		snprintf(tbuf, sizeof tbuf, "%d.%d.%d.%d.", a4, a3, a2, a1);
-                extract_token(&tbuf[strlen(tbuf)], rbl_domains, rbl, '|', (sizeof tbuf - strlen(tbuf)));
+                extract_token(&tbuf[suffix_pos], rbl_domains, rbl, '|', (sizeof tbuf - suffix_pos));
 
 		if (rblcheck_backend(tbuf, txt_answer, sizeof txt_answer)) {
 			strcpy(message_to_spammer, txt_answer);
-			CtdlLogPrintf(CTDL_INFO, "RBL: %s\n", txt_answer);
-			return(1);
+			syslog(LOG_INFO, "RBL: %s %s", cs_addr, txt_answer);
+			rc = 1;
 		}
 	}
-
-	return(0);
+finish_rbl:
+	/* How long did this transaction take? */
+	gettimeofday(&tx_finish, NULL);
+
+	syslog(LOG_WARNING, "rbl: %s [%ld.%06ld] %s",
+		cs_addr,
+		((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) / 1000000,
+		((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) % 1000000,
+		(rc)?"found":"none found"
+	);
+
+	return rc;
 }
 			
 
 /*
  * Convert a host name to a dotted quad address. 
  * Returns zero on success or nonzero on failure.
+ *
+ * FIXME this is obviously not IPv6 compatible.
  */
 int hostname_to_dotted_quad(char *addr, char *host) {
 	struct hostent *ch;