diff options
Diffstat (limited to 'test/confs')
-rw-r--r-- | test/confs/0002 | 18 | ||||
-rw-r--r-- | test/confs/0481 | 2 | ||||
-rw-r--r-- | test/confs/0496 | 7 | ||||
-rw-r--r-- | test/confs/0538 | 7 | ||||
-rw-r--r-- | test/confs/0566 | 66 | ||||
-rw-r--r-- | test/confs/0567 | 91 | ||||
-rw-r--r-- | test/confs/3455 | 2 | ||||
-rw-r--r-- | test/confs/3465 | 2 | ||||
-rw-r--r-- | test/confs/5400 | 50 | ||||
-rw-r--r-- | test/confs/5401 | 50 | ||||
-rw-r--r-- | test/confs/5410 | 59 | ||||
-rw-r--r-- | test/confs/5420 | 59 |
12 files changed, 409 insertions, 4 deletions
diff --git a/test/confs/0002 b/test/confs/0002 index af680500c..409bd755f 100644 --- a/test/confs/0002 +++ b/test/confs/0002 @@ -15,6 +15,8 @@ gecos_name = CALLER_NAME # ----- Main settings ----- domainlist dlist = *.aa.bb : ^\Nxxx(.*) +domainlist elist = +dlist : ;; +domainlist flist = <; a ; b;;c ; +elist ; 2001:630:212:8:204::b664 ; hostlist hlist = V4NET.11.12.13 : iplsearch;DIR/aux-fixed/0002.iplsearch headers_charset = iso-8859-8 @@ -42,4 +44,20 @@ check_data: warn logwrite = Subject is: "$h_subject:" deny message = reply_address=<$reply_address> +a_ret: + accept message = ($acl_narg) [$acl_arg1] [$acl_arg2] + +a_none: + accept + +a_deny: + deny message = ($acl_narg) [$acl_arg1] [$acl_arg2] + +a_defer: + defer + +a_sub: + require acl = a_none foo bar baz barf + require acl = a_deny "new arg1" $acl_arg1 + # End diff --git a/test/confs/0481 b/test/confs/0481 index be3f923dd..212af518d 100644 --- a/test/confs/0481 +++ b/test/confs/0481 @@ -23,6 +23,7 @@ r1: r2: driver = redirect + headers_remove = Remove-Me-Also: headers_remove = Remove-Me: data = $local_part@domain @@ -30,6 +31,7 @@ r3: driver = accept headers_remove = Remove-Me: headers_add = X-Was-Remove-Me: >$h_remove-me:< + headers_add = ${if def:h_remove-me-also {X-Was-Remove-Me-Also: >$h_remove-me-also:<}} transport = t1 diff --git a/test/confs/0496 b/test/confs/0496 index 4bc2fde19..9b03b850f 100644 --- a/test/confs/0496 +++ b/test/confs/0496 @@ -19,11 +19,14 @@ acl_smtp_rcpt = check_rcpt begin acl check_rcpt: - warn message = data1 data1\ndata2 data2 + warn message = data1 data1\ndata2 data2\n + warn message = \n\ndata3\n\ndata4\n\n warn message = :after_received:After-Received: some text\n\ :at_start:At-Start: some text\n\ :at_end: At-End: some text - accept + warn message = data4 + warn add_header = X-multiline: foo\n\tbar + accept logwrite = $headers_added # ----- Routers ----- diff --git a/test/confs/0538 b/test/confs/0538 index 7f89ccc6a..5865e3110 100644 --- a/test/confs/0538 +++ b/test/confs/0538 @@ -38,6 +38,13 @@ r1: route_list = * "<= 127.0.0.1:PORT_S" self = send verify_only + transport = t1 + + +begin transports + +t1: + driver = smtp # End diff --git a/test/confs/0566 b/test/confs/0566 new file mode 100644 index 000000000..83e97fb18 --- /dev/null +++ b/test/confs/0566 @@ -0,0 +1,66 @@ +# Exim test configuration 0566 + +exim_path = EXIM_PATH +host_lookup_order = bydns +primary_hostname = myhost.test.ex +rfc1413_query_timeout = 0s +spool_directory = DIR/spool +log_file_path = DIR/spool/log/%slog +log_selector = +8bitmime +gecos_pattern = "" +gecos_name = CALLER_NAME + +# ----- Main settings ----- + +domainlist local_domains = test.ex + +acl_smtp_rcpt = acl_rcpt +acl_smtp_data = acl_data + + +# ------ ACLs ------ + +begin acl + +acl_rcpt: + accept endpass + message = SIZE value too big + condition = ${if > {$message_size}{10000}{no}{yes}} + +acl_data: + accept endpass + message = message too big - \$recipients=$recipients ($recipients_count) + condition = ${if > {$message_size}{10000}{no}{yes}} + + +# ------ Routers ------ + +begin routers + +r1: + driver = dnslookup + domains = ! +local_domains + transport = dev_null + no_more + +r2: + driver = accept + local_parts = userx : postmaster + transport = local_delivery + + +# ------ Transports ------ + +begin transports + +dev_null: + driver = appendfile + file = /dev/null + user = CALLER + +local_delivery: + driver = appendfile + file = DIR/test-mail/$local_part + user = CALLER + +# End diff --git a/test/confs/0567 b/test/confs/0567 new file mode 100644 index 000000000..7348b1fe5 --- /dev/null +++ b/test/confs/0567 @@ -0,0 +1,91 @@ +# Exim test configuration 0532 + +CONNECTCOND= + +exim_path = EXIM_PATH +host_lookup_order = bydns +primary_hostname = myhost.test.ex +rfc1413_query_timeout = 0s +spool_directory = DIR/spool +log_file_path = DIR/spool/log/%slog +gecos_pattern = "" +gecos_name = CALLER_NAME + +# ----- Main settings ----- + +acl_smtp_connect = connect +acl_smtp_mail = mail +acl_smtp_rcpt = rcpt +acl_smtp_predata = predata +acl_smtp_data = data +acl_not_smtp = notsmtp + +qualify_domain = test.ex +trusted_users = CALLER + +hostlist internal_headers = x-mail-2 : x-mail-3 + + +# ----- ACL ----- + +begin acl + +connect: + accept CONNECTCOND + +mail: + accept remove_header = x-mail-1 + senders = mailok@test.ex + # Won't work because doesn't expand + remove_header = +internal_headers + accept + +rcpt: + accept local_parts = rcptok + remove_header = x-rcpt-4 : x-rcpt-2 + set acl_m_hdr = x-predata-1 + deny add_header = RCPT: denied $local_part + + +predata: + warn remove_header = x-predata-3 : $acl_m_hdr + # Won't work because doesn't use wildcards + accept remove_header = x-not-* + +data: + warn log_message = Verified previously removed header X-Rcpt-2 + condition = ${if eq{$h_x-rcpt-2:}{}} + warn remove_header = x-data-1 : x-data-4 + condition = ${if eq{$h_cond:}{accept}} + remove_header = x-data-3 + # Won't delete this header because condition fails before the modifier + warn condition = ${if eq{$h_cond:}{reject}} + remove_header = x-data-2 + warn log_message = Verified removed header X-Data-3 in this ACL still visible + condition = ${if !eq{$h_x-data-3:}{}} + accept + +notsmtp: + # Will remove a required header (Date) if told to + accept remove_header = x-notsmtp-1 : date + + +# ----- Routers ----- + +begin routers + +r1: + driver = accept + transport = t1 + + +# ----- Transports ----- + +begin transports + +t1: + driver = appendfile + file = DIR/test-mail/$local_part + user = CALLER + +# End diff --git a/test/confs/3455 b/test/confs/3455 index 274de6316..ab26f43cc 100644 --- a/test/confs/3455 +++ b/test/confs/3455 @@ -36,7 +36,7 @@ plain: server_condition = "\ ${if and {{eq{$2}{userx}}{eq{$3}{secret1}}}{yes}{no}}" server_set_id = $2 - client_condition = ${if !eq {$tls_cipher}{}} + client_condition = ${if !eq {$tls_out_cipher}{}} client_send = ^userx^secret1 login: diff --git a/test/confs/3465 b/test/confs/3465 index adadeb059..161fff526 100644 --- a/test/confs/3465 +++ b/test/confs/3465 @@ -36,7 +36,7 @@ plain: server_condition = "\ ${if and {{eq{$2}{userx}}{eq{$3}{secret1}}}{yes}{no}}" server_set_id = $2 - client_condition = ${if !eq {$tls_cipher}{}} + client_condition = ${if !eq {$tls_out_cipher}{}} client_send = ^userx^secret1 login: diff --git a/test/confs/5400 b/test/confs/5400 new file mode 100644 index 000000000..8f2e8b585 --- /dev/null +++ b/test/confs/5400 @@ -0,0 +1,50 @@ +# Exim test configuration 5400 + +exim_path = EXIM_PATH +host_lookup_order = bydns +primary_hostname = myhost.test.ex +rfc1413_query_timeout = 0s +spool_directory = DIR/spool +log_file_path = DIR/spool/log/%slog +gecos_pattern = "" +gecos_name = CALLER_NAME + +# ----- Main settings ----- + +domainlist local_domains = test.ex : *.test.ex + +acl_smtp_rcpt = ar + + +# ----- ACLs ----- + +begin acl + +ar: + accept control = cutthrough_delivery + logwrite = rcpt for $local_part@$domain + +# ----- Routers ----- + +begin routers + +all: + driver = manualroute + domains = ! +local_domains + route_list = * 127.0.0.1 + self = send + transport = smtp + no_more + + +# ----- Transports ----- + +begin transports + +smtp: + driver = smtp + interface = HOSTIPV4 + port = PORT_S + + +# End diff --git a/test/confs/5401 b/test/confs/5401 new file mode 100644 index 000000000..db018a6d4 --- /dev/null +++ b/test/confs/5401 @@ -0,0 +1,50 @@ +# Exim test configuration 5401 + +exim_path = EXIM_PATH +host_lookup_order = bydns +primary_hostname = myhost.test.ex +rfc1413_query_timeout = 0s +spool_directory = DIR/spool +log_file_path = DIR/spool/log/%slog +gecos_pattern = "" +gecos_name = CALLER_NAME + +# ----- Main settings ----- + +domainlist local_domains = test.ex : *.test.ex + +acl_smtp_rcpt = acl_rcpt + +# ----- ACLs ------- + +begin acl + +acl_rcpt: + accept control = cutthrough_delivery + verify = recipient + + +# ----- Routers ----- + +begin routers + +all: + driver = manualroute + domains = ! +local_domains + route_list = * 127.0.0.1 + self = send + transport = smtp + no_more + + +# ----- Transports ----- + +begin transports + +smtp: + driver = smtp + interface = HOSTIPV4 + port = PORT_S + + +# End diff --git a/test/confs/5410 b/test/confs/5410 new file mode 100644 index 000000000..576967cac --- /dev/null +++ b/test/confs/5410 @@ -0,0 +1,59 @@ +# Exim test configuration 5410 + +exim_path = EXIM_PATH +host_lookup_order = bydns +primary_hostname = myhost.test.ex +rfc1413_query_timeout = 0s +spool_directory = DIR/spool +log_file_path = DIR/spool/log/%slog +gecos_pattern = "" +gecos_name = CALLER_NAME + +# ----- Main settings ----- + +log_selector = +smtp_confirmation +tls_advertise_hosts = * +tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} + +domainlist local_domains = test.ex : *.test.ex + +acl_smtp_rcpt = ${if eq {SERVER}{server}{queue}{cutthrough}} + +# ----- ACLs ------- + +begin acl + +cutthrough: + accept control = cutthrough_delivery + verify = recipient + +queue: + accept control = queue_only + +# ----- Routers ----- + +begin routers + +all: + driver = manualroute + domains = ! +local_domains + route_list = * 127.0.0.1 + self = send + address_data = $local_part + transport = smtp + no_more + + +# ----- Transports ----- + +begin transports + +smtp: + driver = smtp + interface = HOSTIPV4 + port = PORT_D + hosts_avoid_tls = ${if eq {$address_data}{usery}{*}{:}} + hosts_verify_avoid_tls = ${if eq {$address_data}{userz}{*}{:}} + + +# End diff --git a/test/confs/5420 b/test/confs/5420 new file mode 100644 index 000000000..2a7ebda1b --- /dev/null +++ b/test/confs/5420 @@ -0,0 +1,59 @@ +# Exim test configuration 5420 + +exim_path = EXIM_PATH +host_lookup_order = bydns +primary_hostname = myhost.test.ex +rfc1413_query_timeout = 0s +spool_directory = DIR/spool +log_file_path = DIR/spool/log/%slog +gecos_pattern = "" +gecos_name = CALLER_NAME + +# ----- Main settings ----- + +log_selector = +smtp_confirmation +tls_advertise_hosts = * +tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} + +domainlist local_domains = test.ex : *.test.ex + +acl_smtp_rcpt = ${if eq {SERVER}{server}{queue}{cutthrough}} + +# ----- ACLs ------- + +begin acl + +cutthrough: + accept control = cutthrough_delivery + verify = recipient + +queue: + accept control = queue_only + +# ----- Routers ----- + +begin routers + +all: + driver = manualroute + domains = ! +local_domains + route_list = * 127.0.0.1 + self = send + address_data = $local_part + transport = smtp + no_more + + +# ----- Transports ----- + +begin transports + +smtp: + driver = smtp + interface = HOSTIPV4 + port = PORT_D + hosts_avoid_tls = ${if eq {$address_data}{usery}{*}{:}} + hosts_verify_avoid_tls = ${if eq {$address_data}{userz}{*}{:}} + + +# End |