@@ -1,3 +1,7 @@

+Wed Aug 29 18:27:55 BST 2007 (njh)

+----------------------------------

+  * libclamav:	mbox optimisation to reduce the lifetime of temporary files

+

 Tue Aug 28 16:08:13 BST 2007 (njh)

 ----------------------------------

   * libclamav/mbox.c:	MailFollowURLS: improved debugging

@@ -48,6 +48,7 @@ static	char	const	rcsid[] = "$Id: blob.c,v 1.64 2007/02/12 22:25:14 njh Exp $";

 #include "others.h"

 #include "mbox.h"

 #include "matcher.h"

+#include "scanners.h"

 #ifndef	CL_DEBUG

 #define	NDEBUG	/* map CLAMAV debug onto standard */

@@ -214,7 +215,7 @@ blobAddData(blob *b, const unsigned char *data, size_t len)

 		assert(b->len == 0);

 		assert(b->size == 0);

-		b->size = len * 4;

+		b->size = (off_t)len * 4;

 		b->data = cli_malloc(b->size);

 	} else if(b->size < b->len + (off_t)len) {

 		unsigned char *p = cli_realloc(b->data, b->size + (len * 4));

@@ -222,14 +223,14 @@ blobAddData(blob *b, const unsigned char *data, size_t len)

 		if(p == NULL)

 			return -1;

-		b->size += len * 4;

+		b->size += (off_t)len * 4;

 		b->data = p;

 	}

 #endif

 	if(b->data) {

 		memcpy(&b->data[b->len], data, len);

-		b->len += len;

+		b->len += (off_t)len;

 	}

 	return 0;

 }

@@ -344,12 +345,12 @@ blobGrow(blob *b, size_t len)

 		b->data = cli_malloc(len);

 		if(b->data)

-			b->size = len;

+			b->size = (off_t)len;

 	} else {

 		unsigned char *ptr = cli_realloc(b->data, b->size + len);

 		if(ptr) {

-			b->size += len;

+			b->size += (off_t)len;

 			b->data = ptr;

 		}

 	}

@@ -371,6 +372,52 @@ fileblobCreate(void)

 #endif

 }

+/*

+ * Returns CL_CLEAN or CL_VIRUS. Destroys the fileblob and removes the file

+ * if possible

+ */

+int

+fileblobScanAndDestroy(fileblob *fb)

+{

+	switch(fileblobScan(fb)) {

+		case CL_VIRUS:

+			fileblobDestructiveDestroy(fb);

+			return CL_VIRUS;

+		case CL_BREAK:

+			fileblobDestructiveDestroy(fb);

+			return CL_CLEAN;

+		default:

+			fileblobDestroy(fb);

+			return CL_CLEAN;

+	}

+}

+

+/*

+ * Destroy the fileblob, and remove the file associated with it

+ */

+void

+fileblobDestructiveDestroy(fileblob *fb)

+{

+	if(fb->fp && fb->fullname) {

+		fclose(fb->fp);

+		cli_dbgmsg("fileblobDestructiveDestroy: %s\n", fb->fullname);

+		if(unlink(fb->fullname) < 0)

+			cli_warnmsg("fileblobDestructiveDestroy: Can't delete file %s\n", fb->fullname);

+		free(fb->fullname);

+		fb->fp = NULL;

+		fb->fullname = NULL;

+	}

+	if(fb->b.name) {

+		free(fb->b.name);

+		fb->b.name = NULL;

+	}

+	fileblobDestroy(fb);

+}

+

+/*

+ * Destroy the fileblob, and remove the file associated with it if that file is

+ * empty

+ */

 void

 fileblobDestroy(fileblob *fb)

 {

@@ -384,7 +431,7 @@ fileblobDestroy(fileblob *fb)

 			if(!fb->isNotEmpty) {

 				cli_dbgmsg("fileblobDestroy: not saving empty file\n");

 				if(unlink(fb->fullname) < 0)

-					cli_warnmsg("fileblobDestroy: Can't delete empty files %s\n", fb->fullname);

+					cli_warnmsg("fileblobDestroy: Can't delete empty file %s\n", fb->fullname);

 			}

 		}

 		free(fb->b.name);

@@ -571,10 +618,62 @@ fileblobSetCTX(fileblob *fb, cli_ctx *ctx)

 	fb->ctx = ctx;

 }

+/*

+ * Performs a full scan on the fileblob, returning ClamAV status:

+ *	CL_BREAK means clean

+ *	CL_CLEAN means unknown

+ *	CL_VIRUS means infected

+ */

+int

+fileblobScan(const fileblob *fb)

