X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/7c5214ecc29b8fc23e15030db8207e3ff2cb4fc6..7eb0e5d2b8453f753bd2d8e2e77cf4b7e0b24b1b:/src/src/sieve.c diff --git a/src/src/sieve.c b/src/src/sieve.c index 34764a4a7..635d57827 100644 --- a/src/src/sieve.c +++ b/src/src/sieve.c @@ -1,11 +1,11 @@ -/* $Cambridge: exim/src/src/sieve.c,v 1.24 2007/02/07 14:41:13 ph10 Exp $ */ - /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) Michael Haardt 2003-2006 */ -/* See the file NOTICE for conditions of use and distribution. */ +/* Copyright (c) Michael Haardt 2003 - 2015 + * Copyright (c) The Exim Maintainers 2016 + * See the file NOTICE for conditions of use and distribution. + */ /* This code was contributed by Michael Haardt. */ @@ -28,11 +28,14 @@ /* Undefine it for UNIX-style \n end-of-line terminators (default). */ #undef RFC_EOL +/* Define this for development of the Sieve extension "encoded-character". */ +#define ENCODED_CHARACTER + /* Define this for development of the Sieve extension "envelope-auth". */ #undef ENVELOPE_AUTH /* Define this for development of the Sieve extension "enotify". */ -#undef ENOTIFY +#define ENOTIFY /* Define this for the Sieve extension "subaddress". */ #define SUBADDRESS @@ -58,6 +61,9 @@ struct Sieve int keep; int require_envelope; int require_fileinto; +#ifdef ENCODED_CHARACTER + int require_encoded_character; +#endif #ifdef ENVELOPE_AUTH int require_envelope_auth; #endif @@ -65,6 +71,7 @@ struct Sieve int require_enotify; struct Notification *notified; #endif + uschar *enotify_mailto_owner; #ifdef SUBADDRESS int require_subaddress; #endif @@ -102,6 +109,38 @@ struct Notification struct Notification *next; }; +/* This should be a complete list of supported extensions, so that an external +ManageSieve (RFC 5804) program can interrogate the current Exim binary for the +list of extensions and provide correct information to a client. + +We'll emit the list in the order given here; keep it alphabetically sorted, so +that callers don't get surprised. + +List *MUST* end with a NULL. Which at least makes ifdef-vs-comma easier. */ + +const uschar *exim_sieve_extension_list[] = { + CUS"comparator-i;ascii-numeric", + CUS"copy", +#ifdef ENCODED_CHARACTER + CUS"encoded-character", +#endif +#ifdef ENOTIFY + CUS"enotify", +#endif + CUS"envelope", +#ifdef ENVELOPE_AUTH + CUS"envelope-auth", +#endif + CUS"fileinto", +#ifdef SUBADDRESS + CUS"subaddress", +#endif +#ifdef VACATION + CUS"vacation", +#endif + NULL +}; + static int eq_asciicase(const struct String *needle, const struct String *haystack, int match_prefix); static int parse_test(struct Sieve *filter, int *cond, int exec); static int parse_commands(struct Sieve *filter, int exec, address_item **generated); @@ -126,6 +165,10 @@ static uschar str_fileinto_c[]="fileinto"; static const struct String str_fileinto={ str_fileinto_c, 8 }; static uschar str_envelope_c[]="envelope"; static const struct String str_envelope={ str_envelope_c, 8 }; +#ifdef ENCODED_CHARACTER +static uschar str_encoded_character_c[]="encoded-character"; +static const struct String str_encoded_character={ str_encoded_character_c, 17 }; +#endif #ifdef ENVELOPE_AUTH static uschar str_envelope_auth_c[]="envelope-auth"; static const struct String str_envelope_auth={ str_envelope_auth_c, 13 }; @@ -133,6 +176,12 @@ static const struct String str_envelope_auth={ str_envelope_auth_c, 13 }; #ifdef ENOTIFY static uschar str_enotify_c[]="enotify"; static const struct String str_enotify={ str_enotify_c, 7 }; +static uschar str_online_c[]="online"; +static const struct String str_online={ str_online_c, 6 }; +static uschar str_maybe_c[]="maybe"; +static const struct String str_maybe={ str_maybe_c, 5 }; +static uschar str_auto_submitted_c[]="Auto-Submitted"; +static const struct String str_auto_submitted={ str_auto_submitted_c, 14 }; #endif #ifdef SUBADDRESS static uschar str_subaddress_c[]="subaddress"; @@ -185,6 +234,9 @@ uschar *new = NULL; uschar ch; size_t line; +/* Two passes: one to count output allocation size, second +to do the encoding */ + for (pass=0; pass<=1; ++pass) { line=0; @@ -198,54 +250,47 @@ for (pass=0; pass<=1; ++pass) for (start=src->character,end=start+src->length; start=73) + if (line>=73) /* line length limit */ { if (pass==0) dst->length+=2; else { - *new++='='; + *new++='='; /* line split */ *new++='\n'; } line=0; } - if - ( - (ch>=33 && ch<=60) - || (ch>=62 && ch<=126) - || - ( - (ch==9 || ch==32) - && start+2='!' && ch<='<') + || (ch>='>' && ch<='~') + || ( (ch=='\t' || ch==' ') + && start+2length; else - *new++=*start; + *new++=*start; /* copy char */ ++line; } - else if (ch=='\r' && start+1length; - line=0; - } else - *new++='\n'; - line=0; - ++start; + *new++='\n'; /* NL */ + line=0; + ++start; /* consume extra input char */ } else { if (pass==0) dst->length+=3; else - { - sprintf(CS new,"=%02X",ch); + { /* encoded char */ + new += sprintf(CS new,"=%02X",ch); new+=3; } line+=3; @@ -365,10 +410,11 @@ Returns -1 syntax error */ -static int parse_mailto_uri(struct Sieve *filter, const uschar *uri, string_item **recipient, struct String *header, struct String *body) +static int parse_mailto_uri(struct Sieve *filter, const uschar *uri, string_item **recipient, struct String *header, struct String *subject, struct String *body) { const uschar *start; -struct String to,hname,hvalue; +struct String to, hname; +struct String hvalue = {.character = NULL, .length = 0}; int capacity; string_item *new; @@ -377,6 +423,7 @@ if (Ustrncmp(uri,"mailto:",7)) filter->errmsg=US "Unknown URI scheme"; return 0; } + uri+=7; if (*uri && *uri!='?') for (;;) @@ -386,9 +433,9 @@ if (*uri && *uri!='?') if (uri>start) { capacity=0; - to.character=(uschar*)0; + to.character= NULL; to.length=0; - to.character=string_cat(to.character,&capacity,&to.length,start,uri-start); + to.character=string_catn(to.character, &capacity, &to.length, start, uri-start); to.character[to.length]='\0'; if (uri_decode(&to)==-1) { @@ -420,9 +467,9 @@ if (*uri=='?') if (uri>start) { capacity=0; - hname.character=(uschar*)0; + hname.character= NULL; hname.length=0; - hname.character=string_cat(hname.character,&capacity,&hname.length,start,uri-start); + hname.character = string_catn(hname.character, &capacity, &hname.length, start, uri-start); hname.character[hname.length]='\0'; if (uri_decode(&hname)==-1) { @@ -443,9 +490,9 @@ if (*uri=='?') if (uri>start) { capacity=0; - hvalue.character=(uschar*)0; + hvalue.character= NULL; hvalue.length=0; - hvalue.character=string_cat(hvalue.character,&capacity,&hvalue.length,start,uri-start); + hvalue.character=string_catn(hvalue.character,&capacity,&hvalue.length,start,uri-start); hvalue.character[hvalue.length]='\0'; if (uri_decode(&hvalue)==-1) { @@ -464,13 +511,17 @@ if (*uri=='?') } else if (hname.length==4 && strcmpic(hname.character, US"body")==0) *body=hvalue; + else if (hname.length==7 && strcmpic(hname.character, US"subject")==0) + *subject=hvalue; else { static struct String ignore[]= { + {US"date",4}, {US"from",4}, - {US"subject",7}, - {US"received",8} + {US"message-id",10}, + {US"received",8}, + {US"auto-submitted",14} }; static struct String *end=ignore+sizeof(ignore)/sizeof(ignore[0]); struct String *i; @@ -480,10 +531,10 @@ if (*uri=='?') { if (header->length==-1) header->length=0; capacity=header->length; - header->character=string_cat(header->character,&capacity,&header->length,hname.character,hname.length); - header->character=string_cat(header->character,&capacity,&header->length,CUS ": ",2); - header->character=string_cat(header->character,&capacity,&header->length,hvalue.character,hvalue.length); - header->character=string_cat(header->character,&capacity,&header->length,CUS "\n",1); + header->character=string_catn(header->character,&capacity,&header->length,hname.character,hname.length); + header->character=string_catn(header->character,&capacity,&header->length,CUS ": ",2); + header->character=string_catn(header->character,&capacity,&header->length,hvalue.character,hvalue.length); + header->character=string_catn(header->character,&capacity,&header->length,CUS "\n",1); header->character[header->length]='\0'; } } @@ -591,8 +642,10 @@ return (match_prefix ? nl==0 : nl==0 && hl==0); /* Arguments: - needle pattern to search ... - haystack ... inside the haystack + needle pattern to search ... + haystack ... inside the haystack + ascii_caseless ignore ASCII case + match_octet match octets, not UTF-8 multi-octet characters Returns: 0 needle not found in haystack 1 needle found @@ -955,24 +1008,24 @@ while (l) { case '\0': { - quoted=string_cat(quoted,&size,&ptr,CUS "\\0",2); + quoted=string_catn(quoted,&size,&ptr,CUS "\\0",2); break; } case '$': case '{': case '}': { - quoted=string_cat(quoted,&size,&ptr,CUS "\\",1); + quoted=string_catn(quoted,&size,&ptr,CUS "\\",1); } default: { - quoted=string_cat(quoted,&size,&ptr,h,1); + quoted=string_catn(quoted,&size,&ptr,h,1); } } ++h; --l; } -quoted=string_cat(quoted,&size,&ptr,CUS "",1); +quoted=string_catn(quoted,&size,&ptr,CUS "",1); return quoted; } @@ -982,7 +1035,7 @@ return quoted; *************************************************/ /* -According to RFC 3028, duplicate delivery to the same address must +According to RFC 5228, duplicate delivery to the same address must not happen, so the list is first searched for the address. Arguments: @@ -993,33 +1046,36 @@ Arguments: Returns: nothing */ -static void add_addr(address_item **generated, uschar *addr, int file, int maxage, int maxmessages, int maxstorage) +static void +add_addr(address_item **generated, uschar *addr, int file, int maxage, int maxmessages, int maxstorage) { address_item *new_addr; for (new_addr=*generated; new_addr; new_addr=new_addr->next) - { - if (Ustrcmp(new_addr->address,addr)==0 && (file ? testflag(new_addr, af_pfr|af_file) : 1)) + if ( Ustrcmp(new_addr->address,addr) == 0 + && ( !file + || testflag(new_addr, af_pfr) + || testflag(new_addr, af_file) + ) + ) { if ((filter_test != FTEST_NONE && debug_selector != 0) || (debug_selector & D_filter) != 0) - { debug_printf("Repeated %s `%s' ignored.\n",file ? "fileinto" : "redirect", addr); - } + return; } - } if ((filter_test != FTEST_NONE && debug_selector != 0) || (debug_selector & D_filter) != 0) - { debug_printf("%s `%s'\n",file ? "fileinto" : "redirect", addr); - } -new_addr=deliver_make_addr(addr,TRUE); + +new_addr = deliver_make_addr(addr,TRUE); if (file) { - setflag(new_addr, af_pfr|af_file); + setflag(new_addr, af_pfr); + setflag(new_addr, af_file); new_addr->mode = 0; } -new_addr->p.errors_address = NULL; +new_addr->prop.errors_address = NULL; new_addr->next = *generated; *generated = new_addr; } @@ -1185,8 +1241,212 @@ return 1; } +#ifdef ENCODED_CHARACTER +/************************************************* +* Decode hex-encoded-character string * +*************************************************/ + +/* +Encoding definition: + blank = SP / TAB / CRLF + hex-pair-seq = *blank hex-pair *(1*blank hex-pair) *blank + hex-pair = 1*2HEXDIG + +Arguments: + src points to a hex-pair-seq + end points to its end + dst points to the destination of the decoded octets, + optionally to (uschar*)0 for checking only + +Returns: >=0 number of decoded octets + -1 syntax error +*/ + +static int hex_decode(uschar *src, uschar *end, uschar *dst) +{ +int decoded=0; + +while (*src==' ' || *src=='\t' || *src=='\n') ++src; +do + { + int x,d,n; + + for (x=0,d=0; d<2 && src='0' && n<='9' ? n-'0' : 10+(n-'a')),++d,++src); + if (d==0) return -1; + if (dst) *dst++=x; + ++decoded; + if (src==end) return decoded; + if (*src==' ' || *src=='\t' || *src=='\n') + while (*src==' ' || *src=='\t' || *src=='\n') ++src; + else + return -1; + } +while (src=0 number of decoded octets + -1 syntax error + -2 semantic error (character range violation) +*/ + +static int unicode_decode(uschar *src, uschar *end, uschar *dst) +{ +int decoded=0; + +while (*src==' ' || *src=='\t' || *src=='\n') ++src; +do + { + uschar *hex_seq; + int c,d,n; + + unicode_hex: + for (hex_seq=src; src='0' && n<='9' ? n-'0' : 10+(n-'a')),++d,++src); + if (src==hex_seq) return -1; + if (d==7 || (!((c>=0 && c<=0xd7ff) || (c>=0xe000 && c<=0x10ffff)))) return -2; + if (c<128) + { + if (dst) *dst++=c; + ++decoded; + } + else if (c>=0x80 && c<=0x7ff) + { + if (dst) + { + *dst++=192+(c>>6); + *dst++=128+(c&0x3f); + } + decoded+=2; + } + else if (c>=0x800 && c<=0xffff) + { + if (dst) + { + *dst++=224+(c>>12); + *dst++=128+((c>>6)&0x3f); + *dst++=128+(c&0x3f); + } + decoded+=3; + } + else if (c>=0x10000 && c<=0x1fffff) + { + if (dst) + { + *dst++=240+(c>>18); + *dst++=128+((c>>10)&0x3f); + *dst++=128+((c>>6)&0x3f); + *dst++=128+(c&0x3f); + } + decoded+=4; + } + if (*src==' ' || *src=='\t' || *src=='\n') + { + while (*src==' ' || *src=='\t' || *src=='\n') ++src; + if (src==end) return decoded; + goto unicode_hex; + } + } +while (srccharacter; +dst=src; +end=data->character+data->length; +while (src=0 + ) + { + dst+=hex_decode(src+6,brace,dst); + src=brace+1; + } + else if ( + strncmpic(src,US "${unicode:",10)==0 + && (brace=Ustrchr(src+10,'}'))!=(uschar*)0 + ) + { + switch (unicode_decode(src+10,brace,(uschar*)0)) + { + case -2: + { + filter->errmsg=CUS "unicode character out of range"; + return -1; + } + case -1: + { + *dst++=*src++; + break; + } + default: + { + dst+=unicode_decode(src+10,brace,dst); + src=brace+1; + } + } + } + else *dst++=*src++; + } + data->length=dst-data->character; + *dst='\0'; +return 1; +} +#endif + + +/************************************************* +* Parse an optional string * *************************************************/ /* @@ -1232,13 +1492,17 @@ if (*filter->pc=='"') /* quoted string */ ++filter->pc; /* that way, there will be at least one character allocated */ - data->character=string_cat(data->character,&dataCapacity,&foo,CUS "",1); + data->character=string_catn(data->character,&dataCapacity,&foo,CUS "",1); +#ifdef ENCODED_CHARACTER + if (filter->require_encoded_character + && string_decode(filter,data)==-1) + return -1; +#endif return 1; } else if (*filter->pc=='\\' && *(filter->pc+1)) /* quoted character */ { - if (*(filter->pc+1)=='0') data->character=string_cat(data->character,&dataCapacity,&data->length,CUS "",1); - else data->character=string_cat(data->character,&dataCapacity,&data->length,filter->pc+1,1); + data->character=string_catn(data->character,&dataCapacity,&data->length,filter->pc+1,1); filter->pc+=2; } else /* regular character */ @@ -1248,11 +1512,11 @@ if (*filter->pc=='"') /* quoted string */ #else if (*filter->pc=='\n') { - data->character=string_cat(data->character,&dataCapacity,&data->length,US"\r",1); + data->character=string_catn(data->character,&dataCapacity,&data->length,US"\r",1); ++filter->line; } #endif - data->character=string_cat(data->character,&dataCapacity,&data->length,filter->pc,1); + data->character=string_catn(data->character,&dataCapacity,&data->length,filter->pc,1); filter->pc++; } } @@ -1294,7 +1558,7 @@ else if (Ustrncmp(filter->pc,CUS "text:",5)==0) /* multiline string */ if (*filter->pc=='\n') /* end of line */ #endif { - data->character=string_cat(data->character,&dataCapacity,&data->length,CUS "\r\n",2); + data->character=string_catn(data->character,&dataCapacity,&data->length,CUS "\r\n",2); #ifdef RFC_EOL filter->pc+=2; #else @@ -1310,24 +1574,29 @@ else if (Ustrncmp(filter->pc,CUS "text:",5)==0) /* multiline string */ int foo=data->length; /* that way, there will be at least one character allocated */ - data->character=string_cat(data->character,&dataCapacity,&foo,CUS "",1); + data->character=string_catn(data->character,&dataCapacity,&foo,CUS "",1); #ifdef RFC_EOL filter->pc+=3; #else filter->pc+=2; #endif ++filter->line; +#ifdef ENCODED_CHARACTER + if (filter->require_encoded_character + && string_decode(filter,data)==-1) + return -1; +#endif return 1; } else if (*filter->pc=='.' && *(filter->pc+1)=='.') /* remove dot stuffing */ { - data->character=string_cat(data->character,&dataCapacity,&data->length,CUS ".",1); + data->character=string_catn(data->character,&dataCapacity,&data->length,CUS ".",1); filter->pc+=2; } } else /* regular character */ { - data->character=string_cat(data->character,&dataCapacity,&data->length,filter->pc,1); + data->character=string_catn(data->character,&dataCapacity,&data->length,filter->pc,1); filter->pc++; } } @@ -1358,7 +1627,7 @@ static int parse_identifier(struct Sieve *filter, const uschar *id) { size_t idlen=Ustrlen(id); - if (Ustrncmp(filter->pc,id,idlen)==0) + if (strncmpic(US filter->pc,US id,idlen)==0) { uschar next=filter->pc[idlen]; @@ -1440,12 +1709,13 @@ Returns: 1 success -1 no string list found */ -static int parse_stringlist(struct Sieve *filter, struct String **data) +static int +parse_stringlist(struct Sieve *filter, struct String **data) { const uschar *orig=filter->pc; -int dataCapacity=0; -int dataLength=0; -struct String *d=(struct String*)0; +int dataCapacity = 0; +int dataLength = 0; +struct String *d = NULL; int m; if (*filter->pc=='[') /* string list */ @@ -1454,20 +1724,18 @@ if (*filter->pc=='[') /* string list */ for (;;) { if (parse_white(filter)==-1) goto error; - if ((dataLength+1)>=dataCapacity) /* increase buffer */ + if (dataLength+1 >= dataCapacity) /* increase buffer */ { struct String *new; int newCapacity; /* Don't amalgamate with next line; some compilers grumble */ - newCapacity=dataCapacity?(dataCapacity*=2):(dataCapacity=4); - if ((new=(struct String*)store_get(sizeof(struct String)*newCapacity))==(struct String*)0) - { - filter->errmsg=CUstrerror(errno); - goto error; - } + + dataCapacity = dataCapacity ? dataCapacity * 2 : 4; + new = store_get(sizeof(struct String) * dataCapacity); + if (d) memcpy(new,d,sizeof(struct String)*dataLength); - d=new; - dataCapacity=newCapacity; + d = new; } + m=parse_string(filter,&d[dataLength]); if (m==0) { @@ -1704,7 +1972,7 @@ Grammar: Arguments: filter points to the Sieve filter including its state n total number of tests - true number of passed tests + num_true number of passed tests exec Execute parsed statements Returns: 1 success @@ -1712,14 +1980,14 @@ Returns: 1 success -1 syntax or execution error */ -static int parse_testlist(struct Sieve *filter, int *n, int *true, int exec) +static int parse_testlist(struct Sieve *filter, int *n, int *num_true, int exec) { if (parse_white(filter)==-1) return -1; if (*filter->pc=='(') { ++filter->pc; *n=0; - *true=0; + *num_true=0; for (;;) { int cond; @@ -1728,7 +1996,7 @@ if (*filter->pc=='(') { case -1: return -1; case 0: filter->errmsg=CUS "missing test"; return -1; - default: ++*n; if (cond) ++*true; break; + default: ++*n; if (cond) ++*num_true; break; } if (parse_white(filter)==-1) return -1; if (*filter->pc==',') ++filter->pc; @@ -1916,13 +2184,13 @@ else if (parse_identifier(filter,CUS "allof")) allof-test = "allof" */ - int n,true; + int n,num_true; - switch (parse_testlist(filter,&n,&true,exec)) + switch (parse_testlist(filter,&n,&num_true,exec)) { case -1: return -1; case 0: filter->errmsg=CUS "missing test list"; return -1; - default: *cond=(n==true); return 1; + default: *cond=(n==num_true); return 1; } } else if (parse_identifier(filter,CUS "anyof")) @@ -1931,13 +2199,13 @@ else if (parse_identifier(filter,CUS "anyof")) anyof-test = "anyof" */ - int n,true; + int n,num_true; - switch (parse_testlist(filter,&n,&true,exec)) + switch (parse_testlist(filter,&n,&num_true,exec)) { case -1: return -1; case 0: filter->errmsg=CUS "missing test list"; return -1; - default: *cond=(true>0); return 1; + default: *cond=(num_true>0); return 1; } } else if (parse_identifier(filter,CUS "exists")) @@ -2252,11 +2520,11 @@ else if (parse_identifier(filter,CUS "envelope")) return 1; } #ifdef ENOTIFY -else if (parse_identifier(filter,CUS "valid_notif_method")) +else if (parse_identifier(filter,CUS "valid_notify_method")) { /* - valid_notif_method = "valid_notif_method" - + valid_notify_method = "valid_notify_method" + */ struct String *uris,*u; @@ -2279,19 +2547,110 @@ else if (parse_identifier(filter,CUS "valid_notif_method")) for (u=uris; u->length!=-1 && *cond; ++u) { string_item *recipient; - struct String header,body; + struct String header,subject,body; recipient=NULL; header.length=-1; header.character=(uschar*)0; + subject.length=-1; + subject.character=(uschar*)0; body.length=-1; body.character=(uschar*)0; - if (parse_mailto_uri(filter,u->character,&recipient,&header,&body)!=1) + if (parse_mailto_uri(filter,u->character,&recipient,&header,&subject,&body)!=1) *cond=0; } } return 1; } +else if (parse_identifier(filter,CUS "notify_method_capability")) + { + /* + notify_method_capability = "notify_method_capability" [COMPARATOR] [MATCH-TYPE] + + + + */ + + int m; + int co=0,mt=0; + + enum Comparator comparator=COMP_EN_ASCII_CASEMAP; + enum MatchType matchType=MATCH_IS; + struct String uri,capa,*keys,*k; + + if (!filter->require_enotify) + { + filter->errmsg=CUS "missing previous require \"enotify\";"; + return -1; + } + for (;;) + { + if (parse_white(filter)==-1) return -1; + if ((m=parse_comparator(filter,&comparator))!=0) + { + if (m==-1) return -1; + if (co) + { + filter->errmsg=CUS "comparator already specified"; + return -1; + } + else co=1; + } + else if ((m=parse_matchtype(filter,&matchType))!=0) + { + if (m==-1) return -1; + if (mt) + { + filter->errmsg=CUS "match type already specified"; + return -1; + } + else mt=1; + } + else break; + } + if ((m=parse_string(filter,&uri))!=1) + { + if (m==0) filter->errmsg=CUS "missing notification URI string"; + return -1; + } + if (parse_white(filter)==-1) return -1; + if ((m=parse_string(filter,&capa))!=1) + { + if (m==0) filter->errmsg=CUS "missing notification capability string"; + return -1; + } + if (parse_white(filter)==-1) return -1; + if ((m=parse_stringlist(filter,&keys))!=1) + { + if (m==0) filter->errmsg=CUS "missing key string list"; + return -1; + } + if (exec) + { + string_item *recipient; + struct String header,subject,body; + + *cond=0; + recipient=NULL; + header.length=-1; + header.character=(uschar*)0; + subject.length=-1; + subject.character=(uschar*)0; + body.length=-1; + body.character=(uschar*)0; + if (parse_mailto_uri(filter,uri.character,&recipient,&header,&subject,&body)==1) + { + if (eq_asciicase(&capa,&str_online,0)==1) + for (k=keys; k->length!=-1; ++k) + { + *cond=compare(filter,k,&str_maybe,comparator,matchType); + if (*cond==-1) return -1; + if (*cond) break; + } + } + } + return 1; + } #endif else return 0; } @@ -2380,8 +2739,8 @@ Returns: 2 success by stop 1 other success -1 syntax or execution error */ -static int parse_commands(struct Sieve *filter, int exec, - address_item **generated) +static int +parse_commands(struct Sieve *filter, int exec, address_item **generated) { while (*filter->pc) { @@ -2613,14 +2972,16 @@ while (*filter->pc) int m; struct String from; struct String importance; - struct String *options; struct String message; struct String method; struct Notification *already; string_item *recipient; struct String header; + struct String subject; struct String body; - uschar *envelope_from,*envelope_to; + uschar *envelope_from; + struct String auto_submitted_value; + uschar *auto_submitted_def; if (!filter->require_enotify) { @@ -2631,16 +2992,16 @@ while (*filter->pc) from.length=-1; importance.character=(uschar*)0; importance.length=-1; - options=(struct String*)0; message.character=(uschar*)0; message.length=-1; recipient=NULL; header.length=-1; header.character=(uschar*)0; + subject.length=-1; + subject.character=(uschar*)0; body.length=-1; body.character=(uschar*)0; - envelope_from=expand_string("$sender_address"); - envelope_to=expand_string("$local_part_prefix$local_part$local_part_suffix@$domain"); + envelope_from=(sender_address && sender_address[0]) ? expand_string(US"$local_part_prefix$local_part$local_part_suffix@$domain") : US ""; for (;;) { if (parse_white(filter)==-1) return -1; @@ -2689,65 +3050,94 @@ while (*filter->pc) return -1; } if (parse_semicolon(filter)==-1) return -1; - - for (already=filter->notified; already; already=already->next) - { - if (already->method.length==method.length - && (method.length==-1 || strcmp(already->method.character,method.character)==0) - && already->importance.length==importance.length - && (importance.length==-1 || strcmp(already->importance.character,importance.character)==0) - && already->message.length==message.length - && (message.length==-1 || strcmp(already->message.character,message.character)==0)) - break; - } - if (already==(struct Notification*)0) - /* New notification, process it */ + if (parse_mailto_uri(filter,method.character,&recipient,&header,&subject,&body)!=1) + return -1; + if (exec) { - if (parse_mailto_uri(filter,method.character,&recipient,&header,&body)!=1) - return -1; - struct Notification *sent; - sent=store_get(sizeof(struct Notification)); - sent->method=method; - sent->importance=importance; - sent->message=message; - sent->next=filter->notified; - filter->notified=sent; - if ((filter_test != FTEST_NONE && debug_selector != 0) || (debug_selector & D_filter) != 0) + if (message.length==-1) message=subject; + if (message.length==-1) expand_header(&message,&str_subject); + expand_header(&auto_submitted_value,&str_auto_submitted); + auto_submitted_def=expand_string(string_sprintf("${if def:header_auto-submitted {true}{false}}")); + if (auto_submitted_value.character == NULL || auto_submitted_def == NULL) { - debug_printf("Notification to `%s'.\n",method.character); + filter->errmsg=CUS "header string expansion failed"; + return -1; } -#ifndef COMPILE_SYNTAX_CHECKER - if (exec) + if (Ustrcmp(auto_submitted_def,"true")!=0 || Ustrcmp(auto_submitted_value.character,"no")==0) { - string_item *p; - header_line *h; - int pid,fd; + for (already=filter->notified; already; already=already->next) + { + if (already->method.length==method.length + && (method.length==-1 || Ustrcmp(already->method.character,method.character)==0) + && already->importance.length==importance.length + && (importance.length==-1 || Ustrcmp(already->importance.character,importance.character)==0) + && already->message.length==message.length + && (message.length==-1 || Ustrcmp(already->message.character,message.character)==0)) + break; + } + if (already==(struct Notification*)0) + /* New notification, process it */ + { + struct Notification *sent; + sent=store_get(sizeof(struct Notification)); + sent->method=method; + sent->importance=importance; + sent->message=message; + sent->next=filter->notified; + filter->notified=sent; + #ifndef COMPILE_SYNTAX_CHECKER + if (filter_test == FTEST_NONE) + { + string_item *p; + int pid,fd; - if ((pid = child_open_exim2(&fd,envelope_to,envelope_to))>=1) + if ((pid = child_open_exim2(&fd,envelope_from,envelope_from))>=1) + { + FILE *f; + uschar *buffer; + int buffer_capacity; + + f = fdopen(fd, "wb"); + fprintf(f,"From: %s\n",from.length==-1 ? expand_string(US"$local_part_prefix$local_part$local_part_suffix@$domain") : from.character); + for (p=recipient; p; p=p->next) fprintf(f,"To: %s\n",p->text); + fprintf(f,"Auto-Submitted: auto-notified; %s\n",filter->enotify_mailto_owner); + if (header.length>0) fprintf(f,"%s",header.character); + if (message.length==-1) + { + message.character=US"Notification"; + message.length=Ustrlen(message.character); + } + /* Allocation is larger than necessary, but enough even for split MIME words */ + buffer_capacity=32+4*message.length; + buffer=store_get(buffer_capacity); + if (message.length!=-1) fprintf(f,"Subject: %s\n",parse_quote_2047(message.character, message.length, US"utf-8", buffer, buffer_capacity, TRUE)); + fprintf(f,"\n"); + if (body.length>0) fprintf(f,"%s\n",body.character); + fflush(f); + (void)fclose(f); + (void)child_close(pid, 0); + } + } + if ((filter_test != FTEST_NONE && debug_selector != 0) || (debug_selector & D_filter) != 0) + { + debug_printf("Notification to `%s': '%s'.\n",method.character,message.length!=-1 ? message.character : CUS ""); + } +#endif + } + else { - FILE *f; - - f = fdopen(fd, "wb"); - for (h = header_list; h != NULL; h = h->next) - if (h->type == htype_received) fprintf(f,"%s",h->text); - fprintf(f,"From: %s\n",from.length==-1 ? envelope_to : from.character); - for (p=recipient; p; p=p->next) fprintf(f,"To: %s\n",p->text); - if (header.length>0) fprintf(f,"%s",header.character); - fprintf(f,"Subject: %s\n",message.length==-1 ? CUS "notification" : message.character); - fprintf(f,"\n"); - if (body.length>0) fprintf(f,"%s\n",body.character); - fflush(f); - (void)fclose(f); - (void)child_close(pid, 0); + if ((filter_test != FTEST_NONE && debug_selector != 0) || (debug_selector & D_filter) != 0) + { + debug_printf("Repeated notification to `%s' ignored.\n",method.character); + } } } -#endif - } - else - { - if ((filter_test != FTEST_NONE && debug_selector != 0) || (debug_selector & D_filter) != 0) + else { - debug_printf("Repeated notification to `%s' ignored.\n",method.character); + if ((filter_test != FTEST_NONE && debug_selector != 0) || (debug_selector & D_filter) != 0) + { + debug_printf("Ignoring notification, triggering message contains Auto-submitted: field.\n"); + } } } } @@ -2911,10 +3301,10 @@ while (*filter->pc) capacity=0; if (handle.length==-1) { - if (subject.length!=-1) key.character=string_cat(key.character,&capacity,&key.length,subject.character,subject.length); - if (from.length!=-1) key.character=string_cat(key.character,&capacity,&key.length,from.character,from.length); - key.character=string_cat(key.character,&capacity,&key.length,reason_is_mime?US"1":US"0",1); - key.character=string_cat(key.character,&capacity,&key.length,reason.character,reason.length); + if (subject.length!=-1) key.character=string_catn(key.character,&capacity,&key.length,subject.character,subject.length); + if (from.length!=-1) key.character=string_catn(key.character,&capacity,&key.length,from.character,from.length); + key.character=string_catn(key.character,&capacity,&key.length,reason_is_mime?US"1":US"0",1); + key.character=string_catn(key.character,&capacity,&key.length,reason.character,reason.length); } else key=handle; @@ -2929,8 +3319,8 @@ while (*filter->pc) { capacity=Ustrlen(filter->vacation_directory); start=capacity; - once=string_cat(filter->vacation_directory,&capacity,&start,US"/",1); - once=string_cat(once,&capacity,&start,hexdigest,33); + once=string_catn(filter->vacation_directory,&capacity,&start,US"/",1); + once=string_catn(once,&capacity,&start,hexdigest,33); once[start] = '\0'; /* process subject */ @@ -2945,7 +3335,7 @@ while (*filter->pc) expand_header(&subject,&str_subject); capacity=6; start=6; - subject.character=string_cat(US"Auto: ",&capacity,&start,subject.character,subject.length); + subject.character=string_catn(US"Auto: ",&capacity,&start,subject.character,subject.length); subject.length=start; } else @@ -2959,7 +3349,7 @@ while (*filter->pc) addr = deliver_make_addr(string_sprintf(">%.256s", sender_address), FALSE); setflag(addr, af_pfr); - setflag(addr, af_ignore_error); + addr->prop.ignore_error = TRUE; addr->next = *generated; *generated = addr; addr->reply = store_get(sizeof(reply_item)); @@ -2969,10 +3359,11 @@ while (*filter->pc) addr->reply->from = expand_string(US"$local_part@$domain"); else addr->reply->from = from.character; - /* Allocation is larger than neccessary, but enough even for split MIME words */ + /* Allocation is larger than necessary, but enough even for split MIME words */ buffer_capacity=32+4*subject.length; buffer=store_get(buffer_capacity); - addr->reply->subject=parse_quote_2047(subject.character, subject.length, US"utf-8", buffer, buffer_capacity, TRUE); + /* deconst cast safe as we pass in a non-const item */ + addr->reply->subject = US parse_quote_2047(subject.character, subject.length, US"utf-8", buffer, buffer_capacity, TRUE); addr->reply->oncelog=once; addr->reply->once_repeat=days*86400; @@ -2991,18 +3382,18 @@ while (*filter->pc) ); capacity = 0; start = 0; - addr->reply->headers = string_cat(NULL,&capacity,&start,reason.character,mime_body-reason.character); + addr->reply->headers = string_catn(NULL,&capacity,&start,reason.character,mime_body-reason.character); addr->reply->headers[start] = '\0'; capacity = 0; start = 0; if (mime_body+(sizeof(nlnl)-1)reply->text = string_cat(NULL,&capacity,&start,mime_body,reason_end-mime_body); + addr->reply->text = string_catn(NULL,&capacity,&start,mime_body,reason_end-mime_body); addr->reply->text[start] = '\0'; } else { - struct String qp = { NULL, 0 }; /* Keep compiler happy (PH) */ + struct String qp = { .character = NULL, .length = 0 }; /* Keep compiler happy (PH) */ capacity = 0; start = reason.length; @@ -3041,14 +3432,17 @@ Returns: 1 success -1 syntax or execution error */ -static int parse_start(struct Sieve *filter, int exec, - address_item **generated) +static int +parse_start(struct Sieve *filter, int exec, address_item **generated) { filter->pc=filter->filter; filter->line=1; filter->keep=1; filter->require_envelope=0; filter->require_fileinto=0; +#ifdef ENCODED_CHARACTER +filter->require_encoded_character=0; +#endif #ifdef ENVELOPE_AUTH filter->require_envelope_auth=0; #endif @@ -3121,11 +3515,22 @@ while (parse_identifier(filter,CUS "require")) { if (eq_octet(check,&str_envelope,0)) filter->require_envelope=1; else if (eq_octet(check,&str_fileinto,0)) filter->require_fileinto=1; +#ifdef ENCODED_CHARACTER + else if (eq_octet(check,&str_encoded_character,0)) filter->require_encoded_character=1; +#endif #ifdef ENVELOPE_AUTH else if (eq_octet(check,&str_envelope_auth,0)) filter->require_envelope_auth=1; #endif #ifdef ENOTIFY - else if (eq_octet(check,&str_enotify,0)) filter->require_enotify=1; + else if (eq_octet(check,&str_enotify,0)) + { + if (filter->enotify_mailto_owner == NULL) + { + filter->errmsg=CUS "enotify disabled"; + return -1; + } + filter->require_enotify=1; + } #endif #ifdef SUBADDRESS else if (eq_octet(check,&str_subaddress,0)) filter->require_subaddress=1; @@ -3173,7 +3578,8 @@ Arguments: filter points to the entire file, read into store as a single string options controls whether various special things are allowed, and requests special actions (not currently used) - sieve_vacation_directory where to store vacation "once" files + vacation_directory where to store vacation "once" files + enotify_mailto_owner owner of mailto notifications useraddress string expression for :user part of address subaddress string expression for :subaddress part of address generated where to hang newly-generated addresses @@ -3189,7 +3595,8 @@ Returns: FF_DELIVERED success, a significant action was taken int sieve_interpret(uschar *filter, int options, uschar *vacation_directory, - uschar *useraddress, uschar *subaddress, address_item **generated, uschar **error) + uschar *enotify_mailto_owner, uschar *useraddress, uschar *subaddress, + address_item **generated, uschar **error) { struct Sieve sieve; int r; @@ -3215,6 +3622,20 @@ else } } +if (enotify_mailto_owner == NULL) + sieve.enotify_mailto_owner = NULL; +else + { + sieve.enotify_mailto_owner=expand_string(enotify_mailto_owner); + if (sieve.enotify_mailto_owner == NULL) + { + *error = string_sprintf("failed to expand \"%s\" " + "(sieve_enotify_mailto_owner): %s", enotify_mailto_owner, + expand_string_message); + return FF_ERROR; + } + } + sieve.useraddress = useraddress == NULL ? CUS "$local_part_prefix$local_part$local_part_suffix" : useraddress; sieve.subaddress = subaddress;