@@ -89,6 +89,7 @@ Thomas Lamy <Thomas.Lamy*in-online.net>

 Marty Lee <marty*maui.co.uk>

 Peter N Lewis <peter*stairways.com.au>

 David S. Madole <david*madole.net>

+Joe Maimon <jmaimon*ttec.com>

 Andrey V. Malyshev <amal*krasn.ru>

 Everton da Silva Marques <everton*lab.ipaccess.diveo.net.br>

 Andrey J. Melnikoff <temnota*kmv.ru>

@@ -1,3 +1,15 @@

+Sat May  1 21:29:29 CEST 2004 (tk)

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

+  * clamd: stream scanner:

+	+ scan exactly up to StreamMaxLength (patch by Joe Maimon

+	  <jmaimon*ttec.com>)

+	+ fix description leak on ReadTimeout (patch by Maxim Dounin

+	  <mdounin@rambler-co.ru>)

+  * contrib/trashscan: v. 0.12 (Trashware <trashware*gmx.de>)

+  * libclamav: in block-encrypted mode scan a raw encrypted archive before

+	       marking it as encrypted (requested by Andy Fiddaman

+	       <clam*fiddaman.net>)

+

 Thu Apr 29 21:59:36 CEST 2004 (tk)

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

   * libclamav: detect more mail file types

