Merge pull request #121 from gryphius/0_7_0

0 7 0

fuglu/conf/fuglu.conf.dist

@@ -135,6 +135,20 @@ dbconnectstring=
 #if the statement returns more than one row/value only the first value in the first row is used
 sql=SELECT value FROM fugluconfig WHERE `section`=:section AND `option`=:option AND `scope` IN ('$GLOBAL',CONCAT('%',:to_domain),:to_address) ORDER BY `scope` DESC
 
+[performance]
+
+#minimum scanner threads
+minthreads=2
+
+#maximum scanner threads
+maxthreads=40
+
+#Method for parallelism, either 'thread' or 'process' 
+backend=thread
+
+#Initial number of processes when backend='process'. If 0 (the default), automatically selects twice the number of available virtual cores. Despite its 'initial'-name, this number currently is not adapted automatically.
+initialprocs=0
+
 [spam]
 
 #what to do with messages that plugins think are spam but not so sure ("low spam")
@@ -163,19 +177,14 @@ boundarydistance=0
 #Only required if plugins need to have information about the last untrusted host and the message doesn't pass a fixed amount of hops to reach this system in your network
 trustedhostsregex=
 
-[performance]
-
-#minimum scanner threads
-minthreads=2
-
-#maximum scanner threads
-maxthreads=40
-
 [esmtpconnector]
 
 #confirmation template sent back to the connecting client for accepted messages
 queuetemplate=${injectanswer}
 
+#only deliver the message to the first recipient, ignore the others. This is useful in spamtrap setups where we don't want to create duplicate deliveries.
+ignore_multiple_recipients=0
+
 [virus]
 
 ##what to do with messages if a plugin detects a virus
@@ -248,6 +257,9 @@ checkarchivecontent=0
 #only extract and examine files up to this amount of (uncompressed) bytes
 archivecontentmaxsize=5000000
 
+#comma separated list of archive extensions. do only process archives of given types.
+enabledarchivetypes=
+
 [ClamavPlugin]
 
 #hostname where clamd runs
@@ -314,7 +326,7 @@ forwardoriginal=0
 #eg. start with _YESNO_ or _YESNOCAPS_ and contain score=_SCORE_
 spamheader=X-Spam-Status
 
-#enable SA user configuration 
+#enable user_prefs in SA. This hands the recipient address over the spamd connection which allows SA to search for configuration overrides
 peruserconfig=1
 
 #spamscore threshold to mark a message as high spam

fuglu/doc/CHANGELOG

@@ -1,14 +1,23 @@
--- Fuglu 0.6.7, unreleased
+-- Fuglu 0.7.0, 2018-01-14
  * Attachment Plugin:
  * support more archive types ( tar.gz, tgz, tar.bz2, .7z)
  * extract archives based on detected magic mime type if possible (instead of file ending)
+ * the plugin now supports scan-time configuration options
  * New Plugin: SpearPhish detection
  * Improve body text extraction by also extracting multipart/mixed and the message's epilogue
  * various refactorings / remove lots of code smell
  * suspect: new "blocked" default tag to indicate a message contains unwanted content (blocked attachents etc), but is not strictly malicious like spam/virus
  * new tool 'fuglu_client' allows scanning messages from the commandline by either injecting them into a running fuglu
  with the Netcat plugin or by starting its own temporary fuglu instance. This is helpful for debugging or running fuglu
  in fetchmail like environments
+ * multi processing mode: instead of running multithreaded the scanning tasks can now run in their own process
+ * prequeue mode can now be configured to only deliver to one recipient per message - useful in spamtrap setups
+ * Add IPv6 support in various plugins connecting to other daemons (clamav, spamasassin, drweb, fprot, icap, sssp)
+ * domainauth plugin: remove hard dependency of pkg_resources
+
+Developers:
+ * suspect.to_addr is no longer a writeable member, it has been converted to a property which always returns the first recipient of a message
+
 
 -- Fuglu 0.6.6, 2016-05-17
  * Minimum python version 2.6

fuglu/src/fuglu/__init__.py

@@ -16,4 +16,4 @@
 __all__ = ['bounce', 'core', 'daemon', 'funkyconsole',
  'protocolbase', 'scansession', 'shared', 'stats', 'threadpool']
 
-FUGLU_VERSION = "0.6.6"
+FUGLU_VERSION = "0.7.0"

fuglu/tests/integration/testdata/endtoendtest.conf

@@ -21,6 +21,11 @@ mrtgdir=
 logtemplate=Suspect ${id} from=${from_address} to=${to_address} size=${size} spam=${spam} virus=${virus} modified=${modified} decision=${decision}
 spamstatusheader=1
 
+[performance]
+backend=thread
+minthreads=10
+maxthreads=20
+
 [smtpconnector]
 requeuetemplate=FUGLU REQUEUE(${id}): ${injectanswer}
 
@@ -55,4 +60,4 @@ pipelining=0
 [FiletypePlugin]
 template_blockedfile=/etc/fuglu/templates/blockedfile.tmpl
 rulesdir=/etc/fuglu/rules
-blockaction=DELETE
+blockaction=DELETE