Commit Graph

49 Commits

Author SHA1 Message Date
Matt Simerson
ab22cb2ac4 spamassassin: further log message refinement 2013-08-05 15:01:52 -07:00
Matt Simerson
4646b0ff0a spamassassin: s/deny/fail/ from a log message (consistency) 2013-08-05 15:01:51 -07:00
Matt Simerson
d460dc86e3 spamassassin: add explicit default reject_type
consolidate the two data_post methods into one (more linear, simpler)
more informative log message
add new headers to top of headers (not bottom (consistent MTA behavior))
2013-08-05 15:01:48 -07:00
Matt Simerson
57a0e4ba7b updated plugins to use QP::Plugins::is_immune 2012-06-04 03:26:16 -04:00
Matt Simerson
19927a117e spamassassin: added spam status to log messages
added additional values to tests, to suppress test warnings
2012-05-20 23:39:03 -07:00
Matt Simerson
d644c24c83 spamassassin updates
refactored into small subs with unit tests.
parse SA header with split instead of regexp (more reliable)
store SA results in a 'spamassassin' transaction note
add strict and warnings pragma
renamed reject_threshold -> reject (backwards compatible)
added relayclient skip option and POD. Skips SA processing when relayclient is set
added MULTIPLE RECIPIENT BEHAVIOR topic to POD
2012-05-06 16:18:22 -07:00
Ask Bjørn Hansen
a23d4b3da9 Fix 01-syntax test failures
Exclude some tests with dependencies.

Remove -T from perl line in plugins
This makes it harder to test with PERL5LIB/perlbrew etc
2012-04-29 01:36:01 -07:00
Matt Simerson
dbaa9dbd6c POD corrections, additional tests, plugin consistency
on files in plugins dir:
  fixed a number of POD errors

  formatted some # comments into POD

  removed bare 1;  (these are plugins, not perl modules)
    most instances of this were copy/pasted from a previous plugin that had it

  removed instances of # vim ts=N ...
    they weren't consistent, many didn't match .perltidyrc

  on modules that failed perl -c tests, added 'use Qpsmtpd::Constants;'

Conflicts:

	plugins/async/check_earlytalker
	plugins/async/dns_whitelist_soft
	plugins/async/dnsbl
	plugins/async/queue/smtp-forward
	plugins/async/require_resolvable_fromhost
	plugins/async/rhsbl
	plugins/async/uribl
	plugins/auth/auth_checkpassword
	plugins/auth/auth_cvm_unix_local
	plugins/auth/auth_flat_file
	plugins/auth/auth_ldap_bind
	plugins/auth/auth_vpopmail
	plugins/auth/auth_vpopmail_sql
	plugins/auth/authdeny
	plugins/check_badmailfromto
	plugins/check_badrcptto_patterns
	plugins/check_bogus_bounce
	plugins/check_earlytalker
	plugins/check_norelay
	plugins/check_spamhelo
	plugins/connection_time
	plugins/dns_whitelist_soft
	plugins/dnsbl
	plugins/domainkeys
	plugins/greylisting
	plugins/hosts_allow
	plugins/http_config
	plugins/logging/adaptive
	plugins/logging/apache
	plugins/logging/connection_id
	plugins/logging/transaction_id
	plugins/logging/warn
	plugins/milter
	plugins/queue/exim-bsmtp
	plugins/queue/maildir
	plugins/queue/postfix-queue
	plugins/queue/smtp-forward
	plugins/quit_fortune
	plugins/random_error
	plugins/rcpt_map
	plugins/rcpt_regexp
	plugins/relay_only
	plugins/require_resolvable_fromhost
	plugins/rhsbl
	plugins/sender_permitted_from
	plugins/spamassassin
	plugins/tls
	plugins/tls_cert
	plugins/uribl
	plugins/virus/aveclient
	plugins/virus/bitdefender
	plugins/virus/clamav
	plugins/virus/clamdscan
	plugins/virus/hbedv
	plugins/virus/kavscanner
	plugins/virus/klez_filter
	plugins/virus/sophie
	plugins/virus/uvscan
