@@ -1,3 +1,12 @@

+Tue Feb 19 19:42:23 EET 2008 (edwin)

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

+  * libclamav/scanners.c, dconf.c:

+	don't scan comment.html and script.html.

+	add failsafe dconf option. (bb #851) 

+	set scanscript limit to 512k

+  * libclamav/htmlnorm.c: TODO don't generate above 2 files

+  * libclamav/regex/regcomp.c: better condition for bb #849

+

 Tue Feb 19 15:35:47 CET 2008 (tk)

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

   * libclamunrar/unrarvm.c: fix declaration of rar_dbgmsg() (bb#848)

@@ -87,6 +87,7 @@ static struct dconf_module modules[] = {

     { "DOCUMENT",   "RTF",	    DOC_CONF_RTF,	    1 },

     { "DOCUMENT",   "PDF",	    DOC_CONF_PDF,	    1 },

     { "DOCUMENT",   "SCRIPT",	    DOC_CONF_SCRIPT,	    1 },

+    { "DOCUMENT",   "HTMLSKIPRAW",  DOC_CONF_HTML_SKIPRAW,  1 },

     { "MAIL",	    "MBOX",	    MAIL_CONF_MBOX,	    1 },

     { "MAIL",	    "TNEF",	    MAIL_CONF_TNEF,	    1 },

@@ -71,10 +71,11 @@ struct cli_dconf {

 #define ARCH_CONF_AUTOIT    0x2000

 /* Document flags */

-#define DOC_CONF_HTML	    0x1

-#define DOC_CONF_RTF	    0x2

-#define DOC_CONF_PDF	    0x4

-#define DOC_CONF_SCRIPT	    0x8

+#define DOC_CONF_HTML		0x1

+#define DOC_CONF_RTF		0x2

+#define DOC_CONF_PDF		0x4

+#define DOC_CONF_SCRIPT 	0x8

+#define DOC_CONF_HTML_SKIPRAW	0x16

 /* Mail flags */

 #define MAIL_CONF_MBOX	    0x1

@@ -1060,7 +1060,7 @@ allocset(struct parse *p)

 		(void) memset((char *)p->g->setbits + (nbytes - css), 0, css);

 	}

-	if(!p->g->sets)

+	if(!p->g->sets || !p->g->setbits)

 		goto nomem;

 	cs = &p->g->sets[no];

@@ -885,8 +885,6 @@ static int cli_scanhtml(int desc, cli_ctx *ctx)

 	char *tempname, fullname[1024];

 	int ret=CL_CLEAN, fd;

 	struct stat sb;

-	struct stat first_stat;

-

     cli_dbgmsg("in cli_scanhtml()\n");

@@ -898,6 +896,7 @@ static int cli_scanhtml(int desc, cli_ctx *ctx)

     /* Because HTML detection is FP-prone and html_normalise_fd() needs to

      * mmap the file don't normalise files larger than 10 MB.

      */

+

     if(sb.st_size > 10485760) {

 	cli_dbgmsg("cli_scanhtml: exiting (file larger than 10 MB)\n");

 	return CL_CLEAN;

@@ -914,47 +913,13 @@ static int cli_scanhtml(int desc, cli_ctx *ctx)

     snprintf(fullname, 1024, "%s/nocomment.html", tempname);

     fd = open(fullname, O_RDONLY|O_BINARY);

     if (fd >= 0) {

-	if(fstat(fd, &first_stat) == -1) {

-		cli_errmsg("cli_scanhtml: fstat() failed for %s: %d\n", fullname, fd);

-		close(fd);

-		ret = CL_EIO;

-	} else {

-		ret = cli_scandesc(fd, ctx, 0, CL_TYPE_HTML, 0, NULL);

-		close(fd);

-	}

-    }

-

-    if (ret == CL_CLEAN) {

-	snprintf(fullname, 1024, "%s/comment.html", tempname);

-	fd = open(fullname, O_RDONLY|O_BINARY);

-	if (fd >= 0) {

-	    if(fstat(fd, &sb) == -1) {

-		cli_errmsg("cli_scanhtml: fstat() failed for %s: %d\n", fullname, fd);

-		close(fd);

-		ret = CL_EIO;

-	    } else {

-		    if(sb.st_size != first_stat.st_size) {

-			    /* scan only if HTML contained comments, otherwise we already scanned it

-			     * above */

-			    ret = cli_scandesc(fd, ctx, 0, CL_TYPE_HTML, 0, NULL);

-		    } else {

-			    cli_dbgmsg("Skipping comment.html because it is identical to nocomment.html\n");

-		    }

-		    close(fd);

-	    }

-	}

-    }

-

-    if (ret == CL_CLEAN) {

-	snprintf(fullname, 1024, "%s/script.html", tempname);

-	fd = open(fullname, O_RDONLY|O_BINARY);

-	if (fd >= 0) {

 	    ret = cli_scandesc(fd, ctx, 0, CL_TYPE_HTML, 0, NULL);

 	    close(fd);

-	}

     }

-    if(ret == CL_CLEAN) {

+    if(ret == CL_CLEAN && sb.st_size < 2097152) {

+	    /* limit to 2 MB, we're not interesting in scanning large files in notags form */

+	    /* TODO: don't even create notags if file is over 2 MB */

 	    snprintf(fullname, 1024, "%s/notags.html", tempname);

 	    fd = open(fullname, O_RDONLY|O_BINARY);

 	    if(fd >= 0) {

@@ -993,7 +958,7 @@ static int cli_scanscript(int desc, cli_ctx *ctx)

 	}

 	/* don't normalize files that are too large */

-	if(sb.st_size > 409600) {

+	if(sb.st_size > 524288) {

 		cli_dbgmsg("cli_scanscript: exiting (file larger than 400 kB)\n");

 		return CL_CLEAN;

 	}

@@ -1923,8 +1888,8 @@ int cli_magic_scandesc(int desc, cli_ctx *ctx)

 	}

     }

-    /* CL_TYPE_HTML: raw HTML file already scanned in cli_scanhtml() */

-    if(type != CL_TYPE_IGNORED && type != CL_TYPE_HTML && ret != CL_VIRUS && !ctx->engine->sdb) {

+    /* CL_TYPE_HTML: raw HTML files are not scanned, unless safety measure activated via DCONF */

+    if(type != CL_TYPE_IGNORED && (type != CL_TYPE_HTML || !(DCONF_DOC & DOC_CONF_HTML_SKIPRAW)) && ret != CL_VIRUS && !ctx->engine->sdb) {

 	if(cli_scanraw(desc, ctx, type, typercg) == CL_VIRUS)

 	    return CL_VIRUS;

     }