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

cli_warnmsg -> cli_dbgmsg (bb #880),

Browse Source 
don't handle multipart/encrypted specially


git-svn: trunk@3738
remotes/push_mirror/metadata
Török Edvin 17 years ago
parent a87b030d75
commit 6351aa86fa
3 changed files with 52 additions and 59 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. 5
      ChangeLog
  2. 84
      libclamav/mbox.c
  3. 22
      libclamav/message.c

5
ChangeLog
Unescape View File

@ -1,3 +1,8 @@
Mon Mar 24 20:30:34 EET 2008 (edwin)
------------------------------------
* libclamav/mbox.c, message.c: cli_warnmsg -> cli_dbgmsg (bb #880),
don't handle multipart/encrypted specially
Mon Mar 24 19:31:10 CET 2008 (acab)
-----------------------------------
* libclamav/nsis: a cleaner approach to bb#844 and bb#888

84
libclamav/mbox.c
Unescape View File

@ -464,7 +464,7 @@ cli_mbox(const char *dir, int desc, cli_ctx *ctx)
struct scanlist *scanlist, *scanelem;
if(dir == NULL) {
cli_warnmsg("cli_mbox called with NULL dir\n");
cli_dbgmsg("cli_mbox called with NULL dir\n");
return CL_ENULLARG;
}
if(fstat(desc, &statb) < 0)
@ -634,9 +634,9 @@ cli_mbox(const char *dir, int desc, cli_ctx *ctx)
/* TODO: reduce the number of falls through here */
if(hasuuencode)
/* TODO: fast track visa */
cli_warnmsg("New world - fall back to old uudecoder\n");
cli_dbgmsg("New world - fall back to old uudecoder\n");
else
cli_warnmsg("cli_mbox: unknown encoder, type %d\n", type);
cli_dbgmsg("cli_mbox: unknown encoder, type %d\n", type);
if(type == CL_TYPE_MAIL)
return cli_parse_mbox(dir, desc, ctx);
cli_dbgmsg("Unknown filetype %d, return CLEAN\n", type);
@ -1004,7 +1004,7 @@ cli_mbox(const char *dir, int desc, cli_ctx *ctx)
if(ret != CL_EFORMAT)
return ret;
cli_warnmsg("New world - don't know what to do - fall back to old world\n");
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, ctx);
@ -1096,7 +1096,7 @@ create_map(const char *begin, const char *end)
};
if(map) {
cli_warnmsg("create_map called without free_map\n");
cli_dbgmsg("create_map called without free_map\n");
free_map();
}
while(begin < end) {
@ -1159,7 +1159,7 @@ int
cli_mbox(const char *dir, int desc, cli_ctx *ctx)
{
if(dir == NULL) {
cli_warnmsg("cli_mbox called with NULL dir\n");
cli_dbgmsg("cli_mbox called with NULL dir\n");
return CL_ENULLARG;
}
return cli_parse_mbox(dir, desc, ctx);
@ -2017,7 +2017,7 @@ parseEmailBody(message *messageIn, text *textIn, mbox_ctx *mctx, unsigned int re
*/
if(recursion_level > limits->maxreclevel) {
cli_warnmsg("parseEmailBody: hit maximum recursion level (%u)\n", recursion_level);
cli_dbgmsg("parseEmailBody: hit maximum recursion level (%u)\n", recursion_level);
return MAXREC;
}
if(limits->maxfiles && (mctx->files >= limits->maxfiles)) {
@ -2037,7 +2037,7 @@ parseEmailBody(message *messageIn, text *textIn, mbox_ctx *mctx, unsigned int re
mime_type mimeType;
int subtype, inhead, htmltextPart, inMimeHead, i;
const char *mimeSubtype;
char *protocol, *boundary;
char *boundary;
const text *t_line;
/*bool isAlternative;*/
message *aMessage;
@ -2119,7 +2119,7 @@ parseEmailBody(message *messageIn, text *textIn, mbox_ctx *mctx, unsigned int re
/* Perhaps it should assume mixed? */
if(mimeSubtype[0] == '\0') {
cli_warnmsg("Multipart has no subtype assuming alternative\n");
cli_dbgmsg("Multipart has no subtype assuming alternative\n");
mimeSubtype = "alternative";
messageSetMimeSubtype(mainMessage, "alternative");
}
@ -2130,7 +2130,7 @@ parseEmailBody(message *messageIn, text *textIn, mbox_ctx *mctx, unsigned int re
t_line = messageGetBody(mainMessage);
if(t_line == NULL) {
cli_warnmsg("Multipart MIME message has no body\n");
cli_dbgmsg("Multipart MIME message has no body\n");
free((char *)boundary);
mimeType = NOMIME;
break;
@ -2645,6 +2645,9 @@ parseEmailBody(message *messageIn, text *textIn, mbox_ctx *mctx, unsigned int re
* parameters, but there's no need for us to
* verify that they exist
*/
case ENCRYPTED:
/* MUAs without encryption plugins can display as multipart/mixed,
* just scan it*/
case MIXED:
case APPLEDOUBLE: /* not really supported */
/*
@ -2691,21 +2694,6 @@ parseEmailBody(message *messageIn, text *textIn, mbox_ctx *mctx, unsigned int re
htmltextPart = 0;
rc = parseEmailBody(messages[htmltextPart], aText, mctx, recursion_level + 1);
break;
case ENCRYPTED:
rc = FAIL; /* Not yet handled */
protocol = (char *)messageFindArgument(mainMessage, "protocol");
if(protocol) {
if(strcasecmp(protocol, "application/pgp-encrypted") == 0) {
/* RFC2015 */
cli_warnmsg("PGP encoded attachment not scanned\n");
rc = OK_ATTACHMENTS_NOT_SAVED;
} else
cli_warnmsg("Unknown encryption protocol '%s' - if you believe this file contains a virus, submit it to www.clamav.net\n", protocol);
free(protocol);
} else
cli_dbgmsg("Encryption method missing protocol name\n");
break;
default:
assert(0);
@ -2747,7 +2735,7 @@ parseEmailBody(message *messageIn, text *textIn, mbox_ctx *mctx, unsigned int re
case BINARY:
break;
default:
cli_warnmsg("MIME type 'message' cannot be decoded\n");
cli_dbgmsg("MIME type 'message' cannot be decoded\n");
break;
}
rc = FAIL;
@ -2796,7 +2784,7 @@ parseEmailBody(message *messageIn, text *textIn, mbox_ctx *mctx, unsigned int re
return rc;
default:
cli_warnmsg("Message received with unknown mime encoding - assume application");
cli_dbgmsg("Message received with unknown mime encoding - assume application");
/*
* Some Yahoo emails attach as
* Content-Type: X-unknown/unknown;
@ -3368,7 +3356,7 @@ parseMimeHeader(message *m, const char *cmd, const table_t *rfc821Table, const c
* for the subtype because virus writers and
* email client writers don't get it right
*/
cli_warnmsg("Empty content-type received, no subtype specified, assuming text/plain; charset=us-ascii\n");
cli_dbgmsg("Empty content-type received, no subtype specified, assuming text/plain; charset=us-ascii\n");
else if(strchr(ptr, '/') == NULL)
/*
* Empty field, such as
@ -3391,7 +3379,7 @@ parseMimeHeader(message *m, const char *cmd, const table_t *rfc821Table, const c
* put white space after the ;
*/
if(*arg == '/') {
cli_warnmsg("Content-type '/' received, assuming application/octet-stream\n");
cli_dbgmsg("Content-type '/' received, assuming application/octet-stream\n");
messageSetMimeType(m, "application");
messageSetMimeSubtype(m, "octet-stream");
} else {
@ -3803,7 +3791,7 @@ rfc1341(message *m, const char *dir)
}
if(oldfilename) {
cli_warnmsg("Must reset to %s\n", oldfilename);
cli_dbgmsg("Must reset to %s\n", oldfilename);
free(oldfilename);
}
@ -3887,7 +3875,7 @@ rfc1341(message *m, const char *dir)
continue;
if(now - statb.st_mtime > (time_t)(7 * 24 * 3600))
if(unlink(fullname) >= 0)
cli_warnmsg("removed old RFC1341 file %s\n", fullname);
cli_dbgmsg("removed old RFC1341 file %s\n", fullname);
continue;
}
@ -4101,10 +4089,10 @@ do_checkURLs(mbox_ctx *mctx, tag_arguments_t *hrefs)
* What about foreign character spoofing?
*/
if(strchr(url, '%') && strchr(url, '@'))
cli_warnmsg("Possible URL spoofing attempt noticed, but not blocked (%s)\n", url);
cli_dbgmsg("Possible URL spoofing attempt noticed, but not blocked (%s)\n", url);
if(n == FOLLOWURLS) {
cli_warnmsg("URL %s will not be scanned (FOLLOWURLS limit %d was reached)\n",
cli_dbgmsg("URL %s will not be scanned (FOLLOWURLS limit %d was reached)\n",
url, FOLLOWURLS);
break;
}
@ -4280,7 +4268,7 @@ getURL(struct arg *arg)
cli_dbgmsg("Getting %s\n", url);
if(strncasecmp(url, "http://", 7) != 0) {
cli_warnmsg("Unsupported protocol\n");
cli_dbgmsg("Unsupported protocol\n");
fclose(fp);
return NULL;
}
@ -4430,7 +4418,7 @@ getURL(struct arg *arg)
end++;
*end = '\0';
if(arg->depth >= FOLLOWURLS) {
cli_warnmsg("URL %s will not be followed to %s (FOLLOWURLS limit %d was reached)\n",
cli_dbgmsg("URL %s will not be followed to %s (FOLLOWURLS limit %d was reached)\n",
arg->url, location, FOLLOWURLS);
break;
}
@ -4566,9 +4554,9 @@ nonblock_connect(SOCKET sock, const struct sockaddr_in *sin, const char *hostnam
flags = fcntl(sock, F_GETFL, 0);
if(flags == -1L)
cli_warnmsg("getfl: %s\n", strerror(errno));
cli_dbgmsg("getfl: %s\n", strerror(errno));
else if(fcntl(sock, F_SETFL, (long)(flags | O_NONBLOCK)) < 0)
cli_warnmsg("setfl: %s\n", strerror(errno));
cli_dbgmsg("setfl: %s\n", strerror(errno));
#else
flags = -1L;
#endif
@ -4582,12 +4570,12 @@ nonblock_connect(SOCKET sock, const struct sockaddr_in *sin, const char *hostnam
case EISCONN:
return 0; /* connected */
default:
cli_warnmsg("%s: connect: %s\n",
cli_dbgmsg("%s: connect: %s\n",
hostname, strerror(errno));
#ifdef F_SETFL
if(flags != -1L)
if(fcntl(sock, F_SETFL, flags))
cli_warnmsg("f_setfl: %s\n", strerror(errno));
cli_dbgmsg("f_setfl: %s\n", strerror(errno));
#endif
return -1; /* failed */
}
@ -4595,7 +4583,7 @@ nonblock_connect(SOCKET sock, const struct sockaddr_in *sin, const char *hostnam
#ifdef F_SETFL
if(flags != -1L)
if(fcntl(sock, F_SETFL, flags))
cli_warnmsg("f_setfl: %s\n", strerror(errno));
cli_dbgmsg("f_setfl: %s\n", strerror(errno));
#endif
return connect_error(sock, hostname);
}
@ -4617,7 +4605,7 @@ nonblock_connect(SOCKET sock, const struct sockaddr_in *sin, const char *hostnam
(now.tv_sec > timeout.tv_sec);
if(t) {
cli_warnmsg("%s: connect timeout (%d secs)\n",
cli_dbgmsg("%s: connect timeout (%d secs)\n",
hostname, CONNECT_TIMEOUT);
break;
}
@ -4636,7 +4624,7 @@ nonblock_connect(SOCKET sock, const struct sockaddr_in *sin, const char *hostnam
n = select(numfd, 0, &fds, 0, &waittime);
if(n < 0) {
cli_warnmsg("%s: select attempt %d %s\n",
cli_dbgmsg("%s: select attempt %d %s\n",
hostname, select_failures, strerror(errno));
if(--select_failures >= 0)
continue; /* not timed-out, try again */
@ -4649,14 +4637,14 @@ nonblock_connect(SOCKET sock, const struct sockaddr_in *sin, const char *hostnam
#ifdef F_SETFL
if(flags != -1L)
if(fcntl(sock, F_SETFL, flags))
cli_warnmsg("f_setfl: %s\n", strerror(errno));
cli_dbgmsg("f_setfl: %s\n", strerror(errno));
#endif
return connect_error(sock, hostname);
}
/* timeout */
if(attempts++ == NONBLOCK_MAX_ATTEMPTS) {
cli_warnmsg("timeout connecting to %s\n", hostname);
cli_dbgmsg("timeout connecting to %s\n", hostname);
break;
}
}
@ -4664,7 +4652,7 @@ nonblock_connect(SOCKET sock, const struct sockaddr_in *sin, const char *hostnam
#ifdef F_SETFL
if(flags != -1L)
if(fcntl(sock, F_SETFL, flags))
cli_warnmsg("f_setfl: %s\n", strerror(errno));
cli_dbgmsg("f_setfl: %s\n", strerror(errno));
#endif
return -1; /* failed */
}
@ -4679,7 +4667,7 @@ connect_error(SOCKET sock, const char *hostname)
getsockopt(sock, SOL_SOCKET, SO_ERROR, &optval, &optlen);
if(optval) {
cli_warnmsg("%s: %s\n", hostname, strerror(optval));
cli_dbgmsg("%s: %s\n", hostname, strerror(optval));
return -1;
}
#endif
@ -4802,7 +4790,7 @@ getline_from_mbox(char *buffer, size_t len, FILE *fin)
if(len == 0) {
/* the email probably breaks RFC821 */
cli_warnmsg("getline_from_mbox: buffer overflow stopped, line lost\n");
cli_dbgmsg("getline_from_mbox: buffer overflow stopped, line lost\n");
return NULL;
}
*buffer = '\0';
@ -5153,7 +5141,7 @@ do_multipart(message *mainMessage, message **messages, int i, mbox_status *rc, m
}
return mainMessage;
default:
cli_warnmsg("Only text and application attachments are fully supported, type = %d\n",
cli_dbgmsg("Only text and application attachments are fully supported, type = %d\n",
messageGetMimeType(aMessage));
/* fall through - we may be able to salvage something */
}

22
libclamav/message.c
Unescape View File

@ -223,7 +223,7 @@ messageSetMimeType(message *mess, const char *type)
assert(mess != NULL);
if(type == NULL) {
cli_warnmsg("Empty content-type field\n");
cli_dbgmsg("Empty content-type field\n");
return 0;
}
@ -438,11 +438,11 @@ messageAddArgument(message *m, const char *arg)
* FIXME: Bounce message handling is corrupting the in
* core copies of headers
*/
cli_warnmsg("Possible data corruption fixed\n");
cli_dbgmsg("Possible data corruption fixed\n");
p[8] = '=';
} else {
if(p && *p)
cli_warnmsg("messageAddArgument, '%s' contains no '='\n", p);
cli_dbgmsg("messageAddArgument, '%s' contains no '='\n", p);
free(m->mimeArguments[offset]);
m->mimeArguments[offset] = NULL;
return;
@ -662,7 +662,7 @@ messageFindArgument(const message *m, const char *variable)
while(isspace(*ptr))
ptr++;
if(*ptr != '=') {
cli_warnmsg("messageFindArgument: no '=' sign found in MIME header '%s' (%s)\n", variable, messageGetArgument(m, i));
cli_dbgmsg("messageFindArgument: no '=' sign found in MIME header '%s' (%s)\n", variable, messageGetArgument(m, i));
return NULL;
}
if((*++ptr == '"') && (strchr(&ptr[1], '"') != NULL)) {
@ -733,7 +733,7 @@ messageHasArgument(const message *m, const char *variable)
while(isspace(*ptr))
ptr++;
if(*ptr != '=') {
cli_warnmsg("messageHasArgument: no '=' sign found in MIME header '%s' (%s)\n", variable, messageGetArgument(m, i));
cli_dbgmsg("messageHasArgument: no '=' sign found in MIME header '%s' (%s)\n", variable, messageGetArgument(m, i));
return 0;
}
return 1;
@ -1278,7 +1278,7 @@ messageExport(message *m, const char *dir, void *(*create)(void), void (*destroy
continue;
if((c < 0x20) || (c > 0x7f) || (hqxtbl[c] == 0xff)) {
cli_warnmsg("Invalid HQX7 character '%c' (0x%02x)\n", c, c);
cli_dbgmsg("Invalid HQX7 character '%c' (0x%02x)\n", c, c);
break;
}
c = hqxtbl[c];
@ -1377,7 +1377,7 @@ messageExport(message *m, const char *dir, void *(*create)(void), void (*destroy
len);
}
if(len == 0) {
cli_warnmsg("Discarding empty binHex attachment\n");
cli_dbgmsg("Discarding empty binHex attachment\n");
(*destroy)(ret);
blobDestroy(tmp);
return NULL;
@ -1447,7 +1447,7 @@ messageExport(message *m, const char *dir, void *(*create)(void), void (*destroy
l = blobGetDataSize(tmp) - byte;
if(l < dataforklen) {
cli_warnmsg("Corrupt BinHex file, claims it is %lu bytes long in a message of %lu bytes\n",
cli_dbgmsg("Corrupt BinHex file, claims it is %lu bytes long in a message of %lu bytes\n",
dataforklen, l);
dataforklen = l;
}
@ -1600,7 +1600,7 @@ messageExport(message *m, const char *dir, void *(*create)(void), void (*destroy
* message
*/
if(t_line == NULL) {
cli_warnmsg("Empty attachment not saved\n");
cli_dbgmsg("Empty attachment not saved\n");
(*destroy)(ret);
return NULL;
}
@ -2175,7 +2175,7 @@ decodeLine(message *m, encoding_type et, const char *line, unsigned char *buf, s
* the maximum length of a uuencoded line is
* 62 characters
*/
cli_warnmsg("uudecode: buffer overflow stopped, attempting to ignore but decoding may fail\n");
cli_dbgmsg("uudecode: buffer overflow stopped, attempting to ignore but decoding may fail\n");
else {
(void)decode(m, line, buf, uudecode, (len & 3) == 0);
buf = &buf[reallen];
@ -2668,7 +2668,7 @@ rfc2231(const char *in)
if(field != CONTENTS) {
free(ret);
cli_warnmsg("Invalid RFC2231 header: '%s'\n", in);
cli_dbgmsg("Invalid RFC2231 header: '%s'\n", in);
return cli_strdup("");
}

Write Preview
Loading…
Cancel
Save