X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Fsieve.c;h=549dba197c3578f3513ad9f195a0f789d3adddca;hb=c51b8e75b2fe31282ea1526ed556d7d9402d543f;hp=32170a3378c1038347183d3a1efd5c6fb25b1ac5;hpb=1c59d63bc3e53fc16671151a92606d305ba5499e;p=exim.git diff --git a/src/src/sieve.c b/src/src/sieve.c index 32170a337..549dba197 100644 --- a/src/src/sieve.c +++ b/src/src/sieve.c @@ -1,10 +1,10 @@ -/* $Cambridge: exim/src/src/sieve.c,v 1.13 2005/08/30 10:55:52 ph10 Exp $ */ +/* $Cambridge: exim/src/src/sieve.c,v 1.23 2006/10/10 15:36:50 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) Michael Haardt 2003-2005 */ +/* Copyright (c) Michael Haardt 2003-2006 */ /* See the file NOTICE for conditions of use and distribution. */ /* This code was contributed by Michael Haardt. */ @@ -28,10 +28,16 @@ /* Undefine it for UNIX-style \n end-of-line terminators (default). */ #undef RFC_EOL -/* Define this for development of the subaddress Sieve extension. */ +/* Define this for development of the Sieve extension "envelope-auth". */ +#undef ENVELOPE_AUTH + +/* Define this for development of the Sieve extension "notify". */ +#undef NOTIFY + +/* 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 */ @@ -52,6 +58,13 @@ struct Sieve int keep; int require_envelope; int require_fileinto; +#ifdef ENVELOPE_AUTH + int require_envelope_auth; +#endif +#ifdef NOTIFY + int require_notify; + struct Notification *notified; +#endif #ifdef SUBADDRESS int require_subaddress; #endif @@ -81,6 +94,14 @@ struct String int length; }; +struct Notification + { + struct String method; + struct String priority; + struct String message; + struct Notification *next; + }; + static int parse_test(struct Sieve *filter, int *cond, int exec); static int parse_commands(struct Sieve *filter, int exec, address_item **generated); @@ -92,6 +113,8 @@ 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 }; +static uschar str_auth_c[]="auth"; +static const struct String str_auth={ str_auth_c, 4 }; static uschar str_sender_c[]="Sender"; static const struct String str_sender={ str_sender_c, 6 }; static uschar str_resent_from_c[]="Resent-From"; @@ -102,6 +125,14 @@ 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 ENVELOPE_AUTH +static uschar str_envelope_auth_c[]="envelope-auth"; +static const struct String str_envelope_auth={ str_envelope_auth_c, 13 }; +#endif +#ifdef NOTIFY +static uschar str_notify_c[]="notify"; +static const struct String str_notify={ str_notify_c, 6 }; +#endif #ifdef SUBADDRESS static uschar str_subaddress_c[]="subaddress"; static const struct String str_subaddress={ str_subaddress_c, 10 }; @@ -139,6 +170,10 @@ 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) @@ -180,13 +215,8 @@ for (pass=0; pass<=1; ++pass) || ( (ch==9 || ch==32) -#ifdef RFC_EOL && start+2length; line=0; - ++start; } else *new++='\n'; line=0; + ++start; } -#else - else if (ch=='\n') - { - if (pass==0) - ++dst->length; - else - *new++=*start; - ++line; - } -#endif else { if (pass==0) @@ -237,6 +256,173 @@ for (pass=0; pass<=1; ++pass) } +/************************************************* +* Decode URI encoded string * +*************************************************/ + +/* +Arguments: + str URI encoded string + +Returns + 0 Decoding successful + -1 Encoding error +*/ + +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 + +Returns + 1 URI is syntactically OK + -1 syntax error +*/ + +int parse_mailto_uri(struct Sieve *filter, const uschar *uri, string_item **recipient, struct String *body) +{ +const uschar *start; +struct String to,hname,hvalue; +int capacity; +string_item *new; + +if (*uri && *uri!='?') + for (;;) + { + /* match to */ + for (start=uri; *uri && *uri!='?' && (*uri!='%' || *(uri+1)!='2' || tolower(*(uri+2))!='c'); ++uri); + if (uri>start) + { + capacity=0; + to.character=(uschar*)0; + to.length=0; + to.character=string_cat(to.character,&capacity,&to.length,start,uri-start); + to.character[to.length]='\0'; + if (uri_decode(&to)==-1) + { + filter->errmsg=US"Invalid URI encoding"; + return -1; + } + new=store_get(sizeof(string_item)); + new->text=store_get(to.length+1); + 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) + { + capacity=0; + hname.character=(uschar*)0; + hname.length=0; + hname.character=string_cat(hname.character,&capacity,&hname.length,start,uri-start); + hname.character[hname.length]='\0'; + 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) + { + capacity=0; + hvalue.character=(uschar*)0; + hvalue.length=0; + hvalue.character=string_cat(hvalue.character,&capacity,&hvalue.length,start,uri-start); + hvalue.character[hvalue.length]='\0'; + if (uri_decode(&hvalue)==-1) + { + filter->errmsg=US"Invalid URI encoding"; + return -1; + } + } + if (hname.length==2 && strcmp(CS hname.character,"to")==0) + { + new=store_get(sizeof(string_item)); + new->text=store_get(hvalue.length+1); + 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 && strcmp(CS hname.character,"body")==0) + *body=hvalue; + if (*uri=='&') ++uri; + else break; + } + } +if (*uri) + { + filter->errmsg=US"Syntactically invalid URI"; + return -1; + } +return 1; +} + /************************************************* * Octet-wise string comparison * *************************************************/ @@ -336,7 +522,7 @@ Returns: 0 needle not found in haystack */ static int eq_glob(const struct String *needle, - const struct String *haystack, int ascii_caseless) + const struct String *haystack, int ascii_caseless, int match_octet) { const uschar *n,*h,*nend,*hend; int may_advance=0; @@ -366,14 +552,19 @@ while (nerrmsg=CUS "syntactically invalid pattern"; return -1; @@ -591,7 +783,7 @@ switch (mt) } case COMP_EN_ASCII_CASEMAP: { - if ((r=eq_glob(needle,haystack,1))==-1) + if ((r=eq_glob(needle,haystack,1,1))==-1) { filter->errmsg=CUS "syntactically invalid pattern"; return -1; @@ -760,6 +952,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 @@ -777,20 +973,17 @@ value->length=0; value->character=(uschar*)0; t=r=s=expand_string(string_sprintf("$rheader_%s",quote(header))); -while (*r==' ') ++r; +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); } @@ -960,6 +1153,7 @@ if (*filter->pc=='"') /* quoted string */ int foo=data->length; ++filter->pc; + /* that way, there will be at least one character allocated */ data->character=string_cat(data->character,&dataCapacity,&foo,CUS "",1); return 1; } @@ -971,6 +1165,15 @@ if (*filter->pc=='"') /* quoted string */ } else /* regular character */ { +#ifdef RFC_EOL + if (*filter->pc=='\r' && *(filter->pc+1)=='\n') ++filter->line; +#else + if (*filter->pc=='\n') + { + data->character=string_cat(data->character,&dataCapacity,&data->length,US"\r",1); + ++filter->line; + } +#endif data->character=string_cat(data->character,&dataCapacity,&data->length,filter->pc,1); filter->pc++; } @@ -1026,7 +1229,10 @@ 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); + int foo=data->length; + + /* that way, there will be at least one character allocated */ + data->character=string_cat(data->character,&dataCapacity,&foo,CUS "",1); #ifdef RFC_EOL filter->pc+=3; #else @@ -1620,6 +1826,8 @@ if (parse_identifier(filter,CUS "address")) if (saveend == 0) break; header_value = end_addr + 1; } + parse_allow_group = FALSE; + parse_found_group = FALSE; } } return 1; @@ -1824,6 +2032,9 @@ 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; @@ -1886,7 +2097,7 @@ else if (parse_identifier(filter,CUS "envelope")) return -1; } *cond=0; - for (e=env; e->character; ++e) + for (e=env; e->length!=-1 && !*cond; ++e) { const uschar *envelopeExpr=CUS 0; uschar *envelope=US 0; @@ -1919,6 +2130,23 @@ else if (parse_identifier(filter,CUS "envelope")) 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"; @@ -2054,6 +2282,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) @@ -2075,6 +2308,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) @@ -2187,7 +2425,7 @@ while (*filter->pc) fileinto-command = "fileinto" { fileinto-options } string ";" fileinto-options = fileinto-options =) [ ":copy" ] - */ + */ struct String folder; uschar *s; @@ -2241,6 +2479,148 @@ while (*filter->pc) } if (parse_semicolon(filter)==-1) return -1; } +#ifdef NOTIFY + else if (parse_identifier(filter,CUS "notify")) + { + /* + notify-command = "notify" { notify-options } ";" + notify-options = [":method" string] + [":priority" string] + [":message" string] + */ + + int m; + struct String method; + struct String priority; + struct String message; + struct Notification *already; + string_item *recipient; + struct String body; + uschar *envelope_from,*envelope_to; + + if (!filter->require_notify) + { + filter->errmsg=CUS "missing previous require \"notify\";"; + return -1; + } + method.character=(uschar*)0; + method.length=-1; + priority.character=(uschar*)0; + priority.length=-1; + message.character=(uschar*)0; + message.length=-1; + recipient=NULL; + 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"); + for (;;) + { + if (parse_white(filter)==-1) return -1; + if (parse_identifier(filter,CUS ":method")==1) + { + if (parse_white(filter)==-1) return -1; + if ((m=parse_string(filter,&method))!=1) + { + if (m==0) filter->errmsg=CUS "method string expected"; + return -1; + } + if (method.length>7 && strncmp(method.character,"mailto:",7)==0) + { + if (parse_mailto_uri(filter,method.character+7,&recipient,&body)==-1) return -1; + } + } + else if (parse_identifier(filter,CUS ":priority")==1) + { + if (parse_white(filter)==-1) return -1; + if ((m=parse_string(filter,&priority))!=1) + { + if (m==0) filter->errmsg=CUS "priority string expected"; + 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_semicolon(filter)==-1) return -1; + + if (method.length==-1) + { + if ((filter_test != FTEST_NONE && debug_selector != 0) || (debug_selector & D_filter) != 0) + { + debug_printf("Ignoring method-less notification.\n"); + } + } + else + { + 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->priority.length==priority.length + && (priority.length==-1 || strcmp(already->priority.character,priority.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 */ + { + struct Notification *sent; + sent=store_get(sizeof(struct Notification)); + sent->method=method; + sent->priority=priority; + sent->message=message; + sent->next=filter->notified; + filter->notified=sent; + if ((filter_test != FTEST_NONE && debug_selector != 0) || (debug_selector & D_filter) != 0) + { + debug_printf("Notification to `%s'.\n",method.character); + } +#ifndef COMPILE_SYNTAX_CHECKER + if (exec) + { + string_item *p; + header_line *h; + int pid,fd; + + if ((pid = child_open_exim2(&fd,envelope_to,envelope_to))>=1) + { + FILE *f; + + f = fdopen(fd, "wb"); + fprintf(f,"From: %s\n",envelope_to); + for (p=recipient; p; p=p->next) fprintf(f,"To: %s\n",p->text); + for (h = header_list; h != NULL; h = h->next) + if (h->type == htype_received) fprintf(f,"%s",h->text); + 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); + } + } +#endif + } + else + { + if ((filter_test != FTEST_NONE && debug_selector != 0) || (debug_selector & D_filter) != 0) + { + debug_printf("Repeated notification to `%s' ignored.\n",method.character); + } + } + } + } +#endif #ifdef VACATION else if (parse_identifier(filter,CUS "vacation")) { @@ -2427,11 +2807,11 @@ while (*filter->pc) 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]); - if (filter_test != FTEST_NONE) + 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); } - else + if (filter_test == FTEST_NONE) { capacity=Ustrlen(filter->vacation_directory); start=capacity; @@ -2443,11 +2823,22 @@ while (*filter->pc) if (subject.length==-1) { - expand_header(&subject,&str_subject); - capacity=6; - start=6; - subject.character=string_cat(US"Auto: ",&capacity,&start,subject.character,subject.length); - subject.length=start; + uschar *subject_def; + + subject_def=expand_string(US"${if def:header_subject {true}{false}}"); + if (Ustrcmp(subject_def,"true")==0) + { + expand_header(&subject,&str_subject); + capacity=6; + start=6; + subject.character=string_cat(US"Auto: ",&capacity,&start,subject.character,subject.length); + subject.length=start; + } + else + { + subject.character=US"Automated reply"; + subject.length=Ustrlen(subject.character); + } } /* add address to list of generated addresses */ @@ -2465,9 +2856,9 @@ while (*filter->pc) else addr->reply->from = from.character; /* Allocation is larger than neccessary, but enough even for split MIME words */ - buffer_capacity=16+4*subject.length; + 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); + addr->reply->subject=parse_quote_2047(subject.character, subject.length, US"utf-8", buffer, buffer_capacity, TRUE); addr->reply->oncelog=once; addr->reply->once_repeat=days*86400; @@ -2476,16 +2867,12 @@ while (*filter->pc) 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 ( 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<(reason_end-(sizeof(nlnl)-1)) && memcmp(mime_body,nlnl,(sizeof(nlnl)-1)); ++mime_body ); capacity = 0; @@ -2494,14 +2881,14 @@ while (*filter->pc) 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[start] = '\0'; } else { - struct String qp; + struct String qp = { NULL, 0 }; /* Keep compiler happy (PH) */ capacity = 0; start = reason.length; @@ -2513,7 +2900,7 @@ while (*filter->pc) } } } - else if (filter_test != FTEST_NONE) + 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"); } @@ -2548,6 +2935,13 @@ filter->line=1; filter->keep=1; filter->require_envelope=0; filter->require_fileinto=0; +#ifdef ENVELOPE_AUTH +filter->require_envelope_auth=0; +#endif +#ifdef NOTIFY +filter->require_notify=0; +filter->notified=(struct Notification*)0; +#endif #ifdef SUBADDRESS filter->require_subaddress=0; #endif @@ -2613,6 +3007,12 @@ 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 ENVELOPE_AUTH + else if (eq_octet(check,&str_envelope_auth,0)) filter->require_envelope_auth=1; +#endif +#ifdef NOTIFY + else if (eq_octet(check,&str_notify,0)) filter->require_notify=1; +#endif #ifdef SUBADDRESS else if (eq_octet(check,&str_subaddress,0)) filter->require_subaddress=1; #endif