X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=blobdiff_plain;f=src%2Fsrc%2Fsieve.c;h=18aa3e609ead7f995d2bcde2bbd63473d0379e79;hp=b5053c796cb2d6198b22f5a4071bb961396da570;hb=1e1ddfac79fbcd052f199500a6493c7f79cb8462;hpb=c3aea640e1d51e0eab69cde6a3dc8b30e41cbf9c diff --git a/src/src/sieve.c b/src/src/sieve.c index b5053c796..18aa3e609 100644 --- a/src/src/sieve.c +++ b/src/src/sieve.c @@ -1,11 +1,11 @@ -/* $Cambridge: exim/src/src/sieve.c,v 1.5 2005/02/15 15:48:46 ph10 Exp $ */ - /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) Michael Haardt 2003,2004 */ -/* See the file NOTICE for conditions of use and distribution. */ +/* Copyright (c) Michael Haardt 2003 - 2015 + * Copyright (c) The Exim Maintainers 2016 - 2020 + * See the file NOTICE for conditions of use and distribution. + */ /* This code was contributed by Michael Haardt. */ @@ -21,18 +21,26 @@ #include "exim.h" #if HAVE_ICONV -#include +# include #endif /* Define this for RFC compliant \r\n end-of-line terminators. */ /* Undefine it for UNIX-style \n end-of-line terminators (default). */ #undef RFC_EOL -/* Define this for development of the subaddress Sieve extension. */ -/* The code is currently broken. */ -#undef SUBADDRESS +/* 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". */ +#define ENOTIFY + +/* Define this for the Sieve extension "subaddress". */ +#define SUBADDRESS -/* Define this for the vacation Sieve extension. */ +/* Define this for the Sieve extension "vacation". */ #define VACATION /* Must be >= 1 */ @@ -53,6 +61,17 @@ 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 +#ifdef ENOTIFY + int require_enotify; + struct Notification *notified; +#endif + uschar *enotify_mailto_owner; #ifdef SUBADDRESS int require_subaddress; #endif @@ -61,11 +80,13 @@ struct Sieve int vacation_ran; #endif uschar *vacation_directory; + const uschar *subaddress; + const uschar *useraddress; int require_copy; int require_iascii_numeric; }; -enum Comparator { COMP_OCTET, COMP_ASCII_CASEMAP, COMP_ASCII_NUMERIC }; +enum Comparator { COMP_OCTET, COMP_EN_ASCII_CASEMAP, COMP_ASCII_NUMERIC }; enum MatchType { MATCH_IS, MATCH_CONTAINS, MATCH_MATCHES }; #ifdef SUBADDRESS enum AddressPart { ADDRPART_USER, ADDRPART_DETAIL, ADDRPART_LOCALPART, ADDRPART_DOMAIN, ADDRPART_ALL }; @@ -80,6 +101,47 @@ struct String int length; }; +struct Notification + { + struct String method; + struct String importance; + struct String message; + 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); @@ -91,6 +153,10 @@ static uschar str_cc_c[]="Cc"; static const struct String str_cc={ str_cc_c, 2 }; static uschar str_bcc_c[]="Bcc"; static const struct String str_bcc={ str_bcc_c, 3 }; +#ifdef ENVELOPE_AUTH +static uschar str_auth_c[]="auth"; +static const struct String str_auth={ str_auth_c, 4 }; +#endif static uschar str_sender_c[]="Sender"; static const struct String str_sender={ str_sender_c, 6 }; static uschar str_resent_from_c[]="Resent-From"; @@ -101,6 +167,24 @@ 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 }; +#endif +#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"; static const struct String str_subaddress={ str_subaddress_c, 10 }; @@ -115,12 +199,16 @@ static uschar str_copy_c[]="copy"; static const struct String str_copy={ str_copy_c, 4 }; static uschar str_iascii_casemap_c[]="i;ascii-casemap"; static const struct String str_iascii_casemap={ str_iascii_casemap_c, 15 }; +static uschar str_enascii_casemap_c[]="en;ascii-casemap"; +static const struct String str_enascii_casemap={ str_enascii_casemap_c, 16 }; static uschar str_ioctet_c[]="i;octet"; static const struct String str_ioctet={ str_ioctet_c, 7 }; static uschar str_iascii_numeric_c[]="i;ascii-numeric"; static const struct String str_iascii_numeric={ str_iascii_numeric_c, 15 }; static uschar str_comparator_iascii_casemap_c[]="comparator-i;ascii-casemap"; static const struct String str_comparator_iascii_casemap={ str_comparator_iascii_casemap_c, 26 }; +static uschar str_comparator_enascii_casemap_c[]="comparator-en;ascii-casemap"; +static const struct String str_comparator_enascii_casemap={ str_comparator_enascii_casemap_c, 27 }; static uschar str_comparator_ioctet_c[]="comparator-i;octet"; static const struct String str_comparator_ioctet={ str_comparator_ioctet_c, 18 }; static uschar str_comparator_iascii_numeric_c[]="comparator-i;ascii-numeric"; @@ -134,94 +222,77 @@ static const struct String str_comparator_iascii_numeric={ str_comparator_iascii /* Arguments: src UTF-8 string + dst US-ASCII string + +Returns + dst */ -static struct String *quoted_printable_encode(const struct String *src, struct String *dst) +static struct String * +quoted_printable_encode(const struct String *src, struct String *dst) { -int pass; -const uschar *start,*end; uschar *new = NULL; uschar ch; size_t line; -for (pass=0; pass<=1; ++pass) +/* Two passes: one to count output allocation size, second +to do the encoding */ + +for (int pass = 0; pass <= 1; pass++) { line=0; if (pass==0) dst->length=0; else { - dst->character=store_get(dst->length+1); /* plus one for \0 */ + dst->character = store_get(dst->length+1, is_tainted(src->character)); /* plus one for \0 */ new=dst->character; } - for (start=src->character,end=start+src->length; startcharacter, * end = start + src->length; + start < end; ++start) { ch=*start; - if (line>=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) -#ifdef RFC_EOL - && start+2='!' && ch<='<') + || (ch>='>' && ch<='~') + || ( (ch=='\t' || ch==' ') + && start+2length; else - *new++=*start; + *new++=*start; /* copy char */ ++line; } -#ifdef RFC_EOL - else if (ch=='\r' && start+1length; - line=0; - ++start; - } - else - *new++='\n'; - line=0; - } -#else - else if (ch=='\n') + else if (ch=='\r' && start+1length; else - *new++=*start; - ++line; + *new++='\n'; /* NL */ + line=0; + ++start; /* consume extra input char */ } -#endif else { if (pass==0) dst->length+=3; else - { - sprintf(CS new,"=%02X",ch); - new+=3; + { /* encoded char */ + new += sprintf(CS new,"=%02X",ch); } line+=3; } @@ -232,6 +303,260 @@ for (pass=0; pass<=1; ++pass) } +/************************************************* +* Check mail address for correct syntax * +*************************************************/ + +/* +Check mail address for being syntactically correct. + +Arguments: + filter points to the Sieve filter including its state + address String containing one address + +Returns + 1 Mail address is syntactically OK + -1 syntax error +*/ + +int check_mail_address(struct Sieve *filter, const struct String *address) +{ +int start, end, domain; +uschar *error,*ss; + +if (address->length>0) + { + ss = parse_extract_address(address->character, &error, &start, &end, &domain, + FALSE); + if (!ss) + { + filter->errmsg=string_sprintf("malformed address \"%s\" (%s)", + address->character, error); + return -1; + } + else + return 1; + } +else + { + filter->errmsg=CUS "empty address"; + return -1; + } +} + + +/************************************************* +* Decode URI encoded string * +*************************************************/ + +/* +Arguments: + str URI encoded string + +Returns + 0 Decoding successful + -1 Encoding error +*/ + +#ifdef ENOTIFY +static int +uri_decode(struct String *str) +{ +uschar *s,*t,*e; + +if (str->length==0) return 0; +for (s=str->character,t=s,e=s+str->length; slength=t-str->character; +return 0; +} + + +/************************************************* +* Parse mailto URI * +*************************************************/ + +/* +Parse mailto-URI. + + mailtoURI = "mailto:" [ to ] [ headers ] + to = [ addr-spec *("%2C" addr-spec ) ] + headers = "?" header *( "&" header ) + header = hname "=" hvalue + hname = *urlc + hvalue = *urlc + +Arguments: + filter points to the Sieve filter including its state + uri URI, excluding scheme + recipient + body + +Returns + 1 URI is syntactically OK + 0 Unknown URI scheme + -1 syntax error +*/ + +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; +struct String hvalue = {.character = NULL, .length = 0}; +string_item *new; + +if (Ustrncmp(uri,"mailto:",7)) + { + filter->errmsg=US "Unknown URI scheme"; + return 0; + } + +uri+=7; +if (*uri && *uri!='?') + for (;;) + { + /* match to */ + for (start=uri; *uri && *uri!='?' && (*uri!='%' || *(uri+1)!='2' || tolower(*(uri+2))!='c'); ++uri); + if (uri>start) + { + gstring * g = string_catn(NULL, start, uri-start); + + to.character = string_from_gstring(g); + to.length = g->ptr; + if (uri_decode(&to)==-1) + { + filter->errmsg=US"Invalid URI encoding"; + return -1; + } + new=store_get(sizeof(string_item), FALSE); + new->text = store_get(to.length+1, is_tainted(to.character)); + if (to.length) memcpy(new->text, to.character, to.length); + new->text[to.length]='\0'; + new->next=*recipient; + *recipient=new; + } + else + { + filter->errmsg=US"Missing addr-spec in URI"; + return -1; + } + if (*uri=='%') uri+=3; + else break; + } +if (*uri=='?') + { + ++uri; + for (;;) + { + /* match hname */ + for (start=uri; *uri && (isalnum(*uri) || strchr("$-_.+!*'(),%",*uri)); ++uri); + if (uri>start) + { + gstring * g = string_catn(NULL, start, uri-start); + + hname.character = string_from_gstring(g); + hname.length = g->ptr; + if (uri_decode(&hname)==-1) + { + filter->errmsg=US"Invalid URI encoding"; + return -1; + } + } + /* match = */ + if (*uri=='=') + ++uri; + else + { + filter->errmsg=US"Missing equal after hname"; + return -1; + } + /* match hvalue */ + for (start=uri; *uri && (isalnum(*uri) || strchr("$-_.+!*'(),%",*uri)); ++uri); + if (uri>start) + { + gstring * g = string_catn(NULL, start, uri-start); + + hname.character = string_from_gstring(g); + hname.length = g->ptr; + if (uri_decode(&hvalue)==-1) + { + filter->errmsg=US"Invalid URI encoding"; + return -1; + } + } + if (hname.length==2 && strcmpic(hname.character, US"to")==0) + { + new=store_get(sizeof(string_item), FALSE); + new->text = store_get(hvalue.length+1, is_tainted(hvalue.character)); + if (hvalue.length) memcpy(new->text, hvalue.character, hvalue.length); + new->text[hvalue.length]='\0'; + new->next=*recipient; + *recipient=new; + } + 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"message-id",10}, + {US"received",8}, + {US"auto-submitted",14} + }; + static struct String *end=ignore+sizeof(ignore)/sizeof(ignore[0]); + struct String *i; + + for (i=ignore; ilength==-1) header->length = 0; + + g = string_catn(NULL, header->character, header->length); + g = string_catn(g, hname.character, hname.length); + g = string_catn(g, CUS ": ", 2); + g = string_catn(g, hvalue.character, hvalue.length); + g = string_catn(g, CUS "\n", 1); + + header->character = string_from_gstring(g); + header->length = g->ptr; + } + } + if (*uri=='&') ++uri; + else break; + } + } +if (*uri) + { + filter->errmsg=US"Syntactically invalid URI"; + return -1; + } +return 1; +} +#endif + + /************************************************* * Octet-wise string comparison * *************************************************/ @@ -306,8 +631,7 @@ while (nl>0 && hl>0) if (hc&0x80) return 0; #endif /* tolower depends on the locale and only ASCII case must be insensitive */ - if ((nc&0x80) || (hc&0x80)) { if (nc!=hc) return 0; } - else if ((nc>='A' && nc<='Z' ? nc|0x20 : nc) != (hc>='A' && hc<='Z' ? hc|0x20 : hc)) return 0; + if ((nc>='A' && nc<='Z' ? nc|0x20 : nc) != (hc>='A' && hc<='Z' ? hc|0x20 : hc)) return 0; ++n; ++h; --nl; @@ -318,241 +642,116 @@ return (match_prefix ? nl==0 : nl==0 && hl==0); /************************************************* -* Octet-wise glob pattern search * +* Glob pattern search * *************************************************/ /* 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 + -1 pattern error */ -static int eq_octetglob(const struct String *needle, - const struct String *haystack) +static int eq_glob(const struct String *needle, + const struct String *haystack, int ascii_caseless, int match_octet) { -struct String n,h; +const uschar *n,*h,*nend,*hend; +int may_advance=0; -n=*needle; -h=*haystack; -while (n.length) +n=needle->character; +h=haystack->character; +nend=n+needle->length; +hend=h+haystack->length; +while (n='A' && *npart<='Z' ? *npart|0x20 : *npart) != (*hpart>='A' && *hpart<='Z' ? *hpart|0x20 : *hpart)) + : *hpart!=*npart + ) { - while (h.length && (h.character[0]&0x80)) + if (may_advance) + /* string match after a star failed, advance and try again */ { - ++h.character; - --h.length; + ++h; + goto match_part; } + else return 0; } else { - ++h.character; - --h.length; - } + ++npart; + ++hpart; + }; } - else return 0; - break; } - case '\\': + /* at this point, a part was matched successfully */ + if (may_advance && npart==nend && hpart='A' && nc<='Z' ? nc|0x20 : nc) != (hc>='A' && hc<='Z' ? hc|0x20 : hc)) return 0; - ++h.character; - --h.length; - ++n.character; - --n.length; + ++h; + goto match_part; } + h=hpart; + n=npart; + may_advance=0; } } -return (h.length==0); +return (h==hend ? 1 : may_advance); } @@ -615,6 +814,7 @@ switch (relop) /* Arguments: + filter points to the Sieve filter including its state needle UTF-8 pattern or string to search ... haystack ... inside the haystack co comparator to use @@ -644,7 +844,7 @@ if ((filter_test != FTEST_NONE && debug_selector != 0) || switch (co) { case COMP_OCTET: debug_printf("i;octet"); break; - case COMP_ASCII_CASEMAP: debug_printf("i;ascii-casemap"); break; + case COMP_EN_ASCII_CASEMAP: debug_printf("en;ascii-casemap"); break; case COMP_ASCII_NUMERIC: debug_printf("i;ascii-numeric"); break; } debug_printf("\"):\n"); @@ -654,21 +854,15 @@ if ((filter_test != FTEST_NONE && debug_selector != 0) || switch (mt) { case MATCH_IS: - { switch (co) { case COMP_OCTET: - { if (eq_octet(needle,haystack,0)) r=1; break; - } - case COMP_ASCII_CASEMAP: - { + case COMP_EN_ASCII_CASEMAP: if (eq_asciicase(needle,haystack,0)) r=1; break; - } case COMP_ASCII_NUMERIC: - { if (!filter->require_iascii_numeric) { filter->errmsg=CUS "missing previous require \"comparator-i;ascii-numeric\";"; @@ -676,10 +870,9 @@ switch (mt) } if (eq_asciinumeric(needle,haystack,EQ)) r=1; break; - } } break; - } + case MATCH_CONTAINS: { struct String h; @@ -687,45 +880,42 @@ switch (mt) switch (co) { case COMP_OCTET: - { - for (h=*haystack; h.length; ++h.character,--h.length) if (eq_octet(needle,&h,1)) { r=1; break; } + for (h = *haystack; h.length; ++h.character,--h.length) + if (eq_octet(needle,&h,1)) { r=1; break; } break; - } - case COMP_ASCII_CASEMAP: - { - for (h=*haystack; h.length; ++h.character,--h.length) if (eq_asciicase(needle,&h,1)) { r=1; break; } + case COMP_EN_ASCII_CASEMAP: + for (h = *haystack; h.length; ++h.character, --h.length) + if (eq_asciicase(needle,&h,1)) { r=1; break; } break; - } default: - { filter->errmsg=CUS "comparator does not offer specified matchtype"; return -1; - } } break; } + case MATCH_MATCHES: - { switch (co) { case COMP_OCTET: - { - if (eq_octetglob(needle,haystack)) r=1; + if ((r=eq_glob(needle,haystack,0,1))==-1) + { + filter->errmsg=CUS "syntactically invalid pattern"; + return -1; + } break; - } - case COMP_ASCII_CASEMAP: - { - if (eq_asciicaseglob(needle,haystack)) r=1; + case COMP_EN_ASCII_CASEMAP: + if ((r=eq_glob(needle,haystack,1,1))==-1) + { + filter->errmsg=CUS "syntactically invalid pattern"; + return -1; + } break; - } default: - { filter->errmsg=CUS "comparator does not offer specified matchtype"; return -1; - } } break; - } } if ((filter_test != FTEST_NONE && debug_selector != 0) || (debug_selector & D_filter) != 0) @@ -790,10 +980,10 @@ Arguments: Returns: quoted string */ -static const uschar *quote(const struct String *header) +static const uschar * +quote(const struct String *header) { -uschar *quoted=NULL; -int size=0,ptr=0; +gstring * quoted = NULL; size_t l; const uschar *h; @@ -804,26 +994,20 @@ while (l) switch (*h) { case '\0': - { - quoted=string_cat(quoted,&size,&ptr,CUS "\\0",2); + quoted = string_catn(quoted, CUS "\\0", 2); break; - } case '$': case '{': case '}': - { - quoted=string_cat(quoted,&size,&ptr,CUS "\\",1); - } + quoted = string_catn(quoted, CUS "\\", 1); default: - { - quoted=string_cat(quoted,&size,&ptr,h,1); - } + quoted = string_catn(quoted, h, 1); } ++h; --l; } -quoted=string_cat(quoted,&size,&ptr,CUS "",1); -return quoted; +quoted = string_catn(quoted, CUS "", 1); +return string_from_gstring(quoted); } @@ -832,7 +1016,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: @@ -843,33 +1027,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)) +for (new_addr = *generated; new_addr; new_addr = new_addr->next) + 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; } @@ -880,6 +1067,10 @@ new_addr->next = *generated; *************************************************/ /* +Unfold the header field as described in RFC 2822 and remove all +leading and trailing white space, then perform MIME decoding and +translate the header field to UTF-8. + Arguments: value returned value of the field header name of the header field @@ -896,21 +1087,19 @@ uschar *errmsg; value->length=0; value->character=(uschar*)0; -t=r=s=expand_string(string_sprintf("$rheader_%s",quote(header))); -while (*r==' ') ++r; +t = r = s = expand_string(string_sprintf("$rheader_%s",quote(header))); +if (!t) return; +while (*r==' ' || *r=='\t') ++r; while (*r) { if (*r=='\n') - { ++r; - while (*r==' ' || *r=='\t') ++r; - if (*r) *t++=' '; - } else *t++=*r++; } -*t++='\0'; -value->character=rfc2047_decode(s,TRUE,US"utf-8",'\0',&value->length,&errmsg); +while (t>s && (*(t-1)==' ' || *(t-1)=='\t')) --t; +*t='\0'; +value->character=rfc2047_decode(s,check_rfc2047_length,US"utf-8",'\0',&value->length,&errmsg); } @@ -950,92 +1139,301 @@ while (*filter->pc) } else ++filter->pc; } -filter->errmsg=CUS "missing end of comment"; -return -1; +filter->errmsg=CUS "missing end of comment"; +return -1; +} + + +/************************************************* +* Parse remaining C-style comment * +*************************************************/ + +/* +Token definition: + Everything up to star slash + +Arguments: + filter points to the Sieve filter including its state + +Returns: 1 success + -1 syntax error +*/ + +static int parse_comment(struct Sieve *filter) +{ + filter->pc+=2; + while (*filter->pc) + { + if (*filter->pc=='*' && *(filter->pc+1)=='/') + { + filter->pc+=2; + return 1; + } + else ++filter->pc; + } + filter->errmsg=CUS "missing end of comment"; + return -1; +} + + +/************************************************* +* Parse optional white space * +*************************************************/ + +/* +Token definition: + Spaces, tabs, CRLFs, hash comments or C-style comments + +Arguments: + filter points to the Sieve filter including its state + +Returns: 1 success + -1 syntax error +*/ + +static int parse_white(struct Sieve *filter) +{ +while (*filter->pc) + { + if (*filter->pc==' ' || *filter->pc=='\t') ++filter->pc; +#ifdef RFC_EOL + else if (*filter->pc=='\r' && *(filter->pc+1)=='\n') +#else + else if (*filter->pc=='\n') +#endif + { +#ifdef RFC_EOL + filter->pc+=2; +#else + ++filter->pc; +#endif + ++filter->line; + } + else if (*filter->pc=='#') + { + if (parse_hashcomment(filter)==-1) return -1; + } + else if (*filter->pc=='/' && *(filter->pc+1)=='*') + { + if (parse_comment(filter)==-1) return -1; + } + else break; + } +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 parse_comment(struct Sieve *filter) +static int +unicode_decode(uschar *src, uschar *end, uschar *dst) { - filter->pc+=2; - while (*filter->pc) +int decoded=0; + +while (*src==' ' || *src=='\t' || *src=='\n') ++src; +do { - if (*filter->pc=='*' && *(filter->pc+1)=='/') + uschar *hex_seq; + int c,d,n; + + unicode_hex: + for (hex_seq = src; src < end && *src=='0'; ) src++; + for (c = 0, d = 0; + d < 7 && src < end && isxdigit(n=tolower(*src)); + c=(c<<4)|(n>='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) { - filter->pc+=2; - return 1; + 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; } - else ++filter->pc; } - filter->errmsg=CUS "missing end of comment"; - return -1; +while (srcpc) +uschar *src,*dst,*end; + +src=data->character; +dst=src; +end=data->character+data->length; +while (srcpc==' ' || *filter->pc=='\t') ++filter->pc; -#ifdef RFC_EOL - else if (*filter->pc=='\r' && *(filter->pc+1)=='\n') -#else - else if (*filter->pc=='\n') -#endif - { -#ifdef RFC_EOL - filter->pc+=2; -#else - ++filter->pc; -#endif - ++filter->line; - } - else if (*filter->pc=='#') + uschar *brace; + + if ( + strncmpic(src,US "${hex:",6)==0 + && (brace=Ustrchr(src+6,'}'))!=(uschar*)0 + && (hex_decode(src+6,brace,(uschar*)0))>=0 + ) { - if (parse_hashcomment(filter)==-1) return -1; + dst+=hex_decode(src+6,brace,dst); + src=brace+1; } - else if (*filter->pc=='/' && *(filter->pc+1)=='*') + else if ( + strncmpic(src,US "${unicode:",10)==0 + && (brace=Ustrchr(src+10,'}'))!=(uschar*)0 + ) { - if (parse_comment(filter)==-1) return -1; + 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 break; + else *dst++=*src++; } + data->length=dst-data->character; + *dst='\0'; return 1; } +#endif /************************************************* -* Parse a optional string * +* Parse an optional string * *************************************************/ /* @@ -1064,12 +1462,14 @@ Returns: 1 success 0 identifier not matched */ -static int parse_string(struct Sieve *filter, struct String *data) +static int +parse_string(struct Sieve *filter, struct String *data) { -int dataCapacity=0; +gstring * g = NULL; + +data->length = 0; +data->character = NULL; -data->length=0; -data->character=(uschar*)0; if (*filter->pc=='"') /* quoted string */ { ++filter->pc; @@ -1077,21 +1477,41 @@ if (*filter->pc=='"') /* quoted string */ { if (*filter->pc=='"') /* end of string */ { - int foo=data->length; - ++filter->pc; - data->character=string_cat(data->character,&dataCapacity,&foo,CUS "",1); + + if (g) + { + data->character = string_from_gstring(g); + data->length = g->ptr; + } + else + data->character = US"\0"; + /* that way, there will be at least one character allocated */ + +#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); + g = string_catn(g, filter->pc+1, 1); filter->pc+=2; } else /* regular character */ { - data->character=string_cat(data->character,&dataCapacity,&data->length,filter->pc,1); +#ifdef RFC_EOL + if (*filter->pc=='\r' && *(filter->pc+1)=='\n') ++filter->line; +#else + if (*filter->pc=='\n') + { + g = string_catn(g, US"\r", 1); + ++filter->line; + } +#endif + g = string_catn(g, filter->pc, 1); filter->pc++; } } @@ -1133,7 +1553,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); + g = string_catn(g, CUS "\r\n", 2); #ifdef RFC_EOL filter->pc+=2; #else @@ -1146,24 +1566,37 @@ else if (Ustrncmp(filter->pc,CUS "text:",5)==0) /* multiline string */ if (*filter->pc=='.' && *(filter->pc+1)=='\n') /* end of string */ #endif { - data->character=string_cat(data->character,&dataCapacity,&data->length,CUS "",1); + if (g) + { + data->character = string_from_gstring(g); + data->length = g->ptr; + } + else + data->character = US"\0"; + /* that way, there will be at least one character allocated */ + #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); + g = string_catn(g, CUS ".", 1); filter->pc+=2; } } else /* regular character */ { - data->character=string_cat(data->character,&dataCapacity,&data->length,filter->pc,1); + g = string_catn(g, filter->pc, 1); filter->pc++; } } @@ -1194,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]; @@ -1276,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 */ @@ -1290,20 +1724,17 @@ 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, FALSE); + if (d) memcpy(new,d,sizeof(struct String)*dataLength); - d=new; - dataCapacity=newCapacity; + d = new; } + m=parse_string(filter,&d[dataLength]); if (m==0) { @@ -1336,15 +1767,13 @@ if (*filter->pc=='[') /* string list */ } else /* single string */ { - if ((d=store_get(sizeof(struct String)*2))==(struct String*)0) - { + if (!(d=store_get(sizeof(struct String)*2, FALSE))) return -1; - } + m=parse_string(filter,&d[0]); if (m==-1) - { return -1; - } + else if (m==0) { filter->pc=orig; @@ -1468,7 +1897,12 @@ switch (parse_string(filter,&comparator_name)) } else if (eq_asciicase(&comparator_name,&str_iascii_casemap,0)) { - *c=COMP_ASCII_CASEMAP; + *c=COMP_EN_ASCII_CASEMAP; + match=1; + } + else if (eq_asciicase(&comparator_name,&str_enascii_casemap,0)) + { + *c=COMP_EN_ASCII_CASEMAP; match=1; } else if (eq_asciicase(&comparator_name,&str_iascii_numeric,0)) @@ -1535,7 +1969,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 @@ -1543,14 +1977,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; @@ -1559,7 +1993,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; @@ -1595,7 +2029,8 @@ Returns: 1 success -1 syntax or execution error */ -static int parse_test(struct Sieve *filter, int *cond, int exec) +static int +parse_test(struct Sieve *filter, int *cond, int exec) { if (parse_white(filter)==-1) return -1; if (parse_identifier(filter,CUS "address")) @@ -1608,9 +2043,9 @@ if (parse_identifier(filter,CUS "address")) */ enum AddressPart addressPart=ADDRPART_ALL; - enum Comparator comparator=COMP_ASCII_CASEMAP; + enum Comparator comparator=COMP_EN_ASCII_CASEMAP; enum MatchType matchType=MATCH_IS; - struct String *hdr,*h,*key,*k; + struct String *hdr,*key; int m; int ap=0,co=0,mt=0; @@ -1662,7 +2097,7 @@ if (parse_identifier(filter,CUS "address")) return -1; } *cond=0; - for (h=hdr; h->length!=-1 && !*cond; ++h) + for (struct String * h = hdr; h->length!=-1 && !*cond; ++h) { uschar *header_value=(uschar*)0,*extracted_addr,*end_addr; @@ -1683,13 +2118,12 @@ if (parse_identifier(filter,CUS "address")) if (exec) { /* We are only interested in addresses below, so no MIME decoding */ - header_value=expand_string(string_sprintf("$rheader_%s",quote(h))); - if (header_value == NULL) + if (!(header_value = expand_string(string_sprintf("$rheader_%s",quote(h))))) { filter->errmsg=CUS "header string expansion failed"; return -1; } - parse_allow_group = TRUE; + f.parse_allow_group = TRUE; while (*header_value && !*cond) { uschar *error; @@ -1711,21 +2145,17 @@ if (parse_identifier(filter,CUS "address")) case ADDRPART_LOCALPART: part=extracted_addr; part[domain-1]='\0'; break; case ADDRPART_DOMAIN: part=extracted_addr+domain; break; #ifdef SUBADDRESS - case ADDRPART_DETAIL: - part=NULL; + case ADDRPART_DETAIL: part=NULL; break; #endif - break; } *end_addr = saveend; if (part) { - for (k=key; k->length!=-1; ++k) + for (struct String * k = key; k->length !=- 1; ++k) { - struct String partStr; + struct String partStr = {.character = part, .length = Ustrlen(part)}; - partStr.character=part; - partStr.length=Ustrlen(part); if (extracted_addr) { *cond=compare(filter,k,&partStr,comparator,matchType); @@ -1737,6 +2167,8 @@ if (parse_identifier(filter,CUS "address")) if (saveend == 0) break; header_value = end_addr + 1; } + f.parse_allow_group = FALSE; + f.parse_found_group = FALSE; } } return 1; @@ -1747,13 +2179,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")) @@ -1762,13 +2194,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")) @@ -1777,7 +2209,7 @@ else if (parse_identifier(filter,CUS "exists")) exists-test = "exists" */ - struct String *hdr,*h; + struct String *hdr; int m; if (parse_white(filter)==-1) return -1; @@ -1789,12 +2221,12 @@ else if (parse_identifier(filter,CUS "exists")) if (exec) { *cond=1; - for (h=hdr; h->length!=-1 && *cond; ++h) + for (struct String * h = hdr; h->length != -1 && *cond; ++h) { uschar *header_def; - header_def=expand_string(string_sprintf("${if def:header_%s {true}{false}}",quote(h))); - if (header_def == NULL) + header_def = expand_string(string_sprintf("${if def:header_%s {true}{false}}",quote(h))); + if (!header_def) { filter->errmsg=CUS "header string expansion failed"; return -1; @@ -1820,9 +2252,9 @@ else if (parse_identifier(filter,CUS "header")) */ - enum Comparator comparator=COMP_ASCII_CASEMAP; + enum Comparator comparator=COMP_EN_ASCII_CASEMAP; enum MatchType matchType=MATCH_IS; - struct String *hdr,*h,*key,*k; + struct String *hdr,*key; int m; int co=0,mt=0; @@ -1864,7 +2296,7 @@ else if (parse_identifier(filter,CUS "header")) return -1; } *cond=0; - for (h=hdr; h->length!=-1 && !*cond; ++h) + for (struct String * h = hdr; h->length != -1 && !*cond; ++h) { if (!is_header(h)) { @@ -1877,21 +2309,19 @@ else if (parse_identifier(filter,CUS "header")) uschar *header_def; expand_header(&header_value,h); - header_def=expand_string(string_sprintf("${if def:header_%s {true}{false}}",quote(h))); - if (header_value.character == NULL || header_def == NULL) + header_def = expand_string(string_sprintf("${if def:header_%s {true}{false}}",quote(h))); + if (!header_value.character || !header_def) { filter->errmsg=CUS "header string expansion failed"; return -1; } - for (k=key; k->length!=-1; ++k) - { + for (struct String * k = key; k->length != -1; ++k) if (Ustrcmp(header_def,"true")==0) { *cond=compare(filter,k,&header_value,comparator,matchType); if (*cond==-1) return -1; if (*cond) break; } - } } } return 1; @@ -1941,18 +2371,207 @@ else if (parse_identifier(filter,CUS "envelope")) envelope-part is case insensitive "from" or "to" +#ifdef ENVELOPE_AUTH + envelope-part =/ "auth" +#endif + */ + + enum Comparator comparator=COMP_EN_ASCII_CASEMAP; + enum AddressPart addressPart=ADDRPART_ALL; + enum MatchType matchType=MATCH_IS; + struct String *env,*key; + int m; + int co=0,ap=0,mt=0; + + if (!filter->require_envelope) + { + filter->errmsg=CUS "missing previous require \"envelope\";"; + 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_addresspart(filter,&addressPart))!=0) + { + if (m==-1) return -1; + if (ap) + { + filter->errmsg=CUS "address part already specified"; + return -1; + } + else ap=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 (parse_white(filter)==-1) return -1; + if ((m=parse_stringlist(filter,&env))!=1) + { + if (m==0) filter->errmsg=CUS "envelope string list expected"; + return -1; + } + if (parse_white(filter)==-1) return -1; + if ((m=parse_stringlist(filter,&key))!=1) + { + if (m==0) filter->errmsg=CUS "key string list expected"; + return -1; + } + *cond=0; + for (struct String * e = env; e->length != -1 && !*cond; ++e) + { + const uschar *envelopeExpr=CUS 0; + uschar *envelope=US 0; + + if (eq_asciicase(e,&str_from,0)) + { + switch (addressPart) + { + case ADDRPART_ALL: envelopeExpr=CUS "$sender_address"; break; +#ifdef SUBADDRESS + case ADDRPART_USER: +#endif + case ADDRPART_LOCALPART: envelopeExpr=CUS "${local_part:$sender_address}"; break; + case ADDRPART_DOMAIN: envelopeExpr=CUS "${domain:$sender_address}"; break; +#ifdef SUBADDRESS + case ADDRPART_DETAIL: envelopeExpr=CUS 0; break; +#endif + } + } + else if (eq_asciicase(e,&str_to,0)) + { + switch (addressPart) + { + case ADDRPART_ALL: envelopeExpr=CUS "$local_part_prefix$local_part$local_part_suffix@$domain"; break; +#ifdef SUBADDRESS + case ADDRPART_USER: envelopeExpr=filter->useraddress; break; + case ADDRPART_DETAIL: envelopeExpr=filter->subaddress; break; +#endif + case ADDRPART_LOCALPART: envelopeExpr=CUS "$local_part_prefix$local_part$local_part_suffix"; break; + case ADDRPART_DOMAIN: envelopeExpr=CUS "$domain"; break; + } + } +#ifdef ENVELOPE_AUTH + else if (eq_asciicase(e,&str_auth,0)) + { + switch (addressPart) + { + case ADDRPART_ALL: envelopeExpr=CUS "$authenticated_sender"; break; +#ifdef SUBADDRESS + case ADDRPART_USER: +#endif + case ADDRPART_LOCALPART: envelopeExpr=CUS "${local_part:$authenticated_sender}"; break; + case ADDRPART_DOMAIN: envelopeExpr=CUS "${domain:$authenticated_sender}"; break; +#ifdef SUBADDRESS + case ADDRPART_DETAIL: envelopeExpr=CUS 0; break; +#endif + } + } +#endif + else + { + filter->errmsg=CUS "invalid envelope string"; + return -1; + } + if (exec && envelopeExpr) + { + if (!(envelope=expand_string(US envelopeExpr))) + { + filter->errmsg=CUS "header string expansion failed"; + return -1; + } + for (struct String * k = key; k->length != -1; ++k) + { + struct String envelopeStr = {.character = envelope, .length = Ustrlen(envelope)}; + + *cond=compare(filter,k,&envelopeStr,comparator,matchType); + if (*cond==-1) return -1; + if (*cond) break; + } + } + } + return 1; + } +#ifdef ENOTIFY +else if (parse_identifier(filter,CUS "valid_notify_method")) + { + /* + valid_notify_method = "valid_notify_method" + + */ + + struct String *uris; + int m; + + if (!filter->require_enotify) + { + filter->errmsg=CUS "missing previous require \"enotify\";"; + return -1; + } + if (parse_white(filter)==-1) return -1; + if ((m=parse_stringlist(filter,&uris))!=1) + { + if (m==0) filter->errmsg=CUS "URI string list expected"; + return -1; + } + if (exec) + { + *cond=1; + for (struct String * u = uris; u->length != -1 && *cond; ++u) + { + string_item *recipient; + 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,&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] + + + */ - enum Comparator comparator=COMP_ASCII_CASEMAP; - enum AddressPart addressPart=ADDRPART_ALL; - enum MatchType matchType=MATCH_IS; - struct String *env,*e,*key,*k; int m; - int co=0,ap=0,mt=0; + int co=0,mt=0; - if (!filter->require_envelope) + enum Comparator comparator=COMP_EN_ASCII_CASEMAP; + enum MatchType matchType=MATCH_IS; + struct String uri,capa,*keys; + + if (!filter->require_enotify) { - filter->errmsg=CUS "missing previous require \"envelope\";"; + filter->errmsg=CUS "missing previous require \"enotify\";"; return -1; } for (;;) @@ -1968,16 +2587,6 @@ else if (parse_identifier(filter,CUS "envelope")) } else co=1; } - else if ((m=parse_addresspart(filter,&addressPart))!=0) - { - if (m==-1) return -1; - if (ap) - { - filter->errmsg=CUS "address part already specified"; - return -1; - } - else ap=1; - } else if ((m=parse_matchtype(filter,&matchType))!=0) { if (m==-1) return -1; @@ -1990,80 +2599,48 @@ else if (parse_identifier(filter,CUS "envelope")) } else break; } - if (parse_white(filter)==-1) return -1; - if ((m=parse_stringlist(filter,&env))!=1) - { - if (m==0) filter->errmsg=CUS "envelope string list expected"; - return -1; - } - if (parse_white(filter)==-1) return -1; - if ((m=parse_stringlist(filter,&key))!=1) - { - if (m==0) filter->errmsg=CUS "key string list expected"; - return -1; - } - *cond=0; - for (e=env; e->character; ++e) - { - const uschar *envelopeExpr=CUS 0; - uschar *envelope=US 0; - - if (eq_asciicase(e,&str_from,0)) + if ((m=parse_string(filter,&uri))!=1) { - switch (addressPart) - { - case ADDRPART_ALL: envelopeExpr=CUS "$sender_address"; break; -#ifdef SUBADDRESS - case ADDRPART_USER: -#endif - case ADDRPART_LOCALPART: envelopeExpr=CUS "${local_part:$sender_address}"; break; - case ADDRPART_DOMAIN: envelopeExpr=CUS "${domain:$sender_address}"; break; -#ifdef SUBADDRESS - case ADDRPART_DETAIL: - envelopeExpr=CUS 0; - break; -#endif - } + if (m==0) filter->errmsg=CUS "missing notification URI string"; + return -1; } - else if (eq_asciicase(e,&str_to,0)) + if (parse_white(filter)==-1) return -1; + if ((m=parse_string(filter,&capa))!=1) { - switch (addressPart) - { - case ADDRPART_ALL: envelopeExpr=CUS "$local_part_prefix$local_part$local_part_suffix@$domain"; break; -#ifdef SUBADDRESS - case ADDRPART_USER: envelopeExpr=CUS "$local_part_prefix$local_part"; break; - case ADDRPART_DETAIL: envelopeExpr=CUS "$local_part_suffix"; break; -#endif - case ADDRPART_LOCALPART: envelopeExpr=CUS "$local_part_prefix$local_part$local_part_suffix"; break; - case ADDRPART_DOMAIN: envelopeExpr=CUS "$domain"; break; - } + if (m==0) filter->errmsg=CUS "missing notification capability string"; + return -1; } - else + if (parse_white(filter)==-1) return -1; + if ((m=parse_stringlist(filter,&keys))!=1) { - filter->errmsg=CUS "invalid envelope string"; + if (m==0) filter->errmsg=CUS "missing key string list"; return -1; } - if (exec && envelopeExpr) + if (exec) { - if ((envelope=expand_string(US envelopeExpr)) == NULL) - { - filter->errmsg=CUS "header string expansion failed"; - return -1; - } - for (k=key; k->length!=-1; ++k) - { - struct String envelopeStr; - - envelopeStr.character=envelope; - envelopeStr.length=Ustrlen(envelope); - *cond=compare(filter,&envelopeStr,k,comparator,matchType); - if (*cond==-1) return -1; - if (*cond) break; - } + 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 (struct String * k = keys; k->length != -1; ++k) + { + *cond=compare(filter,k,&str_maybe,comparator,matchType); + if (*cond==-1) return -1; + if (*cond) break; + } } - } - return 1; + return 1; } +#endif else return 0; } @@ -2101,7 +2678,7 @@ if (*filter->pc=='{') } else { - filter->errmsg=CUS "expecting command or closing brace"; + filter->errmsg=CUS "expecting command or closing brace"; return -1; } } @@ -2151,8 +2728,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) { @@ -2173,6 +2750,11 @@ while (*filter->pc) filter->errmsg=CUS "missing test"; return -1; } + if ((filter_test != FTEST_NONE && debug_selector != 0) || + (debug_selector & D_filter) != 0) + { + if (exec) debug_printf("if %s\n",cond?"true":"false"); + } m=parse_block(filter,exec ? cond : 0, generated); if (m==-1 || m==2) return m; if (m==0) @@ -2194,6 +2776,11 @@ while (*filter->pc) filter->errmsg=CUS "missing test"; return -1; } + if ((filter_test != FTEST_NONE && debug_selector != 0) || + (debug_selector & D_filter) != 0) + { + if (exec) debug_printf("elsif %s\n",cond?"true":"false"); + } m=parse_block(filter,exec && unsuccessful ? cond : 0, generated); if (m==-1 || m==2) return m; if (m==0) @@ -2360,23 +2947,211 @@ while (*filter->pc) } if (parse_semicolon(filter)==-1) return -1; } +#ifdef ENOTIFY + else if (parse_identifier(filter,CUS "notify")) + { + /* + notify-command = "notify" { notify-options } ";" + notify-options = [":from" string] + [":importance" <"1" / "2" / "3">] + [":options" 1*(string-list / number)] + [":message" string] + */ + + int m; + struct String from; + struct String importance; + struct String message; + struct String method; + struct Notification *already; + string_item *recipient; + struct String header; + struct String subject; + struct String body; + uschar *envelope_from; + struct String auto_submitted_value; + uschar *auto_submitted_def; + + if (!filter->require_enotify) + { + filter->errmsg=CUS "missing previous require \"enotify\";"; + return -1; + } + from.character=(uschar*)0; + from.length=-1; + importance.character=(uschar*)0; + importance.length=-1; + 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 = sender_address && sender_address[0] + ? expand_string(US"$local_part_prefix$local_part$local_part_suffix@$domain") : US ""; + if (!envelope_from) + { + filter->errmsg=CUS "expansion failure for envelope from"; + return -1; + } + for (;;) + { + if (parse_white(filter)==-1) return -1; + if (parse_identifier(filter,CUS ":from")==1) + { + if (parse_white(filter)==-1) return -1; + if ((m=parse_string(filter,&from))!=1) + { + if (m==0) filter->errmsg=CUS "from string expected"; + return -1; + } + } + else if (parse_identifier(filter,CUS ":importance")==1) + { + if (parse_white(filter)==-1) return -1; + if ((m=parse_string(filter,&importance))!=1) + { + if (m==0) filter->errmsg=CUS "importance string expected"; + return -1; + } + if (importance.length!=1 || importance.character[0]<'1' || importance.character[0]>'3') + { + filter->errmsg=CUS "invalid importance"; + return -1; + } + } + else if (parse_identifier(filter,CUS ":options")==1) + { + if (parse_white(filter)==-1) return -1; + } + else if (parse_identifier(filter,CUS ":message")==1) + { + if (parse_white(filter)==-1) return -1; + if ((m=parse_string(filter,&message))!=1) + { + if (m==0) filter->errmsg=CUS "message string expected"; + return -1; + } + } + else break; + } + if (parse_white(filter)==-1) return -1; + if ((m=parse_string(filter,&method))!=1) + { + if (m==0) filter->errmsg=CUS "missing method string"; + return -1; + } + if (parse_semicolon(filter)==-1) return -1; + if (parse_mailto_uri(filter,method.character,&recipient,&header,&subject,&body)!=1) + return -1; + if (exec) + { + 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(US"${if def:header_auto-submitted {true}{false}}"); + if (!auto_submitted_value.character || !auto_submitted_def) + { + filter->errmsg=CUS "header string expansion failed"; + return -1; + } + if (Ustrcmp(auto_submitted_def,"true")!=0 || Ustrcmp(auto_submitted_value.character,"no")==0) + { + 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) + /* New notification, process it */ + { + struct Notification * sent = store_get(sizeof(struct Notification), FALSE); + 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) + { + int pid, fd; + + if ((pid = child_open_exim2(&fd, envelope_from, envelope_from, + US"sieve-notify")) >= 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 (string_item * 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, TRUE); + 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) + debug_printf("Notification to `%s': '%s'.\n",method.character,message.length!=-1 ? message.character : CUS ""); +#endif + } + else + if ((filter_test != FTEST_NONE && debug_selector != 0) || debug_selector & D_filter) + debug_printf("Repeated notification to `%s' ignored.\n",method.character); + } + else + if ((filter_test != FTEST_NONE && debug_selector != 0) || debug_selector & D_filter) + debug_printf("Ignoring notification, triggering message contains Auto-submitted: field.\n"); + } + } +#endif #ifdef VACATION else if (parse_identifier(filter,CUS "vacation")) { /* vacation-command = "vacation" { vacation-options } ";" vacation-options = [":days" number] - [":addresses" string-list] [":subject" string] + [":from" string] + [":addresses" string-list] [":mime"] + [":handle" string] */ int m; unsigned long days; - struct String *addresses=(struct String*)0; struct String subject; + struct String from; + struct String *addresses; int reason_is_mime; string_item *aliases; + struct String handle; struct String reason; if (!filter->require_vacation) @@ -2396,8 +3171,13 @@ while (*filter->pc) days=VACATION_MIN_DAYS>7 ? VACATION_MIN_DAYS : 7; subject.character=(uschar*)0; subject.length=-1; + from.character=(uschar*)0; + from.length=-1; + addresses=(struct String*)0; aliases=NULL; reason_is_mime=0; + handle.character=(uschar*)0; + handle.length=-1; for (;;) { if (parse_white(filter)==-1) return -1; @@ -2408,39 +3188,56 @@ while (*filter->pc) if (daysVACATION_MAX_DAYS) days=VACATION_MAX_DAYS; } + else if (parse_identifier(filter,CUS ":subject")==1) + { + if (parse_white(filter)==-1) return -1; + if ((m=parse_string(filter,&subject))!=1) + { + if (m==0) filter->errmsg=CUS "subject string expected"; + return -1; + } + } + else if (parse_identifier(filter,CUS ":from")==1) + { + if (parse_white(filter)==-1) return -1; + if ((m=parse_string(filter,&from))!=1) + { + if (m==0) filter->errmsg=CUS "from string expected"; + return -1; + } + if (check_mail_address(filter,&from)!=1) + return -1; + } else if (parse_identifier(filter,CUS ":addresses")==1) { - struct String *a; - if (parse_white(filter)==-1) return -1; if ((m=parse_stringlist(filter,&addresses))!=1) { if (m==0) filter->errmsg=CUS "addresses string list expected"; return -1; } - for (a=addresses; a->length!=-1; ++a) + for (struct String * a = addresses; a->length != -1; ++a) { - string_item *new; + string_item * new = store_get(sizeof(string_item), FALSE); - new=store_get(sizeof(string_item)); - new->text=store_get(a->length+1); + new->text = store_get(a->length+1, is_tainted(a->character)); if (a->length) memcpy(new->text,a->character,a->length); new->text[a->length]='\0'; new->next=aliases; aliases=new; } } - else if (parse_identifier(filter,CUS ":subject")==1) + else if (parse_identifier(filter,CUS ":mime")==1) + reason_is_mime=1; + else if (parse_identifier(filter,CUS ":handle")==1) { if (parse_white(filter)==-1) return -1; - if ((m=parse_string(filter,&subject))!=1) + if ((m=parse_string(filter,&from))!=1) { - if (m==0) filter->errmsg=CUS "subject string expected"; + if (m==0) filter->errmsg=CUS "handle string expected"; return -1; } } - else if (parse_identifier(filter,CUS ":mime")==1) - reason_is_mime=1; else break; } if (parse_white(filter)==-1) return -1; @@ -2449,120 +3246,147 @@ while (*filter->pc) if (m==0) filter->errmsg=CUS "missing reason string"; return -1; } + if (reason_is_mime) + { + uschar *s,*end; + + for (s = reason.character, end = reason.character + reason.length; + serrmsg=CUS "MIME reason string contains 8bit text"; + return -1; + } + } if (parse_semicolon(filter)==-1) return -1; if (exec) { address_item *addr; - int capacity,start; uschar *buffer; int buffer_capacity; - struct String key; md5 base; uschar digest[16]; uschar hexdigest[33]; - int i; - uschar *once; + gstring * once; if (filter_personal(aliases,TRUE)) { + if (filter_test == FTEST_NONE) + { + /* ensure oncelog directory exists; failure will be detected later */ - /* ensure oncelog directory exists; failure will be detected later */ - - (void)directory_make(NULL, filter->vacation_directory, 0700, FALSE); - + (void)directory_make(NULL, filter->vacation_directory, 0700, FALSE); + } /* build oncelog filename */ - key.character=(uschar*)0; - key.length=0; - capacity=0; - if (subject.length!=-1) key.character=string_cat(key.character,&capacity,&key.length,subject.character,subject.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); md5_start(&base); - md5_end(&base, key.character, key.length, digest); - for (i = 0; i < 16; i++) sprintf(CS (hexdigest+2*i), "%02X", digest[i]); - 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); - - /* process subject */ - if (subject.length==-1) + if (handle.length==-1) { - expand_header(&subject,&str_subject); - while (subject.length>=4 && Ustrncmp(subject.character,"Re: ",4)==0) - { - subject.character+=4; - subject.length-=4; - } - capacity=6; - start=6; - subject.character=string_cat(US"Auto: ",&capacity,&start,subject.character,subject.length); - subject.length=start; + gstring * key = NULL; + if (subject.length!=-1) key =string_catn(key, subject.character, subject.length); + if (from.length!=-1) key = string_catn(key, from.character, from.length); + key = string_catn(key, reason_is_mime?US"1":US"0", 1); + key = string_catn(key, reason.character, reason.length); + md5_end(&base, key->s, key->ptr, digest); } + else + md5_end(&base, handle.character, handle.length, digest); - /* add address to list of generated addresses */ - - addr = deliver_make_addr(string_sprintf(">%.256s", sender_address), FALSE); - setflag(addr, af_pfr); - setflag(addr, af_ignore_error); - addr->next = *generated; - *generated = addr; - addr->reply = store_get(sizeof(reply_item)); - memset(addr->reply,0,sizeof(reply_item)); /* XXX */ - addr->reply->to = string_copy(sender_address); - addr->reply->from = expand_string(US"$local_part@$domain"); - /* Allocation is larger than neccessary, but enough even for split MIME words */ - buffer_capacity=16+4*subject.length; - buffer=store_get(buffer_capacity); - addr->reply->subject=parse_quote_2047(subject.character, subject.length, US"utf-8", buffer, buffer_capacity); - addr->reply->oncelog=once; - addr->reply->once_repeat=days*86400; - - /* build body and MIME headers */ - - if (reason_is_mime) - { - uschar *mime_body,*reason_end; -#ifdef RFC_EOL - static const uschar nlnl[]="\r\n\r\n"; -#else - static const uschar nlnl[]="\n\n"; -#endif + for (int i = 0; i < 16; i++) sprintf(CS (hexdigest+2*i), "%02X", digest[i]); - for - ( - mime_body=reason.character,reason_end=reason.character+reason.length; - mime_body<(reason_end-sizeof(nlnl)-1) && memcmp(mime_body,nlnl,sizeof(nlnl)-1); - ++mime_body - ); - capacity = 0; - start = 0; - addr->reply->headers = string_cat(NULL,&capacity,&start,reason.character,mime_body-reason.character); - capacity = 0; - start = 0; - if (mime_bodyreply->text = string_cat(NULL,&capacity,&start,mime_body,reason_end-mime_body); - } - else + if ((filter_test != FTEST_NONE && debug_selector != 0) || (debug_selector & D_filter) != 0) + debug_printf("Sieve: mail was personal, vacation file basename: %s\n", hexdigest); + + if (filter_test == FTEST_NONE) { - struct String qp; - - capacity = 0; - start = reason.length; - addr->reply->headers = US"MIME-Version: 1.0\n" - "Content-Type: text/plain;\n" - "\tcharset=\"utf-8\"\n" - "Content-Transfer-Encoding: quoted-printable"; - addr->reply->text = quoted_printable_encode(&reason,&qp)->character; + once = string_cat (NULL, filter->vacation_directory); + once = string_catn(once, US"/", 1); + once = string_catn(once, hexdigest, 33); + + /* process subject */ + + if (subject.length==-1) + { + uschar *subject_def; + + subject_def = expand_string(US"${if def:header_subject {true}{false}}"); + if (subject_def && Ustrcmp(subject_def,"true")==0) + { + gstring * g = string_catn(NULL, US"Auto: ", 6); + + expand_header(&subject,&str_subject); + g = string_catn(g, subject.character, subject.length); + subject.character = string_from_gstring(g); + subject.length = g->ptr; + } + else + { + subject.character=US"Automated reply"; + subject.length=Ustrlen(subject.character); + } + } + + /* add address to list of generated addresses */ + + addr = deliver_make_addr(string_sprintf(">%.256s", sender_address), FALSE); + setflag(addr, af_pfr); + addr->prop.ignore_error = TRUE; + addr->next = *generated; + *generated = addr; + addr->reply = store_get(sizeof(reply_item), FALSE); + memset(addr->reply,0,sizeof(reply_item)); /* XXX */ + addr->reply->to = string_copy(sender_address); + if (from.length==-1) + addr->reply->from = expand_string(US"$local_part@$domain"); + else + addr->reply->from = from.character; + /* Allocation is larger than necessary, but enough even for split MIME words */ + buffer_capacity=32+4*subject.length; + buffer = store_get(buffer_capacity, is_tainted(subject.character)); + /* 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 = string_from_gstring(once); + addr->reply->once_repeat=days*86400; + + /* build body and MIME headers */ + + if (reason_is_mime) + { + uschar *mime_body,*reason_end; + static const uschar nlnl[]="\r\n\r\n"; + + for + ( + mime_body = reason.character, reason_end = reason.character + reason.length; + mime_body < (reason_end-(sizeof(nlnl)-1)) && memcmp(mime_body, nlnl, (sizeof(nlnl)-1)); + ) mime_body++; + + addr->reply->headers = string_copyn(reason.character, mime_body-reason.character); + + if (mime_body+(sizeof(nlnl)-1)reply->text = string_copyn(mime_body, reason_end-mime_body); + } + else + { + struct String qp = { .character = NULL, .length = 0 }; /* Keep compiler happy (PH) */ + + addr->reply->headers = US"MIME-Version: 1.0\n" + "Content-Type: text/plain;\n" + "\tcharset=\"utf-8\"\n" + "Content-Transfer-Encoding: quoted-printable"; + addr->reply->text = quoted_printable_encode(&reason,&qp)->character; + } } } + else if ((filter_test != FTEST_NONE && debug_selector != 0) || (debug_selector & D_filter) != 0) + debug_printf("Sieve: mail was not personal, vacation would ignore it\n"); } } + else break; #endif - else break; } return 1; } @@ -2582,14 +3406,24 @@ 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 +#ifdef ENOTIFY +filter->require_enotify=0; +filter->notified=(struct Notification*)0; +#endif #ifdef SUBADDRESS filter->require_subaddress=0; #endif @@ -2602,7 +3436,7 @@ filter->require_iascii_numeric=0; if (parse_white(filter)==-1) return -1; -if (exec && filter->vacation_directory != NULL) /* 2nd test added by PH */ +if (exec && filter->vacation_directory != NULL && filter_test == FTEST_NONE) { DIR *oncelogdir; struct dirent *oncelog; @@ -2611,27 +3445,24 @@ if (exec && filter->vacation_directory != NULL) /* 2nd test added by PH */ /* clean up old vacation log databases */ - oncelogdir=opendir(CS filter->vacation_directory); - - if (oncelogdir ==(DIR*)0 && errno != ENOENT) + if ( !(oncelogdir = exim_opendir(filter->vacation_directory)) + && errno != ENOENT) { - filter->errmsg=CUS "unable to open vacation directory"; + filter->errmsg = CUS "unable to open vacation directory"; return -1; } - if (oncelogdir != NULL) + if (oncelogdir) { time(&now); - while ((oncelog=readdir(oncelogdir))!=(struct dirent*)0) - { + while ((oncelog = readdir(oncelogdir))) if (strlen(oncelog->d_name)==32) { - uschar *s=string_sprintf("%s/%s",filter->vacation_directory,oncelog->d_name); + uschar *s = string_sprintf("%s/%s",filter->vacation_directory,oncelog->d_name); if (Ustat(s,&properties)==0 && (properties.st_mtime+VACATION_MAX_DAYS*86400) */ - struct String *cap,*check; + struct String *cap; int m; if (parse_white(filter)==-1) return -1; @@ -2651,17 +3482,34 @@ while (parse_identifier(filter,CUS "require")) if (m==0) filter->errmsg=CUS "capability string list expected"; return -1; } - for (check=cap; check->character; ++check) + for (struct String * check = cap; check->character; ++check) { - if (eq_asciicase(check,&str_envelope,0)) filter->require_envelope=1; - else if (eq_asciicase(check,&str_fileinto,0)) filter->require_fileinto=1; + 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)) + { + if (filter->enotify_mailto_owner == NULL) + { + filter->errmsg=CUS "enotify disabled"; + return -1; + } + filter->require_enotify=1; + } +#endif #ifdef SUBADDRESS - else if (eq_asciicase(check,&str_subaddress,0)) filter->require_subaddress=1; + else if (eq_octet(check,&str_subaddress,0)) filter->require_subaddress=1; #endif #ifdef VACATION - else if (eq_asciicase(check,&str_vacation,0)) + else if (eq_octet(check,&str_vacation,0)) { - if (filter->vacation_directory == NULL) + if (filter_test == FTEST_NONE && filter->vacation_directory == NULL) { filter->errmsg=CUS "vacation disabled"; return -1; @@ -2669,10 +3517,11 @@ while (parse_identifier(filter,CUS "require")) filter->require_vacation=1; } #endif - else if (eq_asciicase(check,&str_copy,0)) filter->require_copy=1; - else if (eq_asciicase(check,&str_comparator_ioctet,0)) ; - else if (eq_asciicase(check,&str_comparator_iascii_casemap,0)) ; - else if (eq_asciicase(check,&str_comparator_iascii_numeric,0)) filter->require_iascii_numeric=1; + else if (eq_octet(check,&str_copy,0)) filter->require_copy=1; + else if (eq_octet(check,&str_comparator_ioctet,0)) ; + else if (eq_octet(check,&str_comparator_iascii_casemap,0)) ; + else if (eq_octet(check,&str_comparator_enascii_casemap,0)) ; + else if (eq_octet(check,&str_comparator_iascii_numeric,0)) filter->require_iascii_numeric=1; else { filter->errmsg=CUS "unknown capability"; @@ -2700,7 +3549,10 @@ 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 error where to pass back an error text @@ -2714,6 +3566,7 @@ Returns: FF_DELIVERED success, a significant action was taken int sieve_interpret(uschar *filter, int options, uschar *vacation_directory, + uschar *enotify_mailto_owner, uschar *useraddress, uschar *subaddress, address_item **generated, uschar **error) { struct Sieve sieve; @@ -2724,14 +3577,13 @@ options = options; /* Keep picky compilers happy */ error = error; DEBUG(D_route) debug_printf("Sieve: start of processing\n"); -sieve.filter=filter; +sieve.filter = filter; -if (vacation_directory == NULL) +if (!vacation_directory) sieve.vacation_directory = NULL; else { - sieve.vacation_directory=expand_string(vacation_directory); - if (sieve.vacation_directory == NULL) + if (!(sieve.vacation_directory = expand_string(vacation_directory))) { *error = string_sprintf("failed to expand \"%s\" " "(sieve_vacation_directory): %s", vacation_directory, @@ -2740,6 +3592,23 @@ else } } +if (!enotify_mailto_owner) + sieve.enotify_mailto_owner = NULL; +else + { + if (!(sieve.enotify_mailto_owner = expand_string(enotify_mailto_owner))) + { + *error = string_sprintf("failed to expand \"%s\" " + "(sieve_enotify_mailto_owner): %s", enotify_mailto_owner, + expand_string_message); + return FF_ERROR; + } + } + +sieve.useraddress = useraddress + ? useraddress : CUS "$local_part_prefix$local_part$local_part_suffix"; +sieve.subaddress = subaddress; + #ifdef COMPILE_SYNTAX_CHECKER if (parse_start(&sieve,0,generated)==1) #else @@ -2749,12 +3618,12 @@ if (parse_start(&sieve,1,generated)==1) if (sieve.keep) { add_addr(generated,US"inbox",1,0,0,0); - msg = string_sprintf("Keep"); + msg = US"Implicit keep"; r = FF_DELIVERED; } - else + else { - msg = string_sprintf("No keep"); + msg = US"No implicit keep"; r = FF_DELIVERED; } }