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

parser: fixed aaa+bbb@aaa.fu recipient address

Browse Source 
Change-Id: Ia638fdd4c740261b423dd0e03b528e2b3c39f3d8
Signed-off-by: SJ <sj@acts.hu>
This commit is contained in:
SJ 2017-01-31 21:17:14 +01:00
parent 78d52fe06c
commit 9a98571f2a
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config.h
View File

@ -13,7 +13,7 @@
#define VERSION "1.2.0"
#define BUILD 952
#define BUILD 953
#define HOSTID "mailarchiver"

21
src/parser.c
View File

@ -172,10 +172,10 @@ void storno_attachment(struct parser_state *state){
int parse_line(char *buf, struct parser_state *state, struct session_data *sdata, int take_into_pieces, char *writebuffer, int writebuffersize, char *abuffer, int abuffersize, struct __data *data, struct __config *cfg){
char *p, *q, puf[SMALLBUFSIZE];
char *p, *q, *r, puf[SMALLBUFSIZE];
unsigned char b64buffer[MAXBUFSIZE];
char tmpbuf[MAXBUFSIZE];
int n64, writelen, boundary_line=0, result;
int n, n64, writelen, boundary_line=0, result;
unsigned int len;
if(cfg->debug == 1) printf("line: %s", buf);
@ -739,8 +739,20 @@ int parse_line(char *buf, struct parser_state *state, struct session_data *sdata
/* skip any address matching ...@cfg->hostid, 2013.10.29, SJ */
q = strchr(puf, '@');
if(q && strncmp(q+1, cfg->hostid, cfg->hostid_len) == 0){
continue;
if(q){
if(strncmp(q+1, cfg->hostid, cfg->hostid_len) == 0){
continue;
}
/* fix aaa+bbb@ccc.fu address to aaa@ccc.fu, 2017.01.31, SJ */
r = strchr(puf, '+');
if(r){
n = strlen(q);
memmove(r, q, n);
*(r+n) = '\0';
q = r;
}
}
addnode(state->rcpt, puf);
@ -748,6 +760,7 @@ int parse_line(char *buf, struct parser_state *state, struct session_data *sdata
state->tolen += len;
if(does_it_seem_like_an_email_address(puf) == 1){
if(is_email_address_on_my_domains(puf, data) == 1) sdata->internal_recipient = 1;
else sdata->external_recipient = 1;

2
src/parser_utils.c
View File

@ -604,7 +604,7 @@ void translateLine(unsigned char *p, struct parser_state *state){
if(*p == '\'' && prev == '"') { *p = ' '; }
if(*p == '\'' && *(p+1) == '"'){ *p = ' '; }
if(*p == '_' || *p == '\'' || *p == '&'){ continue; }
if(*p == '_' || *p == '\'' || *p == '&' || *p == '+'){ continue; }
prev = *p;
}