@@ -194,7 +194,8 @@ int scan(const char *filename, unsigned long int *scanned, const struct cl_node

 int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, const struct cfgstruct *copt)

 {

-	int ret, portscan = CL_DEFAULT_MAXPORTSCAN, sockfd, port, acceptd, tmpd, bread, retval, timeout;

+	int ret, portscan = CL_DEFAULT_MAXPORTSCAN, sockfd, port, acceptd;

+	int tmpd, bread, retval, timeout, btread;

 	long int size = 0, maxsize = 0;

 	short bound = 0;

 	const char *virname;

@@ -204,6 +205,7 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root

 	struct cfgstruct *cpt;

 	FILE *tmp = NULL;

+

     while(!bound && portscan--) {

 	if((port = cl_rndnum(60000)) < 1024)

 	    port += 2139;

@@ -231,35 +233,36 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root

 	    bound = 1;

     }

-    

-    if((cpt = cfgopt(copt, "ReadTimeout"))) {

+

+    if((cpt = cfgopt(copt, "ReadTimeout")))

 	timeout = cpt->numarg;

-    } else {

+    else

 	timeout = CL_DEFAULT_SCANTIMEOUT;

-    }

-    if (timeout == 0) {

+

+    if(timeout == 0)

     	timeout = -1;

-    }

     if(!bound && !portscan) {

 	logg("!ScanStream: Can't find any free port.\n");

 	mdprintf(odesc, "Can't find any free port ERROR\n");

+	close(sockfd);

 	return -1;

     } else {

 	listen(sockfd, 1);

 	mdprintf(odesc, "PORT %d\n", port);

     }

-    retval = poll_fd(sockfd, timeout);

-    switch (retval) {

-    case 0: /* timeout */

-	mdprintf(sockfd, "Accept timeout ERROR\n");

-	logg("!ScanStream: accept timeout.\n");

-	return -1;

-    case -1:

-	mdprintf(sockfd, "accept poll ERROR\n");

-	logg("!ScanStream: accept poll failed.\n");

-	return -1;

+    switch(retval = poll_fd(sockfd, timeout)) {

+	case 0: /* timeout */

+	    mdprintf(odesc, "Accept timeout ERROR\n");

+	    logg("!ScanStream: accept timeout.\n");

+	    close(sockfd);

+	    return -1;

+	case -1:

+	    mdprintf(odesc, "accept poll ERROR\n");

+	    logg("!ScanStream: accept poll failed.\n");

+	    close(sockfd);

+	    return -1;

     }

     if((acceptd = accept(sockfd, NULL, NULL)) == -1) {

@@ -269,63 +272,63 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root

 	return -1;

     }

-

     logg("*Accepted connection on port %d, fd %d\n", port, acceptd);

-    /* StreamSaveToDisk is enforced, to ensure timeoute */

-    /*if(cfgopt(copt, "StreamSaveToDisk")) {	*/

-	if((tmp = tmpfile()) == NULL) {

+    if((tmp = tmpfile()) == NULL) {

+	shutdown(sockfd, 2);

+	close(sockfd);

+	close(acceptd);

+	mdprintf(odesc, "Temporary file ERROR\n");

+	logg("!ScanStream: Can't create temporary file.\n");

+	return -1;

+    }

+    tmpd = fileno(tmp);

+

+    if((cpt = cfgopt(copt, "StreamMaxLength")))

+	maxsize = cpt->numarg;

+

+    btread = sizeof(buff);

+

+    while((retval = poll_fd(acceptd, timeout)) == 1) {

+	bread = read(acceptd, buff, btread);

+	if(bread <= 0)

+	    break;

+	size += bread;

+

+	if(writen(tmpd, buff, bread) != bread) {

 	    shutdown(sockfd, 2);

 	    close(sockfd);

 	    close(acceptd);

-	    mdprintf(odesc, "Temporary file ERROR\n");

-	    logg("!ScanStream: Can't create temporary file.\n");

+	    mdprintf(odesc, "Temporary file -> write ERROR\n");

+	    logg("!ScanStream: Can't write to temporary file.\n");

+	    if(tmp)

+		fclose(tmp);

 	    return -1;

 	}

-	tmpd = fileno(tmp);

-	if((cpt = cfgopt(copt, "StreamMaxLength")))

-	    maxsize = cpt->numarg;

+	if(maxsize && (size + btread >= maxsize)) {

+	    btread = (maxsize - size); /* only read up to max */

-	while((retval = poll_fd(acceptd, timeout)) == 1) {

-	    bread = read(acceptd, buff, sizeof(buff));

-	    if (bread <= 0) {

-		break;

+	    if(!btread) {

+		logg("^ScanStream: Size limit reached ( max: %d)\n", maxsize);

+	    	break; /* Scan what we have */

 	    }

-	    size += bread;

-

-	    if(maxsize && (size + sizeof(buff)) > maxsize) {

-		shutdown(sockfd, 2);

-		close(sockfd);

-		close(acceptd);

-		mdprintf(odesc, "Size exceeded ERROR\n");

-		logg("^ScanStream: Size exceeded (stopped at %d, max: %d)\n", size, maxsize);

-		if(tmp)

-		    fclose(tmp);

-		return -1;

-	    }

-

-	    if(writen(tmpd, buff, bread) != bread) {

-		shutdown(sockfd, 2);

-		close(sockfd);

-		close(acceptd);

-		mdprintf(odesc, "Temporary file -> write ERROR\n");

-		logg("!ScanStream: Can't write to temporary file.\n");

-		if(tmp)

-		    fclose(tmp);

-		return -1;

-	    }

-

 	}

+    }

-	lseek(tmpd, 0, SEEK_SET);

-	ret = cl_scandesc(tmpd, &virname, scanned, root, limits, options);

-	if(tmp)

-	    fclose(tmp);

+    switch(retval) {

+	case 0: /* timeout */

+	    mdprintf(odesc, "Accept timeout ERROR\n");

+	    logg("!ScanStream: accept timeout.\n");

+	case -1:

+	    mdprintf(odesc, "accept poll ERROR\n");

+	    logg("!ScanStream: accept poll failed.\n");

+    }

-    /* } else

-	ret = cl_scandesc(acceptd, &virname, scanned, root, limits, 0);

-	*/

+    lseek(tmpd, 0, SEEK_SET);

+    ret = cl_scandesc(tmpd, &virname, scanned, root, limits, options);

+    if(tmp)

+	fclose(tmp);

     close(acceptd);

     close(sockfd);

deleted file mode 100644

Binary files a/contrib/trashscan/trashscan-0.10.tar.gz and /dev/null differ

@@ -76,10 +76,10 @@ static const struct cli_magic_s cli_magic[] = {

     {0,  "PK\003\004",			4,  "ZIP",		  CL_ZIPFILE},

     {0,  "\037\213",			2,  "GZip",		  CL_GZFILE},

     {0,  "BZh",				3,  "BZip",		  CL_BZFILE},

-    {0,  "From ",			5,  "MBox",		  CL_MAILFILE},

     /* Mail */

+    {0,  "From ",			5,  "MBox",		  CL_MAILFILE},

     {0,  "Received",			8,  "Raw mail",		  CL_MAILFILE},

     {0,  "Return-Path: ",		13, "Maildir",		  CL_MAILFILE},

     {0,  "Return-path: ",		13, "Maildir",		  CL_MAILFILE},

@@ -107,20 +107,21 @@ static const struct cli_magic_s cli_magic[] = {

     {0,  "\320\317\021\340\241\261\032\341",

 	                    8, "OLE2 container",  CL_OLE2FILE},

+

     /* Ignored types */

     {0,  "\000\000\001\263",             4, "MPEG video stream",  CL_DATAFILE},

     {0,  "\000\000\001\272",             4, "MPEG sys stream",    CL_DATAFILE},

     {0,  "RIFF",                         4, "RIFF",		  CL_DATAFILE},

-    {0,  "GIF87a",                       6, "GIF (87a)",          CL_DATAFILE},

-    {0,  "GIF89a",                       6, "GIF (89a)",          CL_DATAFILE},

-    {0,  "\x89PNG\r\n\x1a\n",            8, "PNG",                CL_DATAFILE},

-    {0,  "\377\330\377\340",             4, "JPEG",               CL_DATAFILE},

-    {0,  "\377\330\377\356",             4, "JPG",                CL_DATAFILE},

+    {0,  "GIF",				 3, "GIF",		  CL_DATAFILE},

+    {0,  "\x89PNG",			 4, "PNG",                CL_DATAFILE},

+    {0,  "\377\330\377",		 4, "JPEG",               CL_DATAFILE},

+    {0,  "BM",				 2, "BMP",                CL_DATAFILE},

     {0,  "OggS",                         4, "Ogg Stream",         CL_DATAFILE},

     {0,  "ID3",				 3, "MP3",		  CL_DATAFILE},

     {0,  "\377\373\220",		 3, "MP3",		  CL_DATAFILE},

     {0,  "\%PDF-",			 5, "PDF document",	  CL_DATAFILE},

+    {0,  "\%!PS-Adobe-",		11, "PostScript",	  CL_DATAFILE},

     {0,  "\060\046\262\165\216\146\317", 7, "WMA/WMV/ASF",	  CL_DATAFILE},

     {0,  ".RMF" ,			 4, "Real Media File",	  CL_DATAFILE},

@@ -146,8 +147,7 @@ cli_file_t cli_filetype(const char *buf, size_t buflen)

 static int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *reclev);

 static int cli_scanfile(const char *filename, const char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *reclev);

-static int cli_scandesc(int desc, const char **virname, long int *scanned, const struct 

-cl_node *root)

+static int cli_scandesc(int desc, const char **virname, long int *scanned, const struct cl_node *root)

 {

  	char *buffer, *buff, *endbl, *pt;

 	int bytes, buffsize, length, ret, *partcnt;

@@ -242,7 +242,9 @@ static int cli_scanrar(int desc, const char **virname, long int *scanned, const

 	if(DETECT_ENCRYPTED && (rarlist->item.Flags & 4)) {

 	    files++;

 	    cli_dbgmsg("Rar -> Encrypted files found in archive.\n");

-	    *virname = "Encrypted.RAR";

+	    lseek(desc, 0, SEEK_SET);

+	    if(cli_scandesc(desc, virname, scanned, root) != CL_VIRUS)

+		*virname = "Encrypted.RAR";

 	    ret = CL_VIRUS;

 	    break;

 	}

@@ -411,7 +413,9 @@ static int cli_scanzip(int desc, const char **virname, long int *scanned, const

 	if(DETECT_ENCRYPTED && (zdirent.d_flags & 1 )) {

 	    files++;

 	    cli_dbgmsg("Zip -> Encrypted files found in archive.\n");

-	    *virname = "Encrypted.Zip";

+	    lseek(desc, 0, SEEK_SET);

+	    if(cli_scandesc(desc, virname, scanned, root) != CL_VIRUS)

+		*virname = "Encrypted.Zip";

 	    ret = CL_VIRUS;

 	    break;

 	}