diff options
Diffstat (limited to 'test/confs')
| -rw-r--r-- | test/confs/4001 | 46 | ||||
| -rw-r--r-- | test/confs/4002 | 16 | ||||
| -rw-r--r-- | test/confs/4003 | 13 | ||||
| -rw-r--r-- | test/confs/4006 | 10 | ||||
| -rw-r--r-- | test/confs/4007 | 4 | ||||
| -rw-r--r-- | test/confs/4008 | 11 | ||||
| -rw-r--r-- | test/confs/4009 | 16 | ||||
| -rw-r--r-- | test/confs/4010 | 47 | ||||
| -rw-r--r-- | test/confs/4011 | 7 | ||||
| -rw-r--r-- | test/confs/4012 | 4 | ||||
| -rw-r--r-- | test/confs/4013 (renamed from test/confs/4004) | 9 | ||||
| -rw-r--r-- | test/confs/4014 (renamed from test/confs/4005) | 13 | ||||
| l--------- | test/confs/4015 | 2 |
13 files changed, 99 insertions, 99 deletions
diff --git a/test/confs/4001 b/test/confs/4001 index 85e68a587..334ca0cae 100644 --- a/test/confs/4001 +++ b/test/confs/4001 @@ -1,29 +1,53 @@ -# Exim test configuration 4001 -# Content-scan: f-protd interface +# Exim test configuration 4001: ACL regex= .include DIR/aux-var/std_conf_prefix primary_hostname = myhost.test.ex +rfc1413_query_timeout = 0s -av_scanner = f-protd : localhost4 PORT_S # ----- Main settings ----- -acl_smtp_rcpt = accept -acl_smtp_data = c_data +acl_smtp_rcpt = check_rcpt +acl_smtp_data = check_data +acl_not_smtp = check_data + + +# ----- ACL ----- begin acl -c_data: - accept !malware = * OPT - deny logwrite = $callout_address malware_name $malware_name +check_rcpt: + accept + +check_data: + warn regex = \N(THIS\s((\w+)\s)?REGEX)\N + message = X-Regex: Regex matched <$regex1> <$regex3> + + warn condition = ${if !eq{$h_fakereject:}{}} + control = fakereject + + warn condition = ${if !eq{$h_fakedefer:}{}} + control = fakedefer + + accept # ----- Routers ----- begin routers -r: - driver = redirect - data = :blackhole: +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/4002 b/test/confs/4002 index dde49c3b2..043a1eccb 100644 --- a/test/confs/4002 +++ b/test/confs/4002 @@ -1,12 +1,17 @@ # Exim test configuration 4002 -# Content-scan: aveserver interface +# Content-scan: spamassassin interface + +OPT= 127.0.0.1 7833 .include DIR/aux-var/std_conf_prefix log_selector = +subject primary_hostname = myhost.test.ex -av_scanner = aveserver : DIR/eximdir/aveserver_sock +# we need to set the sender +trusted_users = CALLER + +spamd_address = OPT # ----- Main settings ----- @@ -16,8 +21,11 @@ acl_smtp_data = c_data begin acl c_data: - accept !malware = * OPT - deny logwrite = malware_name $malware_name + warn + spam = nobody + warn + log_message = $callout_address $spam_action $spam_report + accept # ----- Routers ----- diff --git a/test/confs/4003 b/test/confs/4003 index fbcf3021c..1d00cc695 100644 --- a/test/confs/4003 +++ b/test/confs/4003 @@ -1,12 +1,12 @@ -# Exim test configuration 4002 -# Content-scan: fsecure interface +# Exim test configuration 4003 +# Content-scan: rspamd interface .include DIR/aux-var/std_conf_prefix log_selector = +subject primary_hostname = myhost.test.ex -av_scanner = fsecure : DIR/eximdir/fsec_sock +spamd_address = 127.0.0.1 11333 variant=rspamd # ----- Main settings ----- @@ -16,8 +16,11 @@ acl_smtp_data = c_data begin acl c_data: - accept !malware = <; * OPT - deny logwrite = malware_name $malware_name + warn + spam = nobody + warn + log_message = $spam_action $spam_report + accept # ----- Routers ----- diff --git a/test/confs/4006 b/test/confs/4006 index 3efca602c..4c7059fdf 100644 --- a/test/confs/4006 +++ b/test/confs/4006 @@ -1,12 +1,16 @@ # Exim test configuration 4006 -# Content-scan: avast interface +# Content-scan: clamav interface + +OPT= +CONTROL= .include DIR/aux-var/std_conf_prefix log_selector = +subject primary_hostname = myhost.test.ex -av_scanner = avast : DIR/eximdir/avast_sock : OPTION +#XXX we need an additional test for tcp-connected clamd +av_scanner = clamd : DIR/eximdir/clam_sock CONTROL # ----- Main settings ----- @@ -16,7 +20,7 @@ acl_smtp_data = c_data begin acl c_data: - accept !malware = * INSERT + accept !malware = * OPT deny logwrite = malware_name $malware_name # ----- Routers ----- diff --git a/test/confs/4007 b/test/confs/4007 index 55bfcfafb..0b082b684 100644 --- a/test/confs/4007 +++ b/test/confs/4007 @@ -1,12 +1,12 @@ # Exim test configuration 4007 -# Content-scan: cmsline interface +# Content-scan: avast interface .include DIR/aux-var/std_conf_prefix log_selector = +subject primary_hostname = myhost.test.ex -av_scanner = cmdline : DIR/aux-fixed/TESTNUM.script -o OPT %s : found in file : ^(\S*) +av_scanner = avast : DIR/eximdir/avast_sock : OPTION # ----- Main settings ----- diff --git a/test/confs/4008 b/test/confs/4008 index a3bb87f73..1ec1b85fe 100644 --- a/test/confs/4008 +++ b/test/confs/4008 @@ -1,12 +1,12 @@ # Exim test configuration 4008 -# Content-scan: rspamd interface +# Content-scan: cmsline interface .include DIR/aux-var/std_conf_prefix log_selector = +subject primary_hostname = myhost.test.ex -spamd_address = 127.0.0.1 11333 variant=rspamd +av_scanner = cmdline : DIR/aux-fixed/TESTNUM.script -o OPT %s : found in file : ^(\S*) # ----- Main settings ----- @@ -16,11 +16,8 @@ acl_smtp_data = c_data begin acl c_data: - warn - spam = nobody - warn - log_message = $spam_action $spam_report - accept + accept !malware = * INSERT + deny logwrite = malware_name $malware_name # ----- Routers ----- diff --git a/test/confs/4009 b/test/confs/4009 index dd21a2183..f8e832070 100644 --- a/test/confs/4009 +++ b/test/confs/4009 @@ -1,17 +1,12 @@ # Exim test configuration 4009 -# Content-scan: spamassassin interface - -OPT= 127.0.0.1 7833 +# Content-scan: sophie interface .include DIR/aux-var/std_conf_prefix log_selector = +subject primary_hostname = myhost.test.ex -# we need to set the sender -trusted_users = CALLER - -spamd_address = OPT +av_scanner = sophie : DIR/eximdir/sophie_sock # ----- Main settings ----- @@ -21,11 +16,8 @@ acl_smtp_data = c_data begin acl c_data: - warn - spam = nobody - warn - log_message = $callout_address $spam_action $spam_report - accept + accept !malware = * OPT + deny logwrite = malware_name $malware_name # ----- Routers ----- diff --git a/test/confs/4010 b/test/confs/4010 index f01baf3cf..d7998dc49 100644 --- a/test/confs/4010 +++ b/test/confs/4010 @@ -1,53 +1,30 @@ -# Exim test configuration 0568: ACL regex= +# Exim test configuration 4010 +# Content-scan: fsecure interface .include DIR/aux-var/std_conf_prefix +log_selector = +subject primary_hostname = myhost.test.ex -rfc1413_query_timeout = 0s +av_scanner = fsecure : DIR/eximdir/fsec_sock # ----- Main settings ----- -acl_smtp_rcpt = check_rcpt -acl_smtp_data = check_data -acl_not_smtp = check_data - - -# ----- ACL ----- +acl_smtp_rcpt = accept +acl_smtp_data = c_data begin acl -check_rcpt: - accept - -check_data: - warn regex = \N(THIS\s((\w+)\s)?REGEX)\N - message = X-Regex: Regex matched <$regex1> <$regex3> - - warn condition = ${if !eq{$h_fakereject:}{}} - control = fakereject - - warn condition = ${if !eq{$h_fakedefer:}{}} - control = fakedefer - - accept +c_data: + accept !malware = <; * OPT + deny logwrite = malware_name $malware_name # ----- Routers ----- begin routers -r1: - driver = accept - transport = t1 - -# ----- Transports ----- - -begin transports - -t1: - driver = appendfile - file = DIR/test-mail/$local_part - user = CALLER - +r: + driver = redirect + data = :blackhole: # End diff --git a/test/confs/4011 b/test/confs/4011 index 7be64dc6d..96f5460b9 100644 --- a/test/confs/4011 +++ b/test/confs/4011 @@ -1,11 +1,12 @@ # Exim test configuration 4011 -# Content-scan: f-prot6d interface +# Content-scan: aveserver interface .include DIR/aux-var/std_conf_prefix +log_selector = +subject primary_hostname = myhost.test.ex -av_scanner = f-prot6d : localhost4 PORT_S +av_scanner = aveserver : DIR/eximdir/aveserver_sock # ----- Main settings ----- @@ -16,7 +17,7 @@ begin acl c_data: accept !malware = * OPT - deny logwrite = $callout_address malware_name $malware_name + deny logwrite = malware_name $malware_name # ----- Routers ----- diff --git a/test/confs/4012 b/test/confs/4012 index 9afd4a07c..d0152c507 100644 --- a/test/confs/4012 +++ b/test/confs/4012 @@ -1,11 +1,11 @@ # Exim test configuration 4012 -# Content-scan: sock interface +# Content-scan: f-protd interface .include DIR/aux-var/std_conf_prefix primary_hostname = myhost.test.ex -av_scanner = sock : 127.0.0.1 PORT_S : : BAD : NAME:: (\w+) +av_scanner = f-protd : localhost4 PORT_S # ----- Main settings ----- diff --git a/test/confs/4004 b/test/confs/4013 index 9bc22ce2e..f45082827 100644 --- a/test/confs/4004 +++ b/test/confs/4013 @@ -1,12 +1,11 @@ -# Exim test configuration 4002 -# Content-scan: sophie interface +# Exim test configuration 4013 +# Content-scan: f-prot6d interface .include DIR/aux-var/std_conf_prefix -log_selector = +subject primary_hostname = myhost.test.ex -av_scanner = sophie : DIR/eximdir/sophie_sock +av_scanner = f-prot6d : localhost4 PORT_S # ----- Main settings ----- @@ -17,7 +16,7 @@ begin acl c_data: accept !malware = * OPT - deny logwrite = malware_name $malware_name + deny logwrite = $callout_address malware_name $malware_name # ----- Routers ----- diff --git a/test/confs/4005 b/test/confs/4014 index 0ebb2be7b..e4582fa3d 100644 --- a/test/confs/4005 +++ b/test/confs/4014 @@ -1,16 +1,11 @@ -# Exim test configuration 4005 -# Content-scan: clamav interface - -OPT= -CONTROL= +# Exim test configuration 4014 +# Content-scan: sock interface .include DIR/aux-var/std_conf_prefix -log_selector = +subject primary_hostname = myhost.test.ex -#XXX we need an additional test for tcp-connected clamd -av_scanner = clamd : DIR/eximdir/clam_sock CONTROL +av_scanner = sock : 127.0.0.1 PORT_S : : BAD : NAME:: (\w+) # ----- Main settings ----- @@ -21,7 +16,7 @@ begin acl c_data: accept !malware = * OPT - deny logwrite = malware_name $malware_name + deny logwrite = $callout_address malware_name $malware_name # ----- Routers ----- diff --git a/test/confs/4015 b/test/confs/4015 index eb8888460..4a5de2315 120000 --- a/test/confs/4015 +++ b/test/confs/4015 @@ -1 +1 @@ -4009
\ No newline at end of file +4002
\ No newline at end of file |