X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fclamav%2Fserv_virus.c;h=c5599b9de95576ed4b088d42c3dfa962f2c71be9;hb=882ff5a53c3b4e440520a073cf07dc60b2671876;hp=38b47de84cf1465f5f21a25d369b60b41cff0c7f;hpb=0eea6dcc234e0f524bbf2a1d909455d41ed02314;p=citadel.git diff --git a/citadel/modules/clamav/serv_virus.c b/citadel/modules/clamav/serv_virus.c index 38b47de84..c5599b9de 100644 --- a/citadel/modules/clamav/serv_virus.c +++ b/citadel/modules/clamav/serv_virus.c @@ -1,26 +1,18 @@ /* - * $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 - * - * 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. + * Copyright (c) 1987-2012 by the citadel.org team * - * 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. + * 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. * - * 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 + * 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. */ #define CLAMD_PORT "3310" @@ -34,18 +26,7 @@ #include #include #include - -#if TIME_WITH_SYS_TIME -# include -# include -#else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - +#include #include #include #include @@ -63,16 +44,13 @@ #include "internet_addressing.h" #include "domain.h" #include "clientsocket.h" - - #include "ctdl_module.h" - /* * Connect to the clamd server and scan a message. */ -int clamd(struct CtdlMessage *msg) { +int clamd(struct CtdlMessage *msg, struct recptypes *recp) { int sock = (-1); int streamsock = (-1); char clamhosts[SIZ]; @@ -85,29 +63,27 @@ int clamd(struct CtdlMessage *msg) { StrBuf *msgtext; CitContext *CCC; - /* Don't care if you're logged in. You can still spread viruses. - */ - /* if (CC->logged_in) return(0); */ - /* See if we have any clamd hosts configured */ num_clamhosts = get_hosts(clamhosts, "clamav"); - if (num_clamhosts < 1) return(0); + if (num_clamhosts < 1) { + return(0); + } /* Try them one by one until we get a working one */ for (clamhost=0; clamhost\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) { @@ -117,21 +93,21 @@ int clamd(struct CtdlMessage *msg) { return(0); } CCC=CC; - CCC->sReadBuf = NewStrBuf(); + CCC->SBuf.Buf = NewStrBuf(); CCC->sMigrateBuf = NewStrBuf(); - CCC->sPos = NULL; + 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; } @@ -140,22 +116,21 @@ int clamd(struct CtdlMessage *msg) { 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->sReadBuf); + 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 = NewStrBufPlain(NULL, SIZ); CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_ALL, 0, 1, 0); @@ -168,34 +143,31 @@ int clamd(struct CtdlMessage *msg) { /* Close the streamsocket connection; this tells clamd * that we're done. */ - if (streamsock != -1) + if (streamsock != -1) { 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->sReadBuf); + FreeStrBuf(&CCC->SBuf.Buf); FreeStrBuf(&CCC->sMigrateBuf); return(is_virus); } - CTDL_MODULE_INIT(virus) { if (!threading) @@ -203,6 +175,6 @@ CTDL_MODULE_INIT(virus) CtdlRegisterMessageHook(clamd, EVT_SMTPSCAN); } - /* return our Subversion id for the Log */ - return "$Id$"; + /* return our module name for the log */ + return "virus"; }