X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsrc%2Fsieve.c;h=bda482fd11238133d77b79acd2eb1686ff830b2c;hb=96f5fe4ce29825208eafffcb3579d789dc5b45d1;hp=656b972477626fa95c8690684abb8fa774179002;hpb=f7572e5a358cd3d9581140b87e590d58b6c278f0;p=user%2Fhenk%2Fcode%2Fexim.git diff --git a/src/src/sieve.c b/src/src/sieve.c index 656b97247..bda482fd1 100644 --- a/src/src/sieve.c +++ b/src/src/sieve.c @@ -1,10 +1,8 @@ -/* $Cambridge: exim/src/src/sieve.c,v 1.31 2007/09/28 12:21:57 tom Exp $ */ - /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) Michael Haardt 2003-2007 */ +/* Copyright (c) Michael Haardt 2003 - 2015 */ /* See the file NOTICE for conditions of use and distribution. */ /* This code was contributed by Michael Haardt. */ @@ -71,6 +69,7 @@ struct Sieve int require_enotify; struct Notification *notified; #endif + uschar *enotify_mailto_owner; #ifdef SUBADDRESS int require_subaddress; #endif @@ -108,6 +107,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); @@ -147,6 +178,8 @@ 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"; @@ -250,7 +283,7 @@ for (pass=0; pass<=1; ++pass) } else *new++='\n'; - line=0; + line=0; /*XXX jgh: questionabale indent; probable BUG */ ++start; } else @@ -400,7 +433,7 @@ 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[to.length]='\0'; @@ -434,7 +467,7 @@ 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[hname.length]='\0'; @@ -457,7 +490,7 @@ 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[hvalue.length]='\0'; @@ -487,7 +520,8 @@ if (*uri=='?') {US"date",4}, {US"from",4}, {US"message-id",10}, - {US"received",8} + {US"received",8}, + {US"auto-submitted",14} }; static struct String *end=ignore+sizeof(ignore)/sizeof(ignore[0]); struct String *i; @@ -608,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 @@ -999,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: @@ -1036,7 +1072,7 @@ if (file) setflag(new_addr, af_pfr|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; } @@ -1934,7 +1970,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 @@ -2701,8 +2737,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) { @@ -2934,7 +2970,6 @@ while (*filter->pc) int m; struct String from; struct String importance; - struct String *options; struct String message; struct String method; struct Notification *already; @@ -2942,7 +2977,9 @@ while (*filter->pc) 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) { @@ -2953,7 +2990,6 @@ 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; @@ -2963,8 +2999,7 @@ while (*filter->pc) 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; @@ -3015,75 +3050,92 @@ while (*filter->pc) if (parse_semicolon(filter)==-1) return -1; if (parse_mailto_uri(filter,method.character,&recipient,&header,&subject,&body)!=1) return -1; - if (message.length==-1) message=subject; - if (message.length==-1) expand_header(&message,&str_subject); - - 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 (exec) { - 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': '%s'.\n",method.character,message.length!=-1 ? message.character : CUS ""); + filter->errmsg=CUS "header string expansion failed"; + return -1; } -#ifndef COMPILE_SYNTAX_CHECKER - if (exec && filter_test == FTEST_NONE) + 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 neccessary, 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; - uschar *buffer; - int buffer_capacity; - - 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); - if (message.length==-1) + if ((filter_test != FTEST_NONE && debug_selector != 0) || (debug_selector & D_filter) != 0) { - message.character=US"Notification"; - message.length=Ustrlen(message.character); + debug_printf("Repeated notification to `%s' ignored.\n",method.character); } - /* Allocation is larger than neccessary, 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); } } -#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"); + } } } } @@ -3308,7 +3360,8 @@ while (*filter->pc) /* Allocation is larger than neccessary, 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; @@ -3377,8 +3430,8 @@ 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; @@ -3467,7 +3520,15 @@ while (parse_identifier(filter,CUS "require")) 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; @@ -3515,7 +3576,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 @@ -3531,7 +3593,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; @@ -3557,6 +3620,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;