2012-04-29 00:00:10 -07:00
Robert
61de599c1b Normalize #! lines on all plugins
find . -type f | xargs -n1 perl -pi.bak -0777 -e '$want = "#!perl -Tw"; s/\A#!.*\n/$want\n/; s/\A([^#])/$want\n\1/s'
2012-04-28 20:41:31 -07:00
Robert
b72c4b0b86 Add config example 2009-11-04 21:44:43 -08:00
Robert
de3fbb565f Rename spamsubjectprefix to subject_prefix. Add docs. 2009-11-04 21:43:38 -08:00
Jonathan Martens
48d1a5b9fe Custom spam tag subject munging in spamassasin plugin
Hi all!

I have written a patch to allow the spamassasin plugin to have a custom
spam tag read in from a configuration file as opposed to the default ***
SPAM *** that is hard coded.

When the configuration file (spamsubjectprefix) is not defined or empty
the default value still applies, if it is provided the value from the
configuration file is used.

Any change this can be considered for implementation as we would really
like to have it for SME Server.

Kind regards,

Jonathan

Signed-off-by: Robert <rspier@pobox.com>
2009-11-04 21:38:57 -08:00
Charlie Brady
f4eb90cba3 Fix spamassassin plugin log noise if spam score is 0.0 2009-07-20 13:02:38 +02:00
jaredj
89e391e9d2 Close spamd socket when we're finished with it
QP's connection to spamd unnecessarily persists beyond the run of the
spamassassin plugin itself.  This closes the socket as soon as we're
finished using it.

Signed-off-by: Ask Bjørn Hansen <ask@develooper.com>
2009-04-02 22:35:42 -07:00
Hanno Hecker
e7bcc3fcf9 "chomp" DEBUG output - for logging/file
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@956 958fd67b-6ff1-0310-b445-bb7760255be9
2008-11-04 18:37:21 +00:00
Ask Bjørn Hansen
3c8766f683 update documentation (issue #26)
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@935 958fd67b-6ff1-0310-b445-bb7760255be9
2008-07-31 20:32:32 +00:00
Robert Spier
7169c9f0bc Revert accidental commit 909.
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@910 958fd67b-6ff1-0310-b445-bb7760255be9
2008-05-17 03:54:24 +00:00
Robert Spier
6563dcc4f8 hostnames come in lower case, and might even be longer than 8 characters
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@909 958fd67b-6ff1-0310-b445-bb7760255be9
2008-05-17 03:52:00 +00:00
Matt Sergeant
6f1a048cf3 Add shebang line so syntax highlighters kick in :-)
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@860 958fd67b-6ff1-0310-b445-bb7760255be9
2008-03-18 15:18:19 +00:00
Robert Spier
6a4b30e6f9 add new clamd_user parameter that sets the user we pass to clamd
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@817 958fd67b-6ff1-0310-b445-bb7760255be9
2007-11-17 08:22:00 +00:00
Ask Bjørn Hansen
475203689d Add X-Spam-Level header in spamassassin plugin (idea from Werner Fleck)
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@795 958fd67b-6ff1-0310-b445-bb7760255be9
2007-09-24 20:45:09 +00:00
Ask Bjørn Hansen
2361ca606d Cleanup spamassassin plugin code a little
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@794 958fd67b-6ff1-0310-b445-bb7760255be9
2007-09-24 20:21:24 +00:00
Matt Sergeant
237bf904a5 Quiet warnings (Steve_p)
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@714 958fd67b-6ff1-0310-b445-bb7760255be9
2007-02-13 18:29:47 +00:00
Hanno Hecker
ad541f6207 Qpsmtpd::Transaction: add body_fh(), body_length() and data_size(),
depreceated body_size()


