Stowage/clamav
2
0
Fork 0
mirror of https://github.com/Cisco-Talos/clamav.git synced 2025-10-19 10:23:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added support to scan some bounce messages

Browse source 
git-svn: trunk@216
This commit is contained in:
Nigel Horne 2004-01-28 10:16:51 +00:00
parent c94097feb2
commit cca4efe497
4 changed files with 89 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
clamav-devel/ChangeLog
View file

@ -1,3 +1,9 @@
Wed Jan 28 10:16:49 GMT 2004 (njh)
----------------------------------
* libclamav: Added support to scan some bounce messages
Thanks to Jay <sysop-clamav@coronastreet.net> for
letting me bounce ideas off him
Tue Jan 27 22:36:31 CET 2004 (tk)
---------------------------------
* clamd: clamuko: support VirusEvent (requested by Matt Butt

71
clamav-devel/libclamav/mbox.c
View file

@ -17,6 +17,9 @@
*
* Change History:
* $Log: mbox.c,v $
* Revision 1.35 2004/01/28 10:15:24 nigelhorne
* Added support to scan some bounce messages
*
* Revision 1.34 2004/01/24 17:43:37 nigelhorne
* Removed (incorrect) warning about uninitialised variable
*
@ -93,7 +96,7 @@
* Compilable under SCO; removed duplicate code with message.c
*
*/
static char const rcsid[] = "$Id: mbox.c,v 1.34 2004/01/24 17:43:37 nigelhorne Exp $";
static char const rcsid[] = "$Id: mbox.c,v 1.35 2004/01/28 10:15:24 nigelhorne Exp $";
#ifndef CL_DEBUG
/*#define NDEBUG /* map CLAMAV debug onto standard */
@ -156,6 +159,7 @@ static size_t strip(char *buf, int len);
static size_t strstrip(char *s);
static bool continuationMarker(const char *line);
static int parseMimeHeader(message *m, const char *cmd, const table_t *rfc821Table, const char *arg);
static void saveTextPart(message *m, const char *dir);
static bool saveFile(const blob *b, const char *dir);
/* Maximum number of attachments that we accept */
@ -1158,9 +1162,9 @@ parseEmailBody(message *messageIn, blob **blobsIn, int nBlobs, text *textIn, con
/*
* Look for uu-encoded main file
*/
const text *t_line = uuencodeBegin(mainMessage);
const text *t_line;
if(t_line != NULL) {
if((t_line = uuencodeBegin(mainMessage)) != NULL) {
cli_dbgmsg("Found uuencoded file\n");
/*
@ -1176,21 +1180,40 @@ parseEmailBody(message *messageIn, blob **blobsIn, int nBlobs, text *textIn, con
}
blobDestroy(b);
}
} else {
cli_dbgmsg("Not found uuencoded file\n");
} else if((t_line = bounceBegin(mainMessage)) != NULL) {
/*
* Attempt to save the original (unbounced)
* message - clamscan will find that in the
* directory and call us again (with any luck)
* having found an e-mail message to handle
*/
messageAddArgument(mainMessage, "filename=textportion");
if((b = messageToBlob(mainMessage)) != NULL) {
/*
* Save main part to scan that
*/
cli_dbgmsg("Saving main message, encoded with scheme %d\n",
messageGetEncoding(mainMessage));
/*
* Ignore the blank lines before the message
* proper
*/
while((t_line = t_line->t_next) != NULL)
if(strcmp(t_line->t_text, "") != 0)
break;
(void)saveFile(b, dir);
if(t_line == NULL) {
cli_dbgmsg("Not found bounce message\n");
saveTextPart(mainMessage, dir);
} else if((b = blobCreate()) != NULL) {
cli_dbgmsg("Found a bounce message\n");
do {
blobAddData(b, (unsigned char *)t_line->t_text, strlen(t_line->t_text));
blobAddData(b, (unsigned char *)"\n", 1);
} while((t_line = t_line->t_next) != NULL);
saveFile(b, dir);
blobDestroy(b);
}
} else {
cli_dbgmsg("Not found uuencoded file\n");
saveTextPart(mainMessage, dir);
}
} else
rc = (multiparts) ? 1 : 2; /* anything saved? */
@ -1494,6 +1517,28 @@ parseMimeHeader(message *m, const char *cmd, const table_t *rfc821Table, const c
return type;
}
/*
* Save the text portion of the message
*/
static void
saveTextPart(message *m, const char *dir)
{
blob *b;
messageAddArgument(m, "filename=textportion");
if((b = messageToBlob(m)) != NULL) {
/*
* Save main part to scan that
*/
cli_dbgmsg("Saving main message, encoded with scheme %d\n",
messageGetEncoding(m));
(void)saveFile(b, dir);
blobDestroy(b);
}
}
/*
* Save some data as a unique file in the given directory.
*/

22
clamav-devel/libclamav/message.c
View file

@ -17,6 +17,9 @@
*
* Change History:
* $Log: message.c,v $
* Revision 1.16 2004/01/28 10:15:24 nigelhorne
* Added support to scan some bounce messages
*
* Revision 1.15 2004/01/14 10:08:45 nigelhorne
* blobGetData now allows contents to be changed - tuttut
*
@ -42,7 +45,7 @@
* uuencodebegin() no longer static
*
*/
static char const rcsid[] = "$Id: message.c,v 1.15 2004/01/14 10:08:45 nigelhorne Exp $";
static char const rcsid[] = "$Id: message.c,v 1.16 2004/01/28 10:15:24 nigelhorne Exp $";
#ifndef CL_DEBUG
/*#define NDEBUG /* map CLAMAV debug onto standard */
@ -964,6 +967,23 @@ binhexBegin(const message *m)
return NULL;
}
/*
* Scan to find a bounce message. There is no standard for these, not
* even a convention, so don't expect this to be foolproof
*/
const text *
bounceBegin(const message *m)
{
const text *t_line;
for(t_line = messageGetBody(m); t_line; t_line = t_line->t_next)
if((strcasecmp(t_line->t_text, "--- Below this line is a copy of the message.") == 0) ||
(strcasecmp(t_line->t_text, "------ This is a copy of the message, including all the headers. ------") == 0))
return t_line;
return NULL;
}
/*
* Decode a line and add it to a buffer, return the end of the buffer
* to help appending callers. There is no new line at the end of "line"

4
clamav-devel/libclamav/message.h
View file

@ -16,6 +16,9 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* $Log: message.h,v $
* Revision 1.5 2004/01/28 10:15:24 nigelhorne
* Added support to scan some bounce messages
*
* Revision 1.4 2004/01/14 18:02:55 nigelhorne
* added definition of binhexBegin
*
@ -55,5 +58,6 @@ blob *messageToBlob(const message *m);
text *messageToText(const message *m);
const text *uuencodeBegin(const message *m);
const text *binhexBegin(const message *m);
const text *bounceBegin(const message *m);
#endif /*_MESSAGE_H*/