open-dsi
/
clamav
mirror of https://github.com/Cisco-Talos/clamav
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pass full ctx into the mbox code

Browse Source 
git-svn: trunk@1947
remotes/push_mirror/metadata
Nigel Horne 19 years ago
parent b2ba24f55f
commit 0f7f7682a1
7 changed files with 64 additions and 41 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      clamav-devel/ChangeLog
  2. 20
      clamav-devel/libclamav/blob.c
  3. 58
      clamav-devel/libclamav/mbox.c
  4. 2
      clamav-devel/libclamav/mbox.h
  5. 9
      clamav-devel/libclamav/message.c
  6. 5
      clamav-devel/libclamav/scanners.c
  7. 7
      clamav-devel/libclamav/text.c

4
clamav-devel/ChangeLog
Unescape View File

@ -1,3 +1,7 @@
Wed May 3 10:35:40 BST 2006 (njh)
----------------------------------
* libclamav/scanners.c: Pass full CTX into the mbox code
Tue May 2 16:21:06 BST 2006 (njh)
----------------------------------
* libclamav/mbox.c: Reduce bounce false positives

20
clamav-devel/libclamav/blob.c
Unescape View File

@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
static char const rcsid[] = "$Id: blob.c,v 1.44 2006/04/09 19:59:27 kojm Exp $";
static char const rcsid[] = "$Id: blob.c,v 1.45 2006/05/03 09:36:40 nigelhorne Exp $";
#if HAVE_CONFIG_H
#include "clamav-config.h"
@ -34,9 +34,10 @@ static char const rcsid[] = "$Id: blob.c,v 1.44 2006/04/09 19:59:27 kojm Exp $";
#include <sys/types.h>
#endif
#include "others.h"
#include "mbox.h"
#include "blob.h"
#include "others.h"
#include "matcher.h"
#ifndef CL_DEBUG
#define NDEBUG /* map CLAMAV debug onto standard */
@ -460,6 +461,21 @@ fileblobAddData(fileblob *fb, const unsigned char *data, size_t len)
assert(data != NULL);
if(fb->fp) {
#if 0
extern cli_ctx *current_ctx;
if(current_ctx) {
if(current_ctx->scanned)
*current_ctx->scanned += len / CL_COUNT_PRECISION;
if(cli_scanbuff((char *) data, len, current_ctx->virname, current_ctx->engine, 0) == CL_VIRUS) {
cli_dbgmsg("found %s\n", *current_ctx->virname);
/*ret = CL_VIRUS;
break;*/
}
}
#endif
if(fwrite(data, len, 1, fb->fp) != 1) {
cli_errmsg("fileblobAddData: Can't write %u bytes to temporary file %s: %s\n", len, fb->b.name, strerror(errno));
return -1;

58
clamav-devel/libclamav/mbox.c
Unescape View File

@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
static char const rcsid[] = "$Id: mbox.c,v 1.293 2006/05/02 15:19:24 nigelhorne Exp $";
static char const rcsid[] = "$Id: mbox.c,v 1.294 2006/05/03 09:36:40 nigelhorne Exp $";
#if HAVE_CONFIG_H
#include "clamav-config.h"
@ -54,16 +54,16 @@ static char const rcsid[] = "$Id: mbox.c,v 1.293 2006/05/02 15:19:24 nigelhorne
#include <pthread.h>
#endif
#include "others.h"
#include "defaults.h"
#include "str.h"
#include "filetypes.h"
#include "table.h"
#include "mbox.h"
#include "blob.h"
#include "line.h"
#include "text.h"
#include "message.h"
#include "others.h"
#include "defaults.h"
#include "str.h"
#include "filetypes.h"
#include "uuencode.h"
#ifdef CL_DEBUG
@ -176,11 +176,11 @@ typedef enum { FALSE = 0, TRUE = 1 } bool;
* of EICAR within bounces, which don't metter
*/
static int cli_parse_mbox(const char *dir, int desc, unsigned int options);
static int cli_parse_mbox(const char *dir, int desc, cli_ctx *ctx);
static message *parseEmailFile(FILE *fin, const table_t *rfc821Table, const char *firstLine, const char *dir);
static message *parseEmailHeaders(const message *m, const table_t *rfc821Table);
static int parseEmailHeader(message *m, const char *line, const table_t *rfc821Table);
static int parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t *rfc821Table, const table_t *subtypeTable, unsigned int options);
static int parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t *rfc821Table, const table_t *subtypeTable, cli_ctx *ctx);
static int boundaryStart(const char *line, const char *boundary);
static int endOfMessage(const char *line, const char *boundary);
static int initialiseTables(table_t **rfc821Table, table_t **subtypeTable);
@ -375,7 +375,7 @@ static void free_map(void);
* FIXME: Doesn't catch all phishes
*/
int
cli_mbox(const char *dir, int desc, unsigned int options)
cli_mbox(const char *dir, int desc, cli_ctx *ctx)
{
char *start, *ptr, *line;
const char *last, *p, *q;
@ -401,7 +401,7 @@ cli_mbox(const char *dir, int desc, unsigned int options)
#ifdef NW_MAX_FILE_SIZE
if(size > NW_MAX_FILE_SIZE)
return cli_parse_mbox(dir, desc, options);
return cli_parse_mbox(dir, desc, ctx);
#endif
/*cli_warnmsg("NEW_WORLD is new code - use at your own risk.\n");*/
@ -505,7 +505,7 @@ cli_mbox(const char *dir, int desc, unsigned int options)
munmap(start, size);
free_map();
return cli_parse_mbox(dir, desc, options);
return cli_parse_mbox(dir, desc, ctx);
#endif
}
@ -546,14 +546,14 @@ cli_mbox(const char *dir, int desc, unsigned int options)
else
cli_dbgmsg("cli_mbox: unknown encoder, type %d\n", type);
if(type == CL_TYPE_MAIL)
return cli_parse_mbox(dir, desc, options);
return cli_parse_mbox(dir, desc, ctx);
cli_dbgmsg("Unknown filetype %d, return CLEAN\n", type);
return CL_CLEAN;
}
/* The message could be a plain text phish */
if((type == CL_TYPE_MAIL) && (!(options&CL_DB_NOPHISHING)))
return cli_parse_mbox(dir, desc, options);
if((type == CL_TYPE_MAIL) && (!(ctx->options&CL_DB_NOPHISHING)))
return cli_parse_mbox(dir, desc, ctx);
cli_dbgmsg("cli_mbox: I believe it's plain text which must be clean\n");
return CL_CLEAN;
}
@ -883,7 +883,7 @@ cli_mbox(const char *dir, int desc, unsigned int options)
cli_dbgmsg("New world - don't know what to do - fall back to old world\n");
/* Fall back for now */
lseek(desc, 0L, SEEK_SET);
return cli_parse_mbox(dir, desc, options);
return cli_parse_mbox(dir, desc, ctx);
}
static void
@ -961,13 +961,13 @@ free_map(void)
#else /*!NEW_WORLD*/
int
cli_mbox(const char *dir, int desc, unsigned int options)
cli_mbox(const char *dir, int desc, cli_ctx *ctx)
{
if(dir == NULL) {
cli_warnmsg("cli_mbox called with NULL dir\n");
return CL_ENULLARG;
}
return cli_parse_mbox(dir, desc, options);
return cli_parse_mbox(dir, desc, ctx);
}
#endif
@ -987,7 +987,7 @@ cli_mbox(const char *dir, int desc, unsigned int options)
* e.g. \0Content-Type: application/binary;
*/
static int
cli_parse_mbox(const char *dir, int desc, unsigned int options)
cli_parse_mbox(const char *dir, int desc, cli_ctx *ctx)
{
int retcode, i;
message *body;
@ -1135,7 +1135,7 @@ cli_parse_mbox(const char *dir, int desc, unsigned int options)
}
messageDestroy(m);
if(messageGetBody(body))
if(!parseEmailBody(body, NULL, dir, rfc821, subtype, options)) {
if(!parseEmailBody(body, NULL, dir, rfc821, subtype, ctx)) {
messageReset(body);
m = body;
continue;
@ -1205,7 +1205,7 @@ cli_parse_mbox(const char *dir, int desc, unsigned int options)
* Write out the last entry in the mailbox
*/
if(messageGetBody(body))
if(!parseEmailBody(body, NULL, dir, rfc821, subtype, options))
if(!parseEmailBody(body, NULL, dir, rfc821, subtype, ctx))
retcode = CL_EFORMAT;
/*
@ -1722,7 +1722,7 @@ parseEmailHeader(message *m, const char *line, const table_t *rfc821)
* 2 for success, attachments not saved
*/
static int /* success or fail */
parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t *rfc821Table, const table_t *subtypeTable, unsigned int options)
parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t *rfc821Table, const table_t *subtypeTable, cli_ctx *ctx)
{
message **messages; /* parts of a multipart message */
int inMimeHead, i, rc = 1, htmltextPart, multiparts = 0;
@ -1784,7 +1784,7 @@ parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t
break;
case TEXT:
/* text/plain has been preprocessed as no encoding */
if((options&CL_SCAN_MAILURL) && (subtype == HTML))
if((ctx->options&CL_SCAN_MAILURL) && (subtype == HTML))
checkURLs(mainMessage, dir);
break;
case MULTIPART:
@ -2220,7 +2220,7 @@ parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t
if(htmltextPart == -1)
cli_dbgmsg("No HTML code found to be scanned");
else {
rc = parseEmailBody(aMessage, aText, dir, rfc821Table, subtypeTable, options);
rc = parseEmailBody(aMessage, aText, dir, rfc821Table, subtypeTable, ctx);
if(rc == 1) {
assert(aMessage == messages[htmltextPart]);
messageDestroy(aMessage);
@ -2388,7 +2388,7 @@ parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t
free(filename);
}
} else {
if(options&CL_SCAN_MAILURL)
if(ctx->options&CL_SCAN_MAILURL)
if(tableFind(subtypeTable, cptr) == HTML)
checkURLs(aMessage, dir);
messageAddArgument(aMessage, "filename=mixedtextportion");
@ -2455,7 +2455,7 @@ parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t
messageDestroy(messages[i]);
messages[i] = NULL;
if(body) {
rc = parseEmailBody(body, NULL, dir, rfc821Table, subtypeTable, options);
rc = parseEmailBody(body, NULL, dir, rfc821Table, subtypeTable, ctx);
messageDestroy(body);
}
#endif
@ -2472,13 +2472,13 @@ parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t
* The headers were parsed when reading in the
* whole multipart section
*/
rc = parseEmailBody(aMessage, aText, dir, rfc821Table, subtypeTable, options);
rc = parseEmailBody(aMessage, aText, dir, rfc821Table, subtypeTable, ctx);
cli_dbgmsg("Finished recursion\n");
assert(aMessage == messages[i]);
messageDestroy(messages[i]);
messages[i] = NULL;
} else {
rc = parseEmailBody(NULL, NULL, dir, rfc821Table, subtypeTable, options);
rc = parseEmailBody(NULL, NULL, dir, rfc821Table, subtypeTable, ctx);
if(mainMessage && (mainMessage != messageIn))
messageDestroy(mainMessage);
mainMessage = NULL;
@ -2504,7 +2504,7 @@ parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t
messages[i] = NULL;
}
/* rc = parseEmailBody(NULL, NULL, dir, rfc821Table, subtypeTable, options); */
/* rc = parseEmailBody(NULL, NULL, dir, rfc821Table, subtypeTable, ctx); */
break;
case SIGNED:
case PARALLEL:
@ -2520,7 +2520,7 @@ parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t
if(htmltextPart == -1)
htmltextPart = 0;
rc = parseEmailBody(messages[htmltextPart], aText, dir, rfc821Table, subtypeTable, options);
rc = parseEmailBody(messages[htmltextPart], aText, dir, rfc821Table, subtypeTable, ctx);
break;
case ENCRYPTED:
rc = 0;
@ -2591,7 +2591,7 @@ parseEmailBody(message *messageIn, text *textIn, const char *dir, const table_t
} else
messageReset(mainMessage);
if(messageGetBody(m))
rc = parseEmailBody(m, NULL, dir, rfc821Table, subtypeTable, options);
rc = parseEmailBody(m, NULL, dir, rfc821Table, subtypeTable, ctx);
messageDestroy(m);
}

