geos_one/bongo
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases 1 Wiki Activity

-- removed some legacy dmc code that was no longer used

Browse Source 
-- removed the feedback system.  this was something akin to syslog, but was homebrew.  it connected to port 781, but bongo doesn't have anything listening there
-- by default we are not in verbose mode any longer.  perhaps this should be a configure setting somehow?
-- changed a couple of the debug printf()'s
-- we now no longer support headerThreshold or dropThreshold as we will always add headers to the mail and will leave dropping mail up to the rules agent
-- quarantine code is still in, but is #if 0 'd out.  do we need/want it?
-- cleaned up a couple of unused variables
-- no longer link against the management library
-- removed all cc bounces etc. to the postmaster
This commit is contained in:
pfelt
2007-05-07 04:19:16 +00:00
parent 53cbf5096b
commit 5a3419edac
4 changed files with 107 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/agents/antispam/Bongo.rules
-1
View File
@@ -8,7 +8,6 @@ bongoantispam_SOURCES := \
bongoantispam_LDADD := \
libbongonmap.la \
libbongomanagement.la \
libbongomsgapi.la \
libbongomdb.la \
libbongologger.la \
src/agents/antispam/antispam.c
-57
View File
@@ -426,27 +426,6 @@ ProcessConnection(ASpamClient *client)
LoggerEvent(ASpam.handle.logging, LOGGER_SUBSYSTEM_QUEUE, LOGGER_EVENT_SPAM_BLOCKED, LOG_NOTICE, 0, cur + 1, NULL, source, 0, NULL, 0);
if (ASpam.flags & ASPAM_FLAG_RETURN_TO_SENDER) {
ccode = NMAPSendCommandF(client->conn, "QRTS %s %s %lu %d Mail from user or domain %s is blocked at this site.\r\n",
cur + 1, cur + 1, (long unsigned int)(DSN_HEADER|DSN_FAILURE), DELIVER_BLOCKED, blockedAddr);
}
if ((ccode != -1) && (ASpam.flags & ASPAM_FLAG_NOTIFY_POSTMASTER)) {
if (((ccode = NMAPSendCommandF(client->conn, "QCOPY %s\r\n", qID)) != -1)
&& ((ccode = NMAPReadAnswer(client->conn, client->line, CONN_BUFSIZE, FALSE)) != -1)
&& ((ccode = NMAPSendCommand(client->conn, "QSTOR FLAGS %ld\r\n", (msgFlags | MSG_FLAG_SPAM_CHECKED))) != -1)
&& ((ccode = NMAPReadAnswer(client->conn, client->line, CONN_BUFSIZE, FALSE)) != -1)
&& ((ccode = NMAPSendCommand(client->conn, "QSTOR FROM - -\r\n", 16)) != -1)
&& ((ccode = NMAPReadAnswer(client->conn, client->line, CONN_BUFSIZE, FALSE)) != -1)
&& ((ccode = NMAPSendCommandF(client->conn, "QSTOR LOCAL %s %s 0\r\n", ASpam.postmaster, ASpam.postmaster)) != -1)
&& ((ccode = NMAPReadAnswer(client->conn, client->line, CONN_BUFSIZE, FALSE)) != -1)
&& ((ccode = NMAPSendCommand(client->conn, "QRUN\r\n", 6)) != -1)) {
ccode = NMAPReadAnswer(client->conn, client->line, CONN_BUFSIZE, FALSE);
} else {
NMAPSendCommand(client->conn, "QABRT\r\n", 7);
}
}
*ptr = ' ';
}
}
@@ -677,11 +656,6 @@ AntiSpamServer(void *ignored)
ConnCloseAll(1);
ManagementShutdown();
for (i = 0; (ManagementState() != MANAGEMENT_STOPPED) && (i < 60); i++) {
XplDelay(1000);
}
for (i = 0; (XplSafeRead(ASpam.server.active) > 1) && (i < 60); i++) {
XplDelay(1000);
}
@@ -761,8 +735,6 @@ ReadConfiguration(void) {
unsigned char *pconfig;
BOOL retcode = FALSE;
BongoJsonNode *node;
BongoJsonResult res;
MDBValueStruct *config; /* Temporarily holds options from the database */
if (! NMAPReadConfigFile("antispam", &pconfig)) {
printf("manager: couldn't read config from store\n");
@@ -800,40 +772,12 @@ finish:
#if 0
unsigned char *ptr;
if (MDBRead(MSGSRV_AGENT_ANTISPAM, MSGSRV_A_BOUNCE_RETURN, config) > 0) {
if (atoi(config->Value[0])) {
ASpam.flags |= ASPAM_FLAG_RETURN_TO_SENDER;
}
}
MDBFreeValues(config);
if (MDBRead(MSGSRV_AGENT_ANTISPAM, MSGSRV_A_BOUNCE_CC_POSTMASTER, config) > 0) {
if (atoi(config->Value[0])) {
ASpam.flags |= ASPAM_FLAG_NOTIFY_POSTMASTER;
}
}
MDBFreeValues(config);
/* Find out which queue to register with. Otherwise remain Q_INCOMING */
if (MDBRead(MSGSRV_AGENT_ANTISPAM, MSGSRV_A_REGISTER_QUEUE, config) > 0) {
ASpam.nmap.queue = atol(config->Value[0]);
}
MDBFreeValues(config);
if (MDBRead(MSGSRV_SELECTED_CONTEXT, MSGSRV_A_POSTMASTER, config) > 0) {
ptr = strrchr(config->Value[0], '\\');
if (ptr) {
ptr++;
} else {
ptr = config->Value[0];
}
strcpy(ASpam.postmaster, ptr);
MDBFreeValues(config);
} else {
ASpam.flags &= ~ASPAM_FLAG_NOTIFY_POSTMASTER;
}
if ((ASpam.disallow.used = MDBRead(MSGSRV_AGENT_ANTISPAM, MSGSRV_A_EMAIL_ADDRESS, ASpam.disallow.list)) > 0) {
qsort(ASpam.disallow.list->Value, ASpam.disallow.used, sizeof(unsigned char*), CmpAddr);
@@ -955,7 +899,6 @@ int
XplServiceMain(int argc, char *argv[])
{
int ccode;
XplThreadID id;
if (XplSetEffectiveUser(MsgGetUnprivilegedUser()) < 0) {
XplConsolePrintf("bongoantispam: Could not drop to unprivileged user '%s', exiting.\n", MsgGetUnprivilegedUser());
src/agents/antispam/antispam.h
-30
View File
@@ -24,7 +24,6 @@
#include <connio.h>
#include <mdb.h>
#include <management.h>
#include <msgapi.h>
#include <nmap.h>
#include <nmlib.h>
@@ -69,30 +68,8 @@ typedef struct {
} ASpamClient;
typedef struct {
Connection *conn;
unsigned long timeWaiting;
unsigned long timeOut;
char buffer[CONN_BUFSIZE * 10];
unsigned long bufferUsed;
} FeedbackServer;
typedef struct {
XplMutex mutex; /* protects everything in this structure except server */
BOOL enabled;
char buffer[CONN_BUFSIZE * 10];
unsigned long bufferUsed;
BOOL serverInUse; /* protects server; is protected by mutex */
FeedbackServer server;
} Feedback;
typedef struct {
Feedback feedback;
AddressPool hosts;
double headerThreshold;
double dropThreshold;
BOOL enabled;
unsigned long quarantineQueue;
unsigned long connectionTimeout;
} SpamdConfig;
@@ -102,7 +79,6 @@ typedef struct _ASpamGlobals {
unsigned long quarantineQueue;
unsigned char officialName[MAXEMAILNAMESIZE + 1];
unsigned char postmaster[MDB_MAX_OBJECT_CHARS + 1];
struct {
unsigned long used;
@@ -179,12 +155,6 @@ typedef struct _ASpamGlobals {
extern ASpamGlobals ASpam;
/* management.c */
ManagementVariables *GetASpamManagementVariables(void);
int GetASpamManagementVariablesCount(void);
ManagementCommands *GetASpamManagementCommands(void);
int GetASpamManagementCommandsCount(void);
/* spamd.c */
BOOL SpamdCheck(SpamdConfig *spamd, ASpamClient *client, const char *queueID, BOOL hasFlags, unsigned long msgFlags, unsigned long senderIp, char *senderUserName);
void SpamdShutdown(SpamdConfig *spamd);
src/agents/antispam/spamd.c
+107 -317
View File
@@ -41,122 +41,8 @@
#define SPAMD_DEFAULT_ADDRESS "127.0.0.1"
#define SPAMD_DEFAULT_PORT 783
#define SPAMD_DEFAULT_WEIGHT 1
#define SPAMD_DEFAULT_HEADER_THRESHOLD -9999
#define SPAMD_DEFAULT_DROP_THRESHOLD 9999
#define SPAMD_DEFAULT_CONNECTION_TIMEOUT 20 /* milliseconds */
#define SPAMD_DEFAULT_FEEDBACK_ADDRESS "127.0.0.1"
#define SPAMD_DEFAULT_FEEDBACK_PORT 781
#define SPAMD_DEFAULT_FEEDBACK_TIMEOUT (60 * 15) /* seconds */
__inline static void
SendFeedback(Feedback *feedback, const char *event, const char *queueId, unsigned long senderIp, char *senderUserName, double score)
{
struct in_addr addr;
char *sender;
long len;
unsigned long bufferLeft;
time_t startConnectTime;
long connectTime;
if (!feedback->enabled) {
return;
}
if (!senderUserName) {
sender = "-";
} else {
sender = senderUserName;
}
/* Bug Alert FIXME - senderIP is in non-host order in the envelope for some reason. */
addr.s_addr = senderIp;
XplMutexLock(feedback->mutex);
if (sizeof(feedback->buffer) > feedback->bufferUsed) {
bufferLeft = (unsigned long)(sizeof(feedback->buffer) - feedback->bufferUsed);
} else {
bufferLeft = 0;
}
len = snprintf(feedback->buffer + feedback->bufferUsed, bufferLeft, "%s %s %d.%d.%d.%d %s %f\r\n",
event, queueId + 4, addr.s_net, addr.s_host, addr.s_lh, addr.s_impno, sender, score);
if ((len < 0) || ((unsigned long)len >= bufferLeft)) {
feedback->bufferUsed = 0;
XplMutexUnlock(feedback->mutex);
XplConsolePrintf("BongoAntispam: (%s:%d) Feedback buffer full. Discarding buffered feedback!\n", __FILE__, __LINE__);
return;
}
feedback->bufferUsed += len;
if (feedback->serverInUse) {
XplMutexUnlock(feedback->mutex);
return;
}
feedback->serverInUse = TRUE;
if (feedback->server.bufferUsed == 0) {
/* copy the stuff we have to the server buffer and let the mutex go */
memcpy(feedback->server.buffer, feedback->buffer, feedback->bufferUsed);
feedback->server.bufferUsed = feedback->bufferUsed;
feedback->bufferUsed = 0;
} else {
/* the server buffer already has stuff in it */
}
XplMutexUnlock(feedback->mutex);
/* this might block, but that is not a problem because the mutex has been released. */
if (ConnWrite(feedback->server.conn, feedback->server.buffer, feedback->server.bufferUsed) > -1) {
if (ConnFlush(feedback->server.conn) > -1) {
feedback->server.bufferUsed = 0;
feedback->server.timeWaiting = 0;
feedback->serverInUse = FALSE;
return;
}
}
/* try again */
ConnClose(feedback->server.conn, 0);
startConnectTime = time(NULL);
if (ConnConnect(feedback->server.conn, NULL, 0, NULL) != -1) {
if (ConnWrite(feedback->server.conn, feedback->server.buffer, feedback->server.bufferUsed) > -1) {
if (ConnFlush(feedback->server.conn) > -1) {
feedback->server.bufferUsed = 0;
feedback->server.timeWaiting = 0;
feedback->serverInUse = FALSE;
return;
}
}
}
connectTime = time(NULL) - startConnectTime;
if (connectTime < 2) {
XplDelay(1000);
feedback->server.timeWaiting++;
} else {
feedback->server.timeWaiting += connectTime;
}
if (feedback->server.timeWaiting < feedback->server.timeOut) {
/* let another thread try */
feedback->serverInUse = FALSE;
return;
}
/* There have been too many errors; shut down the feedback system */
ConnFree(feedback->server.conn);
feedback->server.conn = NULL;
feedback->enabled = FALSE;
/* feedback->serverInUse is intentionally left TRUE so that threads */
/* that have already found feedback->enabled to be true and are waiting */
/* on the mutex will fall out and not try to use the connection */
}
/** Connects to spamd to process the message. Depending on your settings, analyzed
* messages are left untouched, or requeued with additional spam information in the
* headers, or they may be deleted from the queue entirely.
@@ -172,7 +58,7 @@ SendFeedback(Feedback *feedback, const char *event, const char *queueId, unsigne
* If you want verbose output from spamd portion of the antispam agent then
* #define VERBOSE_SPAMD
*/
#define VERBOSE_SPAMD
/* #define VERBOSE_SPAMD */
BOOL
SpamdCheck(SpamdConfig *spamd, ASpamClient *client, const char *queueID, BOOL hasFlags, unsigned long msgFlags, unsigned long senderIp, char *senderUserName)
{
@@ -183,7 +69,7 @@ SpamdCheck(SpamdConfig *spamd, ASpamClient *client, const char *queueID, BOOL ha
Connection *conn; /* Holds the current connection to spamd. */
#ifdef VERBOSE_SPAMD
XplConsolePrintf("AntiSpam: (%s) CheckSpamd\n", queueID);
XplConsolePrintf("AntiSpam: (%s) Checking with SpamAssassin spamd\n", queueID);
#endif
infected = FALSE;
@@ -278,152 +164,121 @@ SpamdCheck(SpamdConfig *spamd, ASpamClient *client, const char *queueID, BOOL ha
*/
ptr = strchr(client->line, ';');
score = atof(++ptr);
#ifdef VERBOSE_SPAMD
XplConsolePrintf("AntiSpam: (%s) Current message received a spam score of %f\n", queueID, score);
#endif
}
}
if (score >= ASpam.spamd.headerThreshold) {
infected = TRUE;
if (score < ASpam.spamd.dropThreshold && size != 0) {
/* The spam score is greater than the header threshhold,
* but lower than the drop threshhold. Create a new message
* with spam headers added before deleting this one.
*
* We will use the envelope that we read out in the beginning
* to create the new message envelope.
*/
if ( ((ccode = NMAPSendCommandF(client->conn, "QCREA %d\r\n", Q_INCOMING) ) != -1 )
&& ((ccode = NMAPReadAnswer (client->conn, client->line, CONN_BUFSIZE, TRUE)) == 1000)
/* Create the new queue entry. */
) {
;
} else {
#ifdef VERBOSE_SPAMD
XplConsolePrintf("AntiSpam: (%s) error while creating new queue entry.\n", queueID);
#endif
NMAPSendCommand(client->conn, "QABRT\r\n", 7);
NMAPReadAnswer(client->conn, client->line, CONN_BUFSIZE, FALSE);
goto ErrConnFree;
}
if (hasFlags) {
;
} else if ((((ccode = NMAPSendCommandF(client->conn, "QSTOR RAW X%d\r\n", MSG_FLAG_SPAM_CHECKED)) != -1)
&& ((ccode = NMAPReadAnswer(client->conn, client->line, CONN_BUFSIZE, TRUE)) == 1000))) {
;
} else {
NMAPSendCommand(client->conn, "QABRT\r\n", 7);
goto ErrConnFree;
}
ptr = client->envelope;
while (*ptr) {
/* Parse the old envelope and send all but the FROM line with
* RAW commands, send the from using QSTOR FROM.
*/
ptr2 = strchr(ptr, '\n');
if (ptr2 == NULL){
/* error in the envelope structure. */
NMAPSendCommand(client->conn, "QABRT\r\n", 7);
goto ErrConnFree;
}
*ptr2 = '\0';
switch (*ptr) {
case QUEUE_FLAGS: {
/* Add our own flag to the envelope structure.
*/
success = (((ccode = NMAPSendCommandF(client->conn, "QSTOR RAW X%ld\r\n", (msgFlags | MSG_FLAG_SPAM_CHECKED))) != -1)
&& ((ccode = NMAPReadAnswer(client->conn, client->line, CONN_BUFSIZE, TRUE)) == 1000));
break;
}
case QUEUE_DATE: {
success = TRUE;
break;
}
default: {
success = (((ccode = NMAPSendCommandF(client->conn, "QSTOR RAW %s\n", ptr) ) != -1)
&& ((ccode = NMAPReadAnswer(client->conn, client->line, CONN_BUFSIZE, TRUE)) == 1000));
}
}
*ptr2++ = '\n';
ptr = ptr2;
if (success) {
;
} else {
NMAPSendCommand(client->conn, "QABRT\r\n", 7);
goto ErrConnFree;
}
}
if ( ((ccode = NMAPSendCommandF(client->conn, "QSTOR MESSAGE %ld\r\n", size)) != -1)
&&((ccode = ConnReadToConn(conn, client->conn, size)) != -1)
&&((ccode = NMAPReadAnswer(client->conn, client->line, CONN_BUFSIZE, TRUE)) == 1000)
&&((ccode = NMAPSendCommand(client->conn, "QRUN\r\n", 6)) != -1)
&&((ccode = NMAPReadAnswer(client->conn, client->line, CONN_BUFSIZE, TRUE)) == 1000)) {
/* Copy out the message data from spamd.
* Tell nmap to process the new message.
*/
#ifdef VERBOSE_SPAMD
XplConsolePrintf("AntiSpam: (%s) Created new queue entry with spam headers.\n", queueID);
#else
;
#endif
} else {
NMAPSendCommand(client->conn, "QABRT\r\n", 7);
goto ErrConnFree;
}
/* Drop original message. */
SendFeedback(&(spamd->feedback), "TAGGED", queueID, senderIp, senderUserName, score);
#ifdef VERBOSE_SPAMD
XplConsolePrintf("AntiSpam: (%s) Dropped original spam message from the queue.\n", queueID);
#endif
ccode = NMAPSendCommandF(client->conn, "QDELE %s\r\n", queueID); /* expect ccode != -1*/
ccode = NMAPReadAnswer(client->conn, client->line, CONN_BUFSIZE, TRUE); /* expect ccode == 1000 */
} else {
if (!ASpam.quarantineQueue) {
/* Drop message. */
SendFeedback(&(spamd->feedback), "DROPPED", queueID, senderIp, senderUserName, score);
#ifdef VERBOSE_SPAMD
XplConsolePrintf("AntiSpam: (%s) Dropped spam message from the queue.\n", queueID);
#endif
if ((ccode = NMAPSendCommandF(client->conn, "QDELE %s\r\n", queueID)) != -1) {
if ((ccode = NMAPReadAnswer(client->conn, client->line, CONN_BUFSIZE, TRUE)) == 1000) {
;
} else {
XplConsolePrintf("AntiSpam: (QDELE %s) resulted in %s\n", queueID, client->line);
}
}
} else {
/* Quarantine message. */
SendFeedback(&(spamd->feedback), "QUARANTINED", queueID, senderIp, senderUserName, score);
#ifdef VERBOSE_SPAMD
XplConsolePrintf("AntiSpam: (%s) Moved spam message to quarantine queue %lu.\n", queueID, ASpam.quarantineQueue);
#endif
if ((ccode = NMAPSendCommandF(client->conn, "QMOVE %s %03lu\r\n", queueID, ASpam.quarantineQueue)) != -1) {
if ((ccode = NMAPReadAnswer(client->conn, client->line, CONN_BUFSIZE, TRUE)) == 1000) {
;
} else {
XplConsolePrintf("AntiSpam: (QMOVE %s %03lu) resulted in %s\n", queueID, ASpam.quarantineQueue, client->line);
}
}
}
}
infected = TRUE;
/* Create a new message with spam headers added before deleting this one.
*
* We will use the envelope that we read out in the beginning
* to create the new message envelope.
*/
if ( ((ccode = NMAPSendCommandF(client->conn, "QCREA %d\r\n", Q_INCOMING) ) != -1 )
&& ((ccode = NMAPReadAnswer (client->conn, client->line, CONN_BUFSIZE, TRUE)) == 1000)
/* Create the new queue entry. */
) {
;
} else {
/* Pass message */
SendFeedback(&(spamd->feedback), "PASSED", queueID, senderIp, senderUserName, score);
#ifdef VERBOSE_SPAMD
XplConsolePrintf("AntiSpam: (%s) error while creating new queue entry.\n", queueID);
#endif
NMAPSendCommand(client->conn, "QABRT\r\n", 7);
NMAPReadAnswer(client->conn, client->line, CONN_BUFSIZE, FALSE);
goto ErrConnFree;
}
if (hasFlags) {
;
} else if ((((ccode = NMAPSendCommandF(client->conn, "QSTOR RAW X%d\r\n", MSG_FLAG_SPAM_CHECKED)) != -1)
&& ((ccode = NMAPReadAnswer(client->conn, client->line, CONN_BUFSIZE, TRUE)) == 1000))) {
;
} else {
NMAPSendCommand(client->conn, "QABRT\r\n", 7);
goto ErrConnFree;
}
ptr = client->envelope;
while (*ptr) {
/* Parse the old envelope and send all but the FROM line with
* RAW commands, send the from using QSTOR FROM.
*/
ptr2 = strchr(ptr, '\n');
if (ptr2 == NULL){
/* error in the envelope structure. */
NMAPSendCommand(client->conn, "QABRT\r\n", 7);
goto ErrConnFree;
}
*ptr2 = '\0';
switch (*ptr) {
case QUEUE_FLAGS: {
/* Add our own flag to the envelope structure.
*/
success = (((ccode = NMAPSendCommandF(client->conn, "QSTOR RAW X%ld\r\n", (msgFlags | MSG_FLAG_SPAM_CHECKED))) != -1)
&& ((ccode = NMAPReadAnswer(client->conn, client->line, CONN_BUFSIZE, TRUE)) == 1000));
break;
}
case QUEUE_DATE: {
success = TRUE;
break;
}
default: {
success = (((ccode = NMAPSendCommandF(client->conn, "QSTOR RAW %s\n", ptr) ) != -1)
&& ((ccode = NMAPReadAnswer(client->conn, client->line, CONN_BUFSIZE, TRUE)) == 1000));
}
}
*ptr2++ = '\n';
ptr = ptr2;
if (success) {
;
} else {
NMAPSendCommand(client->conn, "QABRT\r\n", 7);
goto ErrConnFree;
}
}
if ( ((ccode = NMAPSendCommandF(client->conn, "QSTOR MESSAGE %ld\r\n", size)) != -1)
&&((ccode = ConnReadToConn(conn, client->conn, size)) != -1)
&&((ccode = NMAPReadAnswer(client->conn, client->line, CONN_BUFSIZE, TRUE)) == 1000)
&&((ccode = NMAPSendCommand(client->conn, "QRUN\r\n", 6)) != -1)
&&((ccode = NMAPReadAnswer(client->conn, client->line, CONN_BUFSIZE, TRUE)) == 1000)) {
/* Copy out the message data from spamd.
* Tell nmap to process the new message.
*/
#ifdef VERBOSE_SPAMD
XplConsolePrintf("AntiSpam: (%s) Created new queue entry with spam headers.\n", queueID);
#else
;
#endif
} else {
NMAPSendCommand(client->conn, "QABRT\r\n", 7);
goto ErrConnFree;
}
/* Drop original message. */
#ifdef VERBOSE_SPAMD
XplConsolePrintf("AntiSpam: (%s) score is less than header threshold", queueID);
XplConsolePrintf("AntiSpam: (%s) Dropped original spam message from the queue.\n", queueID);
#endif
ccode = NMAPSendCommandF(client->conn, "QDELE %s\r\n", queueID); /* expect ccode != -1*/
ccode = NMAPReadAnswer(client->conn, client->line, CONN_BUFSIZE, TRUE); /* expect ccode == 1000 */
#if 0
this is commented out until we determine how we'd want to do this sort of thing, or even if we would
if (ASpam.quarantineThreshold) {
/* Quarantine message. */
#ifdef VERBOSE_SPAMD
XplConsolePrintf("AntiSpam: (%s) Moved spam message to quarantine queue %lu.\n", queueID, ASpam.quarantineQueue);
#endif
if ((ccode = NMAPSendCommandF(client->conn, "QMOVE %s %03lu\r\n", queueID, ASpam.quarantineQueue)) != -1) {
if ((ccode = NMAPReadAnswer(client->conn, client->line, CONN_BUFSIZE, TRUE)) == 1000) {
;
} else {
XplConsolePrintf("AntiSpam: (QMOVE %s %03lu) resulted in %s\n", queueID, ASpam.quarantineQueue, client->line);
}
}
}
#endif
} else {
/* Pass message */
SendFeedback(&(spamd->feedback), "PASSED", queueID, senderIp, senderUserName, score);
#ifdef VERBOSE_SPAMD
XplConsolePrintf("AntiSpam: (%s) Recieved a non-zero status code from spamd: %d", queueID, ccode);
@@ -479,29 +334,6 @@ ParseHost(char *buffer, char **host, unsigned short *port, unsigned long *weight
}
}
static void
SpamdFeedbackInit(Feedback *feedbackHost, char *host, unsigned short port, unsigned long timeOut)
{
if (!feedbackHost->server.conn) {
struct hostent *hostResult;
hostResult = gethostbyname(host);
if (hostResult) {
feedbackHost->server.conn = ConnAlloc(TRUE);
if (feedbackHost->server.conn) {
feedbackHost->server.conn->socketAddress.sin_family = AF_INET;
feedbackHost->server.conn->socketAddress.sin_addr.s_addr = *(uint32_t *)(hostResult->h_addr_list[0]);
feedbackHost->server.conn->socketAddress.sin_port = htons(port);
feedbackHost->server.timeWaiting = 0;
feedbackHost->server.timeOut = timeOut;
XplMutexInit(feedbackHost->mutex);
return;
}
}
}
feedbackHost->enabled = FALSE;
}
/*
* \c HeaderThreshold: \c <num> is the minimum score before adding spam
* headers to the message. Messages with a spam score greater than or
@@ -522,7 +354,6 @@ SpamdReadConfiguration(SpamdConfig *spamd, BongoJsonNode *node)
const char *tempHost;
unsigned short port;
unsigned long weight;
unsigned long timeOut;
memset(spamd, 0, sizeof(SpamdConfig));
res = BongoJsonJPathGetBool(node, "o:enabled/b", &ASpam.spamd.enabled);
@@ -532,9 +363,6 @@ SpamdReadConfiguration(SpamdConfig *spamd, BongoJsonNode *node)
}
/* Set up default spamd options. */
spamd->headerThreshold = SPAMD_DEFAULT_HEADER_THRESHOLD;
spamd->dropThreshold = SPAMD_DEFAULT_DROP_THRESHOLD;
spamd->quarantineQueue = 0;
spamd->connectionTimeout = SPAMD_DEFAULT_CONNECTION_TIMEOUT;
ConnAddressPoolStartup(&spamd->hosts, 0, 0);
@@ -543,18 +371,6 @@ SpamdReadConfiguration(SpamdConfig *spamd, BongoJsonNode *node)
spamd->connectionTimeout = SPAMD_DEFAULT_CONNECTION_TIMEOUT;
}
if (BongoJsonJPathGetDouble(node, "o:header_threshold/i", &spamd->headerThreshold) != BONGO_JSON_OK) {
spamd->headerThreshold = SPAMD_DEFAULT_HEADER_THRESHOLD;
}
if (BongoJsonJPathGetDouble(node, "o:drop_threshold/i", &spamd->dropThreshold) != BONGO_JSON_OK) {
spamd->dropThreshold = SPAMD_DEFAULT_DROP_THRESHOLD;
}
if (BongoJsonJPathGetInt(node, "o:quarantine_queue/i", (int *)&spamd->quarantineQueue) != BONGO_JSON_OK) {
spamd->quarantineQueue = 0;
}
/* hmm, GetString needs a const char * since it is pointer to memory space that the caller should not modify,
* however ParseHost is going to need a char *. i've got to strdup it and then free it, or re-write
* ParseHost to do it. annoying! */
@@ -568,22 +384,6 @@ SpamdReadConfiguration(SpamdConfig *spamd, BongoJsonNode *node)
MemFree(lHost);
}
if (BongoJsonJPathGetString(node, "o:feedback_host/s", &tempHost) == BONGO_JSON_OK) {
if (!(spamd->feedback.server.conn)) {
char *lHost = MemStrdup(tempHost);
host = SPAMD_DEFAULT_FEEDBACK_ADDRESS;
port = SPAMD_DEFAULT_FEEDBACK_PORT;
timeOut = SPAMD_DEFAULT_FEEDBACK_TIMEOUT;
ParseHost(lHost, &host, &port, &weight);
SpamdFeedbackInit(&(spamd->feedback), host, port, timeOut);
MemFree(lHost);
}
}
if (BongoJsonJPathGetBool(node, "o:feedback_enabled/b", &spamd->feedback.enabled) != BONGO_JSON_OK) {
spamd->feedback.enabled = FALSE;
}
return(TRUE);
}
@@ -594,11 +394,6 @@ SpamdShutdown(SpamdConfig *spamd)
spamd->enabled = FALSE;
ConnAddressPoolShutdown(&(spamd->hosts));
spamd->feedback.enabled = FALSE;
if (spamd->feedback.server.conn) {
ConnFree(spamd->feedback.server.conn);
XplMutexDestroy(spamd->feedback.mutex);
}
memset(spamd, 0, sizeof(SpamdConfig));
}
@@ -610,11 +405,6 @@ SpamdStartup(SpamdConfig *spamd)
ConnAddressPoolAddHost(&(spamd->hosts), SPAMD_DEFAULT_ADDRESS, SPAMD_DEFAULT_PORT, SPAMD_DEFAULT_WEIGHT);
}
if (spamd->feedback.enabled) {
if (!spamd->feedback.server.conn) {
SpamdFeedbackInit(&(spamd->feedback), SPAMD_DEFAULT_FEEDBACK_ADDRESS, SPAMD_DEFAULT_FEEDBACK_PORT, SPAMD_DEFAULT_FEEDBACK_TIMEOUT);
}
}
return;
}