From: Jeremy Harris Date: Thu, 12 Sep 2024 23:22:28 +0000 (+0100) Subject: exim-filter dynamic module X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/aff5e0c480dd4ac2ccd15906c250c18c93ac7f12?ds=sidebyside exim-filter dynamic module --- diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff index bca7d6f87..0a83c294a 100644 --- a/doc/doc-txt/NewStuff +++ b/doc/doc-txt/NewStuff @@ -14,11 +14,12 @@ Version 4.98 3. Events smtp:fail:protocol and smtp:fail:syntax - 4. Support for Sieve filters can be omitted at build time + 4. Support for Exim- and Sieve filters can be omitted at build time - 5. JSON and LDAP lookup support, Sieve, PAM, RADIUS, perl, SPF, DKIM, DMARC and - ARC support, all the router and authenticator drivers, and all the transport - drivers except smtp, can now be built as loadable modules + 5. JSON and LDAP lookup support, both filter types, PAM, RADIUS, perl, SPF, + DKIM, DMARC and ARC support, all the router and authenticator drivers, + and all the transport drivers except smtp, can now be built as loadable + modules Version 4.98 ------------ diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base index 7793e5da2..c27b5eb5c 100644 --- a/src/OS/Makefile-Base +++ b/src/OS/Makefile-Base @@ -513,7 +513,7 @@ OBJ_AUTHS = call_pwcheck.o check_serv_cond.o \ get_data.o get_no64_data.o pwcheck.o OBJ_EXIM = acl.o base64.o child.o crypt16.o daemon.o dbfn.o debug.o deliver.o \ - directory.o dns.o drtables.o enq.o exim.o expand.o filter.o \ + directory.o dns.o drtables.o enq.o exim.o expand.o \ filtertest.o globals.o dnsbl.o hash.o \ header.o host.o host_address.o ip.o log.o lss.o match.o md5.o moan.o \ os.o parse.o priv.o proxy.o queue.o \ @@ -839,7 +839,6 @@ enq.o: $(HDRS) enq.c exim.o: $(HDRS) exim.c expand.o: $(HDRS) expand.c environment.o: $(HDRS) environment.c -filter.o: $(HDRS) filter.c filtertest.o: $(HDRS) filtertest.c globals.o: $(HDRS) globals.c hash.o: $(HDRS) hash.c diff --git a/src/scripts/Configure-Makefile b/src/scripts/Configure-Makefile index fd5afaf10..74f8dda47 100755 --- a/src/scripts/Configure-Makefile +++ b/src/scripts/Configure-Makefile @@ -315,7 +315,7 @@ done <<-END routers ROUTER ACCEPT DNSLOOKUP IPLITERAL IPLOOKUP MANUALROUTE QUERYPROGRAM REDIRECT transports TRANSPORT APPENDFILE AUTOREPLY LMTP PIPE QUEUEFILE SMTP auths AUTH CRAM_MD5 CYRUS_SASL DOVECOT EXTERNAL GSASL HEIMDAL_GSSAPI PLAINTEXT SPA TLS - miscmods SUPPORT ARC _DKIM DMARC PAM PERL RADIUS _SIEVE_FILTER SPF + miscmods SUPPORT ARC _DKIM DMARC _EXIM_FILTER PAM PERL RADIUS _SIEVE_FILTER SPF END # See if there is a definition of EXIM_PERL in what we have built so far. diff --git a/src/scripts/MakeLinks b/src/scripts/MakeLinks index 6327bc819..d07f81e98 100755 --- a/src/scripts/MakeLinks +++ b/src/scripts/MakeLinks @@ -102,6 +102,7 @@ for f in dummy.c \ pdkim/crypt_ver.h pdkim/pdkim.c pdkim/pdkim.h \ pdkim/pdkim_hash.h pdkim/signing.c pdkim/signing.h \ dmarc.c dmarc.h dmarc_api.h \ + exim_filter.c exim_filter_api.h \ pam.c pam_api.h \ perl.c perl_api.h \ radius.c radius_api.h \ @@ -133,7 +134,7 @@ for f in blob.h dbfunctions.h exim.h functions.h globals.h \ \ acl.c buildconfig.c base64.c child.c crypt16.c daemon.c dbfn.c debug.c \ deliver.c directory.c dns.c dnsbl.c drtables.c dummies.c enq.c exim.c \ - exim_dbmbuild.c exim_dbutil.c exim_lock.c expand.c filter.c filtertest.c \ + exim_dbmbuild.c exim_dbutil.c exim_lock.c expand.c filtertest.c \ globals.c hash.c header.c host.c host_address.c ip.c log.c lss.c match.c md5.c moan.c \ parse.c priv.c proxy.c queue.c rda.c readconf.c receive.c retry.c rewrite.c \ regex_cache.c rfc2047.c route.c search.c setenv.c environment.c \ diff --git a/src/src/EDITME b/src/src/EDITME index 85effd13f..2cf0b3da9 100644 --- a/src/src/EDITME +++ b/src/src/EDITME @@ -551,6 +551,17 @@ SUPPORT_DANE=yes # EXIM_MONITOR=eximon.bin +#------------------------------------------------------------------------------ +# Compiling with support for Exim filters is the default. To disable this +# uncomment the line below. + +# DISABLE_EXIM_FILTER=yes + +# Alternatively, to build the support as a dynamically-loaded module uncomment +# this line. + +# SUPPORT_EXIM_FILTER=2 + #------------------------------------------------------------------------------ # Compiling with support for Sieve filters is the default. To disable this # uncomment the line below. diff --git a/src/src/config.h.defaults b/src/src/config.h.defaults index 404ac0c1c..7e8229650 100644 --- a/src/src/config.h.defaults +++ b/src/src/config.h.defaults @@ -53,6 +53,7 @@ Do not put spaces between # and the 'define'. #define DISABLE_DKIM #define DISABLE_ESMTP_LIMITS #define DISABLE_EVENT +#define DISABLE_EXIM_FILTER #define DISABLE_OCSP #define DISABLE_PIPE_CONNECT #define DISABLE_PRDR @@ -171,6 +172,7 @@ Do not put spaces between # and the 'define'. /* Required to support dynamic-module build */ #define SUPPORT_ARC #define SUPPORT_DKIM +#define SUPPORT_EXIM_FILTER #define SUPPORT_PERL #define SUPPORT_SIEVE_FILTER #define SUPPORT_RADIUS diff --git a/src/src/drtables.c b/src/src/drtables.c index 49d3ae129..28846320c 100644 --- a/src/src/drtables.c +++ b/src/src/drtables.c @@ -762,6 +762,9 @@ extern misc_module_info pam_module_info; #if defined(EXIM_PERL) && (!defined(SUPPORT_PERL) || SUPPORT_PERL!=2) extern misc_module_info perl_module_info; #endif +#if !defined(DISABLE_EXIM_FILTER) && (!defined(SUPPORT_EXIM_FILTER) || SUPPORT_EXIM_FILTER!=2) +extern misc_module_info exim_filter_module_info; +#endif #if !defined(DISABLE_SIEVE_FILTER) && (!defined(SUPPORT_SIEVE_FILTER) || SUPPORT_SIEVE_FILTER!=2) extern misc_module_info sieve_filter_module_info; #endif @@ -795,6 +798,9 @@ onetime = TRUE; #if defined(EXIM_PERL) && (!defined(SUPPORT_PERL) || SUPPORT_PERL!=2) misc_mod_add(&perl_module_info); #endif +#if !defined(DISABLE_EXIM_FILTER) && (!defined(SUPPORT_EXIM_FILTER) || SUPPORT_EXIM_FILTER!=2) + misc_mod_add(&exim_filter_module_info); +#endif #if !defined(DISABLE_SIEVE_FILTER) && (!defined(SUPPORT_SIEVE_FILTER) || SUPPORT_SIEVE_FILTER!=2) misc_mod_add(&sieve_filter_module_info); #endif diff --git a/src/src/exim.c b/src/src/exim.c index 274187cfc..0eb221d43 100644 --- a/src/src/exim.c +++ b/src/src/exim.c @@ -1221,6 +1221,9 @@ g = string_cat(g, US"Support for:"); #ifdef WITH_CONTENT_SCAN g = string_cat(g, US" Content_Scanning"); #endif +#ifndef DISABLE_EXIM_FILTER + g = string_cat(g, US" Exim_filter"); +#endif #ifndef DISABLE_SIEVE_FILTER g = string_cat(g, US" Sieve_filter"); #endif diff --git a/src/src/exim.h b/src/src/exim.h index bae5ec390..4af0f0e08 100644 --- a/src/src/exim.h +++ b/src/src/exim.h @@ -567,9 +567,8 @@ config.h, mytypes.h, and store.h, so we don't need to mention them explicitly. #ifdef EXIM_PERL # include "miscmods/perl_api.h" #endif -#ifndef DISABLE_SIEVE -# include "miscmods/sieve_filter_api.h" -#endif +#include "miscmods/exim_filter_api.h" +#include "miscmods/sieve_filter_api.h" /* The following stuff must follow the inclusion of config.h because it requires various things that are set therein. */ diff --git a/src/src/filter.c b/src/src/filter.c deleted file mode 100644 index 76749510a..000000000 --- a/src/src/filter.c +++ /dev/null @@ -1,2643 +0,0 @@ -/************************************************* -* Exim - an Internet mail transport agent * -*************************************************/ - -/* Copyright (c) The Exim Maintainers 2020 - 2024 */ -/* Copyright (c) University of Cambridge 1995 - 2018 */ -/* See the file NOTICE for conditions of use and distribution. */ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - - -/* Code for mail filtering functions. */ - -#include "exim.h" - - -/* Command arguments and left/right points in conditions can contain different -types of data, depending on the particular command or condition. Originally, -(void *) was used as "any old type", with casts, but this gives trouble and -warnings in some environments. So now it is done "properly", with a union. We -need to declare the structures first because some of them are recursive. */ - -struct filter_cmd; -struct condition_block; - -union argtypes { - struct string_item *a; - BOOL b; - struct condition_block *c; - struct filter_cmd *f; - int i; - const uschar *u; -}; - -/* Local structures used in this module */ - -typedef struct filter_cmd { - struct filter_cmd *next; - int command; - BOOL seen; - BOOL noerror; - union argtypes args[1]; -} filter_cmd; - -typedef struct condition_block { - struct condition_block *parent; - int type; - BOOL testfor; - union argtypes left; - union argtypes right; -} condition_block; - -/* Miscellaneous other declarations */ - -static uschar **error_pointer; -static const uschar *log_filename; -static int filter_options; -static int line_number; -static int expect_endif; -static int had_else_endif; -static int log_fd; -static int log_mode; -static int output_indent; -static BOOL filter_delivered; -static BOOL finish_obeyed; -static BOOL seen_force; -static BOOL seen_value; -static BOOL noerror_force; - -enum { had_neither, had_else, had_elif, had_endif }; - -static BOOL read_command_list(const uschar **, filter_cmd ***, BOOL); - - -/* This defines the offsets for the arguments; first the string ones, and -then the non-string ones. The order must be as above. */ - -enum { mailarg_index_to, - mailarg_index_cc, - mailarg_index_bcc, - mailarg_index_from, - mailarg_index_reply_to, - mailarg_index_subject, - mailarg_index_headers, /* misc headers must be last */ - mailarg_index_text, /* text is first after headers */ - mailarg_index_file, /* between text and expand are filenames */ - mailarg_index_log, - mailarg_index_once, - mailarg_index_once_repeat, /* a time string */ - mailarg_index_expand, /* first non-string argument */ - mailarg_index_return, - mailargs_total /* total number of arguments */ - }; - -/* The string arguments for the mail command. The header line ones (that are -permitted to include \n followed by white space) first, and then the body text -one (it can have \n anywhere). Then the file names and once_repeat, which may -not contain \n. */ - -static const char *mailargs[] = { /* "to" must be first, and */ - [mailarg_index_to] = "to", /* "cc" and "bcc" must follow */ - [mailarg_index_cc] = "cc", - [mailarg_index_bcc] = "bcc", - [mailarg_index_from] = "from", - [mailarg_index_reply_to] = "reply_to", - [mailarg_index_subject] = "subject", - [mailarg_index_headers] = "extra_headers", /* misc added header lines */ - [mailarg_index_text] = "text", - [mailarg_index_file] = "file", - [mailarg_index_log] = "log", - [mailarg_index_once] = "once", - [mailarg_index_once_repeat] = "once_repeat" -}; - -/* The count of string arguments */ - -#define MAILARGS_STRING_COUNT (nelem(mailargs)) - -/* The count of string arguments that are actually passed over as strings -(once_repeat is converted to an int). */ - -#define mailargs_string_passed (MAILARGS_STRING_COUNT - 1) - -/* Offsets in the data structure for the string arguments (note that -once_repeat isn't a string argument at this point.) */ - -static int reply_offsets[] = { - [mailarg_index_to] = offsetof(reply_item, to), - [mailarg_index_cc] = offsetof(reply_item, cc), - [mailarg_index_bcc] = offsetof(reply_item, bcc), - [mailarg_index_from] = offsetof(reply_item, from), - [mailarg_index_reply_to] = offsetof(reply_item, reply_to), - [mailarg_index_subject] = offsetof(reply_item, subject), - [mailarg_index_headers] = offsetof(reply_item, headers), - [mailarg_index_text] = offsetof(reply_item, text), - [mailarg_index_file] = offsetof(reply_item, file), - [mailarg_index_log] = offsetof(reply_item, logfile), - [mailarg_index_once] = offsetof(reply_item, oncelog), -}; - -/* Condition identities and names, with negated versions for some -of them. */ - -enum { cond_and, cond_or, cond_personal, cond_begins, cond_BEGINS, - cond_ends, cond_ENDS, cond_is, cond_IS, cond_matches, - cond_MATCHES, cond_contains, cond_CONTAINS, cond_delivered, - cond_above, cond_below, cond_errormsg, cond_firsttime, - cond_manualthaw, cond_foranyaddress }; - -static const char *cond_names[] = { - [cond_and] = "and", - [cond_or] = "or", - [cond_personal] = "personal", - [cond_begins] = "begins", - [cond_BEGINS] = "BEGINS", - [cond_ends] = "ends", - [cond_ENDS] = "ENDS", - [cond_is] = "is", - [cond_IS] = "IS", - [cond_matches] = "matches", - [cond_MATCHES] = "MATCHES", - [cond_contains] = "contains", - [cond_CONTAINS] = "CONTAINS", - [cond_delivered] = "delivered", - [cond_above] = "above", - [cond_below] = "below", - [cond_errormsg] = "error_message", - [cond_firsttime] = "first_delivery", - [cond_manualthaw] = "manually_thawed", - [cond_foranyaddress] = "foranyaddress" }; - -static const char *cond_not_names[] = { - [cond_and] = "", - [cond_or] = "", - [cond_personal] = "not personal", - [cond_begins] = "does not begin", - [cond_BEGINS] = "does not BEGIN", - [cond_ends] = "does not end", - [cond_ENDS] = "does not END", - [cond_is] = "is not", - [cond_IS] = "IS not", - [cond_matches] = "does not match", - [cond_MATCHES] = "does not MATCH", - [cond_contains] = "does not contain", - [cond_CONTAINS] = "does not CONTAIN", - [cond_delivered] = "not delivered", - [cond_above] = "not above", - [cond_below] = "not below", - [cond_errormsg] = "not error_message", - [cond_firsttime] = "not first_delivery", - [cond_manualthaw] = "not manually_thawed", - [cond_foranyaddress] = "not foranyaddress" }; - -/* Tables of binary condition words and their corresponding types. Not easy -to amalgamate with the above because of the different variants. */ - -static const char *cond_words[] = { - "BEGIN", - "BEGINS", - "CONTAIN", - "CONTAINS", - "END", - "ENDS", - "IS", - "MATCH", - "MATCHES", - "above", - "begin", - "begins", - "below", - "contain", - "contains", - "end", - "ends", - "is", - "match", - "matches"}; - -static int cond_word_count = nelem(cond_words); - -static int cond_types[] = { cond_BEGINS, cond_BEGINS, cond_CONTAINS, - cond_CONTAINS, cond_ENDS, cond_ENDS, cond_IS, cond_MATCHES, cond_MATCHES, - cond_above, cond_begins, cond_begins, cond_below, cond_contains, - cond_contains, cond_ends, cond_ends, cond_is, cond_matches, cond_matches }; - -/* Command identities */ - -enum { ADD_COMMAND, DEFER_COMMAND, DELIVER_COMMAND, ELIF_COMMAND, ELSE_COMMAND, - ENDIF_COMMAND, FINISH_COMMAND, FAIL_COMMAND, FREEZE_COMMAND, - HEADERS_COMMAND, IF_COMMAND, LOGFILE_COMMAND, LOGWRITE_COMMAND, - MAIL_COMMAND, NOERROR_COMMAND, PIPE_COMMAND, SAVE_COMMAND, SEEN_COMMAND, - TESTPRINT_COMMAND, UNSEEN_COMMAND, VACATION_COMMAND }; - -static const char * command_list[] = { - [ADD_COMMAND] = "add", - [DEFER_COMMAND] = "defer", - [DELIVER_COMMAND] = "deliver", - [ELIF_COMMAND] = "elif", - [ELSE_COMMAND] = "else", - [ENDIF_COMMAND] = "endif", - [FINISH_COMMAND] = "finish", - [FAIL_COMMAND] = "fail", - [FREEZE_COMMAND] = "freeze", - [HEADERS_COMMAND] = "headers", - [IF_COMMAND] = "if", - [LOGFILE_COMMAND] = "logfile", - [LOGWRITE_COMMAND] = "logwrite", - [MAIL_COMMAND] = "mail", - [NOERROR_COMMAND] = "noerror", - [PIPE_COMMAND] = "pipe", - [SAVE_COMMAND] = "save", - [SEEN_COMMAND] = "seen", - [TESTPRINT_COMMAND] = "testprint", - [UNSEEN_COMMAND] = "unseen", - [VACATION_COMMAND] = "vacation" -}; - -static int command_list_count = nelem(command_list); - -/* This table contains the number of expanded arguments in the bottom 4 bits. -If the top bit is set, it means that the default for the command is "seen". */ - -static uschar command_exparg_count[] = { - [ADD_COMMAND] = 2, - [DEFER_COMMAND] = 1, - [DELIVER_COMMAND] = 128+2, - [ELIF_COMMAND] = 0, - [ELSE_COMMAND] = 0, - [ENDIF_COMMAND] = 0, - [FINISH_COMMAND] = 0, - [FAIL_COMMAND] = 1, - [FREEZE_COMMAND] = 1, - [HEADERS_COMMAND] = 1, - [IF_COMMAND] = 0, - [LOGFILE_COMMAND] = 1, - [LOGWRITE_COMMAND] = 1, - [MAIL_COMMAND] = MAILARGS_STRING_COUNT, - [NOERROR_COMMAND] = 0, - [PIPE_COMMAND] = 128+0, - [SAVE_COMMAND] = 128+1, - [SEEN_COMMAND] = 0, - [TESTPRINT_COMMAND] = 1, - [UNSEEN_COMMAND] = 0, - [VACATION_COMMAND] = MAILARGS_STRING_COUNT -}; - - - -/************************************************* -* Find next significant uschar * -*************************************************/ - -/* Function to skip over white space and, optionally, comments. - -Arguments: - ptr pointer to next character - comment_allowed if TRUE, comments (# to \n) are skipped - -Returns: pointer to next non-whitespace character -*/ - -static const uschar * -nextsigchar(const uschar *ptr, BOOL comment_allowed) -{ -for (;;) - { - while (isspace(*ptr)) - if (*ptr++ == '\n') line_number++; - if (comment_allowed && *ptr == '#') - while (*++ptr != '\n' && *ptr) ; - else - break; - } -return ptr; -} - - - -/************************************************* -* Read one word * -*************************************************/ - -/* The terminator is white space unless bracket is TRUE, in which -case ( and ) terminate. - -Arguments - ptr pointer to next character - buffer where to put the word - size size of buffer - bracket if TRUE, terminate on ( and ) as well as space - -Returns: pointer to the next significant character after the word -*/ - -static const uschar * -nextword(const uschar *ptr, uschar *buffer, int size, BOOL bracket) -{ -uschar * bp = buffer; -while (*ptr && !isspace(*ptr) && - (!bracket || (*ptr != '(' && *ptr != ')'))) - if (bp - buffer < size - 1) - *bp++ = *ptr++; - else - { - *error_pointer = string_sprintf("word is too long in line %d of " - "filter file (max = %d chars)", line_number, size); - break; - } - -*bp = '\0'; -return nextsigchar(ptr, TRUE); -} - - - -/************************************************* -* Read one item * -*************************************************/ - -/* Might be a word, or might be a quoted string; in the latter case -do the escape stuff. - -Arguments: - ptr pointer to next character - buffer where to put the item - size size of buffer - bracket if TRUE, terminate non-quoted on ( and ) as well as space - -Returns: the next significant character after the item -*/ - -static const uschar * -nextitem(const uschar *ptr, uschar *buffer, int size, BOOL bracket) -{ -uschar *bp = buffer; -if (*ptr != '\"') return nextword(ptr, buffer, size, bracket); - -while (*++ptr && *ptr != '\"' && *ptr != '\n') - { - if (bp - buffer >= size - 1) - { - *error_pointer = string_sprintf("string is too long in line %d of " - "filter file (max = %d chars)", line_number, size); - break; - } - - if (*ptr != '\\') *bp++ = *ptr; else - { - if (isspace(ptr[1])) /* \NL ignored */ - { - const uschar *p = ptr + 1; - while (*p != '\n' && isspace(*p)) p++; - if (*p == '\n') - { - line_number++; - ptr = p; - while (ptr[1] != '\n' && isspace(ptr[1])) ptr++; - continue; - } - } - - *bp++ = string_interpret_escape(CUSS &ptr); - } - } - -if (*ptr == '\"') ptr++; - else if (*error_pointer == NULL) - *error_pointer = string_sprintf("quote missing at end of string " - "in line %d", line_number); - -*bp = 0; -return nextsigchar(ptr, TRUE); -} - - - - -/************************************************* -* Convert a string + K|M to a number * -*************************************************/ - -/* -Arguments: - s points to text string - OK set TRUE if a valid number was read - -Returns: the number, or 0 on error (with *OK FALSE) -*/ - -static int -get_number(const uschar *s, BOOL *ok) -{ -int value, count; -*ok = FALSE; -if (sscanf(CS s, "%i%n", &value, &count) != 1) return 0; -if (tolower(s[count]) == 'k') { value *= 1024; count++; } -if (tolower(s[count]) == 'm') { value *= 1024*1024; count++; } -while (isspace(s[count])) count++; -if (s[count]) return 0; -*ok = TRUE; -return value; -} - - - -/************************************************* -* Read one condition * -*************************************************/ - -/* A complete condition must be terminated by "then"; bracketed internal -conditions must be terminated by a closing bracket. They are read by calling -this function recursively. - -Arguments: - ptr points to start of condition - condition_block where to hang the created condition block - toplevel TRUE when called at the top level - -Returns: points to next character after "then" -*/ - -static const uschar * -read_condition(const uschar *ptr, condition_block **cond, BOOL toplevel) -{ -uschar buffer[1024]; -BOOL testfor = TRUE; -condition_block *current_parent = NULL; -condition_block **current = cond; - -*current = NULL; - -/* Loop to read next condition */ - -for (;;) - { - condition_block *c; - - /* reaching the end of the input is an error. */ - - if (!*ptr) - { - *error_pointer = US"\"then\" missing at end of filter file"; - break; - } - - /* Opening bracket at the start of a condition introduces a nested - condition, which must be terminated by a closing bracket. */ - - if (*ptr == '(') - { - ptr = read_condition(nextsigchar(ptr+1, TRUE), &c, FALSE); - if (*error_pointer != NULL) break; - if (*ptr != ')') - { - *error_pointer = string_sprintf("expected \")\" in line %d of " - "filter file", line_number); - break; - } - if (!testfor) - { - c->testfor = !c->testfor; - testfor = TRUE; - } - ptr = nextsigchar(ptr+1, TRUE); - } - - - /* Closing bracket at the start of a condition is an error. Give an - explicit message, as otherwise "unknown condition" would be confusing. */ - - else if (*ptr == ')') - { - *error_pointer = string_sprintf("unexpected \")\" in line %d of " - "filter file", line_number); - break; - } - - /* Otherwise we expect a word or a string. */ - - else - { - ptr = nextitem(ptr, buffer, sizeof(buffer), TRUE); - if (*error_pointer) break; - - /* "Then" at the start of a condition is an error */ - - if (Ustrcmp(buffer, "then") == 0) - { - *error_pointer = string_sprintf("unexpected \"then\" near line %d of " - "filter file", line_number); - break; - } - - /* "Not" at the start of a condition negates the testing condition. */ - - if (Ustrcmp(buffer, "not") == 0) - { - testfor = !testfor; - continue; - } - - /* Build a condition block from the specific word. */ - - c = store_get(sizeof(condition_block), GET_UNTAINTED); - c->left.u = c->right.u = NULL; - c->testfor = testfor; - testfor = TRUE; - - /* Check for conditions that start with a keyword */ - - if (Ustrcmp(buffer, "delivered") == 0) c->type = cond_delivered; - else if (Ustrcmp(buffer, "error_message") == 0) c->type = cond_errormsg; - else if (Ustrcmp(buffer, "first_delivery") == 0) c->type = cond_firsttime; - else if (Ustrcmp(buffer, "manually_thawed") == 0) c->type = cond_manualthaw; - - /* Personal can be followed by any number of aliases */ - - else if (Ustrcmp(buffer, "personal") == 0) - { - c->type = cond_personal; - for (;;) - { - string_item *aa; - const uschar * saveptr = ptr; - ptr = nextword(ptr, buffer, sizeof(buffer), TRUE); - if (*error_pointer) break; - if (Ustrcmp(buffer, "alias") != 0) - { - ptr = saveptr; - break; - } - ptr = nextitem(ptr, buffer, sizeof(buffer), TRUE); - if (*error_pointer) break; - aa = store_get(sizeof(string_item), GET_UNTAINTED); - aa->text = string_copy(buffer); - aa->next = c->left.a; - c->left.a = aa; - } - } - - /* Foranyaddress must be followed by a string and a condition enclosed - in parentheses, which is handled as a subcondition. */ - - else if (Ustrcmp(buffer, "foranyaddress") == 0) - { - ptr = nextitem(ptr, buffer, sizeof(buffer), TRUE); - if (*error_pointer) break; - if (*ptr != '(') - { - *error_pointer = string_sprintf("\"(\" expected after \"foranyaddress\" " - "near line %d of filter file", line_number); - break; - } - - c->type = cond_foranyaddress; - c->left.u = string_copy(buffer); - - ptr = read_condition(nextsigchar(ptr+1, TRUE), &(c->right.c), FALSE); - if (*error_pointer) break; - if (*ptr != ')') - { - *error_pointer = string_sprintf("expected \")\" in line %d of " - "filter file", line_number); - break; - } - ptr = nextsigchar(ptr+1, TRUE); - } - - /* If it's not a word we recognize, then it must be the lefthand - operand of one of the comparison words. */ - - else - { - int i; - const uschar *isptr = NULL; - - c->left.u = string_copy(buffer); - ptr = nextword(ptr, buffer, sizeof(buffer), TRUE); - if (*error_pointer) break; - - /* Handle "does|is [not]", preserving the pointer after "is" in - case it isn't that, but the form "is ". */ - - if (strcmpic(buffer, US"does") == 0 || strcmpic(buffer, US"is") == 0) - { - if (buffer[0] == 'i') { c->type = cond_is; isptr = ptr; } - if (buffer[0] == 'I') { c->type = cond_IS; isptr = ptr; } - - ptr = nextword(ptr, buffer, sizeof(buffer), TRUE); - if (*error_pointer) break; - if (strcmpic(buffer, US"not") == 0) - { - c->testfor = !c->testfor; - if (isptr) isptr = ptr; - ptr = nextword(ptr, buffer, sizeof(buffer), TRUE); - if (*error_pointer) break; - } - } - - for (i = 0; i < cond_word_count; i++) - { - if (Ustrcmp(buffer, cond_words[i]) == 0) - { - c->type = cond_types[i]; - break; - } - } - - /* If an unknown word follows "is" or "is not" - it's actually the argument. Reset to read it. */ - - if (i >= cond_word_count) - { - if (!isptr) - { - *error_pointer = string_sprintf("unrecognized condition word \"%s\" " - "near line %d of filter file", buffer, line_number); - break; - } - ptr = isptr; - } - - /* Get the RH argument. */ - - ptr = nextitem(ptr, buffer, sizeof(buffer), TRUE); - if (*error_pointer) break; - c->right.u = string_copy(buffer); - } - } - - /* We have read some new condition and set it up in the condition block - c; point the current pointer at it, and then deal with what follows. */ - - *current = c; - - /* Closing bracket terminates if this is a lower-level condition. Otherwise - it is unexpected. */ - - if (*ptr == ')') - { - if (toplevel) - *error_pointer = string_sprintf("unexpected \")\" in line %d of " - "filter file", line_number); - break; - } - - /* Opening bracket following a condition is an error; give an explicit - message to make it clearer what is wrong. */ - - else if (*ptr == '(') - { - *error_pointer = string_sprintf("unexpected \"(\" in line %d of " - "filter file", line_number); - break; - } - - /* Otherwise the next thing must be one of the words "and", "or" or "then" */ - - else - { -// const uschar *saveptr = ptr; - ptr = nextword(ptr, buffer, sizeof(buffer), FALSE); - if (*error_pointer) break; - - /* "Then" terminates a toplevel condition; otherwise a closing bracket - has been omitted. Put a string terminator at the start of "then" so - that reflecting the condition can be done when testing. */ - /*XXX This stops us doing a constification job in this file, unfortunately. - Comment it out and see if anything breaks. - With one addition down at DEFERFREEZEFAIL it passes the testsuite. */ - - if (Ustrcmp(buffer, "then") == 0) - { -// if (toplevel) *saveptr = 0; -// else - if (!toplevel) - *error_pointer = string_sprintf("missing \")\" at end of " - "condition near line %d of filter file", line_number); - break; - } - - /* "And" causes a new condition block to replace the one we have - just read, which becomes the left sub-condition. The current pointer - is reset to the pointer for the right sub-condition. We have to keep - track of the tree of sequential "ands", so as to traverse back up it - if an "or" is met. */ - - else if (Ustrcmp(buffer, "and") == 0) - { - condition_block * andc = store_get(sizeof(condition_block), GET_UNTAINTED); - andc->parent = current_parent; - andc->type = cond_and; - andc->testfor = TRUE; - andc->left.c = c; - andc->right.u = NULL; /* insurance */ - *current = andc; - current = &(andc->right.c); - current_parent = andc; - } - - /* "Or" is similar, but has to be done a bit more carefully to - ensure that "and" is more binding. If there's a parent set, we - are following a sequence of "and"s and must track back to their - start. */ - - else if (Ustrcmp(buffer, "or") == 0) - { - condition_block * orc = store_get(sizeof(condition_block), GET_UNTAINTED); - condition_block * or_parent = NULL; - - if (current_parent) - { - while (current_parent->parent && - current_parent->parent->type == cond_and) - current_parent = current_parent->parent; - - /* If the parent has a parent, it must be an "or" parent. */ - - if (current_parent->parent) - or_parent = current_parent->parent; - } - - orc->parent = or_parent; - if (!or_parent) *cond = orc; - else or_parent->right.c = orc; - orc->type = cond_or; - orc->testfor = TRUE; - orc->left.c = (current_parent == NULL)? c : current_parent; - orc->right.c = NULL; /* insurance */ - current = &(orc->right.c); - current_parent = orc; - } - - /* Otherwise there is a disaster */ - - else - { - *error_pointer = string_sprintf("\"and\" or \"or\" or \"%s\" " - "expected near line %d of filter file, but found \"%s\"", - toplevel? "then" : ")", line_number, buffer); - break; - } - } - } - -return nextsigchar(ptr, TRUE); -} - - - -/************************************************* -* Output the current indent * -*************************************************/ - -static void -indent(void) -{ -int i; -DEBUG(D_filter) for (i = 0; i < output_indent; i++) debug_printf(" "); -} - - - -/************************************************* -* Condition printer: for debugging * -*************************************************/ - -/* -Arguments: - c the block at the top of the tree - toplevel TRUE at toplevel - stops overall brackets - -Returns: nothing -*/ - -static void -print_condition(condition_block *c, BOOL toplevel) -{ -const char *name = (c->testfor)? cond_names[c->type] : cond_not_names[c->type]; -switch(c->type) - { - case cond_personal: - case cond_delivered: - case cond_errormsg: - case cond_firsttime: - case cond_manualthaw: - debug_printf("%s", name); - break; - - case cond_is: - case cond_IS: - case cond_matches: - case cond_MATCHES: - case cond_contains: - case cond_CONTAINS: - case cond_begins: - case cond_BEGINS: - case cond_ends: - case cond_ENDS: - case cond_above: - case cond_below: - debug_printf("%s %s %s", c->left.u, name, c->right.u); - break; - - case cond_and: - if (!c->testfor) debug_printf("not ("); - print_condition(c->left.c, FALSE); - debug_printf(" %s ", cond_names[c->type]); - print_condition(c->right.c, FALSE); - if (!c->testfor) debug_printf(")"); - break; - - case cond_or: - if (!c->testfor) debug_printf("not ("); - else if (!toplevel) debug_printf("("); - print_condition(c->left.c, FALSE); - debug_printf(" %s ", cond_names[c->type]); - print_condition(c->right.c, FALSE); - if (!toplevel || !c->testfor) debug_printf(")"); - break; - - case cond_foranyaddress: - debug_printf("%s %s (", name, c->left.u); - print_condition(c->right.c, FALSE); - debug_printf(")"); - break; - } -} - - - - -/************************************************* -* Read one filtering command * -*************************************************/ - -/* -Arguments: - pptr points to pointer to first character of command; the pointer - is updated to point after the last character read - lastcmdptr points to pointer to pointer to last command; used for hanging - on the newly read command - -Returns: TRUE if command successfully read, else FALSE -*/ - -static BOOL -read_command(const uschar **pptr, filter_cmd ***lastcmdptr) -{ -int command, i, cmd_bit; -filter_cmd *new, **newlastcmdptr; -BOOL yield = TRUE; -BOOL was_seen_or_unseen = FALSE; -BOOL was_noerror = FALSE; -uschar buffer[1024]; -const uschar *ptr = *pptr; -const uschar *saveptr; -uschar *fmsg = NULL; - -/* Read the next word and find which command it is. Command words are normally -terminated by white space, but there are two exceptions, which are the "if" and -"elif" commands. We must allow for them to be terminated by an opening bracket, -as brackets are allowed in conditions and users will expect not to require -white space here. */ - -*buffer = '\0'; /* compiler quietening */ - -if (Ustrncmp(ptr, "if(", 3) == 0) - { - Ustrcpy(buffer, US"if"); - ptr += 2; - } -else if (Ustrncmp(ptr, "elif(", 5) == 0) - { - Ustrcpy(buffer, US"elif"); - ptr += 4; - } -else - { - ptr = nextword(ptr, buffer, sizeof(buffer), FALSE); - if (*error_pointer) return FALSE; - } - -for (command = 0; command < command_list_count; command++) - if (Ustrcmp(buffer, command_list[command]) == 0) break; - -/* Handle the individual commands */ - -switch (command) - { - /* Add takes two arguments, separated by the word "to". Headers has two - arguments, but the first must be "add", "remove", or "charset", and it gets - stored in the second argument slot. Neither may be preceded by seen, unseen - or noerror. */ - - case ADD_COMMAND: - case HEADERS_COMMAND: - if (seen_force || noerror_force) - { - *error_pointer = string_sprintf("\"seen\", \"unseen\", or \"noerror\" " - "found before an \"%s\" command near line %d", - command_list[command], line_number); - yield = FALSE; - } - /* Fall through */ - - /* Logwrite, logfile, pipe, and testprint all take a single argument, save - and logfile can have an option second argument for the mode, and deliver can - have "errors_to
" in a system filter, or in a user filter if the - address is the current one. */ - - case DELIVER_COMMAND: - case LOGFILE_COMMAND: - case LOGWRITE_COMMAND: - case PIPE_COMMAND: - case SAVE_COMMAND: - case TESTPRINT_COMMAND: - - ptr = nextitem(ptr, buffer, sizeof(buffer), FALSE); - if (!*buffer) - *error_pointer = string_sprintf("\"%s\" requires an argument " - "near line %d of filter file", command_list[command], line_number); - - if (*error_pointer) yield = FALSE; else - { - union argtypes argument, second_argument; - - argument.u = second_argument.u = NULL; - - if (command == ADD_COMMAND) - { - argument.u = string_copy(buffer); - ptr = nextitem(ptr, buffer, sizeof(buffer), FALSE); - if (!*buffer || Ustrcmp(buffer, "to") != 0) - *error_pointer = string_sprintf("\"to\" expected in \"add\" command " - "near line %d of filter file", line_number); - else - { - ptr = nextitem(ptr, buffer, sizeof(buffer), FALSE); - if (!*buffer) - *error_pointer = string_sprintf("value missing after \"to\" " - "near line %d of filter file", line_number); - else second_argument.u = string_copy(buffer); - } - } - - else if (command == HEADERS_COMMAND) - { - if (Ustrcmp(buffer, "add") == 0) - second_argument.b = TRUE; - else - if (Ustrcmp(buffer, "remove") == 0) second_argument.b = FALSE; - else - if (Ustrcmp(buffer, "charset") == 0) - second_argument.b = TRUE_UNSET; - else - { - *error_pointer = string_sprintf("\"add\", \"remove\", or \"charset\" " - "expected after \"headers\" near line %d of filter file", - line_number); - yield = FALSE; - } - - if (!f.system_filtering && second_argument.b != TRUE_UNSET) - { - *error_pointer = string_sprintf("header addition and removal is " - "available only in system filters: near line %d of filter file", - line_number); - yield = FALSE; - break; - } - - if (yield) - { - ptr = nextitem(ptr, buffer, sizeof(buffer), FALSE); - if (!*buffer) - *error_pointer = string_sprintf("value missing after \"add\", " - "\"remove\", or \"charset\" near line %d of filter file", - line_number); - else argument.u = string_copy(buffer); - } - } - - /* The argument for the logwrite command must end in a newline, and the save - and logfile commands can have an optional mode argument. The deliver - command can have an optional "errors_to
" for a system filter, - or for a user filter if the address is the user's address. Accept the - syntax here - the check is later. */ - - else - { - if (command == LOGWRITE_COMMAND) - { - int len = Ustrlen(buffer); - if (len == 0 || buffer[len-1] != '\n') Ustrcat(buffer, US"\n"); - } - - argument.u = string_copy(buffer); - - if (command == SAVE_COMMAND || command == LOGFILE_COMMAND) - { - if (isdigit(*ptr)) - { - ptr = nextword(ptr, buffer, sizeof(buffer), FALSE); - second_argument.i = (int)Ustrtol(buffer, NULL, 8); - } - else second_argument.i = -1; - } - - else if (command == DELIVER_COMMAND) - { - const uschar *save_ptr = ptr; - ptr = nextword(ptr, buffer, sizeof(buffer), FALSE); - if (Ustrcmp(buffer, "errors_to") == 0) - { - ptr = nextword(ptr, buffer, sizeof(buffer), FALSE); - second_argument.u = string_copy(buffer); - } - else ptr = save_ptr; - } - } - - /* Set up the command block. Seen defaults TRUE for delivery commands, - FALSE for logging commands, and it doesn't matter for testprint, as - that doesn't change the "delivered" status. */ - - if (*error_pointer) yield = FALSE; - else - { - new = store_get(sizeof(filter_cmd) + sizeof(union argtypes), GET_UNTAINTED); - new->next = NULL; - **lastcmdptr = new; - *lastcmdptr = &(new->next); - new->command = command; - new->seen = seen_force? seen_value : command_exparg_count[command] >= 128; - new->noerror = noerror_force; - new->args[0] = argument; - new->args[1] = second_argument; - } - } - break; - - - /* Elif, else and endif just set a flag if expected. */ - - case ELIF_COMMAND: - case ELSE_COMMAND: - case ENDIF_COMMAND: - if (seen_force || noerror_force) - { - *error_pointer = string_sprintf("\"seen\", \"unseen\", or \"noerror\" " - "near line %d is not followed by a command", line_number); - yield = FALSE; - } - - if (expect_endif > 0) - had_else_endif = (command == ELIF_COMMAND)? had_elif : - (command == ELSE_COMMAND)? had_else : had_endif; - else - { - *error_pointer = string_sprintf("unexpected \"%s\" command near " - "line %d of filter file", buffer, line_number); - yield = FALSE; - } - break; - - - /* Defer, freeze, and fail are available only if permitted. */ - - case DEFER_COMMAND: - cmd_bit = RDO_DEFER; - goto DEFER_FREEZE_FAIL; - - case FAIL_COMMAND: - cmd_bit = RDO_FAIL; - goto DEFER_FREEZE_FAIL; - - case FREEZE_COMMAND: - cmd_bit = RDO_FREEZE; - - DEFER_FREEZE_FAIL: - if ((filter_options & cmd_bit) == 0) - { - *error_pointer = string_sprintf("filtering command \"%s\" is disabled: " - "near line %d of filter file", buffer, line_number); - yield = FALSE; - break; - } - - /* A text message can be provided after the "text" keyword, or - as a string in quotes. */ - - saveptr = ptr; - ptr = nextitem(ptr, buffer, sizeof(buffer), FALSE); - if (*saveptr != '\"' && (!*buffer || Ustrcmp(buffer, "text") != 0)) - { - ptr = saveptr; - fmsg = US""; - } - else - { - if (*saveptr != '\"') - ptr = nextitem(ptr, buffer, sizeof(buffer), FALSE); - fmsg = string_copy(buffer); - } - - /* Drop through and treat as "finish", but never set "seen". */ - - seen_value = FALSE; - - /* Finish has no arguments; fmsg defaults to NULL */ - - case FINISH_COMMAND: - new = store_get(sizeof(filter_cmd), GET_UNTAINTED); - new->next = NULL; - **lastcmdptr = new; - *lastcmdptr = &(new->next); - new->command = command; - new->seen = seen_force ? seen_value : FALSE; - new->args[0].u = fmsg; - break; - - - /* Seen, unseen, and noerror are not allowed before if, which takes a - condition argument and then and else sub-commands. */ - - case IF_COMMAND: - if (seen_force || noerror_force) - { - *error_pointer = string_sprintf("\"seen\", \"unseen\", or \"noerror\" " - "found before an \"if\" command near line %d", - line_number); - yield = FALSE; - } - - /* Set up the command block for if */ - - new = store_get(sizeof(filter_cmd) + 4 * sizeof(union argtypes), GET_UNTAINTED); - new->next = NULL; - **lastcmdptr = new; - *lastcmdptr = &new->next; - new->command = command; - new->seen = FALSE; - new->args[0].u = NULL; - new->args[1].u = new->args[2].u = NULL; - new->args[3].u = ptr; - - /* Read the condition */ - - ptr = read_condition(ptr, &new->args[0].c, TRUE); - if (*error_pointer) { yield = FALSE; break; } - - /* Read the commands to be obeyed if the condition is true */ - - newlastcmdptr = &(new->args[1].f); - if (!read_command_list(&ptr, &newlastcmdptr, TRUE)) yield = FALSE; - - /* If commands were successfully read, handle the various possible - terminators. There may be a number of successive "elif" sections. */ - - else - { - while (had_else_endif == had_elif) - { - filter_cmd *newnew = - store_get(sizeof(filter_cmd) + 4 * sizeof(union argtypes), GET_UNTAINTED); - new->args[2].f = newnew; - new = newnew; - new->next = NULL; - new->command = command; - new->seen = FALSE; - new->args[0].u = NULL; - new->args[1].u = new->args[2].u = NULL; - new->args[3].u = ptr; - - ptr = read_condition(ptr, &new->args[0].c, TRUE); - if (*error_pointer) { yield = FALSE; break; } - newlastcmdptr = &(new->args[1].f); - if (!read_command_list(&ptr, &newlastcmdptr, TRUE)) - yield = FALSE; - } - - if (yield == FALSE) break; - - /* Handle termination by "else", possibly following one or more - "elsif" sections. */ - - if (had_else_endif == had_else) - { - newlastcmdptr = &(new->args[2].f); - if (!read_command_list(&ptr, &newlastcmdptr, TRUE)) - yield = FALSE; - else if (had_else_endif != had_endif) - { - *error_pointer = string_sprintf("\"endif\" missing near line %d of " - "filter file", line_number); - yield = FALSE; - } - } - - /* Otherwise the terminator was "endif" - this is checked by - read_command_list(). The pointer is already set to NULL. */ - } - - /* Reset the terminator flag. */ - - had_else_endif = had_neither; - break; - - - /* The mail & vacation commands have a whole slew of keyworded arguments. - The final argument values are the file expand and return message booleans, - whose offsets are defined in mailarg_index_{expand,return}. Although they - are logically booleans, because they are stored in a uschar * value, we use - NULL and not FALSE, to keep 64-bit compilers happy. */ - - case MAIL_COMMAND: - case VACATION_COMMAND: - new = store_get(sizeof(filter_cmd) + mailargs_total * sizeof(union argtypes), GET_UNTAINTED); - new->next = NULL; - new->command = command; - new->seen = seen_force ? seen_value : FALSE; - new->noerror = noerror_force; - for (i = 0; i < mailargs_total; i++) new->args[i].u = NULL; - - /* Read keyword/value pairs until we hit one that isn't. The data - must contain only printing chars plus tab, though the "text" value - can also contain newlines. The "file" keyword can be preceded by the - word "expand", and "return message" has no data. */ - - for (;;) - { - const uschar *saveptr = ptr; - ptr = nextword(ptr, buffer, sizeof(buffer), FALSE); - if (*error_pointer) - { yield = FALSE; break; } - - /* Ensure "return" is followed by "message"; that's a complete option */ - - if (Ustrcmp(buffer, "return") == 0) - { - new->args[mailarg_index_return].u = US""; /* not NULL => TRUE */ - ptr = nextword(ptr, buffer, sizeof(buffer), FALSE); - if (Ustrcmp(buffer, "message") != 0) - { - *error_pointer = string_sprintf("\"return\" not followed by \"message\" " - " near line %d of filter file", line_number); - yield = FALSE; - break; - } - continue; - } - - /* Ensure "expand" is followed by "file", then fall through to process the - file keyword. */ - - if (Ustrcmp(buffer, "expand") == 0) - { - new->args[mailarg_index_expand].u = US""; /* not NULL => TRUE */ - ptr = nextword(ptr, buffer, sizeof(buffer), FALSE); - if (Ustrcmp(buffer, "file") != 0) - { - *error_pointer = string_sprintf("\"expand\" not followed by \"file\" " - " near line %d of filter file", line_number); - yield = FALSE; - break; - } - } - - /* Scan for the keyword */ - - for (i = 0; i < MAILARGS_STRING_COUNT; i++) - if (Ustrcmp(buffer, mailargs[i]) == 0) break; - - /* Not found keyword; assume end of this command */ - - if (i >= MAILARGS_STRING_COUNT) - { - ptr = saveptr; - break; - } - - /* Found keyword, read the data item */ - - ptr = nextitem(ptr, buffer, sizeof(buffer), FALSE); - if (*error_pointer) - { yield = FALSE; break; } - else new->args[i].u = string_copy(buffer); - } - - /* If this is the vacation command, apply some default settings to - some of the arguments. */ - - if (command == VACATION_COMMAND) - { - if (!new->args[mailarg_index_file].u) - { - new->args[mailarg_index_file].u = string_copy(US".vacation.msg"); - new->args[mailarg_index_expand].u = US""; /* not NULL => TRUE */ - } - if (!new->args[mailarg_index_log].u) - new->args[mailarg_index_log].u = string_copy(US".vacation.log"); - if (!new->args[mailarg_index_once].u) - new->args[mailarg_index_once].u = string_copy(US".vacation"); - if (!new->args[mailarg_index_once_repeat].u) - new->args[mailarg_index_once_repeat].u = string_copy(US"7d"); - if (!new->args[mailarg_index_subject].u) - new->args[mailarg_index_subject].u = string_copy(US"On vacation"); - } - - /* Join the address on to the chain of generated addresses */ - - **lastcmdptr = new; - *lastcmdptr = &(new->next); - break; - - - /* Seen and unseen just set flags */ - - case SEEN_COMMAND: - case UNSEEN_COMMAND: - if (!*ptr) - { - *error_pointer = string_sprintf("\"seen\" or \"unseen\" " - "near line %d is not followed by a command", line_number); - yield = FALSE; - } - if (seen_force) - { - *error_pointer = string_sprintf("\"seen\" or \"unseen\" repeated " - "near line %d", line_number); - yield = FALSE; - } - seen_value = (command == SEEN_COMMAND); - seen_force = TRUE; - was_seen_or_unseen = TRUE; - break; - - - /* So does noerror */ - - case NOERROR_COMMAND: - if (!*ptr) - { - *error_pointer = string_sprintf("\"noerror\" " - "near line %d is not followed by a command", line_number); - yield = FALSE; - } - noerror_force = TRUE; - was_noerror = TRUE; - break; - - - /* Oops */ - - default: - *error_pointer = string_sprintf("unknown filtering command \"%s\" " - "near line %d of filter file", buffer, line_number); - yield = FALSE; - break; - } - -if (!was_seen_or_unseen && !was_noerror) - { - seen_force = FALSE; - noerror_force = FALSE; - } - -*pptr = ptr; -return yield; -} - - - -/************************************************* -* Read a list of commands * -*************************************************/ - -/* If conditional is TRUE, the list must be terminated -by the words "else" or "endif". - -Arguments: - pptr points to pointer to next character; the pointer is updated - lastcmdptr points to pointer to pointer to previously-read command; used - for hanging on the new command - conditional TRUE if this command is the subject of a condition - -Returns: TRUE on success -*/ - -static BOOL -read_command_list(const uschar **pptr, filter_cmd ***lastcmdptr, BOOL conditional) -{ -if (conditional) expect_endif++; -had_else_endif = had_neither; -while (**pptr && had_else_endif == had_neither) - { - if (!read_command(pptr, lastcmdptr)) return FALSE; - *pptr = nextsigchar(*pptr, TRUE); - } -if (conditional) - { - expect_endif--; - if (had_else_endif == had_neither) - { - *error_pointer = US"\"endif\" missing at end of filter file"; - return FALSE; - } - } -return TRUE; -} - - - - -/************************************************* -* Test a condition * -*************************************************/ - -/* -Arguments: - c points to the condition block; c->testfor indicated whether - it's a positive or negative condition - toplevel TRUE if called from "if" directly; FALSE otherwise - -Returns: TRUE if the condition is met -*/ - -static BOOL -test_condition(condition_block * c, BOOL toplevel) -{ -BOOL yield = FALSE, textonly_re; -const uschar * exp[2], * p, * pp; -int val[2]; - -if (!c) return TRUE; /* does this ever occur? */ - -switch (c->type) - { - case cond_and: - yield = test_condition(c->left.c, FALSE) && - *error_pointer == NULL && - test_condition(c->right.c, FALSE); - break; - - case cond_or: - yield = test_condition(c->left.c, FALSE) || - (*error_pointer == NULL && - test_condition(c->right.c, FALSE)); - break; - - /* The personal test is meaningless in a system filter. The tests are now in - a separate function (so Sieve can use them). However, an Exim filter does not - scan Cc: (hence the FALSE argument). */ - - case cond_personal: - yield = f.system_filtering? FALSE : filter_personal(c->left.a, FALSE); - break; - - case cond_delivered: - yield = filter_delivered; - break; - - /* Only TRUE if a message is actually being processed; FALSE for address - testing and verification. */ - - case cond_errormsg: - yield = message_id[0] && (!sender_address || !*sender_address); - break; - - /* Only FALSE if a message is actually being processed; TRUE for address - and filter testing and verification. */ - - case cond_firsttime: - yield = filter_test != FTEST_NONE || !message_id[0] || f.deliver_firsttime; - break; - - /* Only TRUE if a message is actually being processed; FALSE for address - testing and verification. */ - - case cond_manualthaw: - yield = message_id[0] && f.deliver_manual_thaw; - break; - - /* The foranyaddress condition loops through a list of addresses */ - - case cond_foranyaddress: - p = c->left.u; - if (!(pp = expand_cstring(p))) - { - *error_pointer = string_sprintf("failed to expand \"%s\" in " - "filter file: %s", p, expand_string_message); - return FALSE; - } - - yield = FALSE; - f.parse_allow_group = TRUE; /* Allow group syntax */ - - while (*pp) - { - uschar *error; - int start, end, domain; - uschar * s; - - p = parse_find_address_end(pp, FALSE); - s = string_copyn(pp, p - pp); - - filter_thisaddress = - parse_extract_address(s, &error, &start, &end, &domain, FALSE); - - if (filter_thisaddress) - { - if ((filter_test != FTEST_NONE && debug_selector != 0) || - (debug_selector & D_filter) != 0) - { - indent(); - debug_printf_indent("Extracted address %s\n", filter_thisaddress); - } - yield = test_condition(c->right.c, FALSE); - } - - if (yield) break; - if (!*p) break; - pp = p + 1; - } - - f.parse_allow_group = FALSE; /* Reset group syntax flags */ - f.parse_found_group = FALSE; - break; - - /* All other conditions have left and right values that need expanding; - on error, it doesn't matter what value is returned. */ - - default: - p = c->left.u; - for (int i = 0; i < 2; i++) - { - if (!(exp[i] = expand_string_2(p, &textonly_re))) - { - *error_pointer = string_sprintf("failed to expand \"%s\" in " - "filter file: %s", p, expand_string_message); - return FALSE; - } - p = c->right.u; - } - - /* Inner switch for the different cases */ - - switch(c->type) - { - case cond_is: - yield = strcmpic(exp[0], exp[1]) == 0; - break; - - case cond_IS: - yield = Ustrcmp(exp[0], exp[1]) == 0; - break; - - case cond_contains: - yield = strstric_c(exp[0], exp[1], FALSE) != NULL; - break; - - case cond_CONTAINS: - yield = Ustrstr(exp[0], exp[1]) != NULL; - break; - - case cond_begins: - yield = strncmpic(exp[0], exp[1], Ustrlen(exp[1])) == 0; - break; - - case cond_BEGINS: - yield = Ustrncmp(exp[0], exp[1], Ustrlen(exp[1])) == 0; - break; - - case cond_ends: - case cond_ENDS: - { - int len = Ustrlen(exp[1]); - const uschar *s = exp[0] + Ustrlen(exp[0]) - len; - yield = s < exp[0] - ? FALSE - : (c->type == cond_ends ? strcmpic(s, exp[1]) : Ustrcmp(s, exp[1])) == 0; - break; - } - - case cond_matches: - case cond_MATCHES: - { - const pcre2_code * re; - mcs_flags flags = textonly_re ? MCS_CACHEABLE : MCS_NOFLAGS; - - if ((filter_test != FTEST_NONE && debug_selector != 0) || - (debug_selector & D_filter) != 0) - { - debug_printf_indent("Match expanded arguments:\n"); - debug_printf_indent(" Subject = %s\n", exp[0]); - debug_printf_indent(" Pattern = %s\n", exp[1]); - } - - if (c->type == cond_matches) flags |= MCS_CASELESS; - if (!(re = regex_compile(exp[1], flags, error_pointer, pcre_gen_cmp_ctx))) - return FALSE; - - yield = regex_match_and_setup(re, exp[0], PCRE_EOPT, -1); - break; - } - - /* For above and below, convert the strings to numbers */ - - case cond_above: - case cond_below: - for (int i = 0; i < 2; i++) - { - val[i] = get_number(exp[i], &yield); - if (!yield) - { - *error_pointer = string_sprintf("malformed numerical string \"%s\"", - exp[i]); - return FALSE; - } - } - yield = c->type == cond_above ? (val[0] > val[1]) : (val[0] < val[1]); - break; - } - break; - } - -if ((filter_test != FTEST_NONE && debug_selector != 0) || - (debug_selector & D_filter) != 0) - { - indent(); - debug_printf_indent("%sondition is %s: ", - toplevel ? "C" : "Sub-c", - yield == c->testfor ? "true" : "false"); - print_condition(c, TRUE); - debug_printf_indent("\n"); - } - -return yield == c->testfor; -} - - - -/************************************************* -* Interpret chain of commands * -*************************************************/ - -/* In testing state, just say what would be done rather than doing it. The -testprint command just expands and outputs its argument in testing state, and -does nothing otherwise. - -Arguments: - commands points to chain of commands to interpret - generated where to hang newly-generated addresses - -Returns: FF_DELIVERED success, a significant action was taken - FF_NOTDELIVERED success, no significant action - FF_DEFER defer requested - FF_FAIL fail requested - FF_FREEZE freeze requested - FF_ERROR there was a problem -*/ - -static int -interpret_commands(filter_cmd *commands, address_item **generated) -{ -const uschar *s; -int mode; -address_item *addr; -BOOL condition_value; - -while (commands) - { - int ff_ret; - uschar *fmsg, *ff_name; - const uschar *expargs[MAILARGS_STRING_COUNT]; - - int i, n[2]; - - /* Expand the relevant number of arguments for the command that are - not NULL. */ - - for (i = 0; i < (command_exparg_count[commands->command] & 15); i++) - { - const uschar *ss = commands->args[i].u; - if (!ss) - expargs[i] = NULL; - else if (!(expargs[i] = expand_cstring(ss))) - { - *error_pointer = string_sprintf("failed to expand \"%s\" in " - "%s command: %s", ss, command_list[commands->command], - expand_string_message); - return FF_ERROR; - } - } - - /* Now switch for each command, setting the "delivered" flag if any of them - have "seen" set. */ - - if (commands->seen) filter_delivered = TRUE; - - switch(commands->command) - { - case ADD_COMMAND: - for (i = 0; i < 2; i++) - { - const uschar *ss = expargs[i]; - uschar *end; - - if (i == 1 && (*ss++ != 'n' || ss[1] != 0)) - { - *error_pointer = string_sprintf("unknown variable \"%s\" in \"add\" " - "command", expargs[i]); - return FF_ERROR; - } - - /* Allow for "--" at the start of the value (from -$n0) for example */ - if (i == 0) while (ss[0] == '-' && ss[1] == '-') ss += 2; - - n[i] = (int)Ustrtol(ss, &end, 0); - if (*end != 0) - { - *error_pointer = string_sprintf("malformed number \"%s\" in \"add\" " - "command", ss); - return FF_ERROR; - } - } - - filter_n[n[1]] += n[0]; - if (filter_test != FTEST_NONE) printf("Add %d to n%d\n", n[0], n[1]); - break; - - /* A deliver command's argument must be a valid address. Its optional - second argument (system filter only) must also be a valid address. */ - - case DELIVER_COMMAND: - for (i = 0; i < 2; i++) - { - s = expargs[i]; - if (s != NULL) - { - int start, end, domain; - uschar *error; - uschar *ss = parse_extract_address(s, &error, &start, &end, &domain, - FALSE); - if (ss) - expargs[i] = filter_options & RDO_REWRITE - ? rewrite_address(ss, TRUE, FALSE, global_rewrite_rules, - rewrite_existflags) - : rewrite_address_qualify(ss, TRUE); - else - { - *error_pointer = string_sprintf("malformed address \"%s\" in " - "filter file: %s", s, error); - return FF_ERROR; - } - } - } - - /* Stick the errors address into a simple variable, as it will - be referenced a few times. Check that the caller is permitted to - specify it. */ - - s = expargs[1]; - - if (s != NULL && !f.system_filtering) - { - uschar *ownaddress = expand_string(US"$local_part@$domain"); - if (strcmpic(ownaddress, s) != 0) - { - *error_pointer = US"errors_to must point to the caller's address"; - return FF_ERROR; - } - } - - /* Test case: report what would happen */ - - if (filter_test != FTEST_NONE) - { - indent(); - printf("%seliver message to: %s%s%s%s\n", - commands->seen ? "D" : "Unseen d", - expargs[0], - commands->noerror? " (noerror)" : "", - s ? " errors_to " : "", - s ? s : US""); - } - - /* Real case. */ - - else - { - DEBUG(D_filter) debug_printf_indent("Filter: %sdeliver message to: %s%s%s%s\n", - commands->seen ? "" : "unseen ", - expargs[0], - commands->noerror ? " (noerror)" : "", - s ? " errors_to " : "", - s ? s : US""); - - /* Create the new address and add it to the chain, setting the - af_ignore_error flag if necessary, and the errors address, which can be - set in a system filter and to the local address in user filters. */ - - addr = deliver_make_addr(US expargs[0], TRUE); /* TRUE => copy s, so deconst ok */ - addr->prop.errors_address = !s ? NULL : string_copy(s); /* Default is NULL */ - if (commands->noerror) addr->prop.ignore_error = TRUE; - addr->next = *generated; - *generated = addr; - } - break; - - case SAVE_COMMAND: - s = expargs[0]; - mode = commands->args[1].i; - - /* Test case: report what would happen */ - - if (filter_test != FTEST_NONE) - { - indent(); - if (mode < 0) - printf("%save message to: %s%s\n", - commands->seen ? "S" : "Unseen s", - s, commands->noerror ? " (noerror)" : ""); - else - printf("%save message to: %s %04o%s\n", - commands->seen ? "S" : "Unseen s", - s, mode, commands->noerror ? " (noerror)" : ""); - } - - /* Real case: Ensure save argument starts with / if there is a home - directory to prepend. */ - - else - { - if (s[0] != '/' && (filter_options & RDO_PREPEND_HOME) != 0 && - deliver_home != NULL && deliver_home[0] != 0) - s = string_sprintf("%s/%s", deliver_home, s); - DEBUG(D_filter) debug_printf_indent("Filter: %ssave message to: %s%s\n", - commands->seen ? "" : "unseen ", - s, commands->noerror ? " (noerror)" : ""); - - /* Create the new address and add it to the chain, setting the - af_pfr and af_file flags, the af_ignore_error flag if necessary, and the - mode value. */ - - addr = deliver_make_addr(US s, TRUE); /* TRUE => copy s, so deconst ok */ - setflag(addr, af_pfr); - setflag(addr, af_file); - if (commands->noerror) addr->prop.ignore_error = TRUE; - addr->mode = mode; - addr->next = *generated; - *generated = addr; - } - break; - - case PIPE_COMMAND: - s = string_copy(commands->args[0].u); - if (filter_test != FTEST_NONE) - { - indent(); - printf("%sipe message to: %s%s\n", - commands->seen ? "P" : "Unseen p", - s, commands->noerror? " (noerror)" : ""); - } - else /* Ensure pipe command starts with | */ - { - DEBUG(D_filter) debug_printf_indent("Filter: %spipe message to: %s%s\n", - commands->seen ? "" : "unseen ", s, - commands->noerror ? " (noerror)" : ""); - if (s[0] != '|') s = string_sprintf("|%s", s); - - /* Create the new address and add it to the chain, setting the - af_ignore_error flag if necessary. Set the af_expand_pipe flag so that - each command argument is expanded in the transport after the command - has been split up into separate arguments. */ - - addr = deliver_make_addr(US s, TRUE); /* TRUE => copy s, so deconst ok */ - setflag(addr, af_pfr); - setflag(addr, af_expand_pipe); - if (commands->noerror) addr->prop.ignore_error = TRUE; - addr->next = *generated; - *generated = addr; - - /* If there are any numeric variables in existence (e.g. after a regex - condition), or if $thisaddress is set, take a copy for use in the - expansion. Note that we can't pass NULL for filter_thisaddress, because - NULL terminates the list. */ - - if (expand_nmax >= 0 || filter_thisaddress != NULL) - { - int ecount = expand_nmax >= 0 ? expand_nmax : -1; - uschar ** ss = store_get(sizeof(uschar *) * (ecount + 3), GET_UNTAINTED); - - addr->pipe_expandn = ss; - if (!filter_thisaddress) filter_thisaddress = US""; - *ss++ = string_copy(filter_thisaddress); - for (int i = 0; i <= expand_nmax; i++) - *ss++ = string_copyn(expand_nstring[i], expand_nlength[i]); - *ss = NULL; - } - } - break; - - /* Set up the file name and mode, and close any previously open - file. */ - - case LOGFILE_COMMAND: - log_mode = commands->args[1].i; - if (log_mode == -1) log_mode = 0600; - if (log_fd >= 0) - { - (void)close(log_fd); - log_fd = -1; - } - log_filename = expargs[0]; - if (filter_test != FTEST_NONE) - { - indent(); - printf("%sogfile %s\n", commands->seen ? "Seen l" : "L", log_filename); - } - break; - - case LOGWRITE_COMMAND: - s = expargs[0]; - - if (filter_test != FTEST_NONE) - { - indent(); - printf("%sogwrite \"%s\"\n", commands->seen ? "Seen l" : "L", - string_printing(s)); - } - - /* Attempt to write to a log file only if configured as permissible. - Logging may be forcibly skipped for verifying or testing. */ - - else if (filter_options & RDO_LOG) /* Locked out */ - { - DEBUG(D_filter) - debug_printf_indent("filter log command aborted: euid=%ld\n", - (long int)geteuid()); - *error_pointer = US"logwrite command forbidden"; - return FF_ERROR; - } - else if (filter_options & RDO_REALLOG) - { - int len; - DEBUG(D_filter) debug_printf_indent("writing filter log as euid %ld\n", - (long int)geteuid()); - if (log_fd < 0) - { - if (!log_filename) - { - *error_pointer = US"attempt to obey \"logwrite\" command " - "without a previous \"logfile\""; - return FF_ERROR; - } - log_fd = Uopen(log_filename, O_CREAT|O_APPEND|O_WRONLY, log_mode); - if (log_fd < 0) - { - *error_pointer = string_open_failed("filter log file \"%s\"", - log_filename); - return FF_ERROR; - } - } - len = Ustrlen(s); - if (write(log_fd, s, len) != len) - { - *error_pointer = string_sprintf("write error on file \"%s\": %s", - log_filename, strerror(errno)); - return FF_ERROR; - } - } - else - DEBUG(D_filter) - debug_printf_indent("skipping logwrite (verifying or testing)\n"); - break; - - /* Header addition and removal is available only in the system filter. The - command is rejected at parse time otherwise. However "headers charset" is - always permitted. */ - - case HEADERS_COMMAND: - { - int subtype = commands->args[1].i; - s = expargs[0]; - - if (filter_test != FTEST_NONE) - printf("Headers %s \"%s\"\n", - subtype == TRUE ? "add" - : subtype == FALSE ? "remove" - : "charset", - string_printing(s)); - - if (subtype == TRUE) - { - if (Uskip_whitespace(&s)) - { - header_add(htype_other, "%s%s", s, - s[Ustrlen(s)-1] == '\n' ? "" : "\n"); - header_last->type = header_checkname(header_last, FALSE); - if (header_last->type >= 'a') header_last->type = htype_other; - } - } - - else if (subtype == FALSE) - { - int sep = 0; - const uschar * list = s; - - for (uschar * ss; ss = string_nextinlist(&list, &sep, NULL, 0); ) - header_remove(0, ss); - } - - /* This setting lasts only while the filter is running; on exit, the - variable is reset to the previous value. */ - - else headers_charset = s; - } - break; - - /* Defer, freeze, and fail are available only when explicitly permitted. - These commands are rejected at parse time otherwise. The message can get - very long by the inclusion of message headers; truncate if it is, and also - ensure printing characters so as not to mess up log files. */ - - case DEFER_COMMAND: - ff_name = US"defer"; - ff_ret = FF_DEFER; - goto DEFERFREEZEFAIL; - - case FAIL_COMMAND: - ff_name = US"fail"; - ff_ret = FF_FAIL; - goto DEFERFREEZEFAIL; - - case FREEZE_COMMAND: - ff_name = US"freeze"; - ff_ret = FF_FREEZE; - - DEFERFREEZEFAIL: - *error_pointer = fmsg = US string_printing(Ustrlen(expargs[0]) > 1024 - ? string_sprintf("%.1000s ... (truncated)", expargs[0]) - : string_copy(expargs[0])); - for(uschar * s = fmsg; *s; s++) - if (!s[1] && *s == '\n') { *s = '\0'; break; } /* drop trailing newline */ - - if (filter_test != FTEST_NONE) - { - indent(); - printf("%c%s text \"%s\"\n", toupper(ff_name[0]), ff_name+1, fmsg); - } - else - DEBUG(D_filter) debug_printf_indent("Filter: %s \"%s\"\n", ff_name, fmsg); - return ff_ret; - - case FINISH_COMMAND: - if (filter_test != FTEST_NONE) - { - indent(); - printf("%sinish\n", commands->seen ? "Seen f" : "F"); - } - else - DEBUG(D_filter) debug_printf_indent("Filter: %sfinish\n", - commands->seen ? " Seen " : ""); - finish_obeyed = TRUE; - return filter_delivered ? FF_DELIVERED : FF_NOTDELIVERED; - - case IF_COMMAND: - { - uschar *save_address = filter_thisaddress; - int ok = FF_DELIVERED; - condition_value = test_condition(commands->args[0].c, TRUE); - if (*error_pointer) - ok = FF_ERROR; - else - { - output_indent += 2; - ok = interpret_commands(commands->args[condition_value ? 1:2].f, - generated); - output_indent -= 2; - } - filter_thisaddress = save_address; - if (finish_obeyed || ok != FF_DELIVERED && ok != FF_NOTDELIVERED) - return ok; - } - break; - - - /* To try to catch runaway loops, do not generate mail if the - return path is unset or if a non-trusted user supplied -f <> - as the return path. */ - - case MAIL_COMMAND: - case VACATION_COMMAND: - if (!return_path || !*return_path) - { - if (filter_test != FTEST_NONE) - printf("%s command ignored because return_path is empty\n", - command_list[commands->command]); - else DEBUG(D_filter) - debug_printf_indent("%s command ignored because return_path " - "is empty\n", command_list[commands->command]); - break; - } - - /* Check the contents of the strings. The type of string can be deduced - from the value of i. - - . If i is equal to mailarg_index_text it's a text string for the body, - where anything goes. - - . If i is > mailarg_index_text, we are dealing with a file name, which - cannot contain non-printing characters. - - . If i is less than mailarg_index_headers we are dealing with something - that will go in a single message header line, where newlines must be - followed by white space. - - . If i is equal to mailarg_index_headers, we have a string that contains - one or more headers. Newlines that are not followed by white space must - be followed by a header name. - */ - - for (i = 0; i < MAILARGS_STRING_COUNT; i++) - { - const uschar *s = expargs[i]; - - if (!s) continue; - - if (i != mailarg_index_text) for (const uschar * p = s; *p; p++) - { - int c = *p; - if (i > mailarg_index_text) - { - if (!mac_isprint(c)) - { - *error_pointer = string_sprintf("non-printing character in \"%s\" " - "in %s command", string_printing(s), - command_list[commands->command]); - return FF_ERROR; - } - } - - /* i < mailarg_index_text */ - - else if (c == '\n' && !isspace(p[1])) - { - if (i < mailarg_index_headers) - { - *error_pointer = string_sprintf("\\n not followed by space in " - "\"%.1024s\" in %s command", string_printing(s), - command_list[commands->command]); - return FF_ERROR; - } - - /* Check for the start of a new header line within the string */ - - else - { - const uschar *pp; - for (pp = p + 1;; pp++) - { - c = *pp; - if (c == ':' && pp != p + 1) break; - if (!c || c == ':' || isspace(c)) - { - *error_pointer = string_sprintf("\\n not followed by space or " - "valid header name in \"%.1024s\" in %s command", - string_printing(s), command_list[commands->command]); - return FF_ERROR; - } - } - p = pp; - } - } - } /* Loop to scan the string */ - - /* The string is OK */ - - commands->args[i].u = s; - } - - /* Proceed with mail or vacation command */ - - if (filter_test != FTEST_NONE) - { - const uschar *to = commands->args[mailarg_index_to].u; - indent(); - printf("%sail to: %s%s%s\n", (commands->seen)? "Seen m" : "M", - to ? to : US"", - commands->command == VACATION_COMMAND ? " (vacation)" : "", - commands->noerror ? " (noerror)" : ""); - for (i = 1; i < MAILARGS_STRING_COUNT; i++) - { - const uschar * arg = commands->args[i].u; - if (arg) - { - int len = Ustrlen(mailargs[i]); - int indent = debug_selector != 0 ? output_indent : 0; - while (len++ < 7 + indent) printf(" "); - printf("%s: %s%s\n", mailargs[i], string_printing(arg), - ( commands->args[mailarg_index_expand].u - && Ustrcmp(mailargs[i], "file") == 0) ? " (expanded)" : ""); - } - } - if (commands->args[mailarg_index_return].u) - printf("Return original message\n"); - } - else - { - const uschar *tt; - const uschar *to = commands->args[mailarg_index_to].u; - gstring * log_addr = NULL; - - if (!to) to = expand_string(US"$reply_address"); - Uskip_whitespace(&to); - - for (tt = to; *tt; tt++) /* Get rid of newlines */ - if (*tt == '\n') - { - uschar * s = string_copy(to); - for (uschar * ss = s; *ss; ss++) - if (*ss == '\n') *ss = ' '; - to = s; - break; - } - - DEBUG(D_filter) - { - debug_printf_indent("Filter: %smail to: %s%s%s\n", - commands->seen ? "seen " : "", - to, - commands->command == VACATION_COMMAND ? " (vacation)" : "", - commands->noerror ? " (noerror)" : ""); - for (i = 1; i < MAILARGS_STRING_COUNT; i++) - { - const uschar *arg = commands->args[i].u; - if (arg) - { - int len = Ustrlen(mailargs[i]); - while (len++ < 15) debug_printf_indent(" "); - debug_printf_indent("%s: %s%s\n", mailargs[i], string_printing(arg), - (commands->args[mailarg_index_expand].u != NULL && - Ustrcmp(mailargs[i], "file") == 0)? " (expanded)" : ""); - } - } - } - - /* Create the "address" for the autoreply. This is used only for logging, - as the actual recipients are extracted from the To: line by -t. We use the - same logic here to extract the working addresses (there may be more than - one). Just in case there are a vast number of addresses, stop when the - string gets too long. */ - - tt = to; - while (*tt) - { - uschar *ss = parse_find_address_end(tt, FALSE); - uschar *recipient, *errmess; - int start, end, domain; - int temp = *ss; - - *ss = 0; - recipient = parse_extract_address(tt, &errmess, &start, &end, &domain, - FALSE); - *ss = temp; - - /* Ignore empty addresses and errors; an error will occur later if - there's something really bad. */ - - if (recipient) - { - log_addr = string_catn(log_addr, log_addr ? US"," : US">", 1); - log_addr = string_cat (log_addr, recipient); - } - - /* Check size */ - - if (log_addr && log_addr->ptr > 256) - { - log_addr = string_catn(log_addr, US", ...", 5); - break; - } - - /* Move on past this address */ - - tt = ss + (*ss ? 1 : 0); - Uskip_whitespace(&tt); - } - - if (log_addr) - addr = deliver_make_addr(string_from_gstring(log_addr), FALSE); - else - { - addr = deliver_make_addr(US ">**bad-reply**", FALSE); - setflag(addr, af_bad_reply); - } - - setflag(addr, af_pfr); - if (commands->noerror) addr->prop.ignore_error = TRUE; - addr->next = *generated; - *generated = addr; - - addr->reply = store_get(sizeof(reply_item), GET_UNTAINTED); - addr->reply->from = NULL; - addr->reply->to = string_copy(to); - addr->reply->file_expand = - commands->args[mailarg_index_expand].u != NULL; - addr->reply->expand_forbid = expand_forbid; - addr->reply->return_message = - commands->args[mailarg_index_return].u != NULL; - addr->reply->once_repeat = 0; - - if (commands->args[mailarg_index_once_repeat].u != NULL) - { - addr->reply->once_repeat = - readconf_readtime(commands->args[mailarg_index_once_repeat].u, 0, - FALSE); - if (addr->reply->once_repeat < 0) - { - *error_pointer = string_sprintf("Bad time value for \"once_repeat\" " - "in mail or vacation command: %s", - commands->args[mailarg_index_once_repeat].u); - return FF_ERROR; - } - } - - /* Set up all the remaining string arguments (those other than "to") */ - - for (i = 1; i < mailargs_string_passed; i++) - { - const uschar *ss = commands->args[i].u; - *(USS((US addr->reply) + reply_offsets[i])) = - ss ? string_copy(ss) : NULL; - } - } - break; - - case TESTPRINT_COMMAND: - if (filter_test != FTEST_NONE || (debug_selector & D_filter) != 0) - { - const uschar *s = string_printing(expargs[0]); - if (filter_test == FTEST_NONE) - debug_printf_indent("Filter: testprint: %s\n", s); - else - printf("Testprint: %s\n", s); - } - } - - commands = commands->next; - } - -return filter_delivered ? FF_DELIVERED : FF_NOTDELIVERED; -} - - - -/************************************************* -* Test for a personal message * -*************************************************/ - -/* This function is global so that it can also be called from the code that -implements Sieve filters. - -Arguments: - aliases a chain of aliases - scan_cc TRUE if Cc: and Bcc: are to be scanned (Exim filters do not) - -Returns: TRUE if the message is deemed to be personal -*/ - -BOOL -filter_personal(string_item *aliases, BOOL scan_cc) -{ -const uschar *self, *self_from, *self_to; -uschar *psself = NULL; -const uschar *psself_from = NULL, *psself_to = NULL; -rmark reset_point = store_mark(); -BOOL yield; -header_line *h; -int to_count = 2; -int from_count = 9; - -/* If any header line in the message is a defined "List-" header field, it is -not a personal message. We used to check for any header line that started with -"List-", but this was tightened up for release 4.54. The check is now for -"List-Id", defined in RFC 2929, or "List-Help", "List-Subscribe", "List- -Unsubscribe", "List-Post", "List-Owner" or "List-Archive", all of which are -defined in RFC 2369. We also scan for "Auto-Submitted"; if it is found to -contain any value other than "no", the message is not personal (RFC 3834). -Previously the test was for "auto-". */ - -for (h = header_list; h; h = h->next) - { - if (h->type == htype_old) continue; - - if (strncmpic(h->text, US"List-", 5) == 0) - { - uschar * s = h->text + 5; - if (strncmpic(s, US"Id:", 3) == 0 || - strncmpic(s, US"Help:", 5) == 0 || - strncmpic(s, US"Subscribe:", 10) == 0 || - strncmpic(s, US"Unsubscribe:", 12) == 0 || - strncmpic(s, US"Post:", 5) == 0 || - strncmpic(s, US"Owner:", 6) == 0 || - strncmpic(s, US"Archive:", 8) == 0) - return FALSE; - } - - else if (strncmpic(h->text, US"Auto-submitted:", 15) == 0) - { - uschar * s = h->text + 15; - Uskip_whitespace(&s); - if (strncmpic(s, US"no", 2) != 0) return FALSE; - s += 2; - Uskip_whitespace(&s); - if (*s) return FALSE; - } - } - -/* Set up "my" address */ - -self = string_sprintf("%s@%s", deliver_localpart, deliver_domain); -self_from = rewrite_one(self, rewrite_from, NULL, FALSE, US"", - global_rewrite_rules); -self_to = rewrite_one(self, rewrite_to, NULL, FALSE, US"", - global_rewrite_rules); - - -if (!self_from) self_from = self; -if (self_to) self_to = self; - -/* If there's a prefix or suffix set, we must include the prefixed/ -suffixed version of the local part in the tests. */ - -if (deliver_localpart_prefix || deliver_localpart_suffix) - { - psself = string_sprintf("%s%s%s@%s", - deliver_localpart_prefix ? deliver_localpart_prefix : US"", - deliver_localpart, - deliver_localpart_suffix ? deliver_localpart_suffix : US"", - deliver_domain); - psself_from = rewrite_one(psself, rewrite_from, NULL, FALSE, US"", - global_rewrite_rules); - psself_to = rewrite_one(psself, rewrite_to, NULL, FALSE, US"", - global_rewrite_rules); - if (psself_from == NULL) psself_from = psself; - if (psself_to == NULL) psself_to = psself; - to_count += 2; - from_count += 2; - } - -/* Do all the necessary tests; the counts are adjusted for {pre,suf}fix */ - -yield = - ( - header_match(US"to:", TRUE, TRUE, aliases, to_count, self, self_to, psself, - psself_to) || - (scan_cc && - ( - header_match(US"cc:", TRUE, TRUE, aliases, to_count, self, self_to, - psself, psself_to) - || - header_match(US"bcc:", TRUE, TRUE, aliases, to_count, self, self_to, - psself, psself_to) - ) - ) - ) && - - header_match(US"from:", TRUE, FALSE, aliases, from_count, "^server@", - "^daemon@", "^root@", "^listserv@", "^majordomo@", "^.*?-request@", - "^owner-[^@]+@", self, self_from, psself, psself_from) && - - header_match(US"precedence:", FALSE, FALSE, NULL, 3, "bulk","list","junk") && - - (sender_address == NULL || sender_address[0] != 0); - -store_reset(reset_point); -return yield; -} - - - -/************************************************* -* Interpret a mail filter file * -*************************************************/ - -/* -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 - generated where to hang newly-generated addresses - error where to pass back an error text - -Returns: FF_DELIVERED success, a significant action was taken - FF_NOTDELIVERED success, no significant action - FF_DEFER defer requested - FF_FAIL fail requested - FF_FREEZE freeze requested - FF_ERROR there was a problem -*/ - -int -filter_interpret(const uschar *filter, int options, address_item **generated, - uschar **error) -{ -int i; -int yield = FF_ERROR; -const uschar *ptr = filter; -const uschar *save_headers_charset = headers_charset; -filter_cmd *commands = NULL; -filter_cmd **lastcmdptr = &commands; - -DEBUG(D_route) debug_printf("Filter: start of processing\n"); -acl_level++; - -/* Initialize "not in an if command", set the global flag that is always TRUE -while filtering, and zero the variables. */ - -expect_endif = 0; -output_indent = 0; -f.filter_running = TRUE; -for (i = 0; i < FILTER_VARIABLE_COUNT; i++) filter_n[i] = 0; - -/* To save having to pass certain values about all the time, make them static. -Also initialize the line number, for error messages, and the log file -variables. */ - -filter_options = options; -filter_delivered = FALSE; -finish_obeyed = FALSE; -error_pointer = error; -*error_pointer = NULL; -line_number = 1; -log_fd = -1; -log_mode = 0600; -log_filename = NULL; - -/* Scan filter file for syntax and build up an interpretation thereof, and -interpret the compiled commands, and if testing, say whether we ended up -delivered or not, unless something went wrong. */ - -seen_force = FALSE; -ptr = nextsigchar(ptr, TRUE); - -if (read_command_list(&ptr, &lastcmdptr, FALSE)) - yield = interpret_commands(commands, generated); - -if (filter_test != FTEST_NONE || (debug_selector & D_filter) != 0) - { - uschar *s = US""; - switch(yield) - { - case FF_DEFER: - s = US"Filtering ended by \"defer\"."; - break; - - case FF_FREEZE: - s = US"Filtering ended by \"freeze\"."; - break; - - case FF_FAIL: - s = US"Filtering ended by \"fail\"."; - break; - - case FF_DELIVERED: - s = US"Filtering set up at least one significant delivery " - "or other action.\n" - "No other deliveries will occur."; - break; - - case FF_NOTDELIVERED: - s = US"Filtering did not set up a significant delivery.\n" - "Normal delivery will occur."; - break; - - case FF_ERROR: - s = string_sprintf("Filter error: %s", *error); - break; - } - - if (filter_test != FTEST_NONE) printf("%s\n", CS s); - else debug_printf_indent("%s\n", s); - } - -/* Close the log file if it was opened, and kill off any numerical variables -before returning. Reset the header decoding charset. */ - -if (log_fd >= 0) (void)close(log_fd); -expand_nmax = -1; -f.filter_running = FALSE; -headers_charset = save_headers_charset; - -acl_level--; -DEBUG(D_route) debug_printf("Filter: end of processing\n"); -return yield; -} - - -/* End of filter.c */ -/* vi: aw ai sw=2 -*/ diff --git a/src/src/filtertest.c b/src/src/filtertest.c index eb5f5e54b..35d939ee0 100644 --- a/src/src/filtertest.c +++ b/src/src/filtertest.c @@ -101,7 +101,6 @@ if (!dot_ended && !stdin_feof()) } if (s == message_body_end || s[-1] != '\n') body_linecount++; } -debug_printf("%s %d\n", __FUNCTION__, __LINE__); message_body[body_len] = 0; message_body_size = message_size - header_size; @@ -144,6 +143,30 @@ while (body_end_len > 0) +static int +exim_filter_interpret(const uschar * filebuf, int options, + address_item ** addrp, uschar ** error) +{ +#ifdef DISABLE_EXIM_FILTER + printf("exim: Exim-filtering not available\n"); + return FF_ERROR; +#else + +const misc_module_info * mi; +uschar * errstr = NULL; +typedef int (*fn_t)(const uschar *, int, address_item **, uschar **); +if (!(mi = misc_mod_find(US"exim_filter", &errstr))) + { + printf("exim: Exim-filtering not available: %s\n", errstr ? errstr : US"?"); + return FF_ERROR; + } +return(((fn_t *) mi->functions)[EXIM_INTERPRET]) + (filebuf, options, addrp, error); +#endif +} + + + /************************************************* * Test a mail filter * *************************************************/ @@ -202,8 +225,8 @@ filter_type = rda_is_filter(filebuf); if (is_system && filter_type == FILTER_FORWARD) filter_type = FILTER_EXIM; printf("Testing %s file \"%s\"\n\n", - (filter_type == FILTER_EXIM)? "Exim filter" : - (filter_type == FILTER_SIEVE)? "Sieve filter" : + filter_type == FILTER_EXIM ? "Exim filter" : + filter_type == FILTER_SIEVE ? "Sieve filter" : "forward file", filename); @@ -234,13 +257,13 @@ if (filter_type == FILTER_FORWARD) return FALSE; } - if (generated == NULL) + if (!generated) printf("exim: no addresses generated from forward file\n"); else { printf("exim: forward file generated:\n"); - while (generated != NULL) + while (generated) { printf(" %s\n", generated->address); generated = generated->next; @@ -264,9 +287,8 @@ if (is_system) { f.system_filtering = TRUE; f.enable_dollar_recipients = TRUE; /* Permit $recipients in system filter */ - yield = filter_interpret - (filebuf, - RDO_DEFER|RDO_FAIL|RDO_FILTER|RDO_FREEZE|RDO_REWRITE, &generated, &error); + yield = exim_filter_interpret(filebuf, + RDO_DEFER|RDO_FAIL|RDO_FILTER|RDO_FREEZE|RDO_REWRITE, &generated, &error); f.enable_dollar_recipients = FALSE; f.system_filtering = FALSE; } @@ -279,13 +301,14 @@ else if (filter_type == FILTER_SIEVE) if (!(mi = misc_mod_find(US"sieve_filter", &errstr))) { printf("exim: Sieve filtering not available: %s\n", errstr ? errstr : US"?"); - return FALSE; + yield = FF_ERROR; } - yield = (((fn_t *) mi->functions)[SIEVE_INTERPRET]) - (filebuf, RDO_REWRITE, NULL, &generated, &error); + else + yield = (((fn_t *) mi->functions)[SIEVE_INTERPRET]) + (filebuf, RDO_REWRITE, NULL, &generated, &error); } else - yield = filter_interpret(filebuf, RDO_REWRITE, &generated, &error); + yield = exim_filter_interpret(filebuf, RDO_REWRITE, &generated, &error); return yield != FF_ERROR; } diff --git a/src/src/functions.h b/src/src/functions.h index 60b07d2d7..875ce25a6 100644 --- a/src/src/functions.h +++ b/src/src/functions.h @@ -240,11 +240,7 @@ extern int_eximarith_t expand_string_integer(uschar *, BOOL); extern void modify_variable(uschar *, void *); extern BOOL fd_ready(int, time_t); - -extern int filter_interpret(const uschar *, int, address_item **, uschar **); -extern BOOL filter_personal(string_item *, BOOL); extern BOOL filter_runtest(int, const uschar *, BOOL, BOOL); -extern BOOL filter_system_interpret(address_item **, uschar **); extern uschar * fn_hdrs_added(void); extern void force_fd(int, int); diff --git a/src/src/miscmods/Makefile b/src/src/miscmods/Makefile index 3c255dbb6..24eea2e28 100644 --- a/src/src/miscmods/Makefile +++ b/src/src/miscmods/Makefile @@ -37,6 +37,7 @@ dkim.o dkim.so: $(HDRS) dkim.h dkim.c dkim_transport.c \ signing.h signing.c dmarc.o dmarc.so: $(HDRS) pdkim.h dmarc.h dmarc.c dummy.o: dummy.c +exim_filter.o exim_filter.so: $(HDRS) exim_filter.c pam.o pam.so: $(HDRS) pam.c perl.o perl.so: $(HDRS) perl.c radius.o radius.so: $(HDRS) radius.c diff --git a/src/src/miscmods/exim_filter.c b/src/src/miscmods/exim_filter.c new file mode 100644 index 000000000..a4c2f0898 --- /dev/null +++ b/src/src/miscmods/exim_filter.c @@ -0,0 +1,2664 @@ +/************************************************* +* Exim - an Internet mail transport agent * +*************************************************/ + +/* Copyright (c) The Exim Maintainers 2020 - 2024 */ +/* Copyright (c) University of Cambridge 1995 - 2018 */ +/* See the file NOTICE for conditions of use and distribution. */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + + +/* Code for mail filtering functions. */ + +#include "../exim.h" + + +/* Command arguments and left/right points in conditions can contain different +types of data, depending on the particular command or condition. Originally, +(void *) was used as "any old type", with casts, but this gives trouble and +warnings in some environments. So now it is done "properly", with a union. We +need to declare the structures first because some of them are recursive. */ + +struct filter_cmd; +struct condition_block; + +union argtypes { + struct string_item *a; + BOOL b; + struct condition_block *c; + struct filter_cmd *f; + int i; + const uschar *u; +}; + +/* Local structures used in this module */ + +typedef struct filter_cmd { + struct filter_cmd *next; + int command; + BOOL seen; + BOOL noerror; + union argtypes args[1]; +} filter_cmd; + +typedef struct condition_block { + struct condition_block *parent; + int type; + BOOL testfor; + union argtypes left; + union argtypes right; +} condition_block; + +/* Miscellaneous other declarations */ + +static uschar **error_pointer; +static const uschar *log_filename; +static int filter_options; +static int line_number; +static int expect_endif; +static int had_else_endif; +static int log_fd; +static int log_mode; +static int output_indent; +static BOOL filter_delivered; +static BOOL finish_obeyed; +static BOOL seen_force; +static BOOL seen_value; +static BOOL noerror_force; + +enum { had_neither, had_else, had_elif, had_endif }; + +static BOOL read_command_list(const uschar **, filter_cmd ***, BOOL); + + +/* This defines the offsets for the arguments; first the string ones, and +then the non-string ones. The order must be as above. */ + +enum { mailarg_index_to, + mailarg_index_cc, + mailarg_index_bcc, + mailarg_index_from, + mailarg_index_reply_to, + mailarg_index_subject, + mailarg_index_headers, /* misc headers must be last */ + mailarg_index_text, /* text is first after headers */ + mailarg_index_file, /* between text and expand are filenames */ + mailarg_index_log, + mailarg_index_once, + mailarg_index_once_repeat, /* a time string */ + mailarg_index_expand, /* first non-string argument */ + mailarg_index_return, + mailargs_total /* total number of arguments */ + }; + +/* The string arguments for the mail command. The header line ones (that are +permitted to include \n followed by white space) first, and then the body text +one (it can have \n anywhere). Then the file names and once_repeat, which may +not contain \n. */ + +static const char *mailargs[] = { /* "to" must be first, and */ + [mailarg_index_to] = "to", /* "cc" and "bcc" must follow */ + [mailarg_index_cc] = "cc", + [mailarg_index_bcc] = "bcc", + [mailarg_index_from] = "from", + [mailarg_index_reply_to] = "reply_to", + [mailarg_index_subject] = "subject", + [mailarg_index_headers] = "extra_headers", /* misc added header lines */ + [mailarg_index_text] = "text", + [mailarg_index_file] = "file", + [mailarg_index_log] = "log", + [mailarg_index_once] = "once", + [mailarg_index_once_repeat] = "once_repeat" +}; + +/* The count of string arguments */ + +#define MAILARGS_STRING_COUNT (nelem(mailargs)) + +/* The count of string arguments that are actually passed over as strings +(once_repeat is converted to an int). */ + +#define mailargs_string_passed (MAILARGS_STRING_COUNT - 1) + +/* Offsets in the data structure for the string arguments (note that +once_repeat isn't a string argument at this point.) */ + +static int reply_offsets[] = { + [mailarg_index_to] = offsetof(reply_item, to), + [mailarg_index_cc] = offsetof(reply_item, cc), + [mailarg_index_bcc] = offsetof(reply_item, bcc), + [mailarg_index_from] = offsetof(reply_item, from), + [mailarg_index_reply_to] = offsetof(reply_item, reply_to), + [mailarg_index_subject] = offsetof(reply_item, subject), + [mailarg_index_headers] = offsetof(reply_item, headers), + [mailarg_index_text] = offsetof(reply_item, text), + [mailarg_index_file] = offsetof(reply_item, file), + [mailarg_index_log] = offsetof(reply_item, logfile), + [mailarg_index_once] = offsetof(reply_item, oncelog), +}; + +/* Condition identities and names, with negated versions for some +of them. */ + +enum { cond_and, cond_or, cond_personal, cond_begins, cond_BEGINS, + cond_ends, cond_ENDS, cond_is, cond_IS, cond_matches, + cond_MATCHES, cond_contains, cond_CONTAINS, cond_delivered, + cond_above, cond_below, cond_errormsg, cond_firsttime, + cond_manualthaw, cond_foranyaddress }; + +static const char *cond_names[] = { + [cond_and] = "and", + [cond_or] = "or", + [cond_personal] = "personal", + [cond_begins] = "begins", + [cond_BEGINS] = "BEGINS", + [cond_ends] = "ends", + [cond_ENDS] = "ENDS", + [cond_is] = "is", + [cond_IS] = "IS", + [cond_matches] = "matches", + [cond_MATCHES] = "MATCHES", + [cond_contains] = "contains", + [cond_CONTAINS] = "CONTAINS", + [cond_delivered] = "delivered", + [cond_above] = "above", + [cond_below] = "below", + [cond_errormsg] = "error_message", + [cond_firsttime] = "first_delivery", + [cond_manualthaw] = "manually_thawed", + [cond_foranyaddress] = "foranyaddress" }; + +static const char *cond_not_names[] = { + [cond_and] = "", + [cond_or] = "", + [cond_personal] = "not personal", + [cond_begins] = "does not begin", + [cond_BEGINS] = "does not BEGIN", + [cond_ends] = "does not end", + [cond_ENDS] = "does not END", + [cond_is] = "is not", + [cond_IS] = "IS not", + [cond_matches] = "does not match", + [cond_MATCHES] = "does not MATCH", + [cond_contains] = "does not contain", + [cond_CONTAINS] = "does not CONTAIN", + [cond_delivered] = "not delivered", + [cond_above] = "not above", + [cond_below] = "not below", + [cond_errormsg] = "not error_message", + [cond_firsttime] = "not first_delivery", + [cond_manualthaw] = "not manually_thawed", + [cond_foranyaddress] = "not foranyaddress" }; + +/* Tables of binary condition words and their corresponding types. Not easy +to amalgamate with the above because of the different variants. */ + +static const char *cond_words[] = { + "BEGIN", + "BEGINS", + "CONTAIN", + "CONTAINS", + "END", + "ENDS", + "IS", + "MATCH", + "MATCHES", + "above", + "begin", + "begins", + "below", + "contain", + "contains", + "end", + "ends", + "is", + "match", + "matches"}; + +static int cond_word_count = nelem(cond_words); + +static int cond_types[] = { cond_BEGINS, cond_BEGINS, cond_CONTAINS, + cond_CONTAINS, cond_ENDS, cond_ENDS, cond_IS, cond_MATCHES, cond_MATCHES, + cond_above, cond_begins, cond_begins, cond_below, cond_contains, + cond_contains, cond_ends, cond_ends, cond_is, cond_matches, cond_matches }; + +/* Command identities */ + +enum { ADD_COMMAND, DEFER_COMMAND, DELIVER_COMMAND, ELIF_COMMAND, ELSE_COMMAND, + ENDIF_COMMAND, FINISH_COMMAND, FAIL_COMMAND, FREEZE_COMMAND, + HEADERS_COMMAND, IF_COMMAND, LOGFILE_COMMAND, LOGWRITE_COMMAND, + MAIL_COMMAND, NOERROR_COMMAND, PIPE_COMMAND, SAVE_COMMAND, SEEN_COMMAND, + TESTPRINT_COMMAND, UNSEEN_COMMAND, VACATION_COMMAND }; + +static const char * command_list[] = { + [ADD_COMMAND] = "add", + [DEFER_COMMAND] = "defer", + [DELIVER_COMMAND] = "deliver", + [ELIF_COMMAND] = "elif", + [ELSE_COMMAND] = "else", + [ENDIF_COMMAND] = "endif", + [FINISH_COMMAND] = "finish", + [FAIL_COMMAND] = "fail", + [FREEZE_COMMAND] = "freeze", + [HEADERS_COMMAND] = "headers", + [IF_COMMAND] = "if", + [LOGFILE_COMMAND] = "logfile", + [LOGWRITE_COMMAND] = "logwrite", + [MAIL_COMMAND] = "mail", + [NOERROR_COMMAND] = "noerror", + [PIPE_COMMAND] = "pipe", + [SAVE_COMMAND] = "save", + [SEEN_COMMAND] = "seen", + [TESTPRINT_COMMAND] = "testprint", + [UNSEEN_COMMAND] = "unseen", + [VACATION_COMMAND] = "vacation" +}; + +static int command_list_count = nelem(command_list); + +/* This table contains the number of expanded arguments in the bottom 4 bits. +If the top bit is set, it means that the default for the command is "seen". */ + +static uschar command_exparg_count[] = { + [ADD_COMMAND] = 2, + [DEFER_COMMAND] = 1, + [DELIVER_COMMAND] = 128+2, + [ELIF_COMMAND] = 0, + [ELSE_COMMAND] = 0, + [ENDIF_COMMAND] = 0, + [FINISH_COMMAND] = 0, + [FAIL_COMMAND] = 1, + [FREEZE_COMMAND] = 1, + [HEADERS_COMMAND] = 1, + [IF_COMMAND] = 0, + [LOGFILE_COMMAND] = 1, + [LOGWRITE_COMMAND] = 1, + [MAIL_COMMAND] = MAILARGS_STRING_COUNT, + [NOERROR_COMMAND] = 0, + [PIPE_COMMAND] = 128+0, + [SAVE_COMMAND] = 128+1, + [SEEN_COMMAND] = 0, + [TESTPRINT_COMMAND] = 1, + [UNSEEN_COMMAND] = 0, + [VACATION_COMMAND] = MAILARGS_STRING_COUNT +}; + + + +/************************************************* +* Find next significant uschar * +*************************************************/ + +/* Function to skip over white space and, optionally, comments. + +Arguments: + ptr pointer to next character + comment_allowed if TRUE, comments (# to \n) are skipped + +Returns: pointer to next non-whitespace character +*/ + +static const uschar * +nextsigchar(const uschar *ptr, BOOL comment_allowed) +{ +for (;;) + { + while (isspace(*ptr)) + if (*ptr++ == '\n') line_number++; + if (comment_allowed && *ptr == '#') + while (*++ptr != '\n' && *ptr) ; + else + break; + } +return ptr; +} + + + +/************************************************* +* Read one word * +*************************************************/ + +/* The terminator is white space unless bracket is TRUE, in which +case ( and ) terminate. + +Arguments + ptr pointer to next character + buffer where to put the word + size size of buffer + bracket if TRUE, terminate on ( and ) as well as space + +Returns: pointer to the next significant character after the word +*/ + +static const uschar * +nextword(const uschar *ptr, uschar *buffer, int size, BOOL bracket) +{ +uschar * bp = buffer; +while (*ptr && !isspace(*ptr) && + (!bracket || (*ptr != '(' && *ptr != ')'))) + if (bp - buffer < size - 1) + *bp++ = *ptr++; + else + { + *error_pointer = string_sprintf("word is too long in line %d of " + "filter file (max = %d chars)", line_number, size); + break; + } + +*bp = '\0'; +return nextsigchar(ptr, TRUE); +} + + + +/************************************************* +* Read one item * +*************************************************/ + +/* Might be a word, or might be a quoted string; in the latter case +do the escape stuff. + +Arguments: + ptr pointer to next character + buffer where to put the item + size size of buffer + bracket if TRUE, terminate non-quoted on ( and ) as well as space + +Returns: the next significant character after the item +*/ + +static const uschar * +nextitem(const uschar *ptr, uschar *buffer, int size, BOOL bracket) +{ +uschar *bp = buffer; +if (*ptr != '\"') return nextword(ptr, buffer, size, bracket); + +while (*++ptr && *ptr != '\"' && *ptr != '\n') + { + if (bp - buffer >= size - 1) + { + *error_pointer = string_sprintf("string is too long in line %d of " + "filter file (max = %d chars)", line_number, size); + break; + } + + if (*ptr != '\\') *bp++ = *ptr; else + { + if (isspace(ptr[1])) /* \NL ignored */ + { + const uschar *p = ptr + 1; + while (*p != '\n' && isspace(*p)) p++; + if (*p == '\n') + { + line_number++; + ptr = p; + while (ptr[1] != '\n' && isspace(ptr[1])) ptr++; + continue; + } + } + + *bp++ = string_interpret_escape(CUSS &ptr); + } + } + +if (*ptr == '\"') ptr++; + else if (*error_pointer == NULL) + *error_pointer = string_sprintf("quote missing at end of string " + "in line %d", line_number); + +*bp = 0; +return nextsigchar(ptr, TRUE); +} + + + + +/************************************************* +* Convert a string + K|M to a number * +*************************************************/ + +/* +Arguments: + s points to text string + OK set TRUE if a valid number was read + +Returns: the number, or 0 on error (with *OK FALSE) +*/ + +static int +get_number(const uschar *s, BOOL *ok) +{ +int value, count; +*ok = FALSE; +if (sscanf(CS s, "%i%n", &value, &count) != 1) return 0; +if (tolower(s[count]) == 'k') { value *= 1024; count++; } +if (tolower(s[count]) == 'm') { value *= 1024*1024; count++; } +while (isspace(s[count])) count++; +if (s[count]) return 0; +*ok = TRUE; +return value; +} + + + +/************************************************* +* Read one condition * +*************************************************/ + +/* A complete condition must be terminated by "then"; bracketed internal +conditions must be terminated by a closing bracket. They are read by calling +this function recursively. + +Arguments: + ptr points to start of condition + condition_block where to hang the created condition block + toplevel TRUE when called at the top level + +Returns: points to next character after "then" +*/ + +static const uschar * +read_condition(const uschar *ptr, condition_block **cond, BOOL toplevel) +{ +uschar buffer[1024]; +BOOL testfor = TRUE; +condition_block *current_parent = NULL; +condition_block **current = cond; + +*current = NULL; + +/* Loop to read next condition */ + +for (;;) + { + condition_block *c; + + /* reaching the end of the input is an error. */ + + if (!*ptr) + { + *error_pointer = US"\"then\" missing at end of filter file"; + break; + } + + /* Opening bracket at the start of a condition introduces a nested + condition, which must be terminated by a closing bracket. */ + + if (*ptr == '(') + { + ptr = read_condition(nextsigchar(ptr+1, TRUE), &c, FALSE); + if (*error_pointer != NULL) break; + if (*ptr != ')') + { + *error_pointer = string_sprintf("expected \")\" in line %d of " + "filter file", line_number); + break; + } + if (!testfor) + { + c->testfor = !c->testfor; + testfor = TRUE; + } + ptr = nextsigchar(ptr+1, TRUE); + } + + + /* Closing bracket at the start of a condition is an error. Give an + explicit message, as otherwise "unknown condition" would be confusing. */ + + else if (*ptr == ')') + { + *error_pointer = string_sprintf("unexpected \")\" in line %d of " + "filter file", line_number); + break; + } + + /* Otherwise we expect a word or a string. */ + + else + { + ptr = nextitem(ptr, buffer, sizeof(buffer), TRUE); + if (*error_pointer) break; + + /* "Then" at the start of a condition is an error */ + + if (Ustrcmp(buffer, "then") == 0) + { + *error_pointer = string_sprintf("unexpected \"then\" near line %d of " + "filter file", line_number); + break; + } + + /* "Not" at the start of a condition negates the testing condition. */ + + if (Ustrcmp(buffer, "not") == 0) + { + testfor = !testfor; + continue; + } + + /* Build a condition block from the specific word. */ + + c = store_get(sizeof(condition_block), GET_UNTAINTED); + c->left.u = c->right.u = NULL; + c->testfor = testfor; + testfor = TRUE; + + /* Check for conditions that start with a keyword */ + + if (Ustrcmp(buffer, "delivered") == 0) c->type = cond_delivered; + else if (Ustrcmp(buffer, "error_message") == 0) c->type = cond_errormsg; + else if (Ustrcmp(buffer, "first_delivery") == 0) c->type = cond_firsttime; + else if (Ustrcmp(buffer, "manually_thawed") == 0) c->type = cond_manualthaw; + + /* Personal can be followed by any number of aliases */ + + else if (Ustrcmp(buffer, "personal") == 0) + { + c->type = cond_personal; + for (;;) + { + string_item *aa; + const uschar * saveptr = ptr; + ptr = nextword(ptr, buffer, sizeof(buffer), TRUE); + if (*error_pointer) break; + if (Ustrcmp(buffer, "alias") != 0) + { + ptr = saveptr; + break; + } + ptr = nextitem(ptr, buffer, sizeof(buffer), TRUE); + if (*error_pointer) break; + aa = store_get(sizeof(string_item), GET_UNTAINTED); + aa->text = string_copy(buffer); + aa->next = c->left.a; + c->left.a = aa; + } + } + + /* Foranyaddress must be followed by a string and a condition enclosed + in parentheses, which is handled as a subcondition. */ + + else if (Ustrcmp(buffer, "foranyaddress") == 0) + { + ptr = nextitem(ptr, buffer, sizeof(buffer), TRUE); + if (*error_pointer) break; + if (*ptr != '(') + { + *error_pointer = string_sprintf("\"(\" expected after \"foranyaddress\" " + "near line %d of filter file", line_number); + break; + } + + c->type = cond_foranyaddress; + c->left.u = string_copy(buffer); + + ptr = read_condition(nextsigchar(ptr+1, TRUE), &(c->right.c), FALSE); + if (*error_pointer) break; + if (*ptr != ')') + { + *error_pointer = string_sprintf("expected \")\" in line %d of " + "filter file", line_number); + break; + } + ptr = nextsigchar(ptr+1, TRUE); + } + + /* If it's not a word we recognize, then it must be the lefthand + operand of one of the comparison words. */ + + else + { + int i; + const uschar *isptr = NULL; + + c->left.u = string_copy(buffer); + ptr = nextword(ptr, buffer, sizeof(buffer), TRUE); + if (*error_pointer) break; + + /* Handle "does|is [not]", preserving the pointer after "is" in + case it isn't that, but the form "is ". */ + + if (strcmpic(buffer, US"does") == 0 || strcmpic(buffer, US"is") == 0) + { + if (buffer[0] == 'i') { c->type = cond_is; isptr = ptr; } + if (buffer[0] == 'I') { c->type = cond_IS; isptr = ptr; } + + ptr = nextword(ptr, buffer, sizeof(buffer), TRUE); + if (*error_pointer) break; + if (strcmpic(buffer, US"not") == 0) + { + c->testfor = !c->testfor; + if (isptr) isptr = ptr; + ptr = nextword(ptr, buffer, sizeof(buffer), TRUE); + if (*error_pointer) break; + } + } + + for (i = 0; i < cond_word_count; i++) + { + if (Ustrcmp(buffer, cond_words[i]) == 0) + { + c->type = cond_types[i]; + break; + } + } + + /* If an unknown word follows "is" or "is not" + it's actually the argument. Reset to read it. */ + + if (i >= cond_word_count) + { + if (!isptr) + { + *error_pointer = string_sprintf("unrecognized condition word \"%s\" " + "near line %d of filter file", buffer, line_number); + break; + } + ptr = isptr; + } + + /* Get the RH argument. */ + + ptr = nextitem(ptr, buffer, sizeof(buffer), TRUE); + if (*error_pointer) break; + c->right.u = string_copy(buffer); + } + } + + /* We have read some new condition and set it up in the condition block + c; point the current pointer at it, and then deal with what follows. */ + + *current = c; + + /* Closing bracket terminates if this is a lower-level condition. Otherwise + it is unexpected. */ + + if (*ptr == ')') + { + if (toplevel) + *error_pointer = string_sprintf("unexpected \")\" in line %d of " + "filter file", line_number); + break; + } + + /* Opening bracket following a condition is an error; give an explicit + message to make it clearer what is wrong. */ + + else if (*ptr == '(') + { + *error_pointer = string_sprintf("unexpected \"(\" in line %d of " + "filter file", line_number); + break; + } + + /* Otherwise the next thing must be one of the words "and", "or" or "then" */ + + else + { +// const uschar *saveptr = ptr; + ptr = nextword(ptr, buffer, sizeof(buffer), FALSE); + if (*error_pointer) break; + + /* "Then" terminates a toplevel condition; otherwise a closing bracket + has been omitted. Put a string terminator at the start of "then" so + that reflecting the condition can be done when testing. */ + /*XXX This stops us doing a constification job in this file, unfortunately. + Comment it out and see if anything breaks. + With one addition down at DEFERFREEZEFAIL it passes the testsuite. */ + + if (Ustrcmp(buffer, "then") == 0) + { +// if (toplevel) *saveptr = 0; +// else + if (!toplevel) + *error_pointer = string_sprintf("missing \")\" at end of " + "condition near line %d of filter file", line_number); + break; + } + + /* "And" causes a new condition block to replace the one we have + just read, which becomes the left sub-condition. The current pointer + is reset to the pointer for the right sub-condition. We have to keep + track of the tree of sequential "ands", so as to traverse back up it + if an "or" is met. */ + + else if (Ustrcmp(buffer, "and") == 0) + { + condition_block * andc = store_get(sizeof(condition_block), GET_UNTAINTED); + andc->parent = current_parent; + andc->type = cond_and; + andc->testfor = TRUE; + andc->left.c = c; + andc->right.u = NULL; /* insurance */ + *current = andc; + current = &(andc->right.c); + current_parent = andc; + } + + /* "Or" is similar, but has to be done a bit more carefully to + ensure that "and" is more binding. If there's a parent set, we + are following a sequence of "and"s and must track back to their + start. */ + + else if (Ustrcmp(buffer, "or") == 0) + { + condition_block * orc = store_get(sizeof(condition_block), GET_UNTAINTED); + condition_block * or_parent = NULL; + + if (current_parent) + { + while (current_parent->parent && + current_parent->parent->type == cond_and) + current_parent = current_parent->parent; + + /* If the parent has a parent, it must be an "or" parent. */ + + if (current_parent->parent) + or_parent = current_parent->parent; + } + + orc->parent = or_parent; + if (!or_parent) *cond = orc; + else or_parent->right.c = orc; + orc->type = cond_or; + orc->testfor = TRUE; + orc->left.c = (current_parent == NULL)? c : current_parent; + orc->right.c = NULL; /* insurance */ + current = &(orc->right.c); + current_parent = orc; + } + + /* Otherwise there is a disaster */ + + else + { + *error_pointer = string_sprintf("\"and\" or \"or\" or \"%s\" " + "expected near line %d of filter file, but found \"%s\"", + toplevel? "then" : ")", line_number, buffer); + break; + } + } + } + +return nextsigchar(ptr, TRUE); +} + + + +/************************************************* +* Output the current indent * +*************************************************/ + +static void +indent(void) +{ +int i; +DEBUG(D_filter) for (i = 0; i < output_indent; i++) debug_printf(" "); +} + + + +/************************************************* +* Condition printer: for debugging * +*************************************************/ + +/* +Arguments: + c the block at the top of the tree + toplevel TRUE at toplevel - stops overall brackets + +Returns: nothing +*/ + +static void +print_condition(condition_block *c, BOOL toplevel) +{ +const char *name = (c->testfor)? cond_names[c->type] : cond_not_names[c->type]; +switch(c->type) + { + case cond_personal: + case cond_delivered: + case cond_errormsg: + case cond_firsttime: + case cond_manualthaw: + debug_printf("%s", name); + break; + + case cond_is: + case cond_IS: + case cond_matches: + case cond_MATCHES: + case cond_contains: + case cond_CONTAINS: + case cond_begins: + case cond_BEGINS: + case cond_ends: + case cond_ENDS: + case cond_above: + case cond_below: + debug_printf("%s %s %s", c->left.u, name, c->right.u); + break; + + case cond_and: + if (!c->testfor) debug_printf("not ("); + print_condition(c->left.c, FALSE); + debug_printf(" %s ", cond_names[c->type]); + print_condition(c->right.c, FALSE); + if (!c->testfor) debug_printf(")"); + break; + + case cond_or: + if (!c->testfor) debug_printf("not ("); + else if (!toplevel) debug_printf("("); + print_condition(c->left.c, FALSE); + debug_printf(" %s ", cond_names[c->type]); + print_condition(c->right.c, FALSE); + if (!toplevel || !c->testfor) debug_printf(")"); + break; + + case cond_foranyaddress: + debug_printf("%s %s (", name, c->left.u); + print_condition(c->right.c, FALSE); + debug_printf(")"); + break; + } +} + + + + +/************************************************* +* Read one filtering command * +*************************************************/ + +/* +Arguments: + pptr points to pointer to first character of command; the pointer + is updated to point after the last character read + lastcmdptr points to pointer to pointer to last command; used for hanging + on the newly read command + +Returns: TRUE if command successfully read, else FALSE +*/ + +static BOOL +read_command(const uschar **pptr, filter_cmd ***lastcmdptr) +{ +int command, i, cmd_bit; +filter_cmd *new, **newlastcmdptr; +BOOL yield = TRUE; +BOOL was_seen_or_unseen = FALSE; +BOOL was_noerror = FALSE; +uschar buffer[1024]; +const uschar *ptr = *pptr; +const uschar *saveptr; +uschar *fmsg = NULL; + +/* Read the next word and find which command it is. Command words are normally +terminated by white space, but there are two exceptions, which are the "if" and +"elif" commands. We must allow for them to be terminated by an opening bracket, +as brackets are allowed in conditions and users will expect not to require +white space here. */ + +*buffer = '\0'; /* compiler quietening */ + +if (Ustrncmp(ptr, "if(", 3) == 0) + { + Ustrcpy(buffer, US"if"); + ptr += 2; + } +else if (Ustrncmp(ptr, "elif(", 5) == 0) + { + Ustrcpy(buffer, US"elif"); + ptr += 4; + } +else + { + ptr = nextword(ptr, buffer, sizeof(buffer), FALSE); + if (*error_pointer) return FALSE; + } + +for (command = 0; command < command_list_count; command++) + if (Ustrcmp(buffer, command_list[command]) == 0) break; + +/* Handle the individual commands */ + +switch (command) + { + /* Add takes two arguments, separated by the word "to". Headers has two + arguments, but the first must be "add", "remove", or "charset", and it gets + stored in the second argument slot. Neither may be preceded by seen, unseen + or noerror. */ + + case ADD_COMMAND: + case HEADERS_COMMAND: + if (seen_force || noerror_force) + { + *error_pointer = string_sprintf("\"seen\", \"unseen\", or \"noerror\" " + "found before an \"%s\" command near line %d", + command_list[command], line_number); + yield = FALSE; + } + /* Fall through */ + + /* Logwrite, logfile, pipe, and testprint all take a single argument, save + and logfile can have an option second argument for the mode, and deliver can + have "errors_to
" in a system filter, or in a user filter if the + address is the current one. */ + + case DELIVER_COMMAND: + case LOGFILE_COMMAND: + case LOGWRITE_COMMAND: + case PIPE_COMMAND: + case SAVE_COMMAND: + case TESTPRINT_COMMAND: + + ptr = nextitem(ptr, buffer, sizeof(buffer), FALSE); + if (!*buffer) + *error_pointer = string_sprintf("\"%s\" requires an argument " + "near line %d of filter file", command_list[command], line_number); + + if (*error_pointer) yield = FALSE; else + { + union argtypes argument, second_argument; + + argument.u = second_argument.u = NULL; + + if (command == ADD_COMMAND) + { + argument.u = string_copy(buffer); + ptr = nextitem(ptr, buffer, sizeof(buffer), FALSE); + if (!*buffer || Ustrcmp(buffer, "to") != 0) + *error_pointer = string_sprintf("\"to\" expected in \"add\" command " + "near line %d of filter file", line_number); + else + { + ptr = nextitem(ptr, buffer, sizeof(buffer), FALSE); + if (!*buffer) + *error_pointer = string_sprintf("value missing after \"to\" " + "near line %d of filter file", line_number); + else second_argument.u = string_copy(buffer); + } + } + + else if (command == HEADERS_COMMAND) + { + if (Ustrcmp(buffer, "add") == 0) + second_argument.b = TRUE; + else + if (Ustrcmp(buffer, "remove") == 0) second_argument.b = FALSE; + else + if (Ustrcmp(buffer, "charset") == 0) + second_argument.b = TRUE_UNSET; + else + { + *error_pointer = string_sprintf("\"add\", \"remove\", or \"charset\" " + "expected after \"headers\" near line %d of filter file", + line_number); + yield = FALSE; + } + + if (!f.system_filtering && second_argument.b != TRUE_UNSET) + { + *error_pointer = string_sprintf("header addition and removal is " + "available only in system filters: near line %d of filter file", + line_number); + yield = FALSE; + break; + } + + if (yield) + { + ptr = nextitem(ptr, buffer, sizeof(buffer), FALSE); + if (!*buffer) + *error_pointer = string_sprintf("value missing after \"add\", " + "\"remove\", or \"charset\" near line %d of filter file", + line_number); + else argument.u = string_copy(buffer); + } + } + + /* The argument for the logwrite command must end in a newline, and the save + and logfile commands can have an optional mode argument. The deliver + command can have an optional "errors_to
" for a system filter, + or for a user filter if the address is the user's address. Accept the + syntax here - the check is later. */ + + else + { + if (command == LOGWRITE_COMMAND) + { + int len = Ustrlen(buffer); + if (len == 0 || buffer[len-1] != '\n') Ustrcat(buffer, US"\n"); + } + + argument.u = string_copy(buffer); + + if (command == SAVE_COMMAND || command == LOGFILE_COMMAND) + { + if (isdigit(*ptr)) + { + ptr = nextword(ptr, buffer, sizeof(buffer), FALSE); + second_argument.i = (int)Ustrtol(buffer, NULL, 8); + } + else second_argument.i = -1; + } + + else if (command == DELIVER_COMMAND) + { + const uschar *save_ptr = ptr; + ptr = nextword(ptr, buffer, sizeof(buffer), FALSE); + if (Ustrcmp(buffer, "errors_to") == 0) + { + ptr = nextword(ptr, buffer, sizeof(buffer), FALSE); + second_argument.u = string_copy(buffer); + } + else ptr = save_ptr; + } + } + + /* Set up the command block. Seen defaults TRUE for delivery commands, + FALSE for logging commands, and it doesn't matter for testprint, as + that doesn't change the "delivered" status. */ + + if (*error_pointer) yield = FALSE; + else + { + new = store_get(sizeof(filter_cmd) + sizeof(union argtypes), GET_UNTAINTED); + new->next = NULL; + **lastcmdptr = new; + *lastcmdptr = &(new->next); + new->command = command; + new->seen = seen_force? seen_value : command_exparg_count[command] >= 128; + new->noerror = noerror_force; + new->args[0] = argument; + new->args[1] = second_argument; + } + } + break; + + + /* Elif, else and endif just set a flag if expected. */ + + case ELIF_COMMAND: + case ELSE_COMMAND: + case ENDIF_COMMAND: + if (seen_force || noerror_force) + { + *error_pointer = string_sprintf("\"seen\", \"unseen\", or \"noerror\" " + "near line %d is not followed by a command", line_number); + yield = FALSE; + } + + if (expect_endif > 0) + had_else_endif = (command == ELIF_COMMAND)? had_elif : + (command == ELSE_COMMAND)? had_else : had_endif; + else + { + *error_pointer = string_sprintf("unexpected \"%s\" command near " + "line %d of filter file", buffer, line_number); + yield = FALSE; + } + break; + + + /* Defer, freeze, and fail are available only if permitted. */ + + case DEFER_COMMAND: + cmd_bit = RDO_DEFER; + goto DEFER_FREEZE_FAIL; + + case FAIL_COMMAND: + cmd_bit = RDO_FAIL; + goto DEFER_FREEZE_FAIL; + + case FREEZE_COMMAND: + cmd_bit = RDO_FREEZE; + + DEFER_FREEZE_FAIL: + if (!(filter_options & cmd_bit)) + { + *error_pointer = string_sprintf("filtering command \"%s\" is disabled: " + "near line %d of filter file", buffer, line_number); + yield = FALSE; + break; + } + + /* A text message can be provided after the "text" keyword, or + as a string in quotes. */ + + saveptr = ptr; + ptr = nextitem(ptr, buffer, sizeof(buffer), FALSE); + if (*saveptr != '\"' && (!*buffer || Ustrcmp(buffer, "text") != 0)) + { + ptr = saveptr; + fmsg = US""; + } + else + { + if (*saveptr != '\"') + ptr = nextitem(ptr, buffer, sizeof(buffer), FALSE); + fmsg = string_copy(buffer); + } + + /* Drop through and treat as "finish", but never set "seen". */ + + seen_value = FALSE; + + /* Finish has no arguments; fmsg defaults to NULL */ + + case FINISH_COMMAND: + new = store_get(sizeof(filter_cmd), GET_UNTAINTED); + new->next = NULL; + **lastcmdptr = new; + *lastcmdptr = &(new->next); + new->command = command; + new->seen = seen_force ? seen_value : FALSE; + new->args[0].u = fmsg; + break; + + + /* Seen, unseen, and noerror are not allowed before if, which takes a + condition argument and then and else sub-commands. */ + + case IF_COMMAND: + if (seen_force || noerror_force) + { + *error_pointer = string_sprintf("\"seen\", \"unseen\", or \"noerror\" " + "found before an \"if\" command near line %d", + line_number); + yield = FALSE; + } + + /* Set up the command block for if */ + + new = store_get(sizeof(filter_cmd) + 4 * sizeof(union argtypes), GET_UNTAINTED); + new->next = NULL; + **lastcmdptr = new; + *lastcmdptr = &new->next; + new->command = command; + new->seen = FALSE; + new->args[0].u = NULL; + new->args[1].u = new->args[2].u = NULL; + new->args[3].u = ptr; + + /* Read the condition */ + + ptr = read_condition(ptr, &new->args[0].c, TRUE); + if (*error_pointer) { yield = FALSE; break; } + + /* Read the commands to be obeyed if the condition is true */ + + newlastcmdptr = &(new->args[1].f); + if (!read_command_list(&ptr, &newlastcmdptr, TRUE)) yield = FALSE; + + /* If commands were successfully read, handle the various possible + terminators. There may be a number of successive "elif" sections. */ + + else + { + while (had_else_endif == had_elif) + { + filter_cmd *newnew = + store_get(sizeof(filter_cmd) + 4 * sizeof(union argtypes), GET_UNTAINTED); + new->args[2].f = newnew; + new = newnew; + new->next = NULL; + new->command = command; + new->seen = FALSE; + new->args[0].u = NULL; + new->args[1].u = new->args[2].u = NULL; + new->args[3].u = ptr; + + ptr = read_condition(ptr, &new->args[0].c, TRUE); + if (*error_pointer) { yield = FALSE; break; } + newlastcmdptr = &(new->args[1].f); + if (!read_command_list(&ptr, &newlastcmdptr, TRUE)) + yield = FALSE; + } + + if (yield == FALSE) break; + + /* Handle termination by "else", possibly following one or more + "elsif" sections. */ + + if (had_else_endif == had_else) + { + newlastcmdptr = &(new->args[2].f); + if (!read_command_list(&ptr, &newlastcmdptr, TRUE)) + yield = FALSE; + else if (had_else_endif != had_endif) + { + *error_pointer = string_sprintf("\"endif\" missing near line %d of " + "filter file", line_number); + yield = FALSE; + } + } + + /* Otherwise the terminator was "endif" - this is checked by + read_command_list(). The pointer is already set to NULL. */ + } + + /* Reset the terminator flag. */ + + had_else_endif = had_neither; + break; + + + /* The mail & vacation commands have a whole slew of keyworded arguments. + The final argument values are the file expand and return message booleans, + whose offsets are defined in mailarg_index_{expand,return}. Although they + are logically booleans, because they are stored in a uschar * value, we use + NULL and not FALSE, to keep 64-bit compilers happy. */ + + case MAIL_COMMAND: + case VACATION_COMMAND: + new = store_get(sizeof(filter_cmd) + mailargs_total * sizeof(union argtypes), GET_UNTAINTED); + new->next = NULL; + new->command = command; + new->seen = seen_force ? seen_value : FALSE; + new->noerror = noerror_force; + for (i = 0; i < mailargs_total; i++) new->args[i].u = NULL; + + /* Read keyword/value pairs until we hit one that isn't. The data + must contain only printing chars plus tab, though the "text" value + can also contain newlines. The "file" keyword can be preceded by the + word "expand", and "return message" has no data. */ + + for (;;) + { + const uschar *saveptr = ptr; + ptr = nextword(ptr, buffer, sizeof(buffer), FALSE); + if (*error_pointer) + { yield = FALSE; break; } + + /* Ensure "return" is followed by "message"; that's a complete option */ + + if (Ustrcmp(buffer, "return") == 0) + { + new->args[mailarg_index_return].u = US""; /* not NULL => TRUE */ + ptr = nextword(ptr, buffer, sizeof(buffer), FALSE); + if (Ustrcmp(buffer, "message") != 0) + { + *error_pointer = string_sprintf("\"return\" not followed by \"message\" " + " near line %d of filter file", line_number); + yield = FALSE; + break; + } + continue; + } + + /* Ensure "expand" is followed by "file", then fall through to process the + file keyword. */ + + if (Ustrcmp(buffer, "expand") == 0) + { + new->args[mailarg_index_expand].u = US""; /* not NULL => TRUE */ + ptr = nextword(ptr, buffer, sizeof(buffer), FALSE); + if (Ustrcmp(buffer, "file") != 0) + { + *error_pointer = string_sprintf("\"expand\" not followed by \"file\" " + " near line %d of filter file", line_number); + yield = FALSE; + break; + } + } + + /* Scan for the keyword */ + + for (i = 0; i < MAILARGS_STRING_COUNT; i++) + if (Ustrcmp(buffer, mailargs[i]) == 0) break; + + /* Not found keyword; assume end of this command */ + + if (i >= MAILARGS_STRING_COUNT) + { + ptr = saveptr; + break; + } + + /* Found keyword, read the data item */ + + ptr = nextitem(ptr, buffer, sizeof(buffer), FALSE); + if (*error_pointer) + { yield = FALSE; break; } + else new->args[i].u = string_copy(buffer); + } + + /* If this is the vacation command, apply some default settings to + some of the arguments. */ + + if (command == VACATION_COMMAND) + { + if (!new->args[mailarg_index_file].u) + { + new->args[mailarg_index_file].u = string_copy(US".vacation.msg"); + new->args[mailarg_index_expand].u = US""; /* not NULL => TRUE */ + } + if (!new->args[mailarg_index_log].u) + new->args[mailarg_index_log].u = string_copy(US".vacation.log"); + if (!new->args[mailarg_index_once].u) + new->args[mailarg_index_once].u = string_copy(US".vacation"); + if (!new->args[mailarg_index_once_repeat].u) + new->args[mailarg_index_once_repeat].u = string_copy(US"7d"); + if (!new->args[mailarg_index_subject].u) + new->args[mailarg_index_subject].u = string_copy(US"On vacation"); + } + + /* Join the address on to the chain of generated addresses */ + + **lastcmdptr = new; + *lastcmdptr = &(new->next); + break; + + + /* Seen and unseen just set flags */ + + case SEEN_COMMAND: + case UNSEEN_COMMAND: + if (!*ptr) + { + *error_pointer = string_sprintf("\"seen\" or \"unseen\" " + "near line %d is not followed by a command", line_number); + yield = FALSE; + } + if (seen_force) + { + *error_pointer = string_sprintf("\"seen\" or \"unseen\" repeated " + "near line %d", line_number); + yield = FALSE; + } + seen_value = (command == SEEN_COMMAND); + seen_force = TRUE; + was_seen_or_unseen = TRUE; + break; + + + /* So does noerror */ + + case NOERROR_COMMAND: + if (!*ptr) + { + *error_pointer = string_sprintf("\"noerror\" " + "near line %d is not followed by a command", line_number); + yield = FALSE; + } + noerror_force = TRUE; + was_noerror = TRUE; + break; + + + /* Oops */ + + default: + *error_pointer = string_sprintf("unknown filtering command \"%s\" " + "near line %d of filter file", buffer, line_number); + yield = FALSE; + break; + } + +if (!was_seen_or_unseen && !was_noerror) + { + seen_force = FALSE; + noerror_force = FALSE; + } + +*pptr = ptr; +return yield; +} + + + +/************************************************* +* Read a list of commands * +*************************************************/ + +/* If conditional is TRUE, the list must be terminated +by the words "else" or "endif". + +Arguments: + pptr points to pointer to next character; the pointer is updated + lastcmdptr points to pointer to pointer to previously-read command; used + for hanging on the new command + conditional TRUE if this command is the subject of a condition + +Returns: TRUE on success +*/ + +static BOOL +read_command_list(const uschar **pptr, filter_cmd ***lastcmdptr, BOOL conditional) +{ +if (conditional) expect_endif++; +had_else_endif = had_neither; +while (**pptr && had_else_endif == had_neither) + { + if (!read_command(pptr, lastcmdptr)) return FALSE; + *pptr = nextsigchar(*pptr, TRUE); + } +if (conditional) + { + expect_endif--; + if (had_else_endif == had_neither) + { + *error_pointer = US"\"endif\" missing at end of filter file"; + return FALSE; + } + } +return TRUE; +} + + + + +/************************************************* +* Test for a personal message * +*************************************************/ + +/* Module API: This function is also called from the code that +implements Sieve filters. + +Arguments: + aliases a chain of aliases + scan_cc TRUE if Cc: and Bcc: are to be scanned (Exim filters do not) + +Returns: TRUE if the message is deemed to be personal +*/ + +static BOOL +filter_personal(string_item *aliases, BOOL scan_cc) +{ +const uschar *self, *self_from, *self_to; +uschar *psself = NULL; +const uschar *psself_from = NULL, *psself_to = NULL; +rmark reset_point = store_mark(); +BOOL yield; +header_line *h; +int to_count = 2; +int from_count = 9; + +/* If any header line in the message is a defined "List-" header field, it is +not a personal message. We used to check for any header line that started with +"List-", but this was tightened up for release 4.54. The check is now for +"List-Id", defined in RFC 2929, or "List-Help", "List-Subscribe", "List- +Unsubscribe", "List-Post", "List-Owner" or "List-Archive", all of which are +defined in RFC 2369. We also scan for "Auto-Submitted"; if it is found to +contain any value other than "no", the message is not personal (RFC 3834). +Previously the test was for "auto-". */ + +for (h = header_list; h; h = h->next) + { + if (h->type == htype_old) continue; + + if (strncmpic(h->text, US"List-", 5) == 0) + { + uschar * s = h->text + 5; + if (strncmpic(s, US"Id:", 3) == 0 || + strncmpic(s, US"Help:", 5) == 0 || + strncmpic(s, US"Subscribe:", 10) == 0 || + strncmpic(s, US"Unsubscribe:", 12) == 0 || + strncmpic(s, US"Post:", 5) == 0 || + strncmpic(s, US"Owner:", 6) == 0 || + strncmpic(s, US"Archive:", 8) == 0) + return FALSE; + } + + else if (strncmpic(h->text, US"Auto-submitted:", 15) == 0) + { + uschar * s = h->text + 15; + Uskip_whitespace(&s); + if (strncmpic(s, US"no", 2) != 0) return FALSE; + s += 2; + Uskip_whitespace(&s); + if (*s) return FALSE; + } + } + +/* Set up "my" address */ + +self = string_sprintf("%s@%s", deliver_localpart, deliver_domain); +self_from = rewrite_one(self, rewrite_from, NULL, FALSE, US"", + global_rewrite_rules); +self_to = rewrite_one(self, rewrite_to, NULL, FALSE, US"", + global_rewrite_rules); + + +if (!self_from) self_from = self; +if (self_to) self_to = self; + +/* If there's a prefix or suffix set, we must include the prefixed/ +suffixed version of the local part in the tests. */ + +if (deliver_localpart_prefix || deliver_localpart_suffix) + { + psself = string_sprintf("%s%s%s@%s", + deliver_localpart_prefix ? deliver_localpart_prefix : US"", + deliver_localpart, + deliver_localpart_suffix ? deliver_localpart_suffix : US"", + deliver_domain); + psself_from = rewrite_one(psself, rewrite_from, NULL, FALSE, US"", + global_rewrite_rules); + psself_to = rewrite_one(psself, rewrite_to, NULL, FALSE, US"", + global_rewrite_rules); + if (psself_from == NULL) psself_from = psself; + if (psself_to == NULL) psself_to = psself; + to_count += 2; + from_count += 2; + } + +/* Do all the necessary tests; the counts are adjusted for {pre,suf}fix */ + +yield = + ( + header_match(US"to:", TRUE, TRUE, aliases, to_count, self, self_to, psself, + psself_to) || + (scan_cc && + ( + header_match(US"cc:", TRUE, TRUE, aliases, to_count, self, self_to, + psself, psself_to) + || + header_match(US"bcc:", TRUE, TRUE, aliases, to_count, self, self_to, + psself, psself_to) + ) + ) + ) && + + header_match(US"from:", TRUE, FALSE, aliases, from_count, "^server@", + "^daemon@", "^root@", "^listserv@", "^majordomo@", "^.*?-request@", + "^owner-[^@]+@", self, self_from, psself, psself_from) && + + header_match(US"precedence:", FALSE, FALSE, NULL, 3, "bulk","list","junk") && + + (sender_address == NULL || sender_address[0] != 0); + +store_reset(reset_point); +return yield; +} + + + +/************************************************* +* Test a condition * +*************************************************/ + +/* +Arguments: + c points to the condition block; c->testfor indicated whether + it's a positive or negative condition + toplevel TRUE if called from "if" directly; FALSE otherwise + +Returns: TRUE if the condition is met +*/ + +static BOOL +test_condition(condition_block * c, BOOL toplevel) +{ +BOOL yield = FALSE, textonly_re; +const uschar * exp[2], * p, * pp; +int val[2]; + +if (!c) return TRUE; /* does this ever occur? */ + +switch (c->type) + { + case cond_and: + yield = test_condition(c->left.c, FALSE) && + *error_pointer == NULL && + test_condition(c->right.c, FALSE); + break; + + case cond_or: + yield = test_condition(c->left.c, FALSE) || + (*error_pointer == NULL && + test_condition(c->right.c, FALSE)); + break; + + /* The personal test is meaningless in a system filter. The tests are now in + a separate function (so Sieve can use them). However, an Exim filter does not + scan Cc: (hence the FALSE argument). */ + + case cond_personal: + yield = f.system_filtering? FALSE : filter_personal(c->left.a, FALSE); + break; + + case cond_delivered: + yield = filter_delivered; + break; + + /* Only TRUE if a message is actually being processed; FALSE for address + testing and verification. */ + + case cond_errormsg: + yield = message_id[0] && (!sender_address || !*sender_address); + break; + + /* Only FALSE if a message is actually being processed; TRUE for address + and filter testing and verification. */ + + case cond_firsttime: + yield = filter_test != FTEST_NONE || !message_id[0] || f.deliver_firsttime; + break; + + /* Only TRUE if a message is actually being processed; FALSE for address + testing and verification. */ + + case cond_manualthaw: + yield = message_id[0] && f.deliver_manual_thaw; + break; + + /* The foranyaddress condition loops through a list of addresses */ + + case cond_foranyaddress: + p = c->left.u; + if (!(pp = expand_cstring(p))) + { + *error_pointer = string_sprintf("failed to expand \"%s\" in " + "filter file: %s", p, expand_string_message); + return FALSE; + } + + yield = FALSE; + f.parse_allow_group = TRUE; /* Allow group syntax */ + + while (*pp) + { + uschar *error; + int start, end, domain; + uschar * s; + + p = parse_find_address_end(pp, FALSE); + s = string_copyn(pp, p - pp); + + filter_thisaddress = + parse_extract_address(s, &error, &start, &end, &domain, FALSE); + + if (filter_thisaddress) + { + if ((filter_test != FTEST_NONE && debug_selector != 0) || + (debug_selector & D_filter) != 0) + { + indent(); + debug_printf_indent("Extracted address %s\n", filter_thisaddress); + } + yield = test_condition(c->right.c, FALSE); + } + + if (yield) break; + if (!*p) break; + pp = p + 1; + } + + f.parse_allow_group = FALSE; /* Reset group syntax flags */ + f.parse_found_group = FALSE; + break; + + /* All other conditions have left and right values that need expanding; + on error, it doesn't matter what value is returned. */ + + default: + p = c->left.u; + for (int i = 0; i < 2; i++) + { + if (!(exp[i] = expand_string_2(p, &textonly_re))) + { + *error_pointer = string_sprintf("failed to expand \"%s\" in " + "filter file: %s", p, expand_string_message); + return FALSE; + } + p = c->right.u; + } + + /* Inner switch for the different cases */ + + switch(c->type) + { + case cond_is: + yield = strcmpic(exp[0], exp[1]) == 0; + break; + + case cond_IS: + yield = Ustrcmp(exp[0], exp[1]) == 0; + break; + + case cond_contains: + yield = strstric_c(exp[0], exp[1], FALSE) != NULL; + break; + + case cond_CONTAINS: + yield = Ustrstr(exp[0], exp[1]) != NULL; + break; + + case cond_begins: + yield = strncmpic(exp[0], exp[1], Ustrlen(exp[1])) == 0; + break; + + case cond_BEGINS: + yield = Ustrncmp(exp[0], exp[1], Ustrlen(exp[1])) == 0; + break; + + case cond_ends: + case cond_ENDS: + { + int len = Ustrlen(exp[1]); + const uschar *s = exp[0] + Ustrlen(exp[0]) - len; + yield = s < exp[0] + ? FALSE + : (c->type == cond_ends ? strcmpic(s, exp[1]) : Ustrcmp(s, exp[1])) == 0; + break; + } + + case cond_matches: + case cond_MATCHES: + { + const pcre2_code * re; + mcs_flags flags = textonly_re ? MCS_CACHEABLE : MCS_NOFLAGS; + + if ((filter_test != FTEST_NONE && debug_selector != 0) || + (debug_selector & D_filter) != 0) + { + debug_printf_indent("Match expanded arguments:\n"); + debug_printf_indent(" Subject = %s\n", exp[0]); + debug_printf_indent(" Pattern = %s\n", exp[1]); + } + + if (c->type == cond_matches) flags |= MCS_CASELESS; + if (!(re = regex_compile(exp[1], flags, error_pointer, pcre_gen_cmp_ctx))) + return FALSE; + + yield = regex_match_and_setup(re, exp[0], PCRE_EOPT, -1); + break; + } + + /* For above and below, convert the strings to numbers */ + + case cond_above: + case cond_below: + for (int i = 0; i < 2; i++) + { + val[i] = get_number(exp[i], &yield); + if (!yield) + { + *error_pointer = string_sprintf("malformed numerical string \"%s\"", + exp[i]); + return FALSE; + } + } + yield = c->type == cond_above ? (val[0] > val[1]) : (val[0] < val[1]); + break; + } + break; + } + +if ((filter_test != FTEST_NONE && debug_selector != 0) || + (debug_selector & D_filter) != 0) + { + indent(); + debug_printf_indent("%sondition is %s: ", + toplevel ? "C" : "Sub-c", + yield == c->testfor ? "true" : "false"); + print_condition(c, TRUE); + debug_printf_indent("\n"); + } + +return yield == c->testfor; +} + + + +/************************************************* +* Interpret chain of commands * +*************************************************/ + +/* In testing state, just say what would be done rather than doing it. The +testprint command just expands and outputs its argument in testing state, and +does nothing otherwise. + +Arguments: + commands points to chain of commands to interpret + generated where to hang newly-generated addresses + +Returns: FF_DELIVERED success, a significant action was taken + FF_NOTDELIVERED success, no significant action + FF_DEFER defer requested + FF_FAIL fail requested + FF_FREEZE freeze requested + FF_ERROR there was a problem +*/ + +static int +interpret_commands(filter_cmd *commands, address_item **generated) +{ +const uschar *s; +int mode; +address_item *addr; +BOOL condition_value; + +while (commands) + { + int ff_ret; + uschar *fmsg, *ff_name; + const uschar *expargs[MAILARGS_STRING_COUNT]; + + int i, n[2]; + + /* Expand the relevant number of arguments for the command that are + not NULL. */ + + for (i = 0; i < (command_exparg_count[commands->command] & 15); i++) + { + const uschar *ss = commands->args[i].u; + if (!ss) + expargs[i] = NULL; + else if (!(expargs[i] = expand_cstring(ss))) + { + *error_pointer = string_sprintf("failed to expand \"%s\" in " + "%s command: %s", ss, command_list[commands->command], + expand_string_message); + return FF_ERROR; + } + } + + /* Now switch for each command, setting the "delivered" flag if any of them + have "seen" set. */ + + if (commands->seen) filter_delivered = TRUE; + + switch(commands->command) + { + case ADD_COMMAND: + for (i = 0; i < 2; i++) + { + const uschar *ss = expargs[i]; + uschar *end; + + if (i == 1 && (*ss++ != 'n' || ss[1] != 0)) + { + *error_pointer = string_sprintf("unknown variable \"%s\" in \"add\" " + "command", expargs[i]); + return FF_ERROR; + } + + /* Allow for "--" at the start of the value (from -$n0) for example */ + if (i == 0) while (ss[0] == '-' && ss[1] == '-') ss += 2; + + n[i] = (int)Ustrtol(ss, &end, 0); + if (*end != 0) + { + *error_pointer = string_sprintf("malformed number \"%s\" in \"add\" " + "command", ss); + return FF_ERROR; + } + } + + filter_n[n[1]] += n[0]; + if (filter_test != FTEST_NONE) printf("Add %d to n%d\n", n[0], n[1]); + break; + + /* A deliver command's argument must be a valid address. Its optional + second argument (system filter only) must also be a valid address. */ + + case DELIVER_COMMAND: + for (i = 0; i < 2; i++) + { + s = expargs[i]; + if (s != NULL) + { + int start, end, domain; + uschar *error; + uschar *ss = parse_extract_address(s, &error, &start, &end, &domain, + FALSE); + if (ss) + expargs[i] = filter_options & RDO_REWRITE + ? rewrite_address(ss, TRUE, FALSE, global_rewrite_rules, + rewrite_existflags) + : rewrite_address_qualify(ss, TRUE); + else + { + *error_pointer = string_sprintf("malformed address \"%s\" in " + "filter file: %s", s, error); + return FF_ERROR; + } + } + } + + /* Stick the errors address into a simple variable, as it will + be referenced a few times. Check that the caller is permitted to + specify it. */ + + s = expargs[1]; + + if (s != NULL && !f.system_filtering) + { + uschar *ownaddress = expand_string(US"$local_part@$domain"); + if (strcmpic(ownaddress, s) != 0) + { + *error_pointer = US"errors_to must point to the caller's address"; + return FF_ERROR; + } + } + + /* Test case: report what would happen */ + + if (filter_test != FTEST_NONE) + { + indent(); + printf("%seliver message to: %s%s%s%s\n", + commands->seen ? "D" : "Unseen d", + expargs[0], + commands->noerror? " (noerror)" : "", + s ? " errors_to " : "", + s ? s : US""); + } + + /* Real case. */ + + else + { + DEBUG(D_filter) debug_printf_indent("Filter: %sdeliver message to: %s%s%s%s\n", + commands->seen ? "" : "unseen ", + expargs[0], + commands->noerror ? " (noerror)" : "", + s ? " errors_to " : "", + s ? s : US""); + + /* Create the new address and add it to the chain, setting the + af_ignore_error flag if necessary, and the errors address, which can be + set in a system filter and to the local address in user filters. */ + + addr = deliver_make_addr(US expargs[0], TRUE); /* TRUE => copy s, so deconst ok */ + addr->prop.errors_address = !s ? NULL : string_copy(s); /* Default is NULL */ + if (commands->noerror) addr->prop.ignore_error = TRUE; + addr->next = *generated; + *generated = addr; + } + break; + + case SAVE_COMMAND: + s = expargs[0]; + mode = commands->args[1].i; + + /* Test case: report what would happen */ + + if (filter_test != FTEST_NONE) + { + indent(); + if (mode < 0) + printf("%save message to: %s%s\n", + commands->seen ? "S" : "Unseen s", + s, commands->noerror ? " (noerror)" : ""); + else + printf("%save message to: %s %04o%s\n", + commands->seen ? "S" : "Unseen s", + s, mode, commands->noerror ? " (noerror)" : ""); + } + + /* Real case: Ensure save argument starts with / if there is a home + directory to prepend. */ + + else + { + if (s[0] != '/' && filter_options & RDO_PREPEND_HOME && + deliver_home && *deliver_home) + s = string_sprintf("%s/%s", deliver_home, s); + DEBUG(D_filter) debug_printf_indent("Filter: %ssave message to: %s%s\n", + commands->seen ? "" : "unseen ", + s, commands->noerror ? " (noerror)" : ""); + + /* Create the new address and add it to the chain, setting the + af_pfr and af_file flags, the af_ignore_error flag if necessary, and the + mode value. */ + + addr = deliver_make_addr(US s, TRUE); /* TRUE => copy s, so deconst ok */ + setflag(addr, af_pfr); + setflag(addr, af_file); + if (commands->noerror) addr->prop.ignore_error = TRUE; + addr->mode = mode; + addr->next = *generated; + *generated = addr; + } + break; + + case PIPE_COMMAND: + s = string_copy(commands->args[0].u); + if (filter_test != FTEST_NONE) + { + indent(); + printf("%sipe message to: %s%s\n", + commands->seen ? "P" : "Unseen p", + s, commands->noerror? " (noerror)" : ""); + } + else /* Ensure pipe command starts with | */ + { + DEBUG(D_filter) debug_printf_indent("Filter: %spipe message to: %s%s\n", + commands->seen ? "" : "unseen ", s, + commands->noerror ? " (noerror)" : ""); + if (s[0] != '|') s = string_sprintf("|%s", s); + + /* Create the new address and add it to the chain, setting the + af_ignore_error flag if necessary. Set the af_expand_pipe flag so that + each command argument is expanded in the transport after the command + has been split up into separate arguments. */ + + addr = deliver_make_addr(US s, TRUE); /* TRUE => copy s, so deconst ok */ + setflag(addr, af_pfr); + setflag(addr, af_expand_pipe); + if (commands->noerror) addr->prop.ignore_error = TRUE; + addr->next = *generated; + *generated = addr; + + /* If there are any numeric variables in existence (e.g. after a regex + condition), or if $thisaddress is set, take a copy for use in the + expansion. Note that we can't pass NULL for filter_thisaddress, because + NULL terminates the list. */ + + if (expand_nmax >= 0 || filter_thisaddress != NULL) + { + int ecount = expand_nmax >= 0 ? expand_nmax : -1; + uschar ** ss = store_get(sizeof(uschar *) * (ecount + 3), GET_UNTAINTED); + + addr->pipe_expandn = ss; + if (!filter_thisaddress) filter_thisaddress = US""; + *ss++ = string_copy(filter_thisaddress); + for (int i = 0; i <= expand_nmax; i++) + *ss++ = string_copyn(expand_nstring[i], expand_nlength[i]); + *ss = NULL; + } + } + break; + + /* Set up the file name and mode, and close any previously open + file. */ + + case LOGFILE_COMMAND: + log_mode = commands->args[1].i; + if (log_mode == -1) log_mode = 0600; + if (log_fd >= 0) + { + (void)close(log_fd); + log_fd = -1; + } + log_filename = expargs[0]; + if (filter_test != FTEST_NONE) + { + indent(); + printf("%sogfile %s\n", commands->seen ? "Seen l" : "L", log_filename); + } + break; + + case LOGWRITE_COMMAND: + s = expargs[0]; + + if (filter_test != FTEST_NONE) + { + indent(); + printf("%sogwrite \"%s\"\n", commands->seen ? "Seen l" : "L", + string_printing(s)); + } + + /* Attempt to write to a log file only if configured as permissible. + Logging may be forcibly skipped for verifying or testing. */ + + else if (filter_options & RDO_LOG) /* Locked out */ + { + DEBUG(D_filter) + debug_printf_indent("filter log command aborted: euid=%ld\n", + (long int)geteuid()); + *error_pointer = US"logwrite command forbidden"; + return FF_ERROR; + } + else if (filter_options & RDO_REALLOG) + { + int len; + DEBUG(D_filter) debug_printf_indent("writing filter log as euid %ld\n", + (long int)geteuid()); + if (log_fd < 0) + { + if (!log_filename) + { + *error_pointer = US"attempt to obey \"logwrite\" command " + "without a previous \"logfile\""; + return FF_ERROR; + } + log_fd = Uopen(log_filename, O_CREAT|O_APPEND|O_WRONLY, log_mode); + if (log_fd < 0) + { + *error_pointer = string_open_failed("filter log file \"%s\"", + log_filename); + return FF_ERROR; + } + } + len = Ustrlen(s); + if (write(log_fd, s, len) != len) + { + *error_pointer = string_sprintf("write error on file \"%s\": %s", + log_filename, strerror(errno)); + return FF_ERROR; + } + } + else + DEBUG(D_filter) + debug_printf_indent("skipping logwrite (verifying or testing)\n"); + break; + + /* Header addition and removal is available only in the system filter. The + command is rejected at parse time otherwise. However "headers charset" is + always permitted. */ + + case HEADERS_COMMAND: + { + int subtype = commands->args[1].i; + s = expargs[0]; + + if (filter_test != FTEST_NONE) + printf("Headers %s \"%s\"\n", + subtype == TRUE ? "add" + : subtype == FALSE ? "remove" + : "charset", + string_printing(s)); + + if (subtype == TRUE) + { + if (Uskip_whitespace(&s)) + { + header_add(htype_other, "%s%s", s, + s[Ustrlen(s)-1] == '\n' ? "" : "\n"); + header_last->type = header_checkname(header_last, FALSE); + if (header_last->type >= 'a') header_last->type = htype_other; + } + } + + else if (subtype == FALSE) + { + int sep = 0; + const uschar * list = s; + + for (uschar * ss; ss = string_nextinlist(&list, &sep, NULL, 0); ) + header_remove(0, ss); + } + + /* This setting lasts only while the filter is running; on exit, the + variable is reset to the previous value. */ + + else headers_charset = s; + } + break; + + /* Defer, freeze, and fail are available only when explicitly permitted. + These commands are rejected at parse time otherwise. The message can get + very long by the inclusion of message headers; truncate if it is, and also + ensure printing characters so as not to mess up log files. */ + + case DEFER_COMMAND: + ff_name = US"defer"; + ff_ret = FF_DEFER; + goto DEFERFREEZEFAIL; + + case FAIL_COMMAND: + ff_name = US"fail"; + ff_ret = FF_FAIL; + goto DEFERFREEZEFAIL; + + case FREEZE_COMMAND: + ff_name = US"freeze"; + ff_ret = FF_FREEZE; + + DEFERFREEZEFAIL: + *error_pointer = fmsg = US string_printing(Ustrlen(expargs[0]) > 1024 + ? string_sprintf("%.1000s ... (truncated)", expargs[0]) + : string_copy(expargs[0])); + for(uschar * s = fmsg; *s; s++) + if (!s[1] && *s == '\n') { *s = '\0'; break; } /* drop trailing newline */ + + if (filter_test != FTEST_NONE) + { + indent(); + printf("%c%s text \"%s\"\n", toupper(ff_name[0]), ff_name+1, fmsg); + } + else + DEBUG(D_filter) debug_printf_indent("Filter: %s \"%s\"\n", ff_name, fmsg); + return ff_ret; + + case FINISH_COMMAND: + if (filter_test != FTEST_NONE) + { + indent(); + printf("%sinish\n", commands->seen ? "Seen f" : "F"); + } + else + DEBUG(D_filter) debug_printf_indent("Filter: %sfinish\n", + commands->seen ? " Seen " : ""); + finish_obeyed = TRUE; + return filter_delivered ? FF_DELIVERED : FF_NOTDELIVERED; + + case IF_COMMAND: + { + uschar *save_address = filter_thisaddress; + int ok = FF_DELIVERED; + condition_value = test_condition(commands->args[0].c, TRUE); + if (*error_pointer) + ok = FF_ERROR; + else + { + output_indent += 2; + ok = interpret_commands(commands->args[condition_value ? 1:2].f, + generated); + output_indent -= 2; + } + filter_thisaddress = save_address; + if (finish_obeyed || ok != FF_DELIVERED && ok != FF_NOTDELIVERED) + return ok; + } + break; + + + /* To try to catch runaway loops, do not generate mail if the + return path is unset or if a non-trusted user supplied -f <> + as the return path. */ + + case MAIL_COMMAND: + case VACATION_COMMAND: + if (!return_path || !*return_path) + { + if (filter_test != FTEST_NONE) + printf("%s command ignored because return_path is empty\n", + command_list[commands->command]); + else DEBUG(D_filter) + debug_printf_indent("%s command ignored because return_path " + "is empty\n", command_list[commands->command]); + break; + } + + /* Check the contents of the strings. The type of string can be deduced + from the value of i. + + . If i is equal to mailarg_index_text it's a text string for the body, + where anything goes. + + . If i is > mailarg_index_text, we are dealing with a file name, which + cannot contain non-printing characters. + + . If i is less than mailarg_index_headers we are dealing with something + that will go in a single message header line, where newlines must be + followed by white space. + + . If i is equal to mailarg_index_headers, we have a string that contains + one or more headers. Newlines that are not followed by white space must + be followed by a header name. + */ + + for (i = 0; i < MAILARGS_STRING_COUNT; i++) + { + const uschar *s = expargs[i]; + + if (!s) continue; + + if (i != mailarg_index_text) for (const uschar * p = s; *p; p++) + { + int c = *p; + if (i > mailarg_index_text) + { + if (!mac_isprint(c)) + { + *error_pointer = string_sprintf("non-printing character in \"%s\" " + "in %s command", string_printing(s), + command_list[commands->command]); + return FF_ERROR; + } + } + + /* i < mailarg_index_text */ + + else if (c == '\n' && !isspace(p[1])) + { + if (i < mailarg_index_headers) + { + *error_pointer = string_sprintf("\\n not followed by space in " + "\"%.1024s\" in %s command", string_printing(s), + command_list[commands->command]); + return FF_ERROR; + } + + /* Check for the start of a new header line within the string */ + + else + { + const uschar *pp; + for (pp = p + 1;; pp++) + { + c = *pp; + if (c == ':' && pp != p + 1) break; + if (!c || c == ':' || isspace(c)) + { + *error_pointer = string_sprintf("\\n not followed by space or " + "valid header name in \"%.1024s\" in %s command", + string_printing(s), command_list[commands->command]); + return FF_ERROR; + } + } + p = pp; + } + } + } /* Loop to scan the string */ + + /* The string is OK */ + + commands->args[i].u = s; + } + + /* Proceed with mail or vacation command */ + + if (filter_test != FTEST_NONE) + { + const uschar *to = commands->args[mailarg_index_to].u; + indent(); + printf("%sail to: %s%s%s\n", (commands->seen)? "Seen m" : "M", + to ? to : US"", + commands->command == VACATION_COMMAND ? " (vacation)" : "", + commands->noerror ? " (noerror)" : ""); + for (i = 1; i < MAILARGS_STRING_COUNT; i++) + { + const uschar * arg = commands->args[i].u; + if (arg) + { + int len = Ustrlen(mailargs[i]); + int indent = debug_selector != 0 ? output_indent : 0; + while (len++ < 7 + indent) printf(" "); + printf("%s: %s%s\n", mailargs[i], string_printing(arg), + ( commands->args[mailarg_index_expand].u + && Ustrcmp(mailargs[i], "file") == 0) ? " (expanded)" : ""); + } + } + if (commands->args[mailarg_index_return].u) + printf("Return original message\n"); + } + else + { + const uschar *tt; + const uschar *to = commands->args[mailarg_index_to].u; + gstring * log_addr = NULL; + + if (!to) to = expand_string(US"$reply_address"); + Uskip_whitespace(&to); + + for (tt = to; *tt; tt++) /* Get rid of newlines */ + if (*tt == '\n') + { + uschar * s = string_copy(to); + for (uschar * ss = s; *ss; ss++) + if (*ss == '\n') *ss = ' '; + to = s; + break; + } + + DEBUG(D_filter) + { + debug_printf_indent("Filter: %smail to: %s%s%s\n", + commands->seen ? "seen " : "", + to, + commands->command == VACATION_COMMAND ? " (vacation)" : "", + commands->noerror ? " (noerror)" : ""); + for (i = 1; i < MAILARGS_STRING_COUNT; i++) + { + const uschar *arg = commands->args[i].u; + if (arg) + { + int len = Ustrlen(mailargs[i]); + while (len++ < 15) debug_printf_indent(" "); + debug_printf_indent("%s: %s%s\n", mailargs[i], string_printing(arg), + (commands->args[mailarg_index_expand].u != NULL && + Ustrcmp(mailargs[i], "file") == 0)? " (expanded)" : ""); + } + } + } + + /* Create the "address" for the autoreply. This is used only for logging, + as the actual recipients are extracted from the To: line by -t. We use the + same logic here to extract the working addresses (there may be more than + one). Just in case there are a vast number of addresses, stop when the + string gets too long. */ + + tt = to; + while (*tt) + { + uschar *ss = parse_find_address_end(tt, FALSE); + uschar *recipient, *errmess; + int start, end, domain; + int temp = *ss; + + *ss = 0; + recipient = parse_extract_address(tt, &errmess, &start, &end, &domain, + FALSE); + *ss = temp; + + /* Ignore empty addresses and errors; an error will occur later if + there's something really bad. */ + + if (recipient) + { + log_addr = string_catn(log_addr, log_addr ? US"," : US">", 1); + log_addr = string_cat (log_addr, recipient); + } + + /* Check size */ + + if (log_addr && log_addr->ptr > 256) + { + log_addr = string_catn(log_addr, US", ...", 5); + break; + } + + /* Move on past this address */ + + tt = ss + (*ss ? 1 : 0); + Uskip_whitespace(&tt); + } + + if (log_addr) + addr = deliver_make_addr(string_from_gstring(log_addr), FALSE); + else + { + addr = deliver_make_addr(US ">**bad-reply**", FALSE); + setflag(addr, af_bad_reply); + } + + setflag(addr, af_pfr); + if (commands->noerror) addr->prop.ignore_error = TRUE; + addr->next = *generated; + *generated = addr; + + addr->reply = store_get(sizeof(reply_item), GET_UNTAINTED); + addr->reply->from = NULL; + addr->reply->to = string_copy(to); + addr->reply->file_expand = + commands->args[mailarg_index_expand].u != NULL; + addr->reply->expand_forbid = expand_forbid; + addr->reply->return_message = + commands->args[mailarg_index_return].u != NULL; + addr->reply->once_repeat = 0; + + if (commands->args[mailarg_index_once_repeat].u != NULL) + { + addr->reply->once_repeat = + readconf_readtime(commands->args[mailarg_index_once_repeat].u, 0, + FALSE); + if (addr->reply->once_repeat < 0) + { + *error_pointer = string_sprintf("Bad time value for \"once_repeat\" " + "in mail or vacation command: %s", + commands->args[mailarg_index_once_repeat].u); + return FF_ERROR; + } + } + + /* Set up all the remaining string arguments (those other than "to") */ + + for (i = 1; i < mailargs_string_passed; i++) + { + const uschar *ss = commands->args[i].u; + *(USS((US addr->reply) + reply_offsets[i])) = + ss ? string_copy(ss) : NULL; + } + } + break; + + case TESTPRINT_COMMAND: + if (filter_test != FTEST_NONE || (debug_selector & D_filter) != 0) + { + const uschar *s = string_printing(expargs[0]); + if (filter_test == FTEST_NONE) + debug_printf_indent("Filter: testprint: %s\n", s); + else + printf("Testprint: %s\n", s); + } + } + + commands = commands->next; + } + +return filter_delivered ? FF_DELIVERED : FF_NOTDELIVERED; +} + + + +/************************************************* +* Interpret a mail filter file * +*************************************************/ + +/* Module API: +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 + generated where to hang newly-generated addresses + error where to pass back an error text + +Returns: FF_DELIVERED success, a significant action was taken + FF_NOTDELIVERED success, no significant action + FF_DEFER defer requested + FF_FAIL fail requested + FF_FREEZE freeze requested + FF_ERROR there was a problem +*/ + +static int +filter_interpret(const uschar *filter, int options, address_item **generated, + uschar **error) +{ +int i; +int yield = FF_ERROR; +const uschar *ptr = filter; +const uschar *save_headers_charset = headers_charset; +filter_cmd *commands = NULL; +filter_cmd **lastcmdptr = &commands; + +DEBUG(D_route) debug_printf("Filter: start of processing\n"); +acl_level++; + +/* Initialize "not in an if command", set the global flag that is always TRUE +while filtering, and zero the variables. */ + +expect_endif = 0; +output_indent = 0; +f.filter_running = TRUE; +for (i = 0; i < FILTER_VARIABLE_COUNT; i++) filter_n[i] = 0; + +/* To save having to pass certain values about all the time, make them static. +Also initialize the line number, for error messages, and the log file +variables. */ + +filter_options = options; +filter_delivered = FALSE; +finish_obeyed = FALSE; +error_pointer = error; +*error_pointer = NULL; +line_number = 1; +log_fd = -1; +log_mode = 0600; +log_filename = NULL; + +/* Scan filter file for syntax and build up an interpretation thereof, and +interpret the compiled commands, and if testing, say whether we ended up +delivered or not, unless something went wrong. */ + +seen_force = FALSE; +ptr = nextsigchar(ptr, TRUE); + +if (read_command_list(&ptr, &lastcmdptr, FALSE)) + yield = interpret_commands(commands, generated); + +if (filter_test != FTEST_NONE || (debug_selector & D_filter) != 0) + { + uschar *s = US""; + switch(yield) + { + case FF_DEFER: + s = US"Filtering ended by \"defer\"."; + break; + + case FF_FREEZE: + s = US"Filtering ended by \"freeze\"."; + break; + + case FF_FAIL: + s = US"Filtering ended by \"fail\"."; + break; + + case FF_DELIVERED: + s = US"Filtering set up at least one significant delivery " + "or other action.\n" + "No other deliveries will occur."; + break; + + case FF_NOTDELIVERED: + s = US"Filtering did not set up a significant delivery.\n" + "Normal delivery will occur."; + break; + + case FF_ERROR: + s = string_sprintf("Filter error: %s", *error); + break; + } + + if (filter_test != FTEST_NONE) printf("%s\n", CS s); + else debug_printf_indent("%s\n", s); + } + +/* Close the log file if it was opened, and kill off any numerical variables +before returning. Reset the header decoding charset. */ + +if (log_fd >= 0) (void)close(log_fd); +expand_nmax = -1; +f.filter_running = FALSE; +headers_charset = save_headers_charset; + +acl_level--; +DEBUG(D_route) debug_printf("Filter: end of processing\n"); +return yield; +} + + + + +/******************************************************************************/ +/* Module API */ + +static void * exim_functions[] = { + [EXIM_INTERPRET] = filter_interpret, + [EXIM_FILTER_PERSONAL] = filter_personal, +}; + +misc_module_info exim_filter_module_info = +{ + .name = US"exim_filter", +# ifdef DYNLOOKUP + .dyn_magic = MISC_MODULE_MAGIC, +# endif + + .functions = exim_functions, + .functions_count = nelem(exim_functions), +}; + +/* End of filter.c */ +/* vi: aw ai sw=2 +*/ diff --git a/src/src/miscmods/exim_filter_api.h b/src/src/miscmods/exim_filter_api.h new file mode 100644 index 000000000..a65a7dd06 --- /dev/null +++ b/src/src/miscmods/exim_filter_api.h @@ -0,0 +1,15 @@ +/************************************************* +* Exim - an Internet mail transport agent * +*************************************************/ + +/* Copyright (c) The Exim Maintainers 2024 */ +/* See the file NOTICE for conditions of use and distribution. */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +/* API definitions for the sieve_filter module */ + + +/* Function table entry numbers */ + +#define EXIM_INTERPRET 0 +#define EXIM_FILTER_PERSONAL 1 diff --git a/src/src/miscmods/sieve_filter.c b/src/src/miscmods/sieve_filter.c index 56f20bfd5..f3935caf3 100644 --- a/src/src/miscmods/sieve_filter.c +++ b/src/src/miscmods/sieve_filter.c @@ -3220,13 +3220,19 @@ while (*filter->pc) if (exec) { - address_item *addr; + address_item * addr; md5 base; - uschar digest[16]; - uschar hexdigest[33]; + uschar digest[16], hexdigest[33]; gstring * once; + misc_module_info * mi; + typedef BOOL (*fn_t)(string_item *, BOOL); - if (filter_personal(aliases, TRUE)) + if (!(mi = misc_mod_find(US"exim_filter", NULL))) + { + filter->errmsg = CUS "test for 'personal': module not available"; + return -1; + } + if ((((fn_t *) mi->functions)[EXIM_FILTER_PERSONAL])(aliases, TRUE)) { if (filter_test == FTEST_NONE) { diff --git a/src/src/rda.c b/src/src/rda.c index 3e3a0cf83..405e4646a 100644 --- a/src/src/rda.c +++ b/src/src/rda.c @@ -383,13 +383,21 @@ if (*filtertype != FILTER_FORWARD) if (*filtertype == FILTER_EXIM) { + const misc_module_info * mi; + typedef int (*fn_t)(const uschar *, int, address_item **, uschar **); + if (options & RDO_EXIM_FILTER) { *error = US"Exim filtering not enabled"; return FF_ERROR; } -/*XXX*/ - frc = filter_interpret(data, options, generated, error); + if (!(mi = misc_mod_find(US"exim_filter", NULL))) + { + *error = US"Exim-filtering not available"; + return FF_ERROR; + } + frc = (((fn_t *) mi->functions)[EXIM_INTERPRET]) + (data, options, generated, error); } else { diff --git a/test/README b/test/README index fe31bda43..3f8675545 100644 --- a/test/README +++ b/test/README @@ -1211,7 +1211,7 @@ whose content is fixed, and those whose content needs to be varied according to the current environment. The former are kept in the directory aux-fixed. The latter are distributed in the directory aux-var-src, and copied with the standard substitutions into the directory aux-var at the start of each test -run. +run (with TESTNUM from the numeric prefix of the filename is there is one). Most of the auxiliary files have names that start with a test number, indicating that they are specific to that one test. A few fixed files (for diff --git a/test/aux-fixed/0015.filter.userx b/test/aux-fixed/0015.filter.userx deleted file mode 100644 index b7ef2ed8d..000000000 --- a/test/aux-fixed/0015.filter.userx +++ /dev/null @@ -1,12 +0,0 @@ -# Exim filter - -if error_message then finish endif - -if - $local_part_prefix contains "page" -then - unseen mail to userx text "callpager -r 108 PAGE:${l_50:$message_body}" - unseen pipe callpager -endif - -# End diff --git a/test/aux-fixed/0016.filter.userx b/test/aux-fixed/0016.filter.userx deleted file mode 100644 index a89551d03..000000000 --- a/test/aux-fixed/0016.filter.userx +++ /dev/null @@ -1,11 +0,0 @@ -# Exim filter - -if error_message then finish endif - -if - $local_part_suffix contains "page" -then - unseen mail to userx text "callpager -r 108 PAGE:${l_50:$message_body}" -endif - -# End diff --git a/test/aux-fixed/0037.f-1 b/test/aux-fixed/0037.f-1 deleted file mode 100644 index bfe43b632..000000000 --- a/test/aux-fixed/0037.f-1 +++ /dev/null @@ -1,80 +0,0 @@ -# Exim filter - -add 1 to n3 -add 3 to n4 -add $n3 to n4 -add $n4 to n4 -add 6 to n$n3 -testprint "n0=$n0 n1=$n1 n3=$n3 n4=$n4" - -testprint "${run{/bin/sh -c 'pwd'}}" - -deliver root@$qualify_domain -save /tmp/$primary_hostname 444 -save /tmp/$qualify_domain -pipe "/tmp/$primary_hostname" - -logfile /tmp/logfile logwrite "this is log text: $qualify_domain" - -if $qualify_domain contains $qualify_domain then - testprint "yes" -else - testprint "no" -endif - -if $qualify_domain CONTAINS $qualify_domain then - testprint "yes" -else - testprint "no" -endif - -if $qualify_domain contains ${uc:$qualify_domain} then - testprint "yes" -else - testprint "no" -endif - -if $qualify_domain does not contain ${uc:$qualify_domain} then - testprint "no" -else - testprint "yes" -endif - -if $qualify_domain DOES NOT CONTAIN ${uc:$qualify_domain} then - testprint "no" -else - testprint "yes" -endif - -if $qualify_domain CONTAINS ${uc:$qualify_domain} then - testprint "yes" -else - testprint "no" -endif - -if $qualify_domain is $qualify_domain then - testprint "qualify_domain is qualify_domain" -else - testprint "NOT qualify_domain is qualify_domain" -endif - -if $qualify_domain IS $qualify_domain then - testprint "qualify_domain IS qualify_domain" -else - testprint "NOT qualify_domain IS qualify_domain" -endif - -if $qualify_domain is not $qualify_domain then - testprint "qualify_domain is not qualify_domain" -else - testprint "NOT qualify_domain is not qualify_domain" -endif - -if $qualify_domain IS NOT $qualify_domain then - testprint "qualify_domain IS NOT qualify_domain" -else - testprint "NOT qualify_domain IS NOT qualify_domain" -endif - - - diff --git a/test/aux-fixed/0037.f-2 b/test/aux-fixed/0037.f-2 deleted file mode 100644 index 31d595fd0..000000000 --- a/test/aux-fixed/0037.f-2 +++ /dev/null @@ -1,5 +0,0 @@ -# Exim filter - -deliver root@$qualify_domain errors_to root@$primary_hostname - -testprint End diff --git a/test/aux-fixed/0037.f-3 b/test/aux-fixed/0037.f-3 deleted file mode 100644 index 31d595fd0..000000000 --- a/test/aux-fixed/0037.f-3 +++ /dev/null @@ -1,5 +0,0 @@ -# Exim filter - -deliver root@$qualify_domain errors_to root@$primary_hostname - -testprint End diff --git a/test/aux-fixed/0037.f-4 b/test/aux-fixed/0037.f-4 deleted file mode 100644 index 55f1063f4..000000000 --- a/test/aux-fixed/0037.f-4 +++ /dev/null @@ -1,13 +0,0 @@ -# Exim filter - -if personal alias abcdefgh@ifi.uio.no alias abcdefgh@student.matnat.uio.no - alias xyz@fix.no alias xyzabcd@skjaeveland.com alias abcdefgh@e.fix.no - alias abcdefgh@skjermbrev.com alias abcdefgh@b.b.cl - alias abcdefgh@bzzzt.fix.no -then - testprint "Personal" -else - testprint "Not personal" -endif - -testprint "\\$home = $home" diff --git a/test/aux-fixed/0037.f-5 b/test/aux-fixed/0037.f-5 deleted file mode 100644 index a848ddb9a..000000000 --- a/test/aux-fixed/0037.f-5 +++ /dev/null @@ -1,7 +0,0 @@ -# Exim filter - -testprint "Before fail" - -fail text "This is a forced failure" - -testprint End diff --git a/test/aux-fixed/0037.f-6 b/test/aux-fixed/0037.f-6 deleted file mode 100644 index 2b9df2a24..000000000 --- a/test/aux-fixed/0037.f-6 +++ /dev/null @@ -1,11 +0,0 @@ -# Exim filter - -if $h_subject: is "This is a very long string which isn't likely to occur when\ - testing for a fixed string, but might happen if a long and complicated\ - regular expression and/or lookup gets used in somebody's filter file.\ - Originally the limit was 256 characters, but now we have increased it to\ - a larger figure. This should exceed the old limit and check that the new\ - limit is in place." -then - testprint "Won't happen" -endif diff --git a/test/aux-fixed/0037.f-7 b/test/aux-fixed/0037.f-7 deleted file mode 100644 index 01d6c6db7..000000000 --- a/test/aux-fixed/0037.f-7 +++ /dev/null @@ -1,3 +0,0 @@ -#exim filter - -save relative diff --git a/test/aux-fixed/0037.f-8 b/test/aux-fixed/0037.f-8 deleted file mode 100644 index 2807c12f0..000000000 --- a/test/aux-fixed/0037.f-8 +++ /dev/null @@ -1,5 +0,0 @@ -#exim filter - -if one is one then seen endif - -if two is two then save /dev/null endif diff --git a/test/aux-fixed/0037.f-9 b/test/aux-fixed/0037.f-9 deleted file mode 100644 index 5d8e0ca24..000000000 --- a/test/aux-fixed/0037.f-9 +++ /dev/null @@ -1,3 +0,0 @@ -#exim filter - -unseen diff --git a/test/aux-fixed/0037.msg b/test/aux-fixed/0037.msg deleted file mode 100644 index 8196d9ed2..000000000 --- a/test/aux-fixed/0037.msg +++ /dev/null @@ -1,5 +0,0 @@ -From: abcd@xyz -Subject: message for filter test - -This is the body of the message. It has some length. Indeed it does. We need to -check that the body is correctly visible in the filter. diff --git a/test/aux-fixed/0046.filter.userx b/test/aux-fixed/0046.filter.userx deleted file mode 100644 index c0044c993..000000000 --- a/test/aux-fixed/0046.filter.userx +++ /dev/null @@ -1,4 +0,0 @@ -# Exim filter - -testprint "Body: $message_body" -testprint "End: $message_body_end" diff --git a/test/aux-fixed/0079.aliases b/test/aux-fixed/0079.aliases deleted file mode 100644 index c65edd7fd..000000000 --- a/test/aux-fixed/0079.aliases +++ /dev/null @@ -1 +0,0 @@ -postmaster: userx diff --git a/test/aux-fixed/0093.f-3 b/test/aux-fixed/0093.f-3 deleted file mode 100644 index ca139de10..000000000 --- a/test/aux-fixed/0093.f-3 +++ /dev/null @@ -1,20 +0,0 @@ -#Exim filter - -testprint "From: is ${if def:h_from:{}{not }}defined" -testprint "Absent: is ${if def:h_absent:{}{not }}defined" -testprint "----------------------" -testprint $message_headers -testprint "----------------------" -testprint $message_headers+++more -testprint "----------------------" -testprint "+++$message_headers+++" -testprint "----------------------" -testprint "From: >$h_from:<" -testprint $h_repeated: -testprint "----------------------" -testprint +++$header_repeated:+++ -testprint "----------------------" -testprint reply_address=$reply_address -testprint empty=>$h_empty:< -testprint repeated-empty=>$h_repeated-empty:< -testprint "----------------------" diff --git a/test/aux-fixed/0093.lsearch b/test/aux-fixed/0093.lsearch deleted file mode 100644 index b27516863..000000000 --- a/test/aux-fixed/0093.lsearch +++ /dev/null @@ -1 +0,0 @@ -key1: data for key1 diff --git a/test/aux-fixed/0098.aliases b/test/aux-fixed/0098.aliases deleted file mode 100644 index f7c09d88b..000000000 --- a/test/aux-fixed/0098.aliases +++ /dev/null @@ -1 +0,0 @@ -defer: :defer: This address has been forced to defer. diff --git a/test/aux-fixed/0098.forward b/test/aux-fixed/0098.forward deleted file mode 100644 index bfe65ed08..000000000 --- a/test/aux-fixed/0098.forward +++ /dev/null @@ -1,7 +0,0 @@ -# Exim filter - -if error_message then finish endif - -# This forward is to a pipe that isn't going to work - -pipe /non/existing/file diff --git a/test/aux-fixed/0098.wmf b/test/aux-fixed/0098.wmf deleted file mode 100644 index 19fea5c21..000000000 --- a/test/aux-fixed/0098.wmf +++ /dev/null @@ -1,10 +0,0 @@ -Subject: Warning: message $message_id delayed by $warn_message_delay -**** -warn_message_delay = $warn_message_delay -warn_message_recipients = $warn_message_recipient -warn_message_recipients = $warn_message_recipients -warnmsg_delay = $warnmsg_delay -warnmsg_recipient = $warnmsg_recipient -warnmsg_recipients = $warnmsg_recipients -**** -Final stuff. diff --git a/test/aux-fixed/0122.filter b/test/aux-fixed/0122.filter deleted file mode 100644 index 819a30b42..000000000 --- a/test/aux-fixed/0122.filter +++ /dev/null @@ -1,3 +0,0 @@ -# Exim filter - -if $recipients contains freeze then freeze endif diff --git a/test/aux-fixed/0131.userx b/test/aux-fixed/0131.userx deleted file mode 100644 index e110fe3c5..000000000 --- a/test/aux-fixed/0131.userx +++ /dev/null @@ -1,3 +0,0 @@ -# Exim filter - -unseen deliver copy@test.ex diff --git a/test/aux-fixed/0136.filter b/test/aux-fixed/0136.filter deleted file mode 100644 index ebef56734..000000000 --- a/test/aux-fixed/0136.filter +++ /dev/null @@ -1,5 +0,0 @@ -#Exim filter - -if error_message then finish endif - -deliver unknown@test.ex errors_to forwarder@test.ex diff --git a/test/aux-fixed/0168.filter b/test/aux-fixed/0168.filter deleted file mode 100644 index 12b4bcecd..000000000 --- a/test/aux-fixed/0168.filter +++ /dev/null @@ -1,137 +0,0 @@ -# Exim filter - -freeze text "some error message" - -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff diff --git a/test/aux-fixed/0170.filter b/test/aux-fixed/0170.filter deleted file mode 100644 index 5978e6c03..000000000 --- a/test/aux-fixed/0170.filter +++ /dev/null @@ -1,3 +0,0 @@ -# Exim filter - -pipe "/source/exim4/AutoTest/non-exist" diff --git a/test/aux-fixed/0177.alias b/test/aux-fixed/0177.alias deleted file mode 100644 index e8b091d80..000000000 --- a/test/aux-fixed/0177.alias +++ /dev/null @@ -1 +0,0 @@ -userz: userx@non.local.domain diff --git a/test/aux-fixed/0182.filter b/test/aux-fixed/0182.filter deleted file mode 100644 index 7e581d52b..000000000 --- a/test/aux-fixed/0182.filter +++ /dev/null @@ -1,3 +0,0 @@ -# System filter - -headers add "X-Added: by system filter" diff --git a/test/aux-fixed/0184.lsearch b/test/aux-fixed/0184.lsearch deleted file mode 100644 index b4f46b72e..000000000 --- a/test/aux-fixed/0184.lsearch +++ /dev/null @@ -1 +0,0 @@ -key: value diff --git a/test/aux-fixed/0185.alias b/test/aux-fixed/0185.alias deleted file mode 100644 index 16de12212..000000000 --- a/test/aux-fixed/0185.alias +++ /dev/null @@ -1 +0,0 @@ -usery: userx@non.local.domain diff --git a/test/aux-fixed/0233.filter b/test/aux-fixed/0233.filter deleted file mode 100644 index a60bcba1b..000000000 --- a/test/aux-fixed/0233.filter +++ /dev/null @@ -1,6 +0,0 @@ -if error_message then finish endif - -if $recipients contains userx then - mail to postmaster subject "System filter has frozen" - freeze "system filter freezes" -endif diff --git a/test/aux-fixed/0241.filter b/test/aux-fixed/0241.filter deleted file mode 100644 index 2775f9443..000000000 --- a/test/aux-fixed/0241.filter +++ /dev/null @@ -1,10 +0,0 @@ -# Exim filter - -if error_message then finish endif - -mail - to postmaster - subject "Filter is freezing" - text "I've frozen something" - -freeze "everything's freezing today" diff --git a/test/aux-fixed/0246.data b/test/aux-fixed/0246.data deleted file mode 100644 index 6a1952631..000000000 --- a/test/aux-fixed/0246.data +++ /dev/null @@ -1 +0,0 @@ -1: Data from the file diff --git a/test/aux-fixed/0246.file b/test/aux-fixed/0246.file deleted file mode 100644 index 2fdfb3511..000000000 --- a/test/aux-fixed/0246.file +++ /dev/null @@ -1,3 +0,0 @@ ->>>>>>>>>>>>>> -${if exists{/source/exim4/AutoTest/aux/284.data}{${lookup{1}lsearch{/source/exim4/AutoTest/aux/284.data}{$value}{NOT FOUND}}}{NOT EXISTS}} ->>>>>>>>>>>>>> diff --git a/test/aux-fixed/0248.filter b/test/aux-fixed/0248.filter deleted file mode 100644 index e320aee7d..000000000 --- a/test/aux-fixed/0248.filter +++ /dev/null @@ -1,6 +0,0 @@ -# Exim filter - -# The filter restricts strings to 1024, but we can get a longer one by -# substituting a header line. - -freeze "X-Long header is >$h_X-Long:<" diff --git a/test/aux-fixed/0266.filter b/test/aux-fixed/0266.filter deleted file mode 100644 index cbf403d7f..000000000 --- a/test/aux-fixed/0266.filter +++ /dev/null @@ -1,3 +0,0 @@ -# Exim filter - -syntax error diff --git a/test/aux-fixed/0266.filter2 b/test/aux-fixed/0266.filter2 deleted file mode 100644 index 42f00dfe6..000000000 --- a/test/aux-fixed/0266.filter2 +++ /dev/null @@ -1,3 +0,0 @@ -# Exim filter - -deliver @@in.valid diff --git a/test/aux-fixed/0266.filter3 b/test/aux-fixed/0266.filter3 deleted file mode 100644 index d80e144c3..000000000 --- a/test/aux-fixed/0266.filter3 +++ /dev/null @@ -1,4 +0,0 @@ -# Exim filter - -logfile test-private -logwrite "Testing" diff --git a/test/aux-fixed/0296.Filter b/test/aux-fixed/0296.Filter deleted file mode 100644 index 48e02c04b..000000000 --- a/test/aux-fixed/0296.Filter +++ /dev/null @@ -1,5 +0,0 @@ -# Exim filter - -if $recipients contains failure then - fail "this message is a failure (filter fail)" -endif diff --git a/test/aux-fixed/0297.Filter b/test/aux-fixed/0297.Filter deleted file mode 100644 index e911ce75c..000000000 --- a/test/aux-fixed/0297.Filter +++ /dev/null @@ -1,5 +0,0 @@ -# Exim filter - -if $sender_address is not fil@ter then finish endif - -save ${local_part:$recipients} diff --git a/test/aux-fixed/0298.Filter b/test/aux-fixed/0298.Filter deleted file mode 100644 index b17fceef6..000000000 --- a/test/aux-fixed/0298.Filter +++ /dev/null @@ -1,14 +0,0 @@ -# Exim filter - -if error_message then finish endif - -if $recipients contains failure1 then - -fail "<>This message is being failed and there's a long and tortuous\n\ - explanation about is that is being sent back to the user." - -else - -fail "<>" - -endif diff --git a/test/aux-fixed/0316.f-user b/test/aux-fixed/0316.f-user deleted file mode 100644 index a110ec05b..000000000 --- a/test/aux-fixed/0316.f-user +++ /dev/null @@ -1,22 +0,0 @@ -# Exim filter - -if foranyaddress "a@b, c@d" ( $thisaddress matches ^c ) then - testprint "1 Matched $thisaddress" -endif - -if foranyaddress "Group name: a@b, c@d;, cc@dd" ( $thisaddress matches ^c ) -then - testprint "2 Matched $thisaddress" -endif - -if foranyaddress "Group name: a@b, c@d;, cc@dd" ( $thisaddress matches ^cc ) -then - testprint "3 Matched $thisaddress" -endif - -if foranyaddress "Group name: a@b, c@d;, cc@dd, N2: e@f;, ee@ff" - ( $thisaddress matches ^e ) -then - testprint "4 Matched $thisaddress" -endif - diff --git a/test/aux-fixed/0328.F b/test/aux-fixed/0328.F deleted file mode 100644 index 7b0d88687..000000000 --- a/test/aux-fixed/0328.F +++ /dev/null @@ -1,6 +0,0 @@ -# Exim filter - -headers remove remove -headers add "added: this header is added" -headers add "adrem: this header is added and then removed" -headers remove adrem diff --git a/test/aux-fixed/0329.F b/test/aux-fixed/0329.F deleted file mode 100644 index 7b0d88687..000000000 --- a/test/aux-fixed/0329.F +++ /dev/null @@ -1,6 +0,0 @@ -# Exim filter - -headers remove remove -headers add "added: this header is added" -headers add "adrem: this header is added and then removed" -headers remove adrem diff --git a/test/aux-fixed/0351.F b/test/aux-fixed/0351.F deleted file mode 100644 index 0560cd331..000000000 --- a/test/aux-fixed/0351.F +++ /dev/null @@ -1,7 +0,0 @@ -# Exim filter - -if foranyaddress $h_to: ($thisaddress contains usery) then - headers add "Found: yes\nFound2: yes" -else - headers add "Found: no" -endif diff --git a/test/aux-fixed/0352.F b/test/aux-fixed/0352.F deleted file mode 100644 index 31c01a652..000000000 --- a/test/aux-fixed/0352.F +++ /dev/null @@ -1,17 +0,0 @@ -# Exim filter - -if foranyaddress $h_to: ($thisaddress contains abcd) then - headers add "Found: abcd yes" -else - headers add "Found: abcd no" -endif - -if foranyaddress $h_to: ($thisaddress contains xyz) then - headers add "Found: xyz yes" -else - headers add "Found: xyz no" -endif - -headers add "TO: >$h_to:<" - - diff --git a/test/aux-fixed/0382.F b/test/aux-fixed/0382.F deleted file mode 100644 index fdcfee036..000000000 --- a/test/aux-fixed/0382.F +++ /dev/null @@ -1,3 +0,0 @@ -# Exim filter for test 443 - -# Actually does nothing diff --git a/test/aux-fixed/0406.f b/test/aux-fixed/0406.f deleted file mode 100644 index 6dae29b4a..000000000 --- a/test/aux-fixed/0406.f +++ /dev/null @@ -1,86 +0,0 @@ -# Exim filter - -testprint "subject = >$h_subject:<" -testprint "raw subject = >$rh_subject:<" -testprint "to = >$h_to:<" -testprint "raw to = >$rheader_to:<" - -testprint "rX-1: >$rh_X-1:<" -testprint "bX-1: >$bh_X-1:<" -testprint " X-1: >$h_X-1:<" - -testprint "rX-2: >$rh_X-2:<" -testprint "bX-2: >$bh_X-2:<" -testprint " X-2: >$h_X-2:<" - -testprint "rX-3: >$rh_X-3:<" -testprint "bX-3: >$bh_X-3:<" -testprint " X-3: >$h_X-3:<" - -testprint "rX-4: >$rh_X-4:<" -testprint "bX-4: >$bh_X-4:<" -testprint " X-4: >$h_X-4:<" - -testprint "rX-5: >$rh_X-5:<" -testprint "bX-5: >$bh_X-5:<" -testprint " X-5: >$h_X-5:<" - -testprint "rX-6: >$rh_X-6:<" -testprint "bX-6: >$bh_X-6:<" -testprint " X-6: >$h_X-6:<" - -testprint "rX-7: >$rh_X-7:<" -testprint "bX-7: >$bh_X-7:<" -testprint " X-7: >$h_X-7:<" - -testprint "rX-8: >$rh_X-8:<" -testprint "bX-8: >$bh_X-8:<" -testprint " X-8: >$h_X-8:<" - -testprint "rX-9: >$rh_X-9:<" -testprint "bX-9: >$bh_X-9:<" -testprint " X-9: >$h_X-9:<" - -testprint "rX-10: >$rh_X-10:<" -testprint "bX-10: >$bh_X-10:<" -testprint " X-10: >$h_X-10:<" - -testprint "rX-11: >$rh_X-11:<" -testprint "bX-11: >$bh_X-11:<" -testprint " X-11: >$h_X-11:<" - -testprint "rX-12: >$rh_X-12:<" -testprint "bX-12: >$bh_X-12:<" -testprint " X-12: >$h_X-12:<" - -testprint "rX-13: >$rh_X-13:<" -testprint "bX-13: >$bh_X-13:<" -testprint " X-13: >$h_X-13:<" - -testprint "rX-14: >$rh_X-14:<" -testprint "bX-14: >$bh_X-14:<" -testprint " X-14: >$h_X-14:<" - -testprint "rX-15: >$rh_X-15:<" -testprint "bX-15: >$bh_X-15:<" -testprint " X-15: >$h_X-15:<" - -testprint "rX-16: >$rh_X-16:<" -testprint "bX-16: >$bh_X-16:<" -testprint " X-16: >$h_X-16:<" - -testprint "rX-17: >$rh_X-17:<" -testprint "bX-17: >$bh_X-17:<" -testprint " X-17: >$h_X-17:<" - -testprint "rX-18: >$rh_X-18:<" -testprint "bX-18: >$bh_X-18:<" -testprint " X-18: >$h_X-18:<" - -testprint "rX-19: >$rh_X-19:<" -testprint "bX-19: >$bh_X-19:<" -testprint " X-19: >$h_X-19:<" - -testprint "rX-20: >$rh_X-20:<" -testprint "bX-20: >$bh_X-20:<" -testprint " X-20: >$h_X-20:<" diff --git a/test/aux-fixed/0412.F b/test/aux-fixed/0412.F deleted file mode 100644 index 0560cd331..000000000 --- a/test/aux-fixed/0412.F +++ /dev/null @@ -1,7 +0,0 @@ -# Exim filter - -if foranyaddress $h_to: ($thisaddress contains usery) then - headers add "Found: yes\nFound2: yes" -else - headers add "Found: no" -endif diff --git a/test/aux-fixed/0421.F b/test/aux-fixed/0421.F deleted file mode 100644 index c4175e113..000000000 --- a/test/aux-fixed/0421.F +++ /dev/null @@ -1,3 +0,0 @@ -# Exim filter - -headers add "Reply-to: rr@q.s" diff --git a/test/aux-fixed/0444.sysfilter b/test/aux-fixed/0444.sysfilter deleted file mode 100644 index 521d3200f..000000000 --- a/test/aux-fixed/0444.sysfilter +++ /dev/null @@ -1,21 +0,0 @@ -# Exim system filter file for XXX - -if $h_X-XXX-Original-Host: is not "" then - unseen mail to $return_path from Mailer-Daemon reply_to postmaster - subject "Submission of mail from $return_path directly to the XXX hosts" - text "You sent the message below from the host\n\ - \n $h_X-XXX-Original-Host:\n\n\ - directly to one of the XXX hosts. It will be delivered without any further\n\ - action on your part.\n\n\ - However, this indicates some mis-configuration, as new mail should be sent\n\ - (if XXX is involved at all) to smtp.xxx.example, which no longer refers\n\ - to the XXX hosts. It may be that your mail user agent has been configured to\n\ - use (for example) xxx.example or pop.xxx.example where smtp.xxx.example\n\ - would have been correct.\n\n\ - Eventually attempts to send messages directly to the XXX hosts in this way\n\ - will be rejected. You should modify the configuration of your mail user agent\n\ - to correct the fault described above." - return message - headers remove X-XXX-Original-Host -endif - diff --git a/test/aux-fixed/0452.filter-1 b/test/aux-fixed/0452.filter-1 deleted file mode 100644 index eecadff74..000000000 --- a/test/aux-fixed/0452.filter-1 +++ /dev/null @@ -1,12 +0,0 @@ -# Exim filter - -mail - to $sender_address - subject "Auto generated" - text "This is some body text" - extra_headers "h1: the first added header\n\ - h2: the second added header\n \ - continued on another line\n\ - h3: the third added header" - -# End diff --git a/test/aux-fixed/0452.filter-2 b/test/aux-fixed/0452.filter-2 deleted file mode 100644 index bb45ea834..000000000 --- a/test/aux-fixed/0452.filter-2 +++ /dev/null @@ -1,12 +0,0 @@ -# Exim filter - -mail - to $sender_address - subject "Auto generated" - text "This is some body text" - extra_headers "h1: the first added header\n\ - h2: the second added header\n \ - continued on another line\n\ - h3 the third added header is missing a colon" - -# End diff --git a/test/aux-fixed/0454.filter b/test/aux-fixed/0454.filter deleted file mode 100644 index 6d49eb636..000000000 --- a/test/aux-fixed/0454.filter +++ /dev/null @@ -1,3 +0,0 @@ -# Exim filter - -deliver xx@cam diff --git a/test/aux-fixed/0472.F b/test/aux-fixed/0472.F deleted file mode 100644 index 4a9c2a00a..000000000 --- a/test/aux-fixed/0472.F +++ /dev/null @@ -1,15 +0,0 @@ -# Exim system filter - -add 99 to n1 - -add 10 to n0 -add 2 to n2 -add 3 to n3 -add 4 to n4 -add 5 to n5 -add 6 to n6 -add 7 to n7 -add 8 to n8 -add 9 to n9 - -# End diff --git a/test/aux-fixed/0506.exim-filter b/test/aux-fixed/0506.exim-filter deleted file mode 100644 index b502c0908..000000000 --- a/test/aux-fixed/0506.exim-filter +++ /dev/null @@ -1,3 +0,0 @@ -# Exim filter - -seen finish diff --git a/test/aux-fixed/0510.sfilter b/test/aux-fixed/0510.sfilter deleted file mode 100644 index b8f2c5c1a..000000000 --- a/test/aux-fixed/0510.sfilter +++ /dev/null @@ -1,10 +0,0 @@ -# Exim filter - testing system filter - -testprint "--------System filter---------" -testprint "Sender: $sender_address" -testprint "Subject: $h_Subject:" -testprint "Body: $message_body" - -headers add "X-Header: Added in a system filter" -add 3 to n1 -testprint "n1: $n1" diff --git a/test/aux-fixed/0510.ufilter b/test/aux-fixed/0510.ufilter deleted file mode 100644 index 2bad322c7..000000000 --- a/test/aux-fixed/0510.ufilter +++ /dev/null @@ -1,9 +0,0 @@ -# Exim filter - testing user filter - -testprint "--------User filter---------" -testprint "Sender: $sender_address" -testprint "Subject: $header_Subject:" -testprint "Body: $message_body" -testprint "X-Header: $h_X-Header:" -testprint "sn1: $sn1" - diff --git a/test/aux-fixed/0616.filter b/test/aux-fixed/0616.filter deleted file mode 100644 index 283d823da..000000000 --- a/test/aux-fixed/0616.filter +++ /dev/null @@ -1,3 +0,0 @@ -# Exim filter - -unseen noerror deliver usery@domain1 diff --git a/test/aux-fixed/0617.filter b/test/aux-fixed/0617.filter deleted file mode 100644 index 394d1b2df..000000000 --- a/test/aux-fixed/0617.filter +++ /dev/null @@ -1,3 +0,0 @@ -# Exim filter - -unseen deliver usery@domain1 diff --git a/test/aux-fixed/4110.f-1 b/test/aux-fixed/4110.f-1 new file mode 100644 index 000000000..bfe43b632 --- /dev/null +++ b/test/aux-fixed/4110.f-1 @@ -0,0 +1,80 @@ +# Exim filter + +add 1 to n3 +add 3 to n4 +add $n3 to n4 +add $n4 to n4 +add 6 to n$n3 +testprint "n0=$n0 n1=$n1 n3=$n3 n4=$n4" + +testprint "${run{/bin/sh -c 'pwd'}}" + +deliver root@$qualify_domain +save /tmp/$primary_hostname 444 +save /tmp/$qualify_domain +pipe "/tmp/$primary_hostname" + +logfile /tmp/logfile logwrite "this is log text: $qualify_domain" + +if $qualify_domain contains $qualify_domain then + testprint "yes" +else + testprint "no" +endif + +if $qualify_domain CONTAINS $qualify_domain then + testprint "yes" +else + testprint "no" +endif + +if $qualify_domain contains ${uc:$qualify_domain} then + testprint "yes" +else + testprint "no" +endif + +if $qualify_domain does not contain ${uc:$qualify_domain} then + testprint "no" +else + testprint "yes" +endif + +if $qualify_domain DOES NOT CONTAIN ${uc:$qualify_domain} then + testprint "no" +else + testprint "yes" +endif + +if $qualify_domain CONTAINS ${uc:$qualify_domain} then + testprint "yes" +else + testprint "no" +endif + +if $qualify_domain is $qualify_domain then + testprint "qualify_domain is qualify_domain" +else + testprint "NOT qualify_domain is qualify_domain" +endif + +if $qualify_domain IS $qualify_domain then + testprint "qualify_domain IS qualify_domain" +else + testprint "NOT qualify_domain IS qualify_domain" +endif + +if $qualify_domain is not $qualify_domain then + testprint "qualify_domain is not qualify_domain" +else + testprint "NOT qualify_domain is not qualify_domain" +endif + +if $qualify_domain IS NOT $qualify_domain then + testprint "qualify_domain IS NOT qualify_domain" +else + testprint "NOT qualify_domain IS NOT qualify_domain" +endif + + + diff --git a/test/aux-fixed/4110.f-2 b/test/aux-fixed/4110.f-2 new file mode 100644 index 000000000..31d595fd0 --- /dev/null +++ b/test/aux-fixed/4110.f-2 @@ -0,0 +1,5 @@ +# Exim filter + +deliver root@$qualify_domain errors_to root@$primary_hostname + +testprint End diff --git a/test/aux-fixed/4110.f-3 b/test/aux-fixed/4110.f-3 new file mode 100644 index 000000000..31d595fd0 --- /dev/null +++ b/test/aux-fixed/4110.f-3 @@ -0,0 +1,5 @@ +# Exim filter + +deliver root@$qualify_domain errors_to root@$primary_hostname + +testprint End diff --git a/test/aux-fixed/4110.f-4 b/test/aux-fixed/4110.f-4 new file mode 100644 index 000000000..55f1063f4 --- /dev/null +++ b/test/aux-fixed/4110.f-4 @@ -0,0 +1,13 @@ +# Exim filter + +if personal alias abcdefgh@ifi.uio.no alias abcdefgh@student.matnat.uio.no + alias xyz@fix.no alias xyzabcd@skjaeveland.com alias abcdefgh@e.fix.no + alias abcdefgh@skjermbrev.com alias abcdefgh@b.b.cl + alias abcdefgh@bzzzt.fix.no +then + testprint "Personal" +else + testprint "Not personal" +endif + +testprint "\\$home = $home" diff --git a/test/aux-fixed/4110.f-5 b/test/aux-fixed/4110.f-5 new file mode 100644 index 000000000..a848ddb9a --- /dev/null +++ b/test/aux-fixed/4110.f-5 @@ -0,0 +1,7 @@ +# Exim filter + +testprint "Before fail" + +fail text "This is a forced failure" + +testprint End diff --git a/test/aux-fixed/4110.f-6 b/test/aux-fixed/4110.f-6 new file mode 100644 index 000000000..2b9df2a24 --- /dev/null +++ b/test/aux-fixed/4110.f-6 @@ -0,0 +1,11 @@ +# Exim filter + +if $h_subject: is "This is a very long string which isn't likely to occur when\ + testing for a fixed string, but might happen if a long and complicated\ + regular expression and/or lookup gets used in somebody's filter file.\ + Originally the limit was 256 characters, but now we have increased it to\ + a larger figure. This should exceed the old limit and check that the new\ + limit is in place." +then + testprint "Won't happen" +endif diff --git a/test/aux-fixed/4110.f-7 b/test/aux-fixed/4110.f-7 new file mode 100644 index 000000000..01d6c6db7 --- /dev/null +++ b/test/aux-fixed/4110.f-7 @@ -0,0 +1,3 @@ +#exim filter + +save relative diff --git a/test/aux-fixed/4110.f-8 b/test/aux-fixed/4110.f-8 new file mode 100644 index 000000000..2807c12f0 --- /dev/null +++ b/test/aux-fixed/4110.f-8 @@ -0,0 +1,5 @@ +#exim filter + +if one is one then seen endif + +if two is two then save /dev/null endif diff --git a/test/aux-fixed/4110.f-9 b/test/aux-fixed/4110.f-9 new file mode 100644 index 000000000..5d8e0ca24 --- /dev/null +++ b/test/aux-fixed/4110.f-9 @@ -0,0 +1,3 @@ +#exim filter + +unseen diff --git a/test/aux-fixed/4110.msg b/test/aux-fixed/4110.msg new file mode 100644 index 000000000..8196d9ed2 --- /dev/null +++ b/test/aux-fixed/4110.msg @@ -0,0 +1,5 @@ +From: abcd@xyz +Subject: message for filter test + +This is the body of the message. It has some length. Indeed it does. We need to +check that the body is correctly visible in the filter. diff --git a/test/aux-fixed/4111.filter.userx b/test/aux-fixed/4111.filter.userx new file mode 100644 index 000000000..b7ef2ed8d --- /dev/null +++ b/test/aux-fixed/4111.filter.userx @@ -0,0 +1,12 @@ +# Exim filter + +if error_message then finish endif + +if + $local_part_prefix contains "page" +then + unseen mail to userx text "callpager -r 108 PAGE:${l_50:$message_body}" + unseen pipe callpager +endif + +# End diff --git a/test/aux-fixed/4111.realnames b/test/aux-fixed/4111.realnames new file mode 100644 index 000000000..40a313834 --- /dev/null +++ b/test/aux-fixed/4111.realnames @@ -0,0 +1 @@ +ux: userx diff --git a/test/aux-fixed/4112.filter.userx b/test/aux-fixed/4112.filter.userx new file mode 100644 index 000000000..a89551d03 --- /dev/null +++ b/test/aux-fixed/4112.filter.userx @@ -0,0 +1,11 @@ +# Exim filter + +if error_message then finish endif + +if + $local_part_suffix contains "page" +then + unseen mail to userx text "callpager -r 108 PAGE:${l_50:$message_body}" +endif + +# End diff --git a/test/aux-fixed/4113.filter.userx b/test/aux-fixed/4113.filter.userx new file mode 100644 index 000000000..c0044c993 --- /dev/null +++ b/test/aux-fixed/4113.filter.userx @@ -0,0 +1,4 @@ +# Exim filter + +testprint "Body: $message_body" +testprint "End: $message_body_end" diff --git a/test/aux-fixed/4116.aliases b/test/aux-fixed/4116.aliases new file mode 100644 index 000000000..c65edd7fd --- /dev/null +++ b/test/aux-fixed/4116.aliases @@ -0,0 +1 @@ +postmaster: userx diff --git a/test/aux-fixed/4117.f-3 b/test/aux-fixed/4117.f-3 new file mode 100644 index 000000000..ca139de10 --- /dev/null +++ b/test/aux-fixed/4117.f-3 @@ -0,0 +1,20 @@ +#Exim filter + +testprint "From: is ${if def:h_from:{}{not }}defined" +testprint "Absent: is ${if def:h_absent:{}{not }}defined" +testprint "----------------------" +testprint $message_headers +testprint "----------------------" +testprint $message_headers+++more +testprint "----------------------" +testprint "+++$message_headers+++" +testprint "----------------------" +testprint "From: >$h_from:<" +testprint $h_repeated: +testprint "----------------------" +testprint +++$header_repeated:+++ +testprint "----------------------" +testprint reply_address=$reply_address +testprint empty=>$h_empty:< +testprint repeated-empty=>$h_repeated-empty:< +testprint "----------------------" diff --git a/test/aux-fixed/4117.lsearch b/test/aux-fixed/4117.lsearch new file mode 100644 index 000000000..b27516863 --- /dev/null +++ b/test/aux-fixed/4117.lsearch @@ -0,0 +1 @@ +key1: data for key1 diff --git a/test/aux-fixed/4118.aliases b/test/aux-fixed/4118.aliases new file mode 100644 index 000000000..f7c09d88b --- /dev/null +++ b/test/aux-fixed/4118.aliases @@ -0,0 +1 @@ +defer: :defer: This address has been forced to defer. diff --git a/test/aux-fixed/4118.forward b/test/aux-fixed/4118.forward new file mode 100644 index 000000000..bfe65ed08 --- /dev/null +++ b/test/aux-fixed/4118.forward @@ -0,0 +1,7 @@ +# Exim filter + +if error_message then finish endif + +# This forward is to a pipe that isn't going to work + +pipe /non/existing/file diff --git a/test/aux-fixed/4118.wmf b/test/aux-fixed/4118.wmf new file mode 100644 index 000000000..19fea5c21 --- /dev/null +++ b/test/aux-fixed/4118.wmf @@ -0,0 +1,10 @@ +Subject: Warning: message $message_id delayed by $warn_message_delay +**** +warn_message_delay = $warn_message_delay +warn_message_recipients = $warn_message_recipient +warn_message_recipients = $warn_message_recipients +warnmsg_delay = $warnmsg_delay +warnmsg_recipient = $warnmsg_recipient +warnmsg_recipients = $warnmsg_recipients +**** +Final stuff. diff --git a/test/aux-fixed/4120.filter b/test/aux-fixed/4120.filter new file mode 100644 index 000000000..819a30b42 --- /dev/null +++ b/test/aux-fixed/4120.filter @@ -0,0 +1,3 @@ +# Exim filter + +if $recipients contains freeze then freeze endif diff --git a/test/aux-fixed/4121.userx b/test/aux-fixed/4121.userx new file mode 100644 index 000000000..e110fe3c5 --- /dev/null +++ b/test/aux-fixed/4121.userx @@ -0,0 +1,3 @@ +# Exim filter + +unseen deliver copy@test.ex diff --git a/test/aux-fixed/4122.filter b/test/aux-fixed/4122.filter new file mode 100644 index 000000000..ebef56734 --- /dev/null +++ b/test/aux-fixed/4122.filter @@ -0,0 +1,5 @@ +#Exim filter + +if error_message then finish endif + +deliver unknown@test.ex errors_to forwarder@test.ex diff --git a/test/aux-fixed/4125.filter b/test/aux-fixed/4125.filter new file mode 100644 index 000000000..12b4bcecd --- /dev/null +++ b/test/aux-fixed/4125.filter @@ -0,0 +1,137 @@ +# Exim filter + +freeze text "some error message" + +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +# fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff diff --git a/test/aux-fixed/4126.filter b/test/aux-fixed/4126.filter new file mode 100644 index 000000000..5978e6c03 --- /dev/null +++ b/test/aux-fixed/4126.filter @@ -0,0 +1,3 @@ +# Exim filter + +pipe "/source/exim4/AutoTest/non-exist" diff --git a/test/aux-fixed/4128.alias b/test/aux-fixed/4128.alias new file mode 100644 index 000000000..e8b091d80 --- /dev/null +++ b/test/aux-fixed/4128.alias @@ -0,0 +1 @@ +userz: userx@non.local.domain diff --git a/test/aux-fixed/4129.filter b/test/aux-fixed/4129.filter new file mode 100644 index 000000000..7e581d52b --- /dev/null +++ b/test/aux-fixed/4129.filter @@ -0,0 +1,3 @@ +# System filter + +headers add "X-Added: by system filter" diff --git a/test/aux-fixed/4130.lsearch b/test/aux-fixed/4130.lsearch new file mode 100644 index 000000000..b4f46b72e --- /dev/null +++ b/test/aux-fixed/4130.lsearch @@ -0,0 +1 @@ +key: value diff --git a/test/aux-fixed/4131.alias b/test/aux-fixed/4131.alias new file mode 100644 index 000000000..16de12212 --- /dev/null +++ b/test/aux-fixed/4131.alias @@ -0,0 +1 @@ +usery: userx@non.local.domain diff --git a/test/aux-fixed/4133.filter b/test/aux-fixed/4133.filter new file mode 100644 index 000000000..a60bcba1b --- /dev/null +++ b/test/aux-fixed/4133.filter @@ -0,0 +1,6 @@ +if error_message then finish endif + +if $recipients contains userx then + mail to postmaster subject "System filter has frozen" + freeze "system filter freezes" +endif diff --git a/test/aux-fixed/4134.filter b/test/aux-fixed/4134.filter new file mode 100644 index 000000000..2775f9443 --- /dev/null +++ b/test/aux-fixed/4134.filter @@ -0,0 +1,10 @@ +# Exim filter + +if error_message then finish endif + +mail + to postmaster + subject "Filter is freezing" + text "I've frozen something" + +freeze "everything's freezing today" diff --git a/test/aux-fixed/4135.data b/test/aux-fixed/4135.data new file mode 100644 index 000000000..6a1952631 --- /dev/null +++ b/test/aux-fixed/4135.data @@ -0,0 +1 @@ +1: Data from the file diff --git a/test/aux-fixed/4135.file b/test/aux-fixed/4135.file new file mode 100644 index 000000000..2fdfb3511 --- /dev/null +++ b/test/aux-fixed/4135.file @@ -0,0 +1,3 @@ +>>>>>>>>>>>>>> +${if exists{/source/exim4/AutoTest/aux/284.data}{${lookup{1}lsearch{/source/exim4/AutoTest/aux/284.data}{$value}{NOT FOUND}}}{NOT EXISTS}} +>>>>>>>>>>>>>> diff --git a/test/aux-fixed/4136.filter b/test/aux-fixed/4136.filter new file mode 100644 index 000000000..e320aee7d --- /dev/null +++ b/test/aux-fixed/4136.filter @@ -0,0 +1,6 @@ +# Exim filter + +# The filter restricts strings to 1024, but we can get a longer one by +# substituting a header line. + +freeze "X-Long header is >$h_X-Long:<" diff --git a/test/aux-fixed/4137.filter b/test/aux-fixed/4137.filter new file mode 100644 index 000000000..cbf403d7f --- /dev/null +++ b/test/aux-fixed/4137.filter @@ -0,0 +1,3 @@ +# Exim filter + +syntax error diff --git a/test/aux-fixed/4137.filter2 b/test/aux-fixed/4137.filter2 new file mode 100644 index 000000000..42f00dfe6 --- /dev/null +++ b/test/aux-fixed/4137.filter2 @@ -0,0 +1,3 @@ +# Exim filter + +deliver @@in.valid diff --git a/test/aux-fixed/4137.filter3 b/test/aux-fixed/4137.filter3 new file mode 100644 index 000000000..d80e144c3 --- /dev/null +++ b/test/aux-fixed/4137.filter3 @@ -0,0 +1,4 @@ +# Exim filter + +logfile test-private +logwrite "Testing" diff --git a/test/aux-fixed/4137.list b/test/aux-fixed/4137.list new file mode 100644 index 000000000..09c6cd8a4 --- /dev/null +++ b/test/aux-fixed/4137.list @@ -0,0 +1,5 @@ +(This is just a comment) +userx@test.ex +@@test.ex (This has a syntax error) +spqr@test.ex +userx@test.ex (again) diff --git a/test/aux-fixed/4137.list2 b/test/aux-fixed/4137.list2 new file mode 100644 index 000000000..1a01840ae --- /dev/null +++ b/test/aux-fixed/4137.list2 @@ -0,0 +1,2 @@ +(This is just a comment) +@@test.ex (This has a syntax error) diff --git a/test/aux-fixed/4137.nmlist b/test/aux-fixed/4137.nmlist new file mode 100644 index 000000000..1a01840ae --- /dev/null +++ b/test/aux-fixed/4137.nmlist @@ -0,0 +1,2 @@ +(This is just a comment) +@@test.ex (This has a syntax error) diff --git a/test/aux-fixed/4138.filter b/test/aux-fixed/4138.filter new file mode 100644 index 000000000..cbf403d7f --- /dev/null +++ b/test/aux-fixed/4138.filter @@ -0,0 +1,3 @@ +# Exim filter + +syntax error diff --git a/test/aux-fixed/4138.filter2 b/test/aux-fixed/4138.filter2 new file mode 100644 index 000000000..42f00dfe6 --- /dev/null +++ b/test/aux-fixed/4138.filter2 @@ -0,0 +1,3 @@ +# Exim filter + +deliver @@in.valid diff --git a/test/aux-fixed/4138.filter3 b/test/aux-fixed/4138.filter3 new file mode 100644 index 000000000..88cb68768 --- /dev/null +++ b/test/aux-fixed/4138.filter3 @@ -0,0 +1,6 @@ +# Exim filter + +# router_home_directory = DIR/ + +logfile ${home}test-private +logwrite "Testing" diff --git a/test/aux-fixed/4138.list b/test/aux-fixed/4138.list new file mode 100644 index 000000000..09c6cd8a4 --- /dev/null +++ b/test/aux-fixed/4138.list @@ -0,0 +1,5 @@ +(This is just a comment) +userx@test.ex +@@test.ex (This has a syntax error) +spqr@test.ex +userx@test.ex (again) diff --git a/test/aux-fixed/4138.list2 b/test/aux-fixed/4138.list2 new file mode 100644 index 000000000..1a01840ae --- /dev/null +++ b/test/aux-fixed/4138.list2 @@ -0,0 +1,2 @@ +(This is just a comment) +@@test.ex (This has a syntax error) diff --git a/test/aux-fixed/4138.nmlist b/test/aux-fixed/4138.nmlist new file mode 100644 index 000000000..1a01840ae --- /dev/null +++ b/test/aux-fixed/4138.nmlist @@ -0,0 +1,2 @@ +(This is just a comment) +@@test.ex (This has a syntax error) diff --git a/test/aux-fixed/4139.Filter b/test/aux-fixed/4139.Filter new file mode 100644 index 000000000..48e02c04b --- /dev/null +++ b/test/aux-fixed/4139.Filter @@ -0,0 +1,5 @@ +# Exim filter + +if $recipients contains failure then + fail "this message is a failure (filter fail)" +endif diff --git a/test/aux-fixed/4140.Filter b/test/aux-fixed/4140.Filter new file mode 100644 index 000000000..e911ce75c --- /dev/null +++ b/test/aux-fixed/4140.Filter @@ -0,0 +1,5 @@ +# Exim filter + +if $sender_address is not fil@ter then finish endif + +save ${local_part:$recipients} diff --git a/test/aux-fixed/4141.Filter b/test/aux-fixed/4141.Filter new file mode 100644 index 000000000..b17fceef6 --- /dev/null +++ b/test/aux-fixed/4141.Filter @@ -0,0 +1,14 @@ +# Exim filter + +if error_message then finish endif + +if $recipients contains failure1 then + +fail "<>This message is being failed and there's a long and tortuous\n\ + explanation about is that is being sent back to the user." + +else + +fail "<>" + +endif diff --git a/test/aux-fixed/4142.f-user b/test/aux-fixed/4142.f-user new file mode 100644 index 000000000..a110ec05b --- /dev/null +++ b/test/aux-fixed/4142.f-user @@ -0,0 +1,22 @@ +# Exim filter + +if foranyaddress "a@b, c@d" ( $thisaddress matches ^c ) then + testprint "1 Matched $thisaddress" +endif + +if foranyaddress "Group name: a@b, c@d;, cc@dd" ( $thisaddress matches ^c ) +then + testprint "2 Matched $thisaddress" +endif + +if foranyaddress "Group name: a@b, c@d;, cc@dd" ( $thisaddress matches ^cc ) +then + testprint "3 Matched $thisaddress" +endif + +if foranyaddress "Group name: a@b, c@d;, cc@dd, N2: e@f;, ee@ff" + ( $thisaddress matches ^e ) +then + testprint "4 Matched $thisaddress" +endif + diff --git a/test/aux-fixed/4145.F b/test/aux-fixed/4145.F new file mode 100644 index 000000000..7b0d88687 --- /dev/null +++ b/test/aux-fixed/4145.F @@ -0,0 +1,6 @@ +# Exim filter + +headers remove remove +headers add "added: this header is added" +headers add "adrem: this header is added and then removed" +headers remove adrem diff --git a/test/aux-fixed/4146.F b/test/aux-fixed/4146.F new file mode 100644 index 000000000..7b0d88687 --- /dev/null +++ b/test/aux-fixed/4146.F @@ -0,0 +1,6 @@ +# Exim filter + +headers remove remove +headers add "added: this header is added" +headers add "adrem: this header is added and then removed" +headers remove adrem diff --git a/test/aux-fixed/4149.F b/test/aux-fixed/4149.F new file mode 100644 index 000000000..0560cd331 --- /dev/null +++ b/test/aux-fixed/4149.F @@ -0,0 +1,7 @@ +# Exim filter + +if foranyaddress $h_to: ($thisaddress contains usery) then + headers add "Found: yes\nFound2: yes" +else + headers add "Found: no" +endif diff --git a/test/aux-fixed/4150.F b/test/aux-fixed/4150.F new file mode 100644 index 000000000..31c01a652 --- /dev/null +++ b/test/aux-fixed/4150.F @@ -0,0 +1,17 @@ +# Exim filter + +if foranyaddress $h_to: ($thisaddress contains abcd) then + headers add "Found: abcd yes" +else + headers add "Found: abcd no" +endif + +if foranyaddress $h_to: ($thisaddress contains xyz) then + headers add "Found: xyz yes" +else + headers add "Found: xyz no" +endif + +headers add "TO: >$h_to:<" + + diff --git a/test/aux-fixed/4153.F b/test/aux-fixed/4153.F new file mode 100644 index 000000000..fdcfee036 --- /dev/null +++ b/test/aux-fixed/4153.F @@ -0,0 +1,3 @@ +# Exim filter for test 443 + +# Actually does nothing diff --git a/test/aux-fixed/4156.f b/test/aux-fixed/4156.f new file mode 100644 index 000000000..6dae29b4a --- /dev/null +++ b/test/aux-fixed/4156.f @@ -0,0 +1,86 @@ +# Exim filter + +testprint "subject = >$h_subject:<" +testprint "raw subject = >$rh_subject:<" +testprint "to = >$h_to:<" +testprint "raw to = >$rheader_to:<" + +testprint "rX-1: >$rh_X-1:<" +testprint "bX-1: >$bh_X-1:<" +testprint " X-1: >$h_X-1:<" + +testprint "rX-2: >$rh_X-2:<" +testprint "bX-2: >$bh_X-2:<" +testprint " X-2: >$h_X-2:<" + +testprint "rX-3: >$rh_X-3:<" +testprint "bX-3: >$bh_X-3:<" +testprint " X-3: >$h_X-3:<" + +testprint "rX-4: >$rh_X-4:<" +testprint "bX-4: >$bh_X-4:<" +testprint " X-4: >$h_X-4:<" + +testprint "rX-5: >$rh_X-5:<" +testprint "bX-5: >$bh_X-5:<" +testprint " X-5: >$h_X-5:<" + +testprint "rX-6: >$rh_X-6:<" +testprint "bX-6: >$bh_X-6:<" +testprint " X-6: >$h_X-6:<" + +testprint "rX-7: >$rh_X-7:<" +testprint "bX-7: >$bh_X-7:<" +testprint " X-7: >$h_X-7:<" + +testprint "rX-8: >$rh_X-8:<" +testprint "bX-8: >$bh_X-8:<" +testprint " X-8: >$h_X-8:<" + +testprint "rX-9: >$rh_X-9:<" +testprint "bX-9: >$bh_X-9:<" +testprint " X-9: >$h_X-9:<" + +testprint "rX-10: >$rh_X-10:<" +testprint "bX-10: >$bh_X-10:<" +testprint " X-10: >$h_X-10:<" + +testprint "rX-11: >$rh_X-11:<" +testprint "bX-11: >$bh_X-11:<" +testprint " X-11: >$h_X-11:<" + +testprint "rX-12: >$rh_X-12:<" +testprint "bX-12: >$bh_X-12:<" +testprint " X-12: >$h_X-12:<" + +testprint "rX-13: >$rh_X-13:<" +testprint "bX-13: >$bh_X-13:<" +testprint " X-13: >$h_X-13:<" + +testprint "rX-14: >$rh_X-14:<" +testprint "bX-14: >$bh_X-14:<" +testprint " X-14: >$h_X-14:<" + +testprint "rX-15: >$rh_X-15:<" +testprint "bX-15: >$bh_X-15:<" +testprint " X-15: >$h_X-15:<" + +testprint "rX-16: >$rh_X-16:<" +testprint "bX-16: >$bh_X-16:<" +testprint " X-16: >$h_X-16:<" + +testprint "rX-17: >$rh_X-17:<" +testprint "bX-17: >$bh_X-17:<" +testprint " X-17: >$h_X-17:<" + +testprint "rX-18: >$rh_X-18:<" +testprint "bX-18: >$bh_X-18:<" +testprint " X-18: >$h_X-18:<" + +testprint "rX-19: >$rh_X-19:<" +testprint "bX-19: >$bh_X-19:<" +testprint " X-19: >$h_X-19:<" + +testprint "rX-20: >$rh_X-20:<" +testprint "bX-20: >$bh_X-20:<" +testprint " X-20: >$h_X-20:<" diff --git a/test/aux-fixed/4158.F b/test/aux-fixed/4158.F new file mode 100644 index 000000000..0560cd331 --- /dev/null +++ b/test/aux-fixed/4158.F @@ -0,0 +1,7 @@ +# Exim filter + +if foranyaddress $h_to: ($thisaddress contains usery) then + headers add "Found: yes\nFound2: yes" +else + headers add "Found: no" +endif diff --git a/test/aux-fixed/4159.F b/test/aux-fixed/4159.F new file mode 100644 index 000000000..c4175e113 --- /dev/null +++ b/test/aux-fixed/4159.F @@ -0,0 +1,3 @@ +# Exim filter + +headers add "Reply-to: rr@q.s" diff --git a/test/aux-fixed/4160.message b/test/aux-fixed/4160.message deleted file mode 100644 index fce284df6..000000000 --- a/test/aux-fixed/4160.message +++ /dev/null @@ -1,30 +0,0 @@ -From offerqn@bpk.example.com Wed Feb 05 10:47:05 2003 -Delivered-To: michael@nostromo.somenet-ag.example -From: () c, "A.N. Other" , spam@aaaa.example -To: marian@abcdefgh.example -Subject: =?iso-8859-1?q?abcdef?= - =?iso-8859-1?q?ghi?= -X-Priority: 3 -X-MSMail-Priority: Normal -X-BasAga: 8sDTRgF1RyrcCxLg0m2c -X-AgaUtu: 2Vi3TgrEIwL3KWqSoI7 -X-IdiTegUtuUtu: EY4XogFnkpH1P06d -X-RosHrIdiNa: Vu8pFqH5hFK05kD5opU3 -X-BasAgaNa: T1LeD56uyN -X-Mailer: MMailer v3.0 -X-Special1: ?a=?ISO-8859-1?Q?=00?=cx* -X-Special2: 1a*cx2 -Date: Wed, 5 Feb 2003 0:37:30 +-0800 -Mime-Version: 1.0 -Content-Type: text/html; charset="Windows-1251" -X-Warning: 204.29.65.132 is listed at list.dsbl.org -X-Warning: 204.29.65.132 is listed at unconfirmed.dsbl.org -X-Warning: 204.29.65.132 is listed at singlestage.dnsbl.somenet.example -X-Warning: bpk.example.com is listed at postmaster.rfc-ignorant.org -Delivered-To: irc@01019somenet.example -Delivered-To: irc@irc.somenet.example -Delivered-To: some.one@somenet-ag.example - - -