-/* $Cambridge: exim/src/src/sieve.c,v 1.27 2007/04/12 09:00:52 ph10 Exp $ */
+/* $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-2006 */
+/* Copyright (c) Michael Haardt 2003-2007 */
/* See the file NOTICE for conditions of use and distribution. */
/* This code was contributed by Michael Haardt. */
#undef RFC_EOL
/* Define this for development of the Sieve extension "encoded-character". */
-#undef ENCODED_CHARACTER
+#define ENCODED_CHARACTER
/* Define this for development of the Sieve extension "envelope-auth". */
#undef ENVELOPE_AUTH
/* Define this for development of the Sieve extension "enotify". */
-#undef ENOTIFY
+#define ENOTIFY
/* Define this for the Sieve extension "subaddress". */
#define SUBADDRESS
#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 };
#endif
#ifdef SUBADDRESS
static uschar str_subaddress_c[]="subaddress";
-1 syntax error
*/
-static int parse_mailto_uri(struct Sieve *filter, const uschar *uri, string_item **recipient, struct String *header, struct String *body)
+static int parse_mailto_uri(struct Sieve *filter, const uschar *uri, string_item **recipient, struct String *header, struct String *subject, struct String *body)
{
const uschar *start;
struct String to,hname,hvalue;
}
else if (hname.length==4 && strcmpic(hname.character, US"body")==0)
*body=hvalue;
+ else if (hname.length==7 && strcmpic(hname.character, US"subject")==0)
+ *subject=hvalue;
else
{
static struct String ignore[]=
{
+ {US"date",4},
{US"from",4},
- {US"subject",7},
+ {US"message-id",10},
{US"received",8}
};
static struct String *end=ignore+sizeof(ignore)/sizeof(ignore[0]);
#ifdef ENCODED_CHARACTER
/*************************************************
-* Decode encoded-character string *
+* Decode hex-encoded-character string *
*************************************************/
/*
Encoding definition:
- hex-pair-seq = hex-pair *(WSP hex-pair)
+ blank = SP / TAB / CRLF
+ hex-pair-seq = *blank hex-pair *(1*blank hex-pair) *blank
hex-pair = 1*2HEXDIG
Arguments:
{
int decoded=0;
-while (src<end)
+while (*src==' ' || *src=='\t' || *src=='\n') ++src;
+do
{
- int l,h;
+ int x,d,n;
- if (*src==' ' || *src=='\t') ++src;
- else if ((src+1)<end && isxdigit(h=tolower(*src)) && isxdigit(l=tolower(*(src+1))))
- {
- h=(h>='0' && h<='9') ? h-'0' : 10+(h-'a');
- l=(l>='0' && l<='9') ? l-'0' : 10+(l-'a');
- if (dst) *dst++=(h<<4)|l;
- ++decoded;
- src+=2;
- }
- else return -1;
+ for (x=0,d=0; d<2 && src<end && isxdigit(n=tolower(*src)); x=(x<<4)|(n>='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;
}
- return decoded;
+while (src<end);
+return decoded;
}
/*************************************************
-* Decode encoded-character string *
+* Decode unicode-encoded-character string *
*************************************************/
/*
Encoding definition:
- unicode-hex-seq = unicode-hex *(WSP unicode-hex)
- unicode-hex = 1*6HEXDIG
+ blank = SP / TAB / CRLF
+ unicode-hex-seq = *blank unicode-hex *(blank unicode-hex) *blank
+ unicode-hex = 1*HEXDIG
It is an error for a script to use a hexadecimal value that isn't in
either the range 0 to D7FF or the range E000 to 10FFFF.
+ At this time, strings are already scanned, thus the CRLF is converted
+ to the internally used \n (should RFC_EOL have been used).
+
Arguments:
src points to a unicode-hex-seq
end points to its end
{
int decoded=0;
-while (src<end)
+while (*src==' ' || *src=='\t' || *src=='\n') ++src;
+do
{
- int c,n5,n4,n3,n2,n1,n0;
+ uschar *hex_seq;
+ int c,d,n;
- if (*src==' ' || *src=='\t') ++src;
- else if (
- (src+5)<end
- && isxdigit(n5=tolower(*src))
- && isxdigit(n4=tolower(*(src+1)))
- && isxdigit(n3=tolower(*(src+2)))
- && isxdigit(n2=tolower(*(src+3)))
- && isxdigit(n1=tolower(*(src+4)))
- && isxdigit(n0=tolower(*(src+5)))
- )
+ 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)
{
- n5=(n5>='0' && n5<='9') ? n5-'0' : 10+(n5-'a');
- n4=(n4>='0' && n4<='9') ? n4-'0' : 10+(n4-'a');
- n3=(n3>='0' && n3<='9') ? n3-'0' : 10+(n3-'a');
- n2=(n2>='0' && n2<='9') ? n2-'0' : 10+(n2-'a');
- n1=(n1>='0' && n1<='9') ? n1-'0' : 10+(n1-'a');
- n0=(n0>='0' && n0<='9') ? n0-'0' : 10+(n0-'a');
- c=(n5<<24)|(n4<<16)|(n3<<12)|(n2<<8)|(n1<<4)|n0;
- if (!((c>=0 && c<=0xd7ff) || (c>=0xe000 && c<=0x10ffff))) return -2;
- if (c<128)
- {
- if (dst) *dst++=c;
- ++decoded;
- }
- else if (c>=0x80 && c<=0x7ff)
- {
- if (dst)
- {
- *dst++=192+(c>>6);
- *dst++=128+(c&0x3f);
- }
- decoded+=2;
- }
- else if (c>=0x800 && c<=0xffff)
- {
- if (dst)
- {
- *dst++=224+(c>>12);
- *dst++=128+((c>>6)&0x3f);
- *dst++=128+(c&0x3f);
- }
- decoded+=3;
- }
- else if (c>=0x10000 && c<=0x1fffff)
- {
- if (dst)
- {
- *dst++=240+(c>>18);
- *dst++=128+((c>>10)&0x3f);
- *dst++=128+((c>>6)&0x3f);
- *dst++=128+(c&0x3f);
- }
- decoded+=4;
- }
- src+=6;
+ 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 return -1;
}
- return decoded;
+while (src<end);
+return decoded;
}
uschar *brace;
if (
- Ustrncmp(src,CUS "${hex:",6)==0
+ strncmpic(src,US "${hex:",6)==0
&& (brace=Ustrchr(src+6,'}'))!=(uschar*)0
&& (hex_decode(src+6,brace,(uschar*)0))>=0
)
src=brace+1;
}
else if (
- Ustrncmp(src,CUS "${unicode:",10)==0
+ strncmpic(src,US "${unicode:",10)==0
&& (brace=Ustrchr(src+10,'}'))!=(uschar*)0
)
{
}
else if (*filter->pc=='\\' && *(filter->pc+1)) /* quoted character */
{
- if (*(filter->pc+1)=='0') data->character=string_cat(data->character,&dataCapacity,&data->length,CUS "",1);
- else data->character=string_cat(data->character,&dataCapacity,&data->length,filter->pc+1,1);
+ data->character=string_cat(data->character,&dataCapacity,&data->length,filter->pc+1,1);
filter->pc+=2;
}
else /* regular character */
{
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];
-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;
{
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;
allof-test = "allof" <tests: test-list>
*/
- 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"))
anyof-test = "anyof" <tests: test-list>
*/
- 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"))
return 1;
}
#ifdef ENOTIFY
-else if (parse_identifier(filter,CUS "valid_notif_method"))
+else if (parse_identifier(filter,CUS "valid_notify_method"))
{
/*
- valid_notif_method = "valid_notif_method"
- <notification-uris: string-list>
+ valid_notify_method = "valid_notify_method"
+ <notification-uris: string-list>
*/
struct String *uris,*u;
for (u=uris; u->length!=-1 && *cond; ++u)
{
string_item *recipient;
- struct String header,body;
+ struct String header,subject,body;
recipient=NULL;
header.length=-1;
header.character=(uschar*)0;
+ subject.length=-1;
+ subject.character=(uschar*)0;
body.length=-1;
body.character=(uschar*)0;
- if (parse_mailto_uri(filter,u->character,&recipient,&header,&body)!=1)
+ if (parse_mailto_uri(filter,u->character,&recipient,&header,&subject,&body)!=1)
*cond=0;
}
}
return 1;
}
+else if (parse_identifier(filter,CUS "notify_method_capability"))
+ {
+ /*
+ notify_method_capability = "notify_method_capability" [COMPARATOR] [MATCH-TYPE]
+ <notification-uri: string>
+ <notification-capability: string>
+ <key-list: string-list>
+ */
+
+ int m;
+ int co=0,mt=0;
+
+ enum Comparator comparator=COMP_EN_ASCII_CASEMAP;
+ enum MatchType matchType=MATCH_IS;
+ struct String uri,capa,*keys,*k;
+
+ if (!filter->require_enotify)
+ {
+ filter->errmsg=CUS "missing previous require \"enotify\";";
+ return -1;
+ }
+ for (;;)
+ {
+ if (parse_white(filter)==-1) return -1;
+ if ((m=parse_comparator(filter,&comparator))!=0)
+ {
+ if (m==-1) return -1;
+ if (co)
+ {
+ filter->errmsg=CUS "comparator already specified";
+ return -1;
+ }
+ else co=1;
+ }
+ else if ((m=parse_matchtype(filter,&matchType))!=0)
+ {
+ if (m==-1) return -1;
+ if (mt)
+ {
+ filter->errmsg=CUS "match type already specified";
+ return -1;
+ }
+ else mt=1;
+ }
+ else break;
+ }
+ if ((m=parse_string(filter,&uri))!=1)
+ {
+ if (m==0) filter->errmsg=CUS "missing notification URI string";
+ return -1;
+ }
+ if (parse_white(filter)==-1) return -1;
+ if ((m=parse_string(filter,&capa))!=1)
+ {
+ if (m==0) filter->errmsg=CUS "missing notification capability string";
+ return -1;
+ }
+ if (parse_white(filter)==-1) return -1;
+ if ((m=parse_stringlist(filter,&keys))!=1)
+ {
+ if (m==0) filter->errmsg=CUS "missing key string list";
+ return -1;
+ }
+ if (exec)
+ {
+ string_item *recipient;
+ struct String header,subject,body;
+
+ *cond=0;
+ recipient=NULL;
+ header.length=-1;
+ header.character=(uschar*)0;
+ subject.length=-1;
+ subject.character=(uschar*)0;
+ body.length=-1;
+ body.character=(uschar*)0;
+ if (parse_mailto_uri(filter,uri.character,&recipient,&header,&subject,&body)==1)
+ {
+ if (eq_asciicase(&capa,&str_online,0)==1)
+ for (k=keys; k->length!=-1; ++k)
+ {
+ *cond=compare(filter,k,&str_maybe,comparator,matchType);
+ if (*cond==-1) return -1;
+ if (*cond) break;
+ }
+ }
+ }
+ return 1;
+ }
#endif
else return 0;
}
struct Notification *already;
string_item *recipient;
struct String header;
+ struct String subject;
struct String body;
uschar *envelope_from,*envelope_to;
recipient=NULL;
header.length=-1;
header.character=(uschar*)0;
+ subject.length=-1;
+ subject.character=(uschar*)0;
body.length=-1;
body.character=(uschar*)0;
envelope_from=expand_string("$sender_address");
return -1;
}
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==(struct Notification*)0)
/* New notification, process it */
{
- if (parse_mailto_uri(filter,method.character,&recipient,&header,&body)!=1)
- return -1;
struct Notification *sent;
sent=store_get(sizeof(struct Notification));
sent->method=method;
filter->notified=sent;
if ((filter_test != FTEST_NONE && debug_selector != 0) || (debug_selector & D_filter) != 0)
{
- debug_printf("Notification to `%s'.\n",method.character);
+ debug_printf("Notification to `%s': '%s'.\n",method.character,message.length!=-1 ? message.character : CUS "");
}
#ifndef COMPILE_SYNTAX_CHECKER
if (exec && filter_test == FTEST_NONE)
/* Allocation is larger than neccessary, but enough even for split MIME words */
buffer_capacity=32+4*message.length;
buffer=store_get(buffer_capacity);
- fprintf(f,"Subject: %s\n\n",parse_quote_2047(message.character, message.length, US"utf-8", buffer, 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);
projects / exim.git / blobdiff