/* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003 - 2015
* License: GPL
- * Copyright (c) The Exim Maintainers 2017
+ * Copyright (c) The Exim Maintainers 2016 - 2018
*/
/* Code for calling spamassassin's spamd. Called from acl.c. */
uschar spam_score_buffer[16];
uschar spam_score_int_buffer[16];
uschar spam_bar_buffer[128];
-uschar spam_action_buffer[32];
+uschar * spam_action_buffer;
uschar spam_report_buffer[32600];
uschar prev_user_name[128] = "";
int spam_ok = 0;
spamd_param_init(spamd_address_container *spamd)
{
/* default spamd server weight, time and priority value */
-spamd->is_rspamd = FALSE;
spamd->is_failed = FALSE;
spamd->weight = SPAMD_WEIGHT;
spamd->timeout = SPAMD_TIMEOUT;
return 0; /* OK */
}
-if (Ustrcmp(param, "variant=rspamd") == 0)
- {
- spamd->is_rspamd = TRUE;
- return 0;
- }
-
if (Ustrncmp(param, "tmo=", 4) == 0)
{
int sec = readconf_readtime((s = param+4), '\0', FALSE);
uschar user_name_buffer[128];
unsigned long mbox_size;
FILE *mbox_file;
-int spamd_sock = -1;
+client_conn_ctx spamd_cctx = {.sock = -1};
uschar spamd_buffer[32600];
int i, j, offset, result;
uschar spamd_version[8];
for (;;)
{
/*XXX could potentially use TFO early-data here */
- if ( (spamd_sock = ip_streamsocket(sd->hostspec, &errstr, 5)) >= 0
+ if ( (spamd_cctx.sock = ip_streamsocket(sd->hostspec, &errstr, 5)) >= 0
|| sd->retry <= 0
)
break;
DEBUG(D_acl) debug_printf_indent("spamd: server %s: retry conn\n", sd->hostspec);
while (sd->retry > 0) sd->retry = sleep(sd->retry);
}
- if (spamd_sock >= 0)
+ if (spamd_cctx.sock >= 0)
break;
log_write(0, LOG_MAIN, "%s spamd: %s", loglabel, errstr);
}
}
-(void)fcntl(spamd_sock, F_SETFL, O_NONBLOCK);
+(void)fcntl(spamd_cctx.sock, F_SETFL, O_NONBLOCK);
/* now we are connected to spamd on spamd_sock */
-if (sd->is_rspamd)
- {
- gstring * req_str;
- const uschar * s;
-
- req_str = string_append(NULL, 8,
- "CHECK RSPAMC/1.3\r\nContent-length: ", string_sprintf("%lu\r\n", mbox_size),
- "Queue-Id: ", message_id,
- "\r\nFrom: <", sender_address,
- ">\r\nRecipient-Number: ", string_sprintf("%d\r\n", recipients_count));
-
- for (i = 0; i < recipients_count; i ++)
- req_str = string_append(req_str, 3,
- "Rcpt: <", recipients_list[i].address, ">\r\n");
- if ((s = expand_string(US"$sender_helo_name")) && *s)
- req_str = string_append(req_str, 3, "Helo: ", s, "\r\n");
- if ((s = expand_string(US"$sender_host_name")) && *s)
- req_str = string_append(req_str, 3, "Hostname: ", s, "\r\n");
- if (sender_host_address)
- req_str = string_append(req_str, 3, "IP: ", sender_host_address, "\r\n");
- if ((s = expand_string(US"$authenticated_id")) && *s)
- req_str = string_append(req_str, 3, "User: ", s, "\r\n");
- req_str = string_catn(req_str, "\r\n", 2);
- wrote = send(spamd_sock, req_str->s, req_str->ptr, 0);
- }
-else
- { /* spamassassin variant */
- (void)string_format(spamd_buffer,
- sizeof(spamd_buffer),
- "REPORT SPAMC/1.2\r\nUser: %s\r\nContent-length: %ld\r\n\r\n",
- user_name,
- mbox_size);
- /* send our request */
- wrote = send(spamd_sock, spamd_buffer, Ustrlen(spamd_buffer), 0);
- }
+
+(void)string_format(spamd_buffer,
+ sizeof(spamd_buffer),
+ "REPORT SPAMC/1.2\r\nUser: %s\r\nContent-length: %ld\r\n\r\n",
+ user_name,
+ mbox_size);
+/* send our request */
+wrote = send(spamd_cctx.sock, spamd_buffer, Ustrlen(spamd_buffer), 0);
if (wrote == -1)
{
- (void)close(spamd_sock);
+ (void)close(spamd_cctx.sock);
log_write(0, LOG_MAIN|LOG_PANIC,
"%s spamd %s send failed: %s", loglabel, callout_address, strerror(errno));
goto defer;
* broken in more recent versions (up to 10.4).
*/
#ifndef NO_POLL_H
-pollfd.fd = spamd_sock;
+pollfd.fd = spamd_cctx.sock;
pollfd.events = POLLOUT;
#endif
-(void)fcntl(spamd_sock, F_SETFL, O_NONBLOCK);
do
{
read = fread(spamd_buffer,1,sizeof(spamd_buffer),mbox_file);
select_tv.tv_sec = 1;
select_tv.tv_usec = 0;
FD_ZERO(&select_fd);
- FD_SET(spamd_sock, &select_fd);
- result = select(spamd_sock+1, NULL, &select_fd, NULL, &select_tv);
+ FD_SET(spamd_cctx.sock, &select_fd);
+ result = select(spamd_cctx.sock+1, NULL, &select_fd, NULL, &select_tv);
#endif
/* End Erik's patch */
log_write(0, LOG_MAIN|LOG_PANIC,
"%s timed out writing spamd %s, socket", loglabel, callout_address);
}
- (void)close(spamd_sock);
+ (void)close(spamd_cctx.sock);
goto defer;
}
- wrote = send(spamd_sock,spamd_buffer + offset,read - offset,0);
+ wrote = send(spamd_cctx.sock,spamd_buffer + offset,read - offset,0);
if (wrote == -1)
{
log_write(0, LOG_MAIN|LOG_PANIC,
"%s %s on spamd %s socket", loglabel, callout_address, strerror(errno));
- (void)close(spamd_sock);
+ (void)close(spamd_cctx.sock);
goto defer;
}
if (offset + wrote != read)
{
log_write(0, LOG_MAIN|LOG_PANIC,
"%s error reading spool file: %s", loglabel, strerror(errno));
- (void)close(spamd_sock);
+ (void)close(spamd_cctx.sock);
goto defer;
}
(void)fclose(mbox_file);
/* we're done sending, close socket for writing */
-if (!sd->is_rspamd)
- shutdown(spamd_sock,SHUT_WR);
+shutdown(spamd_cctx.sock, SHUT_WR);
/* read spamd response using what's left of the timeout. */
memset(spamd_buffer, 0, sizeof(spamd_buffer));
offset = 0;
-while ((i = ip_recv(spamd_sock,
+while ((i = ip_recv(&spamd_cctx,
spamd_buffer + offset,
sizeof(spamd_buffer) - offset - 1,
sd->timeout - time(NULL) + start)) > 0)
{
log_write(0, LOG_MAIN|LOG_PANIC,
"%s error reading from spamd %s, socket: %s", loglabel, callout_address, strerror(errno));
- (void)close(spamd_sock);
+ (void)close(spamd_cctx.sock);
return DEFER;
}
/* reading done */
-(void)close(spamd_sock);
-
-if (sd->is_rspamd)
- { /* rspamd variant of reply */
- int r;
- if ( (r = sscanf(CS spamd_buffer,
- "RSPAMD/%7s 0 EX_OK\r\nMetric: default; %7s %lf / %lf / %lf\r\n%n",
- spamd_version, spamd_short_result, &spamd_score, &spamd_threshold,
- &spamd_reject_score, &spamd_report_offset)) != 5
- || spamd_report_offset >= offset /* verify within buffer */
- )
- {
- log_write(0, LOG_MAIN|LOG_PANIC,
- "%s cannot parse spamd %s, output: %d", loglabel, callout_address, r);
- return DEFER;
- }
- /* now parse action */
- p = &spamd_buffer[spamd_report_offset];
+(void)close(spamd_cctx.sock);
- if (Ustrncmp(p, "Action: ", sizeof("Action: ") - 1) == 0)
- {
- p += sizeof("Action: ") - 1;
- q = &spam_action_buffer[0];
- while (*p && *p != '\r' && (q - spam_action_buffer) < sizeof(spam_action_buffer) - 1)
- *q++ = *p++;
- *q = '\0';
- }
- }
-else
{ /* spamassassin */
/* dig in the spamd output and put the report in a multiline header,
if requested */
}
}
- Ustrcpy(spam_action_buffer,
- spamd_score >= spamd_threshold ? "reject" : "no action");
+ spam_action_buffer = spamd_score >= spamd_threshold ? US"reject" : US"no action";
}
/* Create report. Since this is a multiline string,
git://git.exim.org / exim.git / blobdiff