@@ -1,3 +1,9 @@

+Thu Apr 21 12:12:29 BST 2005 (njh)

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

+  * libclamav:		Removed the support for non fast-tracked uuencoded

+				messages. All uuencoded messages are now

+				handled by the fast track visa system

+

 Wed Apr 20 01:50:36 CEST 2005 (tk)

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

   * libclamav/pe.c: Add more machine types (thanks to Christoph)

@@ -38,7 +44,7 @@ Thu Apr 14 14:35:37 BST 2005 (trog)

   * libclamav/unrar.c, unrar.h, unrarvm.h: update code for activation

   * libclamav/Makefile.am, Makefile.in: compile in new RAR code

- 

+

 Thu Apr 14 14:11:31 CEST 2005 (tk)

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

   * freshclam/manager.c: pass proper argument to OnErrorExecute (patch by

@@ -15,7 +15,7 @@

  *  along with this program; if not, write to the Free Software

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

  */

-static	char	const	rcsid[] = "$Id: mbox.c,v 1.238 2005/04/19 09:20:55 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: mbox.c,v 1.239 2005/04/21 11:12:06 nigelhorne Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -1537,19 +1537,11 @@ parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t

 					if(boundaryStart(lineGetData(t_line->t_line), boundary))

 						break;

 					/*

-					 * Found a uuencoded/binhex file before

+					 * Found a binhex file before

 					 *	the first multipart

 					 * TODO: check yEnc

 					 */

-					if(uuencodeBegin(mainMessage) == t_line) {

-						if(messageGetEncoding(mainMessage) == NOENCODING) {

-							messageSetEncoding(mainMessage, "x-uuencode");

-							fb = messageToFileblob(mainMessage, dir);

-

-							if(fb)

-								fileblobDestroy(fb);

-						}

-					} else if(binhexBegin(mainMessage) == t_line) {

+					if(binhexBegin(mainMessage) == t_line) {

 						if(messageGetEncoding(mainMessage) == NOENCODING) {

 							messageSetEncoding(mainMessage, "x-binhex");

 							fb = messageToFileblob(mainMessage, dir);

@@ -1584,7 +1576,7 @@ parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t

 				mimeType = NOMIME;

 				/*

 				 * The break means that we will still

-				 * check if the file contains a uuencoded file

+				 * check if the file contains a yEnc/binhex file

 				 */

 				break;

 			}

@@ -1635,12 +1627,12 @@ parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t

 					cli_dbgmsg("Empty part\n");

 					/*

 					 * Remove this part unless there's

-					 * a uuencoded portion somewhere in

+					 * a binhex portion somewhere in

 					 * the complete message that we may

 					 * throw away by mistake if the MIME

 					 * encoding information is incorrect

 					 */

-					if(uuencodeBegin(mainMessage) == NULL) {

+					if(binhexBegin(mainMessage) == NULL) {

 						messageDestroy(aMessage);

 						--multiparts;

 					}

@@ -2028,9 +2020,9 @@ parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t

 					case NOMIME:

 						cli_dbgmsg("No mime headers found in multipart part %d\n", i);

 						if(mainMessage) {

-							if(uuencodeBegin(aMessage)) {

-								cli_dbgmsg("Found uuencoded message in multipart/mixed mainMessage\n");

-								messageSetEncoding(mainMessage, "x-uuencode");

+							if(binhexBegin(aMessage)) {

+								cli_dbgmsg("Found binhex message in multipart/mixed mainMessage\n");

+								messageSetEncoding(mainMessage, "x-bunhex");

 								fb = messageToFileblob(mainMessage, dir);

 								if(fb)

@@ -2040,16 +2032,7 @@ parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t

 								messageDestroy(mainMessage);

 							mainMessage = NULL;

 						} else if(aMessage) {

-							if(uuencodeBegin(aMessage)) {

-								cli_dbgmsg("Found uuencoded message in multipart/mixed non mime part\n");

-								messageSetEncoding(aMessage, "x-uuencode");

-								fb = messageToFileblob(aMessage, dir);

-

-								if(fb)

-									fileblobDestroy(fb);

-								assert(aMessage == messages[i]);

-								messageReset(messages[i]);

-							} else if(binhexBegin(aMessage)) {

+							if(binhexBegin(aMessage)) {

 								cli_dbgmsg("Found binhex message in multipart/mixed non mime part\n");

 								messageSetEncoding(aMessage, "x-binhex");

 								fb = messageToFileblob(aMessage, dir);

@@ -2080,10 +2063,7 @@ parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t

 							mainMessage = NULL;

 							cptr = messageGetMimeSubtype(aMessage);

 							cli_dbgmsg("Mime subtype \"%s\"\n", cptr);

-							if(uuencodeBegin(aMessage)) {

-								cli_dbgmsg("Found uuencoded message in multipart/mixed text portion\n");

-								messageSetEncoding(aMessage, "x-uuencode");

-							} else if((tableFind(subtypeTable, cptr) == PLAIN) &&

+							if((tableFind(subtypeTable, cptr) == PLAIN) &&

 								  (messageGetEncoding(aMessage) == NOENCODING)) {

 								char *filename;

 								/*

@@ -2517,21 +2497,7 @@ parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t

 		 */

 		const text *t_line;

-		if((t_line = uuencodeBegin(mainMessage)) != NULL) {

-			cli_dbgmsg("Found uuencoded file\n");

-

-			/*

-			 * Main part contains uuencoded section

-			 */

-			messageSetEncoding(mainMessage, "x-uuencode");

-

-			if((fb = messageToFileblob(mainMessage, dir)) != NULL) {

-				if((cptr = fileblobGetFilename(fb)) != NULL)

-					cli_dbgmsg("Saving uuencoded message %s\n", cptr);

-				fileblobDestroy(fb);

-			}

-			rc = 1;

-		} else if((encodingLine(mainMessage) != NULL) &&

+		if((encodingLine(mainMessage) != NULL) &&

 			  ((t_line = bounceBegin(mainMessage)) != NULL)) {

 			const text *t, *start;

 			/*

@@ -2596,8 +2562,6 @@ parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t

 		} else {

 			bool saveIt;

-			cli_dbgmsg("Not found uuencoded file\n");

-

 			if(messageGetMimeType(mainMessage) == MESSAGE)

 				/*

 				 * Quick peek, if the encapsulated

@@ -3925,7 +3889,7 @@ getline(char *buffer, size_t len, FILE *fin)

 	} while(--len > 0);

 	if(len == 0) {

-		/* probably, the email breaks RFC821 */

+		/* the email probably breaks RFC821 */

 		cli_dbgmsg("getline: buffer overflow stopped\n");

 		return NULL;

 	}

@@ -15,7 +15,7 @@

  *  along with this program; if not, write to the Free Software

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

  */

-static	char	const	rcsid[] = "$Id: message.c,v 1.152 2005/03/28 11:03:15 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: message.c,v 1.153 2005/04/21 11:12:06 nigelhorne Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -712,6 +712,13 @@ messageSetEncoding(message *m, const char *enctype)

 				 */

 				continue;

+			if(strcmp(e->string, "uuencode") == 0)

+				/*

+				 * No need to test here - fast track visa will have

+				 * handled uuencoded files

+				 */

+				continue;

+

 			sim = simil(type, e->string);

 			if(sim == 100) {

@@ -949,8 +956,9 @@ messageIsEncoding(message *m)

 		(strncasecmp(line, "Received: ", 10) == 0) &&

 		(cli_filetype(line, strlen(line)) == CL_TYPE_MAIL))

 			m->bounce = m->body_last;

-	else if((m->uuencode == NULL) && isuuencodebegin(line))

-		m->uuencode = m->body_last;

+		/* Not needed with fast track visa technology */

+	/*else if((m->uuencode == NULL) && isuuencodebegin(line))

+		m->uuencode = m->body_last;*/

 	else if((m->binhex == NULL) &&

 		strstr(line, "BinHex") &&

 		(simil(line, binhex) > 90))

@@ -1305,12 +1313,8 @@ messageExport(message *m, const char *dir, void *(*create)(void), void (*destroy

 		if(filename)

 			free((char *)filename);

-		if(m->numberOfEncTypes == 0) {

-			if(uuencodeBegin(m))

-				messageSetEncoding(m, "x-uuencode");

-			else

-				return exportText(messageGetBody(m), ret);

-		}

+		if(m->numberOfEncTypes == 0)

+			return exportText(messageGetBody(m), ret);

 	}

 	for(i = 0; i < m->numberOfEncTypes; i++) {

@@ -1332,36 +1336,7 @@ messageExport(message *m, const char *dir, void *(*create)(void), void (*destroy

 		/*

 		 * Find the filename to decode

 		 */

-		if((enctype == UUENCODE) || uuencodeBegin(m)) {

-			t_line = uuencodeBegin(m);

-

-			if(t_line == NULL) {

-				/*cli_warnmsg("UUENCODED attachment is missing begin statement\n");*/

-				m->uuencode = NULL;

-				m->base64chars = 0;

-				if(i == m->numberOfEncTypes - 1) {

-					(*destroy)(ret);

-					return NULL;

-				}

-				continue;

-			}

-

-			filename = cli_strtok(lineGetData(t_line->t_line), 2, " ");

-

-			if(filename == NULL) {

-				cli_dbgmsg("UUencoded attachment sent with no filename\n");

-				(*destroy)(ret);

-				return NULL;

-			}

-			cli_chomp(filename);

-

-			cli_dbgmsg("Set uuencode filename to \"%s\"\n", filename);

-

-			(*setFilename)(ret, dir, filename);

-			t_line = t_line->t_next;

-			enctype = UUENCODE;

-			m->uuencode = NULL;

-		} else if(((enctype == YENCODE) && yEncBegin(m)) || ((i == 0) && yEncBegin(m))) {

+		if(((enctype == YENCODE) && yEncBegin(m)) || ((i == 0) && yEncBegin(m))) {

 			/*

 			 * TODO: handle multipart yEnc encoded files

 			 */

@@ -1386,6 +1361,15 @@ messageExport(message *m, const char *dir, void *(*create)(void), void (*destroy

 			enctype = YENCODE;

 			m->yenc = NULL;

 		} else {

+			if(enctype == UUENCODE) {

+				/*

+				 * The body will have been stripped out by the fast track visa

+				 * system. Treat as plain/text, which means we'll still scan

+				 * for funnies outside of the uuencoded portion.

+				 */

+				cli_dbgmsg("messageExport: treat uuencode as text/plain");

+				enctype = m->encodingTypes[i] = NOENCODING;

+			}

 			filename = (char *)messageFindArgument(m, "filename");

 			if(filename == NULL) {

 				filename = (char *)messageFindArgument(m, "name");

@@ -1397,6 +1381,8 @@ messageExport(message *m, const char *dir, void *(*create)(void), void (*destroy

 					/*

 					 * Some virus attachments don't say how they've

 					 * been encoded. We assume base64

+					 *

+					 * FIXME: don't do this if it's a fall through from uuencode

 					 */

 					messageSetEncoding(m, "base64");

 			}

@@ -1435,16 +1421,7 @@ messageExport(message *m, const char *dir, void *(*create)(void), void (*destroy

 			unsigned char *bigbuf;

 			size_t datasize;

-			if(enctype == UUENCODE) {

-				/*

-				 * There should be no blank lines in uuencoded

-				 * files...

-				 */

-				if(line == NULL)

-					continue;

-				if(strcasecmp(line, "end") == 0)

-					break;

-			} else if(enctype == YENCODE) {

+			if(enctype == YENCODE) {

 				if(line == NULL)

 					continue;

 				if(strncmp(line, "=yend ", 6) == 0)

@@ -1612,19 +1589,12 @@ messageToText(message *m)

 				}

 				continue;

 			case UUENCODE:

-				t_line = uuencodeBegin(m);

-

-				if(t_line == NULL) {

-					/*cli_warnmsg("UUENCODED attachment is missing begin statement\n");*/

-					if(first) {

-						last->t_next = NULL;

-						textDestroy(first);

-					}

-					return NULL;

+				cli_errmsg("messageToText: Unexpected attempt to handle uuencoded file - report to bugs@clamav.net\n");

+				if(first) {

+					last->t_next = NULL;

+					textDestroy(first);

 				}

-				t_line = t_line->t_next;

-				m->uuencode = NULL;

-				break;

+				return NULL;

 			case YENCODE:

 				t_line = yEncBegin(m);

@@ -1648,16 +1618,13 @@ messageToText(message *m)

 			unsigned char *uptr;

 			const char *line = lineGetData(t_line->t_line);

-			if(enctype == BASE64) {

+			if(enctype == BASE64)

 				/*

 				 * ignore blanks - breaks RFC which is

 				 * probably the point!

 				 */

 				if(line == NULL)

 					continue;

-			} else if(enctype == UUENCODE)

-				if(strcasecmp(line, "end") == 0)

-					break;

 			assert((line == NULL) || (strlen(line) <= sizeof(data)));

@@ -1726,34 +1693,6 @@ messageToText(message *m)

 	return first;

 }

-/*

- * Scan to find the UUENCODED message (if any)

- */

-#if	0

-const text *

-uuencodeBegin(const message *m)

-{

-	const text *t_line;

-

-	/*

-	 * Fix based on an idea by Magnus Jonsson

-	 * <Magnus.Jonsson@umdac.umu.se>, to allow for blank

-	 * lines before the begin. Should not happen, but some

-	 * e-mail clients are rather broken...

-	 */

-	for(t_line = messageGetBody(m); t_line; t_line = t_line->t_next)

-		if(isuuencodebegin(t_line->t_text))

-			return t_line;

-	return NULL;

-}

-#else

-const text *

-uuencodeBegin(const message *m)

-{

-	return m->uuencode;

-}

-#endif

-

 const text *

 yEncBegin(const message *m)

 {

@@ -1842,7 +1781,7 @@ encodingLine(const message *m)

 void

 messageClearMarkers(message *m)

 {

-	m->encoding = m->bounce = m->uuencode = m->binhex = NULL;

+	m->encoding = m->bounce = m->binhex = NULL;

 }

 /*

@@ -2330,8 +2269,6 @@ messageDedup(message *m)

 			continue;

 		if(t1 == m->bounce)

 			continue;

-		if(t1 == m->uuencode)

-			continue;

 		if(t1 == m->binhex)

 			continue;

 		if(t1 == m->yenc)

@@ -2640,6 +2577,9 @@ pop(LINK1 *top, char *buffer)

 int

 isuuencodebegin(const char *line)

 {

+	if(line[0] != 'b')	/* quick check */

+		return 0;

+

 	if(strlen(line) < 10)

 		return 0;

@@ -37,7 +37,6 @@ typedef struct message {

 	 */

 	const text	*bounce;	/* start of a bounced message */

 	const text	*binhex;	/* start of a binhex message */

-	const text	*uuencode;	/* start of a uuencoded message */

 	const text	*yenc;		/* start of a yEnc message */

 	const text	*encoding;	/* is the non MIME message encoded? */

 	const text	*dedupedThisFar;

@@ -66,7 +65,6 @@ fileblob	*messageToFileblob(message *m, const char *dir);

 blob	*messageToBlob(message *m);

 text	*messageToText(message *m);

 const	text	*binhexBegin(const message *m);

-const	text	*uuencodeBegin(const message *m);

 const	text	*yEncBegin(const message *m);

 const	text	*bounceBegin(const message *m);

 const	text	*encodingLine(const message *m);