2
clamav-devel/libclamav/mbox.h
Unescape View File

@ -39,4 +39,4 @@ typedef enum {
#endif
size_t strstrip(char *s); /* remove trailing white space */
int cli_mbox(const char *dir, int desc, unsigned int options);
int cli_mbox(const char *dir, int desc, cli_ctx *ctx);

9
clamav-devel/libclamav/message.c
Unescape View File

@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
static char const rcsid[] = "$Id: message.c,v 1.165 2006/05/02 15:19:24 nigelhorne Exp $";
static char const rcsid[] = "$Id: message.c,v 1.166 2006/05/03 09:36:40 nigelhorne Exp $";
#if HAVE_CONFIG_H
#include "clamav-config.h"
@ -46,15 +46,16 @@ static char const rcsid[] = "$Id: message.c,v 1.165 2006/05/02 15:19:24 nigelhor
#include <pthread.h>
#endif
#include "others.h"
#include "str.h"
#include "filetypes.h"
#include "line.h"
#include "mbox.h"
#include "table.h"
#include "blob.h"
#include "text.h"
#include "strrcpy.h"
#include "others.h"
#include "str.h"
#include "filetypes.h"
/* required for AIX and Tru64 */
#ifdef TRUE

5
clamav-devel/libclamav/scanners.c
Unescape View File

@ -45,8 +45,6 @@
extern short cli_leavetemps_flag;
extern int cli_mbox(const char *dir, int desc, unsigned int options); /* FIXME */
#include "clamav.h"
#include "others.h"
#include "scanners.h"
@ -97,6 +95,7 @@ extern int cli_mbox(const char *dir, int desc, unsigned int options); /* FIXME *
#define MAX_MAIL_RECURSION 15
extern int cli_mbox(const char *dir, int desc, cli_ctx *ctx); /* FIXME */
static int cli_scanfile(const char *filename, cli_ctx *ctx);
/*
@ -1513,7 +1512,7 @@ static int cli_scanmail(int desc, cli_ctx *ctx)
/*
* Extract the attachments into the temporary directory
*/
if((ret = cli_mbox(dir, desc, ctx->options))) {
if((ret = cli_mbox(dir, desc, ctx))) {
if(!cli_leavetemps_flag)
cli_rmdirs(dir);
free(dir);

7
clamav-devel/libclamav/text.c
Unescape View File

@ -17,6 +17,9 @@
* MA 02110-1301, USA.
*
* $Log: text.c,v $
* Revision 1.17 2006/05/03 09:36:40 nigelhorne
* Pass full ctx into the mbox code
*
* Revision 1.16 2006/04/09 19:59:28 kojm
* update GPL headers with new address for FSF
*
@ -58,7 +61,7 @@
*
*/
static char const rcsid[] = "$Id: text.c,v 1.16 2006/04/09 19:59:28 kojm Exp $";
static char const rcsid[] = "$Id: text.c,v 1.17 2006/05/03 09:36:40 nigelhorne Exp $";
#if HAVE_CONFIG_H
#include "clamav-config.h"
@ -84,11 +87,11 @@ static char const rcsid[] = "$Id: text.c,v 1.16 2006/04/09 19:59:28 kojm Exp $";
#include <assert.h>
#include <stdio.h>
#include "others.h"
#include "line.h"
#include "mbox.h"
#include "blob.h"
#include "text.h"
#include "others.h"
static text *textCopy(const text *t_head);
static void addToFileblob(const line_t *line, void *arg);

Write Preview
Loading…
Cancel
Save