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

improved session handling

Browse Source 
Change-Id: I8d7d6acec884ca4909bd00caec7018d447cbb6e7
Signed-off-by: SJ <sj@acts.hu>
This commit is contained in:
SJ 2016-08-21 09:03:01 +02:00
parent 8695663104
commit d87dc6847c
6 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/defs.h
View File

@ -380,6 +380,7 @@ struct session_ctx {
int inj; int inj;
int bdat_rounds; int bdat_rounds;
int bdat_last_round; int bdat_last_round;
struct __data *data;
struct parser_state *parser_state; struct parser_state *parser_state;
struct counters *counters; struct counters *counters;
}; };

3
src/piler.c
View File

@ -108,6 +108,7 @@ static void child_main(struct child *ptr){
struct session_ctx sctx; struct session_ctx sctx;
ptr->messages = 0; ptr->messages = 0;
sctx.data = &data;
if(cfg.verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "child (pid: %d, serial: %d) started main()", getpid(), ptr->serial); if(cfg.verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "child (pid: %d, serial: %d) started main()", getpid(), ptr->serial);
@ -133,7 +134,7 @@ static void child_main(struct child *ptr){
data.child_serial = ptr->serial; data.child_serial = ptr->serial;
sig_block(SIGHUP); sig_block(SIGHUP);
ptr->messages += handle_smtp_session(&sctx, &data, &cfg); ptr->messages += handle_smtp_session(&sctx, &cfg);
sig_unblock(SIGHUP); sig_unblock(SIGHUP);
close(sctx.new_sd); close(sctx.new_sd);

2
src/piler.h
View File

@ -35,7 +35,7 @@ int make_digests(struct session_data *sdata, struct __config *cfg);
void digest_file(char *filename, char *digest); void digest_file(char *filename, char *digest);
void digest_string(char *s, char *digest); void digest_string(char *s, char *digest);
int handle_smtp_session(struct session_ctx *sctx, struct __data *data, struct __config *cfg); int handle_smtp_session(struct session_ctx *sctx, struct __config *cfg);
void remove_stripped_attachments(struct parser_state *state); void remove_stripped_attachments(struct parser_state *state);
int process_message(struct session_data *sdata, struct parser_state *state, struct __data *data, struct __config *cfg); int process_message(struct session_data *sdata, struct parser_state *state, struct __data *data, struct __config *cfg);

64
src/session.c
View File

@ -20,12 +20,12 @@
#include "smtp.h" #include "smtp.h"
int is_blocked_by_tcp_wrappers(int sd); int is_blocked_by_tcp_wrappers(int sd);
void send_response_to_data(struct session_ctx *sctx, struct session_data *sdata, struct __data *data, char *rcptto, struct __config *cfg); void send_response_to_data(struct session_ctx *sctx, struct session_data *sdata, char *rcptto, struct __config *cfg);
void process_written_file(struct session_ctx *sctx, struct session_data *sdata, struct __data *data, struct __config *cfg); void process_written_file(struct session_ctx *sctx, struct session_data *sdata, struct __config *cfg);
void process_data(struct session_ctx *sctx, struct session_data *sdata, struct __data *data, struct parser_state *parser_state, struct __config *cfg); void process_data(struct session_ctx *sctx, struct session_data *sdata, struct parser_state *parser_state, struct __config *cfg);
int handle_smtp_session(struct session_ctx *sctx, struct __data *data, struct __config *cfg){ int handle_smtp_session(struct session_ctx *sctx, struct __config *cfg){
int i, ret, pos, readpos=0, result, n, protocol_state, prevlen=0; int i, ret, pos, readpos=0, result, n, protocol_state, prevlen=0;
char *p, buf[MAXBUFSIZE], puf[MAXBUFSIZE], resp[MAXBUFSIZE], prevbuf[MAXBUFSIZE], last2buf[2*MAXBUFSIZE+1]; char *p, buf[MAXBUFSIZE], puf[MAXBUFSIZE], resp[MAXBUFSIZE], prevbuf[MAXBUFSIZE], last2buf[2*MAXBUFSIZE+1];
struct session_data sdata; struct session_data sdata;
@ -85,7 +85,7 @@ int handle_smtp_session(struct session_ctx *sctx, struct __data *data, struct __
send(sctx->new_sd, buf, strlen(buf), 0); send(sctx->new_sd, buf, strlen(buf), 0);
if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: sent: %s", sdata.ttmpfile, buf); if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: sent: %s", sdata.ttmpfile, buf);
while((n = recvtimeoutssl(sctx->new_sd, &puf[readpos], sizeof(puf)-readpos, TIMEOUT, sdata.tls, data->ssl)) > 0){ while((n = recvtimeoutssl(sctx->new_sd, &puf[readpos], sizeof(puf)-readpos, TIMEOUT, sdata.tls, sctx->data->ssl)) > 0){
pos = 0; pos = 0;
/* accept mail data */ /* accept mail data */
@ -138,7 +138,7 @@ int handle_smtp_session(struct session_ctx *sctx, struct __data *data, struct __
for(i=0; i<sdata.num_of_rcpt_to; i++){ for(i=0; i<sdata.num_of_rcpt_to; i++){
#endif #endif
write1(sctx->new_sd, SMTP_RESP_421_ERR_WRITE_FAILED, strlen(SMTP_RESP_421_ERR_WRITE_FAILED), sdata.tls, data->ssl); write1(sctx->new_sd, SMTP_RESP_421_ERR_WRITE_FAILED, strlen(SMTP_RESP_421_ERR_WRITE_FAILED), sdata.tls, sctx->data->ssl);
#ifdef HAVE_LMTP #ifdef HAVE_LMTP
} }
@ -148,7 +148,7 @@ int handle_smtp_session(struct session_ctx *sctx, struct __data *data, struct __
goto AFTER_PERIOD; goto AFTER_PERIOD;
} }
process_written_file(sctx, &sdata, data, cfg); process_written_file(sctx, &sdata, cfg);
@ -217,7 +217,7 @@ AFTER_PERIOD:
if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: got: %s", sdata.ttmpfile, buf); if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: got: %s", sdata.ttmpfile, buf);
if(strncasecmp(buf, SMTP_CMD_EHLO, strlen(SMTP_CMD_EHLO)) == 0 || strncasecmp(buf, LMTP_CMD_LHLO, strlen(LMTP_CMD_LHLO)) == 0){ if(strncasecmp(buf, SMTP_CMD_EHLO, strlen(SMTP_CMD_EHLO)) == 0 || strncasecmp(buf, LMTP_CMD_LHLO, strlen(LMTP_CMD_LHLO)) == 0){
process_command_ehlo_lhlo(&sdata, data, &protocol_state, &resp[0], sizeof(resp)-1, cfg); process_command_ehlo_lhlo(&sdata, sctx->data, &protocol_state, &resp[0], sizeof(resp)-1, cfg);
continue; continue;
/* FIXME: implement the ENHANCEDSTATUSCODE extensions */ /* FIXME: implement the ENHANCEDSTATUSCODE extensions */
@ -231,8 +231,8 @@ AFTER_PERIOD:
} }
if(cfg->tls_enable > 0 && strncasecmp(buf, SMTP_CMD_STARTTLS, strlen(SMTP_CMD_STARTTLS)) == 0 && strlen(data->starttls) > 4 && sdata.tls == 0){ if(cfg->tls_enable > 0 && strncasecmp(buf, SMTP_CMD_STARTTLS, strlen(SMTP_CMD_STARTTLS)) == 0 && strlen(sctx->data->starttls) > 4 && sdata.tls == 0){
process_command_starttls(&sdata, data, &protocol_state, &starttls, sctx->new_sd, &resp[0], sizeof(resp)-1, cfg); process_command_starttls(&sdata, sctx->data, &protocol_state, &starttls, sctx->new_sd, &resp[0], sizeof(resp)-1, cfg);
continue; continue;
} }
@ -262,16 +262,16 @@ AFTER_PERIOD:
if(cfg->enable_chunking == 1 && strncasecmp(buf, SMTP_CMD_BDAT, strlen(SMTP_CMD_BDAT)) == 0){ if(cfg->enable_chunking == 1 && strncasecmp(buf, SMTP_CMD_BDAT, strlen(SMTP_CMD_BDAT)) == 0){
process_command_bdat(sctx, &sdata, data, &protocol_state, buf, &resp[0], sizeof(resp)-1); process_command_bdat(sctx, &sdata, &protocol_state, buf, &resp[0], sizeof(resp)-1);
if(protocol_state == SMTP_STATE_BDAT){ if(protocol_state == SMTP_STATE_BDAT){
for(i=0; i<sctx->bdat_rounds-1; i++){ for(i=0; i<sctx->bdat_rounds-1; i++){
syslog(LOG_INFO, "%d, sending bdat response", i); if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_INFO, "%s: sending bdat response (%d)", sdata.ttmpfile, i);
write1(sctx->new_sd, "250 octets received\r\n", strlen("250 octets received\r\n"), sdata.tls, data->ssl); write1(sctx->new_sd, "250 octets received\r\n", strlen("250 octets received\r\n"), sdata.tls, sctx->data->ssl);
} }
process_written_file(sctx, &sdata, data, cfg); process_written_file(sctx, &sdata, cfg);
unlink(sdata.ttmpfile); unlink(sdata.ttmpfile);
unlink(sdata.tmpframe); unlink(sdata.tmpframe);
@ -307,7 +307,7 @@ AFTER_PERIOD:
if(strlen(resp) > 0){ if(strlen(resp) > 0){
send_buffered_response(&sdata, data, starttls, sctx->new_sd, &resp[0], cfg); send_buffered_response(&sdata, sctx->data, starttls, sctx->new_sd, &resp[0], cfg);
memset(resp, 0, sizeof(resp)); memset(resp, 0, sizeof(resp));
} }
@ -325,7 +325,7 @@ AFTER_PERIOD:
if(protocol_state < SMTP_STATE_QUIT && sctx->inj == ERR){ if(protocol_state < SMTP_STATE_QUIT && sctx->inj == ERR){
snprintf(buf, MAXBUFSIZE-1, SMTP_RESP_421_ERR, cfg->hostid); snprintf(buf, MAXBUFSIZE-1, SMTP_RESP_421_ERR, cfg->hostid);
write1(sctx->new_sd, buf, strlen(buf), sdata.tls, data->ssl); write1(sctx->new_sd, buf, strlen(buf), sdata.tls, sctx->data->ssl);
if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: sent: %s", sdata.ttmpfile, buf); if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: sent: %s", sdata.ttmpfile, buf);
@ -344,15 +344,15 @@ AFTER_PERIOD:
QUITTING: QUITTING:
update_counters(&sdata, data, sctx->counters, cfg); update_counters(&sdata, sctx->data, sctx->counters, cfg);
#ifdef NEED_MYSQL #ifdef NEED_MYSQL
close_database(&sdata); close_database(&sdata);
#endif #endif
if(sdata.tls == 1){ if(sdata.tls == 1){
SSL_shutdown(data->ssl); SSL_shutdown(sctx->data->ssl);
SSL_free(data->ssl); SSL_free(sctx->data->ssl);
} }
if(cfg->verbosity >= _LOG_INFO) syslog(LOG_PRIORITY, "processed %llu messages", sctx->counters->c_rcvd); if(cfg->verbosity >= _LOG_INFO) syslog(LOG_PRIORITY, "processed %llu messages", sctx->counters->c_rcvd);
@ -381,7 +381,7 @@ int is_blocked_by_tcp_wrappers(int sd){
#endif #endif
void process_written_file(struct session_ctx *sctx, struct session_data *sdata, struct __data *data, struct __config *cfg){ void process_written_file(struct session_ctx *sctx, struct session_data *sdata, struct __config *cfg){
int i; int i;
char *rcpt; char *rcpt;
char delay[SMALLBUFSIZE], tmpbuf[SMALLBUFSIZE]; char delay[SMALLBUFSIZE], tmpbuf[SMALLBUFSIZE];
@ -391,9 +391,9 @@ void process_written_file(struct session_ctx *sctx, struct session_data *sdata,
gettimeofday(&tv1, &tz); gettimeofday(&tv1, &tz);
data->folder = 0; sctx->data->folder = 0;
parser_state = parse_message(sdata, 1, data, cfg); parser_state = parse_message(sdata, 1, sctx->data, cfg);
post_parse(sdata, &parser_state, cfg); post_parse(sdata, &parser_state, cfg);
sctx->parser_state = &parser_state; sctx->parser_state = &parser_state;
@ -419,7 +419,7 @@ void process_written_file(struct session_ctx *sctx, struct session_data *sdata,
sctx->inj = ERR_MYDOMAINS; sctx->inj = ERR_MYDOMAINS;
snprintf(sdata->acceptbuf, SMALLBUFSIZE-1, "250 Ok %s\r\n", sdata->ttmpfile); snprintf(sdata->acceptbuf, SMALLBUFSIZE-1, "250 Ok %s\r\n", sdata->ttmpfile);
write1(sctx->new_sd, sdata->acceptbuf, strlen(sdata->acceptbuf), sdata->tls, data->ssl); write1(sctx->new_sd, sdata->acceptbuf, strlen(sdata->acceptbuf), sdata->tls, sctx->data->ssl);
syslog(LOG_PRIORITY, "%s: discarding: not on mydomains, from=%s, message-id=%s", sdata->ttmpfile, sdata->fromemail, parser_state.message_id); syslog(LOG_PRIORITY, "%s: discarding: not on mydomains, from=%s, message-id=%s", sdata->ttmpfile, sdata->fromemail, parser_state.message_id);
@ -430,7 +430,7 @@ void process_written_file(struct session_ctx *sctx, struct session_data *sdata,
#ifdef HAVE_ANTIVIRUS #ifdef HAVE_ANTIVIRUS
if(cfg->use_antivirus == 1){ if(cfg->use_antivirus == 1){
sdata->rav = do_av_check(sdata, &virusinfo[0], data, cfg); sdata->rav = do_av_check(sdata, &virusinfo[0], sctx->data, cfg);
} }
#endif #endif
@ -442,9 +442,9 @@ void process_written_file(struct session_ctx *sctx, struct session_data *sdata,
#endif #endif
if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: round %d in injection", sdata->ttmpfile, i); if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: round %d in injection", sdata->ttmpfile, i);
process_data(sctx, sdata, data, &parser_state, cfg); process_data(sctx, sdata, &parser_state, cfg);
send_response_to_data(sctx, sdata, data, sdata->rcptto[i], cfg); send_response_to_data(sctx, sdata, sdata->rcptto[i], cfg);
snprintf(delay, SMALLBUFSIZE-1, "delay=%.2f, delays=%.2f/%.2f/%.2f/%.2f/%.2f/%.2f", snprintf(delay, SMALLBUFSIZE-1, "delay=%.2f, delays=%.2f/%.2f/%.2f/%.2f/%.2f/%.2f",
@ -457,7 +457,7 @@ void process_written_file(struct session_ctx *sctx, struct session_data *sdata,
sdata->ttmpfile, sdata->fromemail, sdata->tot_len, sdata->ttmpfile, sdata->fromemail, sdata->tot_len,
sdata->stored_len, parser_state.n_attachments, sdata->stored_len, parser_state.n_attachments,
parser_state.reference, parser_state.message_id, parser_state.reference, parser_state.message_id,
parser_state.retention, data->folder, delay, sctx->status); parser_state.retention, sctx->data->folder, delay, sctx->status);
#ifdef HAVE_LMTP #ifdef HAVE_LMTP
} /* for */ } /* for */
@ -467,7 +467,7 @@ void process_written_file(struct session_ctx *sctx, struct session_data *sdata,
} }
void process_data(struct session_ctx *sctx, struct session_data *sdata, struct __data *data, struct parser_state *parser_state, struct __config *cfg){ void process_data(struct session_ctx *sctx, struct session_data *sdata, struct parser_state *parser_state, struct __config *cfg){
char *arule = NULL; char *arule = NULL;
char virusinfo[SMALLBUFSIZE]; char virusinfo[SMALLBUFSIZE];
@ -496,7 +496,7 @@ void process_data(struct session_ctx *sctx, struct session_data *sdata, struct _
/* check message against archiving rules */ /* check message against archiving rules */
arule = check_againt_ruleset(data->archiving_rules, parser_state, sdata->tot_len, sdata->spam_message); arule = check_againt_ruleset(sctx->data->archiving_rules, parser_state, sdata->tot_len, sdata->spam_message);
if(arule){ if(arule){
syslog(LOG_PRIORITY, "%s: discarding: archiving policy: *%s*", sdata->ttmpfile, arule); syslog(LOG_PRIORITY, "%s: discarding: archiving policy: *%s*", sdata->ttmpfile, arule);
@ -508,7 +508,7 @@ void process_data(struct session_ctx *sctx, struct session_data *sdata, struct _
sctx->status = S_STATUS_DISCARDED; sctx->status = S_STATUS_DISCARDED;
} }
else { else {
sctx->inj = process_message(sdata, parser_state, data, cfg); sctx->inj = process_message(sdata, parser_state, sctx->data, cfg);
unlink(parser_state->message_id_hash); unlink(parser_state->message_id_hash);
sctx->counters->c_size += sdata->tot_len; sctx->counters->c_size += sdata->tot_len;
sctx->counters->c_stored_size = sdata->stored_len; sctx->counters->c_stored_size = sdata->stored_len;
@ -522,7 +522,7 @@ void process_data(struct session_ctx *sctx, struct session_data *sdata, struct _
} }
void send_response_to_data(struct session_ctx *sctx, struct session_data *sdata, struct __data *data, char *rcptto, struct __config *cfg){ void send_response_to_data(struct session_ctx *sctx, struct session_data *sdata, char *rcptto, struct __config *cfg){
/* set the accept buffer */ /* set the accept buffer */
@ -533,7 +533,7 @@ void send_response_to_data(struct session_ctx *sctx, struct session_data *sdata,
sctx->status = S_STATUS_ERROR; sctx->status = S_STATUS_ERROR;
} }
write1(sctx->new_sd, sdata->acceptbuf, strlen(sdata->acceptbuf), sdata->tls, data->ssl); write1(sctx->new_sd, sdata->acceptbuf, strlen(sdata->acceptbuf), sdata->tls, sctx->data->ssl);
if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: sent: %s", sdata->ttmpfile, sdata->acceptbuf); if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: sent: %s", sdata->ttmpfile, sdata->acceptbuf);

10
src/smtp.c
View File

@ -134,7 +134,7 @@ void process_command_data(struct session_data *sdata, int *protocol_state, char
} }
void process_command_bdat(struct session_ctx *sctx, struct session_data *sdata, struct __data *data, int *protocol_state, char *buf, char *resp, int resplen){ void process_command_bdat(struct session_ctx *sctx, struct session_data *sdata, int *protocol_state, char *buf, char *resp, int resplen){
int n, expected_bdat_len; int n, expected_bdat_len;
char puf[MAXBUFSIZE]; char puf[MAXBUFSIZE];
@ -164,13 +164,13 @@ void process_command_bdat(struct session_ctx *sctx, struct session_data *sdata,
} }
} }
else if(sctx->bdat_last_round != 1){ else if(sctx->bdat_last_round != 1){
if((n = recvtimeoutssl(sctx->new_sd, &puf[0], sizeof(puf), TIMEOUT, sdata->tls, data->ssl)) > 0){ if((n = recvtimeoutssl(sctx->new_sd, &puf[0], sizeof(puf), TIMEOUT, sdata->tls, sctx->data->ssl)) > 0){
expected_bdat_len = extract_bdat_command(sctx, sdata, puf); expected_bdat_len = extract_bdat_command(sctx, sdata, puf);
if(expected_bdat_len <= 0 && sctx->bdat_rounds > 0) sctx->bdat_rounds--; if(expected_bdat_len <= 0 && sctx->bdat_rounds > 0) sctx->bdat_rounds--;
} }
} }
if(expected_bdat_len > 0) sdata->tot_len += read_bdat_data(sctx, sdata, data, expected_bdat_len); if(expected_bdat_len > 0) sdata->tot_len += read_bdat_data(sctx, sdata, expected_bdat_len);
} }
fsync(sdata->fd); fsync(sdata->fd);
@ -208,12 +208,12 @@ int extract_bdat_command(struct session_ctx *sctx, struct session_data *sdata, c
} }
int read_bdat_data(struct session_ctx *sctx, struct session_data *sdata, struct __data *data, int expected_bdat_len){ int read_bdat_data(struct session_ctx *sctx, struct session_data *sdata, int expected_bdat_len){
int n, read_bdat_len=0, written_bdat_len=0; int n, read_bdat_len=0, written_bdat_len=0;
char puf[MAXBUFSIZE]; char puf[MAXBUFSIZE];
while(read_bdat_len < expected_bdat_len){ while(read_bdat_len < expected_bdat_len){
if((n = recvtimeoutssl(sctx->new_sd, &puf[0], sizeof(puf), TIMEOUT, sdata->tls, data->ssl)) > 0){ if((n = recvtimeoutssl(sctx->new_sd, &puf[0], sizeof(puf), TIMEOUT, sdata->tls, sctx->data->ssl)) > 0){
read_bdat_len += n; read_bdat_len += n;
written_bdat_len += write(sdata->fd, puf, n); written_bdat_len += write(sdata->fd, puf, n);
} }

4
src/smtp.h
View File

@ -10,11 +10,11 @@ void process_command_starttls(struct session_data *sdata, struct __data *data, i
void process_command_mail_from(struct session_data *sdata, int *protocol_state, char *buf, char *resp, int resplen, struct __config *cfg); void process_command_mail_from(struct session_data *sdata, int *protocol_state, char *buf, char *resp, int resplen, struct __config *cfg);
void process_command_rcpt_to(struct session_data *sdata, int *protocol_state, char *buf, char *resp, int resplen); void process_command_rcpt_to(struct session_data *sdata, int *protocol_state, char *buf, char *resp, int resplen);
void process_command_data(struct session_data *sdata, int *protocol_state, char *resp, int resplen); void process_command_data(struct session_data *sdata, int *protocol_state, char *resp, int resplen);
void process_command_bdat(struct session_ctx *sctx, struct session_data *sdata, struct __data *data, int *protocol_state, char *buf, char *resp, int resplen); void process_command_bdat(struct session_ctx *sctx, struct session_data *sdata, int *protocol_state, char *buf, char *resp, int resplen);
void process_command_quit(struct session_data *sdata, int *protocol_state, char *resp, int resplen, struct __config *cfg); void process_command_quit(struct session_data *sdata, int *protocol_state, char *resp, int resplen, struct __config *cfg);
void process_command_reset(struct session_data *sdata, int *protocol_state, char *resp, int resplen, struct __config *cfg); void process_command_reset(struct session_data *sdata, int *protocol_state, char *resp, int resplen, struct __config *cfg);
int read_bdat_data(struct session_ctx *sctx, struct session_data *sdata, struct __data *data, int expected_bdat_len); int read_bdat_data(struct session_ctx *sctx, struct session_data *sdata, int expected_bdat_len);
int extract_bdat_command(struct session_ctx *sctx, struct session_data *sdata, char *buf); int extract_bdat_command(struct session_ctx *sctx, struct session_data *sdata, char *buf);
void send_buffered_response(struct session_data *sdata, struct __data *data, int starttls, int new_sd, char *resp, struct __config *cfg); void send_buffered_response(struct session_data *sdata, struct __data *data, int starttls, int new_sd, char *resp, struct __config *cfg);