bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2024-11-08 02:01:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

added logging recipients

Browse Source
This commit is contained in:
SJ 2014-08-18 12:58:45 +02:00
parent 5b6c2cbb8f
commit 1852d90211
5 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etc/example.conf
View File

@ -106,6 +106,11 @@ archive_emails_not_having_message_id=0
; everything ; everything
archive_only_mydomains=0 archive_only_mydomains=0
; whether to syslog the recipients of the email in the following format:
; 400000.....xxxxx: rcpt=recipient1@domain.com
; 400000.....xxxxx: rcpt=recipient2@domain.com
syslog_recipients=0
; minimum word length in mail body to index ; minimum word length in mail body to index
min_word_len=1 min_word_len=1

1
src/cfg.c
View File

@ -100,6 +100,7 @@ struct _parse_rule config_parse_rules[] =
{ "server_id", "integer", (void*) int_parser, offsetof(struct __config, server_id), "0", sizeof(int)}, { "server_id", "integer", (void*) int_parser, offsetof(struct __config, server_id), "0", sizeof(int)},
{ "session_timeout", "integer", (void*) int_parser, offsetof(struct __config, session_timeout), "420", sizeof(int)}, { "session_timeout", "integer", (void*) int_parser, offsetof(struct __config, session_timeout), "420", sizeof(int)},
{ "spam_header_line", "string", (void*) string_parser, offsetof(struct __config, spam_header_line), "", MAXVAL-1}, { "spam_header_line", "string", (void*) string_parser, offsetof(struct __config, spam_header_line), "", MAXVAL-1},
{ "syslog_recipients", "integer", (void*) int_parser, offsetof(struct __config, syslog_recipients), "0", sizeof(int)},
{ "tls_enable", "integer", (void*) int_parser, offsetof(struct __config, tls_enable), "0", sizeof(int)}, { "tls_enable", "integer", (void*) int_parser, offsetof(struct __config, tls_enable), "0", sizeof(int)},
{ "tweak_sent_time_offset", "integer", (void*) int_parser, offsetof(struct __config, tweak_sent_time_offset), "0", sizeof(int)}, { "tweak_sent_time_offset", "integer", (void*) int_parser, offsetof(struct __config, tweak_sent_time_offset), "0", sizeof(int)},
{ "update_counters_to_memcached", "integer", (void*) int_parser, offsetof(struct __config, update_counters_to_memcached), "0", sizeof(int)}, { "update_counters_to_memcached", "integer", (void*) int_parser, offsetof(struct __config, update_counters_to_memcached), "0", sizeof(int)},

2
src/cfg.h
View File

@ -86,6 +86,8 @@ struct __config {
int enable_cjk; int enable_cjk;
int syslog_recipients;
int debug; int debug;
}; };

2
src/config.h
View File

@ -14,7 +14,7 @@
#define VERSION "1.1.0-rc4" #define VERSION "1.1.0-rc4"
#define BUILD 883 #define BUILD 884
#define HOSTID "mailarchiver" #define HOSTID "mailarchiver"

15
src/session.c
View File

@ -21,8 +21,8 @@
int handle_smtp_session(int new_sd, struct __data *data, struct __config *cfg){ int handle_smtp_session(int new_sd, struct __data *data, struct __config *cfg){
int i, ret, pos, n, inj=ERR, state, prevlen=0; int i, ret, pos, n, inj=ERR, state, prevlen=0;
char *p, buf[MAXBUFSIZE], puf[MAXBUFSIZE], resp[MAXBUFSIZE], prevbuf[MAXBUFSIZE], last2buf[2*MAXBUFSIZE+1]; char *p, *rcpt, buf[MAXBUFSIZE], puf[MAXBUFSIZE], resp[MAXBUFSIZE], prevbuf[MAXBUFSIZE], last2buf[2*MAXBUFSIZE+1];
char virusinfo[SMALLBUFSIZE], delay[SMALLBUFSIZE]; char virusinfo[SMALLBUFSIZE], delay[SMALLBUFSIZE], tmpbuf[SMALLBUFSIZE];
char *arule = NULL; char *arule = NULL;
char *status = NULL; char *status = NULL;
struct session_data sdata; struct session_data sdata;
@ -161,6 +161,17 @@ int handle_smtp_session(int new_sd, struct __data *data, struct __config *cfg){
gettimeofday(&tv2, &tz); gettimeofday(&tv2, &tz);
sdata.__parsed = tvdiff(tv2, tv1); sdata.__parsed = tvdiff(tv2, tv1);
if(cfg->syslog_recipients == 1){
rcpt = sstate.b_to;
do {
rcpt = split_str(rcpt, " ", tmpbuf, sizeof(tmpbuf)-1);
if(does_it_seem_like_an_email_address(tmpbuf) == 1){
syslog(LOG_PRIORITY, "%s: rcpt=%s", sdata.ttmpfile, tmpbuf);
}
} while(rcpt);
}
if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: parsed message", sdata.ttmpfile); if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: parsed message", sdata.ttmpfile);
if(cfg->archive_only_mydomains == 1 && sdata.internal_sender == 0 && sdata.internal_recipient == 0){ if(cfg->archive_only_mydomains == 1 && sdata.internal_sender == 0 && sdata.internal_recipient == 0){