+{

+	int rc, fd;

+

+	if(fb->isInfected)

+		return CL_VIRUS;

+	if(fb->fullname == NULL) {

+		/* shouldn't happen, scan called before fileblobSetFilename */

+		cli_warnmsg("fileblobScan, fullname == NULL\n");

+		return CL_CLEAN;	/* there is no CL_UNKNOWN */

+	}

+	if(fb->ctx == NULL) {

+		/* fileblobSetCTX hasn't been called */

+		cli_dbgmsg("fileblobScan, ctx == NULL\n");

+		return CL_CLEAN;	/* there is no CL_UNKNOWN */

+	}

+

+	fflush(fb->fp);

+	fd = dup(fileno(fb->fp));

+	if(fd == -1) {

+		cli_warnmsg("%s: dup failed\n", fb->fullname);

+		return CL_CLEAN;

+	}

+	/* cli_scanfile is static :-( */

+	/*if(cli_scanfile(fb->fullname, fb->ctx) == CL_VIRUS) {

+		printf("%s is infected\n", fb->fullname);

+		return CL_VIRUS;

+	}*/

+

+	rc = cli_magic_scandesc(fd, fb->ctx);

+	close(fd);

+	if(rc == CL_VIRUS) {

+		cli_dbgmsg("%s is infected\n", fb->fullname);

+		return CL_VIRUS;

+	}

+	cli_dbgmsg("%s is clean\n", fb->fullname);

+	return CL_BREAK;

+

+	/*return cli_scanfile(fb->fullname, fb->ctx);*/

+}

+

+/*

+ * Doesn't perform a full scan just lets the caller know if something suspicious has

+ * been seen yet

+ */

 int

-fileblobContainsVirus(const fileblob *fb)

+fileblobInfected(const fileblob *fb)

 {

-	return fb->isInfected ? TRUE : FALSE;

+	return fb->isInfected;

 }

 /*

@@ -62,12 +62,15 @@ typedef	struct fileblob {

 } fileblob;

 fileblob	*fileblobCreate(void);

+int	fileblobScanAndDestroy(fileblob *fb);

+void	fileblobDestructiveDestroy(fileblob *fb);

 void	fileblobDestroy(fileblob *fb);

 void	fileblobSetFilename(fileblob *fb, const char *dir, const char *filename);

 const	char	*fileblobGetFilename(const fileblob *fb);

 void	fileblobSetCTX(fileblob *fb, cli_ctx *ctx);

 int	fileblobAddData(fileblob *fb, const unsigned char *data, size_t len);

-int	fileblobContainsVirus(const fileblob *fb);

+int	fileblobScan(const fileblob *fb);

+int	fileblobInfected(const fileblob *fb);

 void	sanitiseName(char *name);

 #endif /*_BLOB_H*/

@@ -257,7 +257,7 @@ static	void	*getURL(struct arg *arg);

 #endif

 static	long	nonblock_fcntl(int sock);

 static	void	restore_fcntl(int sock, long fcntl_flags);

-static	int	nonblock_connect(const char *url, int sock, const struct sockaddr *addr, socklen_t addrlen, int secs);

+static	int	nonblock_connect(const char *url, int sock, const struct sockaddr *addr);

 static	int	connect_error(const char *url, int sock);

 static	int	my_r_gethostbyname(const char *hostname, struct hostent *hp, char *buf, size_t len);

