/*
- * $Id$
- *
* This module allows Citadel to use clamd to filter incoming messages
* arriving via SMTP. For more information on clamd, visit
* http://clamav.net (the ClamAV project is not in any way
* affiliated with the Citadel project).
*
- * Copyright (c) 1987-2009 by the citadel.org team
+ * Copyright (c) 1987-2012 by the citadel.org team
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
+ *
+ *
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ *
+ *
*/
#define CLAMD_PORT "3310"
#include "config.h"
#include "control.h"
#include "user_ops.h"
-#include "policy.h"
#include "database.h"
#include "msgbase.h"
#include "internet_addressing.h"
/*
* Connect to the clamd server and scan a message.
*/
-int clamd(struct CtdlMessage *msg) {
+int clamd(struct CtdlMessage *msg, recptypes *recp) {
int sock = (-1);
int streamsock = (-1);
char clamhosts[SIZ];
char portbuf[SIZ];
int is_virus = 0;
int clamhost;
- char *msgtext;
- size_t msglen;
+ StrBuf *msgtext;
+ CitContext *CCC;
/* Don't care if you're logged in. You can still spread viruses.
*/
/* Try them one by one until we get a working one */
for (clamhost=0; clamhost<num_clamhosts; ++clamhost) {
extract_token(buf, clamhosts, clamhost, '|', sizeof buf);
- CtdlLogPrintf(CTDL_INFO, "Connecting to clamd at <%s>\n", buf);
+ syslog(LOG_INFO, "Connecting to clamd at <%s>\n", buf);
/* Assuming a host:port entry */
extract_token(hostbuf, buf, 0, ':', sizeof hostbuf);
if (extract_token(portbuf, buf, 1, ':', sizeof portbuf)==-1)
/* Didn't specify a port so we'll try the psuedo-standard 3310 */
- sock = sock_connect(hostbuf, CLAMD_PORT, "tcp");
+ sock = sock_connect(hostbuf, CLAMD_PORT);
else
/* Port specified lets try connecting to it! */
- sock = sock_connect(hostbuf, portbuf, "tcp");
+ sock = sock_connect(hostbuf, portbuf);
- if (sock >= 0) CtdlLogPrintf(CTDL_DEBUG, "Connected!\n");
+ if (sock >= 0) syslog(LOG_DEBUG, "Connected!\n");
}
if (sock < 0) {
*/
return(0);
}
+ CCC=CC;
+ CCC->SBuf.Buf = NewStrBuf();
+ CCC->sMigrateBuf = NewStrBuf();
+ CCC->SBuf.ReadWritePointer = NULL;
/* Command */
- CtdlLogPrintf(CTDL_DEBUG, "Transmitting STREAM command\n");
+ syslog(LOG_DEBUG, "Transmitting STREAM command\n");
sprintf(buf, "STREAM\r\n");
sock_write(&sock, buf, strlen(buf));
- CtdlLogPrintf(CTDL_DEBUG, "Waiting for PORT number\n");
+ syslog(LOG_DEBUG, "Waiting for PORT number\n");
if (sock_getln(&sock, buf, sizeof buf) < 0) {
goto bail;
}
- CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
+ syslog(LOG_DEBUG, "<%s\n", buf);
if (strncasecmp(buf, "PORT", 4)!=0) {
goto bail;
}
extract_token(portbuf, buf, 1, ' ', sizeof portbuf);
/* Attempt to establish connection to STREAM socket */
- streamsock = sock_connect(hostbuf, portbuf, "tcp");
+ streamsock = sock_connect(hostbuf, portbuf);
if (streamsock < 0) {
/* If the service isn't running, just pass the mail
* through. Potentially throwing away mails isn't good.
*/
+ FreeStrBuf(&CCC->SBuf.Buf);
+ FreeStrBuf(&CCC->sMigrateBuf);
return(0);
}
else {
- CtdlLogPrintf(CTDL_DEBUG, "STREAM socket connected!\n");
+ syslog(LOG_DEBUG, "STREAM socket connected!\n");
}
/* Message */
- CC->redirect_buffer = malloc(SIZ);
- CC->redirect_len = 0;
- CC->redirect_alloc = SIZ;
+ CC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_ALL, 0, 1, 0);
msgtext = CC->redirect_buffer;
- msglen = CC->redirect_len;
CC->redirect_buffer = NULL;
- CC->redirect_len = 0;
- CC->redirect_alloc = 0;
- sock_write(&streamsock, msgtext, msglen);
- free(msgtext);
+ sock_write(&streamsock, SKEY(msgtext));
+ FreeStrBuf(&msgtext);
/* Close the streamsocket connection; this tells clamd
* that we're done.
close(streamsock);
/* Response */
- CtdlLogPrintf(CTDL_DEBUG, "Awaiting response\n");
+ syslog(LOG_DEBUG, "Awaiting response\n");
if (sock_getln(&sock, buf, sizeof buf) < 0) {
goto bail;
}
- CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
+ syslog(LOG_DEBUG, "<%s\n", buf);
if (strncasecmp(buf, "stream: OK", 10)!=0) {
is_virus = 1;
}
if (is_virus) {
- if (msg->cm_fields['0'] != NULL) {
- free(msg->cm_fields['0']);
- }
- msg->cm_fields['0'] = strdup("message rejected by virus filter");
+ CM_SetField(msg, eErrorMsg, HKEY("message rejected by virus filter"));
}
bail: close(sock);
+ FreeStrBuf(&CCC->SBuf.Buf);
+ FreeStrBuf(&CCC->sMigrateBuf);
return(is_virus);
}
CtdlRegisterMessageHook(clamd, EVT_SMTPSCAN);
}
- /* return our Subversion id for the Log */
- return "$Id$";
+ /* return our module name for the log */
+ return "virus";
}
projects / citadel.git / blobdiff