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

messageExport

Browse Source 
git-svn: trunk@781
remotes/push_mirror/metadata
Nigel Horne 22 years ago
parent 2d83618e8e
commit 78e302e132
6 changed files with 73 additions and 33 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. 10
      clamav-devel/libclamav/blob.c
  3. 2
      clamav-devel/libclamav/blob.h
  4. 6
      clamav-devel/libclamav/mbox.c
  5. 79
      clamav-devel/libclamav/message.c
  6. 5
      clamav-devel/libclamav/message.h

4
clamav-devel/ChangeLog
Unescape View File

@ -1,3 +1,7 @@
Sun Aug 22 16:09:30 BST 2004 (njh)
----------------------------------
* libclamav: Early save to disc is now compatible with FOLLOWURLS
Sun Aug 22 14:18:53 CEST 2004 (tk)
----------------------------------
* libclamav: cli_scanhtml: Respect file size limit

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

@ -16,6 +16,9 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* $Log: blob.c,v $
* Revision 1.16 2004/08/22 15:08:58 nigelhorne
* messageExport
*
* Revision 1.15 2004/08/22 10:34:24 nigelhorne
* Use fileblob
*
@ -47,7 +50,7 @@
* Change LOG to Log
*
*/
static char const rcsid[] = "$Id: blob.c,v 1.15 2004/08/22 10:34:24 nigelhorne Exp $";
static char const rcsid[] = "$Id: blob.c,v 1.16 2004/08/22 15:08:58 nigelhorne Exp $";
#if HAVE_CONFIG_H
#include "clamav-config.h"
@ -122,8 +125,9 @@ blobArrayDestroy(blob *blobList[], int n)
}
}
/*ARGSUSED*/
void
blobSetFilename(blob *b, const char *filename)
blobSetFilename(blob *b, const char *dir, const char *filename)
{
assert(b != NULL);
assert(b->magic == BLOB);
@ -356,7 +360,7 @@ fileblobSetFilename(fileblob *fb, const char *dir, const char *filename)
suffixLen = 0;
}
}
blobSetFilename(&fb->b, filename);
blobSetFilename(&fb->b, dir, filename);
/*
* Reload the filename, it may be different from the one we've

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

@ -38,7 +38,7 @@ typedef struct blob {
blob *blobCreate(void);
void blobDestroy(blob *b);
void blobArrayDestroy(blob *b[], int n);
void blobSetFilename(blob *b, const char *filename);
void blobSetFilename(blob *b, const char *dir, const char *filename);
const char *blobGetFilename(const blob *b);
void blobAddData(blob *b, const unsigned char *data, size_t len);
unsigned char *blobGetData(const blob *b);

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

@ -17,6 +17,9 @@
*
* Change History:
* $Log: mbox.c,v $
* Revision 1.110 2004/08/22 15:08:59 nigelhorne
* messageExport
*
* Revision 1.109 2004/08/22 10:34:24 nigelhorne
* Use fileblob
*
@ -315,7 +318,7 @@
* Compilable under SCO; removed duplicate code with message.c
*
*/
static char const rcsid[] = "$Id: mbox.c,v 1.109 2004/08/22 10:34:24 nigelhorne Exp $";
static char const rcsid[] = "$Id: mbox.c,v 1.110 2004/08/22 15:08:59 nigelhorne Exp $";
#if HAVE_CONFIG_H
#include "clamav-config.h"
@ -1349,6 +1352,7 @@ parseEmailBody(message *messageIn, blob **blobsIn, int nBlobs, text *textIn, con
if(mainMessage && (mainMessage != messageIn))
messageDestroy(mainMessage);
mainMessage = NULL;
cli_dbgmsg("Mime subtype \"%s\"\n", cptr);
if(u_line) {
cli_dbgmsg("Found uuencoded message in multipart/mixed text portion\n");
messageSetEncoding(aMessage, "x-uuencode");

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

@ -17,6 +17,9 @@
*
* Change History:
* $Log: message.c,v $
* Revision 1.74 2004/08/22 15:08:59 nigelhorne
* messageExport
*
* Revision 1.73 2004/08/22 10:34:24 nigelhorne
* Use fileblob
*
@ -216,7 +219,7 @@
* uuencodebegin() no longer static
*
*/
static char const rcsid[] = "$Id: message.c,v 1.73 2004/08/22 10:34:24 nigelhorne Exp $";
static char const rcsid[] = "$Id: message.c,v 1.74 2004/08/22 15:08:59 nigelhorne Exp $";
#if HAVE_CONFIG_H
#include "clamav-config.h"
@ -973,21 +976,20 @@ messageClean(message *m)
}
/*
* Decode and transfer the contents of the message into a blob
* The caller must free the returned blob
* Export a message using the given export routines
*/
fileblob *
messageToFileblob(message *m, const char *dir)
void *
messageExport(message *m, const char *dir, void *(*create)(void), void (*destroy)(void *), void (*setFilename)(void *, const char *, const char *), void (*addData)(void *, const unsigned char *, size_t), void *(*exportText)(const text *, void *))
{
fileblob *fb;
void *ret;
const text *t_line = NULL;
char *filename;
assert(m != NULL);
fb = fileblobCreate();
ret = (*create)();
if(fb == NULL)
if(ret == NULL)
return NULL;
/*
@ -998,7 +1000,7 @@ messageToFileblob(message *m, const char *dir)
if(t_line == NULL) {
/*cli_warnmsg("UUENCODED attachment is missing begin statement\n");*/
fileblobDestroy(fb);
(*destroy)(ret);
return NULL;
}
@ -1006,14 +1008,14 @@ messageToFileblob(message *m, const char *dir)
if(filename == NULL) {
cli_dbgmsg("UUencoded attachment sent with no filename\n");
fileblobDestroy(fb);
(*destroy)(ret);
return NULL;
}
cli_chomp(filename);
cli_dbgmsg("Set uuencode filename to \"%s\"\n", filename);
fileblobSetFilename(fb, dir, filename);
(*setFilename)(ret, dir, filename);
t_line = t_line->t_next;
} else if((t_line = binhexBegin(m)) != NULL) {
unsigned char byte;
@ -1042,7 +1044,7 @@ messageToFileblob(message *m, const char *dir)
tmp = blobCreate();
if(tmp == NULL) {
fileblobDestroy(fb);
(*destroy)(ret);
return NULL;
}
@ -1064,7 +1066,7 @@ messageToFileblob(message *m, const char *dir)
if(data == NULL) {
cli_warnmsg("Couldn't locate the binhex message that was claimed to be there\n");
blobDestroy(tmp);
fileblobDestroy(fb);
(*destroy)(ret);
return NULL;
}
if(data[0] != ':') {
@ -1075,7 +1077,7 @@ messageToFileblob(message *m, const char *dir)
*/
cli_warnmsg("8 bit binhex code is not yet supported\n");
blobDestroy(tmp);
fileblobDestroy(fb);
(*destroy)(ret);
return NULL;
}
@ -1092,7 +1094,7 @@ messageToFileblob(message *m, const char *dir)
uptr = cli_malloc(len);
if(uptr == NULL) {
blobDestroy(tmp);
fileblobDestroy(fb);
(*destroy)(ret);
return NULL;
}
memcpy(uptr, data, len);
@ -1161,7 +1163,7 @@ messageToFileblob(message *m, const char *dir)
blob *u = blobCreate(); /* uncompressed data */
if(u == NULL) {
fileblobDestroy(fb);
(*destroy)(ret);
blobDestroy(tmp);
return NULL;
}
@ -1208,7 +1210,7 @@ messageToFileblob(message *m, const char *dir)
}
if(len == 0) {
cli_warnmsg("Discarding empty binHex attachment\n");
fileblobDestroy(fb);
(*destroy)(ret);
blobDestroy(tmp);
return NULL;
}
@ -1225,19 +1227,19 @@ messageToFileblob(message *m, const char *dir)
*/
byte = data[0];
if(byte >= len) {
fileblobDestroy(fb);
(*destroy)(ret);
blobDestroy(tmp);
return NULL;
}
filename = cli_malloc(byte + 1);
if(filename == NULL) {
fileblobDestroy(fb);
(*destroy)(ret);
blobDestroy(tmp);
return NULL;
}
memcpy(filename, &data[1], byte);
filename[byte] = '\0';
fileblobSetFilename(fb, dir, filename);
(*setFilename)(ret, dir, filename);
/*ptr = cli_malloc(strlen(filename) + 6);*/
ptr = cli_malloc(byte + 6);
if(ptr) {
@ -1276,11 +1278,11 @@ messageToFileblob(message *m, const char *dir)
len, l);
len = l;
}
fileblobAddData(fb, &data[byte], len);
(*addData)(ret, &data[byte], len);
blobDestroy(tmp);
return fb;
return ret;
} else {
filename = (char *)messageFindArgument(m, "filename");
if(filename == NULL) {
@ -1298,7 +1300,7 @@ messageToFileblob(message *m, const char *dir)
messageSetEncoding(m, "base64");
}
fileblobSetFilename(fb, dir, filename);
(*setFilename)(ret, dir, filename);
t_line = messageGetBody(m);
}
@ -1309,7 +1311,7 @@ messageToFileblob(message *m, const char *dir)
*/
if(t_line == NULL) {
cli_warnmsg("Empty attachment not saved\n");
fileblobDestroy(fb);
(*destroy)(ret);
return NULL;
}
@ -1317,7 +1319,7 @@ messageToFileblob(message *m, const char *dir)
/*
* Fast copy
*/
return textToFileblob(t_line, fb);
return exportText(t_line, ret);
do {
unsigned char data[1024];
@ -1342,7 +1344,7 @@ messageToFileblob(message *m, const char *dir)
assert(uptr <= &data[sizeof(data)]);
if(uptr != data)
fileblobAddData(fb, data, (size_t)(uptr - data));
(*addData)(ret, data, (size_t)(uptr - data));
/*
* According to RFC1521, '=' is used to pad out
@ -1364,11 +1366,32 @@ messageToFileblob(message *m, const char *dir)
ptr = decode(m, NULL, data, base64, FALSE);
if(ptr)
fileblobAddData(fb, data, (size_t)(ptr - data));
(*addData)(ret, data, (size_t)(ptr - data));
m->base64chars = 0;
}
return fb;
return ret;
}
/*
* Decode and transfer the contents of the message into a fileblob
* The caller must free the returned fileblob
*/
fileblob *
messageToFileblob(message *m, const char *dir)
{
return messageExport(m, dir, fileblobCreate, fileblobDestroy, fileblobSetFilename, fileblobAddData, textToFileblob);
}
/*
* Decode and transfer the contents of the message into a blob
* The caller must free the returned blob
* TODO: a lot of code here is duplicated with messageToFileblob
*/
blob *
messageToBlob(message *m)
{
return messageExport(m, NULL, blobCreate, blobDestroy, blobSetFilename, blobAddData, textToBlob);
}
/*

5
clamav-devel/libclamav/message.h
Unescape View File

@ -16,6 +16,9 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* $Log: message.h,v $
* Revision 1.15 2004/08/22 15:08:59 nigelhorne
* messageExport
*
* Revision 1.14 2004/08/22 10:34:24 nigelhorne
* Use fileblob
*
@ -94,7 +97,9 @@ int messageAddStr(message *m, const char *data);
int messageAddStrAtTop(message *m, const char *data);
const text *messageGetBody(const message *m);
void messageClean(message *m);
void *messageExport(message *m, const char *dir, void *(*create)(void), void (*destroy)(void *), void (*setFilename)(void *, const char *, const char *), void (*addData)(void *, const unsigned char *, size_t), void *(*exportText)(const text *, void *));
fileblob *messageToFileblob(message *m, const char *dir);
blob *messageToBlob(message *m);
text *messageToText(message *m);
const text *uuencodeBegin(const message *m);
const text *binhexBegin(const message *m);

Write Preview
Loading…
Cancel
Save