@@ -2475,7 +2475,7 @@ parseEmailBody(message *messageIn, text *textIn, mbox_ctx *mctx, unsigned int re

 			cli_dbgmsg("The message has %d parts\n", multiparts);

-			if(((multiparts == 0) || infected) && (aText == NULL)) {

+			if(infected || ((multiparts == 0) && (aText == NULL))) {

 				if(messages) {

 					for(i = 0; i < multiparts; i++)

 						if(messages[i])

@@ -2537,6 +2537,10 @@ parseEmailBody(message *messageIn, text *textIn, mbox_ctx *mctx, unsigned int re

 						messageDestroy(aMessage);

 						messages[htmltextPart] = NULL;

 					}

+					else if(rc == VIRUS) {

+						infected = TRUE;

+						break;

+					}

 				}

 				/*

@@ -2751,7 +2755,8 @@ parseEmailBody(message *messageIn, text *textIn, mbox_ctx *mctx, unsigned int re

 				if(fb) {

 					cli_dbgmsg("Saving main message as attachment\n");

-					fileblobDestroy(fb);

+					if(fileblobScanAndDestroy(fb) == CL_VIRUS)

+						rc = VIRUS;

 					if(mainMessage != messageIn) {

 						messageDestroy(mainMessage);

 						mainMessage = NULL;

@@ -2783,7 +2788,7 @@ parseEmailBody(message *messageIn, text *textIn, mbox_ctx *mctx, unsigned int re

 		/* Look for a bounce in the text (non mime encoded) portion */

 		const text *t;

-		for(t = aText; t; t = t->t_next) {

+		for(t = aText; t && (rc != VIRUS); t = t->t_next) {

 			const line_t *l = t->t_line;

 			const text *lookahead, *topofbounce;

 			const char *s;

@@ -2896,9 +2901,11 @@ parseEmailBody(message *messageIn, text *textIn, mbox_ctx *mctx, unsigned int re

 						break;

 					}

 				}

-			} while(!fileblobContainsVirus(fb));

+			} while(!fileblobInfected(fb));

+

+			if(fileblobScanAndDestroy(fb) == CL_VIRUS)

+				rc = VIRUS;

-			fileblobDestroy(fb);

 			if(topofbounce)

 				t = topofbounce;

 			/*

@@ -4197,13 +4204,13 @@ getURL(struct arg *arg)

 		memcpy((char *)&ip, h.h_addr, sizeof(ip));

 	}

-	server.sin_addr.s_addr = ip;

 	if((sd = socket(AF_INET, SOCK_STREAM, tcp)) < 0) {

 		fclose(fp);

 		return NULL;

 	}

+	server.sin_addr.s_addr = ip;

 	flags = nonblock_fcntl(sd);

-	if(nonblock_connect(url, sd, (struct sockaddr *)&server, sizeof(struct sockaddr_in), URL_TIMEOUT) < 0) {

+	if(nonblock_connect(url, sd, (struct sockaddr *)&server) < 0) {

 		closesocket(sd);

 		fclose(fp);

 		return NULL;

@@ -4440,7 +4447,7 @@ restore_fcntl(int sock, long fcntl_flags)

 }

 static int

-nonblock_connect(const char *url, int sock, const struct sockaddr *addr, socklen_t addrlen, int secs)

+nonblock_connect(const char *url, int sock, const struct sockaddr *addr)

 {

 	int select_failures;	/* Max. of unexpected select() failures */

 	int bogus_loops;	/* Max. of useless loops */

@@ -4450,7 +4457,7 @@ nonblock_connect(const char *url, int sock, const struct sockaddr *addr, socklen

 	/* Calculate into 'timeout' when we should time out */

 	gettimeofday(&timeout, 0);

-	if(connect(sock, addr, addrlen))

+	if(connect(sock, addr, sizeof(struct sockaddr_in)) != 0)

 		switch(errno) {

 			case EALREADY:

 			case EINPROGRESS:

@@ -4468,7 +4475,7 @@ nonblock_connect(const char *url, int sock, const struct sockaddr *addr, socklen

 	numfd = sock + 1; /* Highest fdset fd plus 1 */

 	select_failures = NONBLOCK_SELECT_MAX_FAILURES;

 	bogus_loops = NONBLOCK_MAX_BOGUS_LOOPS;

-	timeout.tv_sec += secs;

+	timeout.tv_sec += URL_TIMEOUT;

 	for (;;) {

 		int n, t;

@@ -4483,7 +4490,7 @@ nonblock_connect(const char *url, int sock, const struct sockaddr *addr, socklen

 		if(t) {

 			cli_warnmsg("%s: connect timeout (%d secs)\n",

-				url, secs);

+				url, URL_TIMEOUT);

 			break;

 		}

@@ -4716,12 +4723,11 @@ exportBinhexMessage(const char *dir, message *m)

 	fb = messageToFileblob(m, dir, 0);

 	if(fb) {

-		if(fileblobContainsVirus(fb))

-			infected = TRUE;

-

 		cli_dbgmsg("Binhex file decoded to %s\n",

 			fileblobGetFilename(fb));

-		fileblobDestroy(fb);

+

+		if(fileblobScanAndDestroy(fb) == CL_VIRUS)

+			infected = TRUE;

 	} else

 		cli_errmsg("Couldn't decode binhex file to %s\n", dir);

@@ -5011,20 +5017,20 @@ do_multipart(message *mainMessage, message **messages, int i, mbox_status *rc, m

 			return mainMessage;

 	}

-	if(addToText) {

-		cli_dbgmsg("Adding to non mime-part\n");

-		*tptr = textAdd(*tptr, messageGetBody(aMessage));

-	} else {

-		fileblob *fb = messageToFileblob(aMessage, mctx->dir, 1);

+	if(*rc != VIRUS) {

+		if(addToText) {

+			cli_dbgmsg("Adding to non mime-part\n");

+			*tptr = textAdd(*tptr, messageGetBody(aMessage));

+		} else {

+			fileblob *fb = messageToFileblob(aMessage, mctx->dir, 1);

-		if(fb) {

-			if(fileblobContainsVirus(fb))

-				*rc = VIRUS;

-			fileblobDestroy(fb);

+			if(fb)

+				if(fileblobScanAndDestroy(fb) == CL_VIRUS)

+					*rc = VIRUS;

 		}

+		if(messageContainsVirus(aMessage))

+			*rc = VIRUS;

 	}

-	if(messageContainsVirus(aMessage))

-		*rc = VIRUS;

 	messageDestroy(aMessage);

 	messages[i] = NULL;