-/*
- * 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-2023 by the citadel.org team
- *
- * 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.
- */
-
-#define CLAMD_PORT "3310"
+// 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-2024 by the citadel.org team
+//
+// This program is open source software. Use, duplication, or disclosure
+// are subject to the terms of the GNU General Public License version 3.
+
+#define CLAMD_PORT "3310"
#include "../../sysdep.h"
#include <stdlib.h>
#include "../../ctdl_module.h"
-/*
- * Connect to the clamd server and scan a message.
- */
+// Connect to the clamd server and scan a message.
int clamd(struct CtdlMessage *msg, struct recptypes *recp) {
int sock = (-1);
int streamsock = (-1);
char clamhosts[SIZ];
int num_clamhosts;
char buf[SIZ];
- char hostbuf[SIZ];
- char portbuf[SIZ];
+ char hostbuf[SIZ];
+ char portbuf[SIZ];
int is_virus = 0;
int clamhost;
StrBuf *msgtext;
- CitContext *CCC;
- /* See if we have any clamd hosts configured */
+ // See if we have any clamd hosts configured
num_clamhosts = get_hosts(clamhosts, "clamav");
if (num_clamhosts < 1) {
return(0);
}
- /* 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);
- 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);
- else
- /* Port specified lets try connecting to it! */
- sock = sock_connect(hostbuf, portbuf);
-
- if (sock >= 0) syslog(LOG_DEBUG, "Connected!\n");
- }
+ // 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);
+ 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);
+ }
+ else {
+ // Port specified lets try connecting to it!
+ sock = sock_connect(hostbuf, portbuf);
+ }
+
+ if (sock >= 0) {
+ syslog(LOG_DEBUG, "Connected!\n");
+ }
+ }
+ // If the service isn't running, just pass the mail through. Potentially throwing away mails isn't good.
if (sock < 0) {
- /* If the service isn't running, just pass the mail
- * through. Potentially throwing away mails isn't good.
- */
return(0);
}
- CCC=CC;
- CCC->SBuf.Buf = NewStrBuf();
- CCC->sMigrateBuf = NewStrBuf();
- CCC->SBuf.ReadWritePointer = NULL;
- /* Command */
+ CC->SBuf.Buf = NewStrBuf();
+ CC->sMigrateBuf = NewStrBuf();
+ CC->SBuf.ReadWritePointer = NULL;
+
+ // Command
syslog(LOG_DEBUG, "Transmitting STREAM command\n");
sprintf(buf, "STREAM\r\n");
sock_write(&sock, buf, strlen(buf));
syslog(LOG_DEBUG, "Waiting for PORT number\n");
- if (sock_getln(&sock, buf, sizeof buf) < 0) {
- goto bail;
- }
+ if (sock_getln(&sock, buf, sizeof buf) < 0) {
+ goto bail;
+ }
- syslog(LOG_DEBUG, "<%s\n", buf);
+ syslog(LOG_DEBUG, "<%s\n", buf);
if (strncasecmp(buf, "PORT", 4)!=0) {
- goto bail;
+ goto bail;
}
- /* Should have received a port number to connect to */
+ // Should have received a port number to connect to
extract_token(portbuf, buf, 1, ' ', sizeof portbuf);
- /* Attempt to establish connection to STREAM socket */
- streamsock = sock_connect(hostbuf, portbuf);
+ // Attempt to establish connection to STREAM socket
+ streamsock = sock_connect(hostbuf, portbuf);
+ // If the service isn't running, just pass the mail through. Potentially throwing away mails isn't good.
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);
+ FreeStrBuf(&CC->SBuf.Buf);
+ FreeStrBuf(&CC->sMigrateBuf);
return(0);
- }
+ }
else {
- syslog(LOG_DEBUG, "STREAM socket connected!\n");
+ syslog(LOG_DEBUG, "STREAM socket connected!\n");
}
-
- /* Message */
+ // Message
CC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_ALL, 0, 1, 0);
msgtext = CC->redirect_buffer;
sock_write(&streamsock, SKEY(msgtext));
FreeStrBuf(&msgtext);
- /* Close the streamsocket connection; this tells clamd
- * that we're done.
- */
+ // Close the streamsocket connection; this tells clamd that we're done.
if (streamsock != -1) {
close(streamsock);
}
- /* Response */
+ // Response
syslog(LOG_DEBUG, "Awaiting response\n");
- if (sock_getln(&sock, buf, sizeof buf) < 0) {
- goto bail;
- }
- syslog(LOG_DEBUG, "<%s\n", buf);
+ if (sock_getln(&sock, buf, sizeof buf) < 0) {
+ goto bail;
+ }
+ syslog(LOG_DEBUG, "<%s\n", buf);
if (strncasecmp(buf, "stream: OK", 10)!=0) {
is_virus = 1;
}
}
bail: close(sock);
- FreeStrBuf(&CCC->SBuf.Buf);
- FreeStrBuf(&CCC->sMigrateBuf);
+ FreeStrBuf(&CC->SBuf.Buf);
+ FreeStrBuf(&CC->sMigrateBuf);
return(is_virus);
}
CtdlRegisterMessageHook(clamd, EVT_SMTPSCAN);
}
- /* return our module name for the log */
- return "virus";
+ // return our module name for the log
+ return "virus";
}
projects / citadel.git / commitdiff