Commit Graph

2363 Commits

Author SHA1 Message Date
Daniel B
9f599f9f47 Record the name of the original plugin (#256)
When using the naughty plugin to defer rejection, we loose the name of the original plugin which caused the reject.
Especially when we parse the logterse plugin output to build graphs. With this addition, we now can get this information back
2016-04-25 06:13:52 -10:00
Daniel B
d6be03b37e Make spammy_tlds configurable (#255)
* Make spammy_tlds configurable
The hardcoded list of spammy tlds can't fit every needs. Makes this configurable through a config file.
You can now also raise the karma for tlds you want.
The default config provided keep the same behaviour as before.

* Update tlds' karma
2016-04-25 06:13:08 -10:00
Daniel B
5e157d2344 Possibility to set the number of "strikes" for the karma plugin (#254)
The default behaviour (connection needs to have at least 3 or -3 to be considered
nice or naughty) is not always what we want, depending on the number of plugins
which adjust the karma. Lets make it configurable
2016-04-20 07:52:47 -10:00
Daniel B
260bd6cdd6 Prevent credentials being logged in plain text (#249)
* Prevent credentials being logged in plain text
except in the highest debug level

* Fix missing semicolon
2016-04-19 18:10:28 -10:00
Matt Simerson
044fff9aa8 Merge pull request #250 from dani/warn_inplicit_split
Prevent a "Use of implicit split" warning
2016-04-19 18:02:14 -10:00
Matt Simerson
5a802a036a Merge pull request #251 from dani/uribl_data_post
uribl needs to hook in data_post
2016-04-19 18:01:30 -10:00
Matt Simerson
4f27f360e9 Merge pull request #252 from dani/tls_proto
Allow setting TLS protocol versions in a config file
2016-04-19 17:55:26 -10:00
Matt Simerson
fee44d1ccf Merge pull request #253 from dani/sa_size
New size_limit param for spamassassin plugin
2016-04-19 17:53:29 -10:00
Daniel Berteaud
4a6ce830b3 New size_limit param for spamassassin plugin
Allow setting the size limit to handle by the plugin, instead of the hardcoded 500_000 value
2016-04-19 18:37:42 +02:00
Daniel Berteaud
0d2690d726 Allow setting TLS protocol versions in a config file
Some users might need to enable the old SSLv3, or others might want to disable TLSv1. Lets make this configurable.
The default value is kept, but can be overriden in the tls_protocols config file
2016-04-19 18:28:36 +02:00
Daniel Berteaud
0c41f2af06 uribl needs to hook in data_post
When hooking into data, there's no email body to check, so no URI is found
2016-04-19 18:22:43 +02:00
Daniel Berteaud
e792c11bfa Prevent a "Use of implicit split" warning
In the helo plugin. Full warn is:
Use of implicit split to @_ is deprecated at /usr/share/qpsmtpd/plugins/helo line 524
2016-04-19 18:18:03 +02:00
Matt Simerson
43020a8041 Merge pull request #248 from smtpd/release-0.96
update Changes, bump version
2016-02-16 14:52:02 -08:00
Matt Simerson
d3546f9501 update Changes, bump version 2016-02-16 14:50:16 -08:00
Matt Simerson
9de7c3778e Merge pull request #244 from priyadi/dmarc-fix
Fix DMARC authentication-result string
2016-02-16 14:39:37 -08:00
Matt Simerson
79deb8b061 Merge pull request #247 from christianeisendle/x-spam_status_outlook_hack_fix
Replace all occurances of CR in X-Spam-Status
2016-02-16 14:25:58 -08:00
Christian Eisendle
4d061dfa89 Replace all occurances of CR in X-Spam-Status
The hack for outlook (replacing CR in X-Spam-Status header) assumes
that there is only a single occurance of CR. However, if spamassassin
adds some more spam status information X-Spam-Status might be several lines
long leading to multiple occurance of CR.
This fix changes the substitute to a global subsititute, replacing all
CRs in the X-SPam-Status header.
2016-02-16 22:03:57 +01:00
Matt Simerson
66e76f5796 Merge pull request #246 from msimerson/master
check *every* regex, not just first
2015-12-20 08:53:25 -08:00
Matt Simerson
965f4fc440 check *every* regex, not just first 2015-12-17 10:47:08 -08:00
Matt Simerson
00343a48ac Merge pull request #243 from priyadi/master
Should only reject if host is not localhost but HELO claims to be one
2015-12-17 10:17:59 -08:00
Matt Simerson
8f4029481a Merge pull request #245 from msimerson/frank
badrcpt use reason, and defined-ness test
2015-07-20 13:09:22 -07:00
Matt Simerson
1143918ec9 badrcpt use reason, and defined-ness test
as reported by frank on the QP mailing list
2015-07-20 09:56:18 -07:00
Priyadi Iman Nurcahyo
feb63c95a5 According to RFC7489 authstr should be: none, pass, fail, temperror, permerror 2015-05-26 19:36:40 +00:00
Priyadi Iman Nurcahyo
0e614e8741 Fix DMARC authentication-result string 2015-05-26 16:13:08 +00:00
Priyadi Iman Nurcahyo
298b92f067 Should only reject if host is not localhost but HELO claims to be one 2015-05-26 10:27:33 +00:00
Jared Johnson
8f14cc01e4 Merge pull request #242 from analogic/patch-1
DMARC plugin: Added option to disable reporting
2015-03-13 16:16:38 -05:00
analogic
e440f8760b DMARC plugin: Added option to disable reporting 2015-03-13 14:02:05 +01:00
Matt Simerson
11a9154552 Merge pull request #234 from jaredj/writeable-dir
Add perms test to Qpsmtpd::DB::File::DBM::dir()
2015-03-10 09:59:03 -07:00
Jared Johnson
88c55ed9a3 Emit detailed warning on unuseable default db dirs 2015-03-09 17:17:26 -05:00
Jared Johnson
1ae8ed206f More useful exception on invalid db_dir 2015-03-09 17:17:26 -05:00
Jared Johnson
84aa8e2328 Die when an invalid dir is specified manually 2015-03-09 17:17:26 -05:00
Jared Johnson
6b13e24221 Add perms test to Qpsmtpd::DB::File::DBM::dir() 2015-03-09 17:17:26 -05:00
Matt Simerson
19650063e6 Merge pull request #241 from jaredj/prune-lock
Don't leave DB locked after pruning empty greylist
2015-03-05 21:06:13 -08:00
Jared Johnson
e98e1c2e82 Regression test for prune_db locking problem 2015-03-05 18:34:59 -06:00
Jared Johnson
4106da56d1 Don't leave DB locked after pruning an empty DB 2015-03-05 18:34:13 -06:00
Matt Simerson
a8b2376e80 Merge pull request #238 from smtpd/revert-237-revert-236-geoip-crash
Don't crash QP when GeoIP data is missing
2015-02-26 17:52:37 -08:00
Jared Johnson
a1144ecbf9 Revert "Revert "Don't crash QP when GeoIP data is missing"" 2015-02-26 17:07:35 -06:00
Jared Johnson
8cb7f8b226 Merge pull request #237 from smtpd/revert-236-geoip-crash
Revert "Don't crash QP when GeoIP data is missing"
2015-02-26 17:06:23 -06:00
Jared Johnson
6f38bdf5ad Revert "Don't crash QP when GeoIP data is missing" 2015-02-26 17:05:52 -06:00
Jared Johnson
c76c00e37c Merge pull request #236 from jaredj/geoip-crash
Don't crash QP when GeoIP data is missing
2015-02-26 17:05:34 -06:00
Jared Johnson
15210db779 Don't crash QP when GeoIP data is missing 2015-02-26 17:04:49 -06:00
Matt Simerson
573f7c5bf4 Merge pull request #233 from jaredj/greylist-error-handling
Skip greylisting when we can't talk to greylist DB
2015-02-23 12:42:22 -08:00
Jared Johnson
15a297372d Default to one-second connect timeout for Redis 2015-02-23 14:32:42 -06:00
Jared Johnson
42c551944e Add some validation for passed db args 2015-02-23 14:13:39 -06:00
Jared Johnson
51ca3fcda4 Skip greylisting when we can't talk to greylist DB 2015-02-23 11:25:36 -06:00
Jared Johnson
4c9bcc0ee4 Configure but don't connect to DB in init_db()
This allows us to start up QP even if e.g. Redis is down
2015-02-23 11:25:18 -06:00
Matt Simerson
f7558f346d Merge pull request #232 from jaredj/mock-not-fake
Change fake_{config,hook} to mock_{config,hook}
2015-02-12 14:28:56 -08:00
Jared Johnson
5f6485e84f Change fake_{config,hook} to mock_{config,hook}
'mock' is more accurate and recognizable
2015-02-12 16:19:44 -06:00
Matt Simerson
e371159e38 Merge pull request #231 from jaredj/fake-greeting
Use a fake greeting for testing run_continuation()
2015-02-12 14:06:01 -08:00
Jared Johnson
95d40297cf Use a fake greeting for testing run_continuation()
This makes the test more universally useful in exercising run_continuation()
itself even with forks that e.g. use custom greetings
2015-02-12 15:53:50 -06:00