git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.3x@689 958fd67b-6ff1-0310-b445-bb7760255be9
2006-12-16 11:56:48 +00:00
Ask Bjørn Hansen
84b7363018 r3826@embla: ask | 2006-07-09 02:34:33 -0700
Enhance the spamassassin plugin to support connecting to a remote
   spamd process (Kjetil Kjernsmo). 


git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.3x@651 958fd67b-6ff1-0310-b445-bb7760255be9
2006-07-09 09:34:51 +00:00
John Peacock
1d0f889d3c Support for RFC 1893 - Enhanced Mail System Status Codes
Patch by Hanno Hecker <hah@uu-x.de>.

Adds the RFC 1893 status codes to the messages which are returned to the
sending client.

git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.3x@602 958fd67b-6ff1-0310-b445-bb7760255be9
2006-01-25 02:59:31 +00:00
Robert Spier
90daeb3786 r483@dog: rspier | 2005-07-06 21:17:00 -0700
The great plugin renaming in the name of inheritance and standardization commit.
 
 1. new concept of standard hook_ names.
 2. Plugin::init
 3. renamed many subroutines in plugins (and cleaned up register subs)
 4. updated README.plugins
 


git-svn-id: https://svn.perl.org/qpsmtpd/trunk@479 958fd67b-6ff1-0310-b445-bb7760255be9
2005-07-07 04:17:39 +00:00
John Peacock
9664eb9469 Change remaining plugins to use LOGXXXX constants instead of bare numbers.
Change plugins/dnsbl to permit AUTH'd or other relay clients even if IP
is on a blacklist.


git-svn-id: https://svn.perl.org/qpsmtpd/trunk@442 958fd67b-6ff1-0310-b445-bb7760255be9
2005-06-22 14:08:57 +00:00
Matt Sergeant
43aa207242 Fix all uses of warn() to be $self->log(LOGWARN, ...)
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@380 958fd67b-6ff1-0310-b445-bb7760255be9
2005-03-03 02:37:04 +00:00
Robert Spier
012c6db2d3 - dnsbl, count_unrec_commands, spamassassin:
use symbolic log levels, instead of numeric
- dnsbl:  set some (probably too large) timeouts
- count_unrec_commands: DENYHARD
- spamassassin: upgrade protocol to support switching users


git-svn-id: https://svn.perl.org/qpsmtpd/trunk@349 958fd67b-6ff1-0310-b445-bb7760255be9
2004-11-27 07:02:23 +00:00
John Peacock
af03c53512 plugins/spamassassin
New option to strip/rename/keep old X-Spam headers (Michael Holzt)


git-svn-id: https://svn.perl.org/qpsmtpd/trunk@335 958fd67b-6ff1-0310-b445-bb7760255be9
2004-10-13 01:52:35 +00:00
John Peacock
479750aa03 * plugins/spamassassin
Revert changes to replace instead of add X-Spam headers


git-svn-id: https://svn.perl.org/qpsmtpd/trunk@331 958fd67b-6ff1-0310-b445-bb7760255be9
2004-09-24 17:29:56 +00:00
John Peacock
9cd26b24c4 * spamassassin
Must replace any existing X-Spam headers with local score,
     rather than adding.  Don't care what other SA instances thought.
     (Michael Holzt)


