-/* $Cambridge: exim/src/src/sieve.c,v 1.24 2007/02/07 14:41:13 ph10 Exp $ */
+/* $Cambridge: exim/src/src/sieve.c,v 1.27 2007/04/12 09:00:52 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/* Undefine it for UNIX-style \n end-of-line terminators (default). */
#undef RFC_EOL
+/* Define this for development of the Sieve extension "encoded-character". */
+#undef ENCODED_CHARACTER
+
/* Define this for development of the Sieve extension "envelope-auth". */
#undef ENVELOPE_AUTH
int keep;
int require_envelope;
int require_fileinto;
+#ifdef ENCODED_CHARACTER
+ int require_encoded_character;
+#endif
#ifdef ENVELOPE_AUTH
int require_envelope_auth;
#endif
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 };
}
+#ifdef ENCODED_CHARACTER
+/*************************************************
+* Decode encoded-character string *
+*************************************************/
+
+/*
+Encoding definition:
+ hex-pair-seq = hex-pair *(WSP hex-pair)
+ 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<end)
+ {
+ int l,h;
+
+ 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;
+ }
+ return decoded;
+}
+
+
+/*************************************************
+* Decode encoded-character string *
+*************************************************/
+
+/*
+Encoding definition:
+ unicode-hex-seq = unicode-hex *(WSP unicode-hex)
+ unicode-hex = 1*6HEXDIG
+
+ 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.
+
+Arguments:
+ src points to a unicode-hex-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
+ -2 semantic error (character range violation)
+*/
+
+static int unicode_decode(uschar *src, uschar *end, uschar *dst)
+{
+int decoded=0;
+
+while (src<end)
+ {
+ int c,n5,n4,n3,n2,n1,n0;
+
+ 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)))
+ )
+ {
+ 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;
+ }
+ else return -1;
+ }
+ return decoded;
+}
+
+
+/*************************************************
+* Decode encoded-character string *
+*************************************************/
+
+/*
+Encoding definition:
+ encoded-arb-octets = "${hex:" hex-pair-seq "}"
+ encoded-unicode-char = "${unicode:" unicode-hex-seq "}"
+
+Arguments:
+ encoded points to an encoded string, returns decoded string
+ filter points to the Sieve filter including its state
+
+Returns: 1 success
+ -1 syntax error
+*/
+
+static int string_decode(struct Sieve *filter, struct String *data)
+{
+uschar *src,*dst,*end;
+
+src=data->character;
+dst=src;
+end=data->character+data->length;
+while (src<end)
+ {
+ uschar *brace;
+
+ if (
+ Ustrncmp(src,CUS "${hex:",6)==0
+ && (brace=Ustrchr(src+6,'}'))!=(uschar*)0
+ && (hex_decode(src+6,brace,(uschar*)0))>=0
+ )
+ {
+ dst+=hex_decode(src+6,brace,dst);
+ src=brace+1;
+ }
+ else if (
+ Ustrncmp(src,CUS "${unicode:",10)==0
+ && (brace=Ustrchr(src+10,'}'))!=(uschar*)0
+ )
+ {
+ switch (unicode_decode(src+10,brace,(uschar*)0))
+ {
+ case -2:
+ {
+ filter->errmsg=CUS "unicode character out of range";
+ return -1;
+ }
+ case -1:
+ {
+ *dst++=*src++;
+ break;
+ }
+ default:
+ {
+ dst+=unicode_decode(src+10,brace,dst);
+ src=brace+1;
+ }
+ }
+ }
+ else *dst++=*src++;
+ }
+ data->length=dst-data->character;
+ *dst='\0';
+return 1;
+}
+#endif
+
+
/*************************************************
-* Parse a optional string *
+* Parse an optional string *
*************************************************/
/*
++filter->pc;
/* that way, there will be at least one character allocated */
data->character=string_cat(data->character,&dataCapacity,&foo,CUS "",1);
+#ifdef ENCODED_CHARACTER
+ if (filter->require_encoded_character
+ && string_decode(filter,data)==-1)
+ return -1;
+#endif
return 1;
}
else if (*filter->pc=='\\' && *(filter->pc+1)) /* quoted character */
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 */
debug_printf("Notification to `%s'.\n",method.character);
}
#ifndef COMPILE_SYNTAX_CHECKER
- if (exec)
+ if (exec && filter_test == FTEST_NONE)
{
string_item *p;
header_line *h;
if ((pid = child_open_exim2(&fd,envelope_to,envelope_to))>=1)
{
FILE *f;
+ uschar *buffer;
+ int buffer_capacity;
f = fdopen(fd, "wb");
for (h = header_list; h != NULL; h = h->next)
fprintf(f,"From: %s\n",from.length==-1 ? envelope_to : from.character);
for (p=recipient; p; p=p->next) fprintf(f,"To: %s\n",p->text);
if (header.length>0) fprintf(f,"%s",header.character);
- fprintf(f,"Subject: %s\n",message.length==-1 ? CUS "notification" : message.character);
- fprintf(f,"\n");
+ if (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);
+ fprintf(f,"Subject: %s\n\n",parse_quote_2047(message.character, message.length, US"utf-8", buffer, buffer_capacity, TRUE));
if (body.length>0) fprintf(f,"%s\n",body.character);
fflush(f);
(void)fclose(f);
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
{
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