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

+Fri Sep 17 10:49:30 BST 2004 (njh)

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

+  * libclamav:	Handle attempts to falsify the mime type

+

 Fri Sep 17 10:10:13 BST 2004 (njh)

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

   * libclamav/mbox.c:	Improved handling of RFC822 comments in headers

@@ -17,6 +17,9 @@

  *

  * Change History:

  * $Log: mbox.c,v $

+ * Revision 1.129  2004/09/17 09:48:53  nigelhorne

+ * Handle attempts to hide mime type

+ *

  * Revision 1.128  2004/09/17 09:09:44  nigelhorne

  * Better handling of RFC822 comments

  *

@@ -372,7 +375,7 @@

  * Compilable under SCO; removed duplicate code with message.c

  *

  */

-static	char	const	rcsid[] = "$Id: mbox.c,v 1.128 2004/09/17 09:09:44 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: mbox.c,v 1.129 2004/09/17 09:48:53 nigelhorne Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -2145,7 +2148,7 @@ parseMimeHeader(message *m, const char *cmd, const table_t *rfc821Table, const c

 					if(copy[0] == '\"')

 						copy++;

 					if(copy[0] != '/') {

-						messageSetMimeType(m, strtok_r(copy, "/", &strptr));

+						int set = messageSetMimeType(m, strtok_r(copy, "/", &strptr));

 						/*

 						 * Stephen White <stephen@earth.li>

@@ -2154,7 +2157,7 @@ parseMimeHeader(message *m, const char *cmd, const table_t *rfc821Table, const c

 						 * the ;

 						 */

 						s = strtok_r(NULL, ";", &strptr);

-						if(s) {

+						if(s && set) {

 							len = strstrip(s) - 1;

 							if(s[len] == '\"') {

 								s[len] = '\0';

@@ -17,6 +17,9 @@

  *

  * Change History:

  * $Log: message.c,v $

+ * Revision 1.84  2004/09/17 09:48:53  nigelhorne

+ * Handle attempts to hide mime type

+ *

  * Revision 1.83  2004/09/16 15:56:45  nigelhorne

  * Handle double colons

  *

@@ -246,7 +249,7 @@

  * uuencodebegin() no longer static

  *

  */

-static	char	const	rcsid[] = "$Id: message.c,v 1.83 2004/09/16 15:56:45 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: message.c,v 1.84 2004/09/17 09:48:53 nigelhorne Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -395,8 +398,11 @@ messageReset(message *m)

 /*

  * Handle the Content-Type header

+ * Return success (1) or failure (0). Failure only happens when it's an

+ * unknown type and we've already received a known type, or we've received an

+ * empty type. If we receive an unknown type by itself we default to application

  */

-void

+int

 messageSetMimeType(message *mess, const char *type)

 {

 #ifdef	CL_THREAD_SAFE

@@ -408,14 +414,12 @@ messageSetMimeType(message *mess, const char *type)

 	assert(mess != NULL);

 	assert(type != NULL);

-	mess->mimeType = NOMIME;

-

 	cli_dbgmsg("messageSetMimeType: '%s'\n", type);

 	/* Ignore leading spaces */

 	while(!isalpha(*type))

 		if(*type++ == '\0')

-			return;

+			return 0;

 #ifdef	CL_THREAD_SAFE

 	pthread_mutex_lock(&mime_mutex);

@@ -428,7 +432,7 @@ messageSetMimeType(message *mess, const char *type)

 #ifdef	CL_THREAD_SAFE

 			pthread_mutex_unlock(&mime_mutex);

 #endif

-			return;

+			return 0;

 		}

 		for(m = mime_map; m->string; m++)

@@ -438,7 +442,7 @@ messageSetMimeType(message *mess, const char *type)

 #ifdef	CL_THREAD_SAFE

 				pthread_mutex_unlock(&mime_mutex);

 #endif

-				return;

+				return 0;

 			}

 	}

 #ifdef	CL_THREAD_SAFE

@@ -447,9 +451,10 @@ messageSetMimeType(message *mess, const char *type)

 	typeval = tableFind(mime_table, type);

-	mess->mimeType = (mime_type)((typeval == -1) ? (int)NOMIME : typeval);

-

-	if(mess->mimeType == NOMIME) {

+	if(typeval != -1) {

+		mess->mimeType = typeval;

+		return 1;

+	} else if(mess->mimeType == NOMIME) {

 		if(strncasecmp(type, "x-", 2) == 0)

 			mess->mimeType = MEXTENSION;

 		else {

@@ -461,7 +466,9 @@ messageSetMimeType(message *mess, const char *type)

 			cli_warnmsg("Unknown MIME type: `%s' - set to Application\n", type);

 			mess->mimeType = APPLICATION;

 		}

+		return 1;

 	}

+	return 0;

 }

 mime_type

@@ -16,6 +16,9 @@

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

  *

  * $Log: message.h,v $

+ * Revision 1.18  2004/09/17 09:48:53  nigelhorne

+ * Handle attempts to hide mime type

+ *

  * Revision 1.17  2004/09/15 18:08:23  nigelhorne

  * Handle multiple encoding types

  *

@@ -88,7 +91,7 @@ typedef struct message {

 message	*messageCreate(void);

 void	messageDestroy(message *m);

 void	messageReset(message *m);

-void	messageSetMimeType(message *m, const char *type);

+int	messageSetMimeType(message *m, const char *type);

 mime_type	messageGetMimeType(const message *m);

 void	messageSetMimeSubtype(message *m, const char *subtype);

 const	char	*messageGetMimeSubtype(const message *m);