git-svn-id: https://svn.perl.org/qpsmtpd/trunk@330 958fd67b-6ff1-0310-b445-bb7760255be9
2004-09-24 15:17:07 +00:00
Ask Bjørn Hansen
154ca2e617 remove warning when not using spamd_socket
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@276 958fd67b-6ff1-0310-b445-bb7760255be9
2004-07-18 11:02:24 +00:00
Robert Spier
7cc66cdf75 "-" is a valid filename element.
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@239 958fd67b-6ff1-0310-b445-bb7760255be9
2004-06-10 06:26:18 +00:00
Ask Bjørn Hansen
5c972e5506 SpamAssassin plugin Outlook compatibility fix (Thanks to Gergely Risko)
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@224 958fd67b-6ff1-0310-b445-bb7760255be9
2004-03-11 09:34:38 +00:00
Matt Sergeant
9c700b18e1 New for 0.28: Log levels and $Include for config/plugins
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@217 958fd67b-6ff1-0310-b445-bb7760255be9
2004-03-05 12:46:24 +00:00
Ask Bjørn Hansen
b005a303b3 spamd_socket support -- thanks to John Peacock
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@213 958fd67b-6ff1-0310-b445-bb7760255be9
2004-03-05 09:12:20 +00:00
Ask Bjørn Hansen
03a53bad7c + Made the SpamAssassin plugin work with SA 2.6+ (thanks to numerous
+  contributors, thanks everyone!). Note that for now it's not
+  including the Spam: headers with the score explained. For that use
+  the spamassassin_spamc plugin from http://projects.bluefeet.net/
+  (for now).


git-svn-id: https://svn.perl.org/qpsmtpd/trunk@206 958fd67b-6ff1-0310-b445-bb7760255be9
2004-02-22 02:17:29 +00:00
Ask Bjørn Hansen
5ea59dbf59 add note about SA 2.50
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@125 958fd67b-6ff1-0310-b445-bb7760255be9
2003-03-18 09:53:37 +00:00
Ask Bjørn Hansen
99fb59a7ff Add munge_subject_threshold and reject_threshold options to the
spamassassin plugin.

Add documentation to the spamassassin plugin.

Add comments to the plugins config


git-svn-id: https://svn.perl.org/qpsmtpd/trunk@103 958fd67b-6ff1-0310-b445-bb7760255be9
2002-12-09 08:47:15 +00:00
Ask Bjørn Hansen
dc562f716e make the spamassassin plugin not stop processing of content plugins
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@98 958fd67b-6ff1-0310-b445-bb7760255be9
2002-11-06 11:03:00 +00:00
Ask Bjørn Hansen
859a3589aa improve error handling
git-svn-id: https://svn.perl.org/qpsmtpd/branches/v010@50 958fd67b-6ff1-0310-b445-bb7760255be9
2002-09-08 10:02:10 +00:00
Ask Bjørn Hansen
21506e8025 notes on spamassassin compatibility
git-svn-id: https://svn.perl.org/qpsmtpd/branches/v010@47 958fd67b-6ff1-0310-b445-bb7760255be9
2002-08-29 03:18:59 +00:00
Ask Bjørn Hansen
95e8a68833 support for SpamAssassin 2.40.
git-svn-id: https://svn.perl.org/qpsmtpd/branches/v010@46 958fd67b-6ff1-0310-b445-bb7760255be9
2002-08-29 03:15:34 +00:00
Ask Bjørn Hansen
0e638f4537 header bugfixes
git-svn-id: https://svn.perl.org/qpsmtpd/branches/v010@45 958fd67b-6ff1-0310-b445-bb7760255be9
2002-08-06 13:39:44 +00:00
Ask Bjørn Hansen
2ee95fc3fc only send messages smaller than 500000 bytes to spamd
git-svn-id: https://svn.perl.org/qpsmtpd/branches/v010@42 958fd67b-6ff1-0310-b445-bb7760255be9
2002-08-06 12:57:59 +00:00
Ask Bjørn Hansen
1e113721d0 spamassassin plugin
git-svn-id: https://svn.perl.org/qpsmtpd/branches/v010@39 958fd67b-6ff1-0310-b445-bb7760255be9
2002-08-06 12:27:35 +00:00
Ask Bjørn Hansen
8ce8427bf9 data_post hook
spamassassin plugin


git-svn-id: https://svn.perl.org/qpsmtpd/branches/v010@38 958fd67b-6ff1-0310-b445-bb7760255be9
2002-08-06 12:01:22 +00:00