fangfrisch 1.9.0.dev3__tar.gz → 1.9.0.dev6__tar.gz

{fangfrisch-1.9.0.dev3/fangfrisch.egg-info → fangfrisch-1.9.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fangfrisch
-Version: 1.9.0.dev3
+Version: 1.9.0.dev6
 Summary: Update and verify unofficial Clam Anti-Virus signatures
 Home-page: https://github.com/rseichter/fangfrisch
 Author: Ralph Seichter

fangfrisch-1.9.0.dev6/docs/Makefile

@@ -0,0 +1,32 @@
+# vim: ts=4 sw=4 noet
+adoc_opts	= -o $@
+cf_combined	= combined.conf
+cf_example	= example.conf
+cf_internal	= internal.conf
+fangfrisch	= ../local/fangfrisch
+out_html	= index.html
+out_pdf		= fangfrisch.pdf
+sources		= fangfrisch.adoc $(cf_combined) $(cf_example) $(cf_internal) ../contrib/fangfrisch-has-news.sh usage.txt
+
+.PHONY:	all clean force
+
+all: $(out_html) $(out_pdf)
+
+$(cf_combined): $(cf_example)
+	$(fangfrisch) -c $< dumpconf > $@
+
+$(cf_internal):
+	$(fangfrisch) -c /dev/null dumpconf > $@
+
+$(out_html): $(sources)
+	asciidoctor -a toc=right $(adoc_opts) $<
+
+$(out_pdf): $(sources)
+	asciidoctor-pdf -a toc=preamble $(adoc_opts) $<
+
+clean:
+	/bin/rm $(out_html) $(out_pdf) || true
+
+force:
+	rm -f $(cf_combined) $(cf_internal)
+	make

{fangfrisch-1.9.0.dev3 → fangfrisch-1.9.0.dev6}/docs/combined.conf

@@ -13,10 +13,10 @@ on_update_timeout = 42
 [fangfrischnews]
 interval = 12h
 local_directory = /tmp
-max_size = 50KB
-script = /path/to/script/fangfrisch-has-news.sh
-on_update_exec = sh -c "[ ! -r ${script} ] || ${script} ${local_directory}"
-prefix = http://mirror.sentries.org/fangfrisch/
+max_size = 100KB
+script = /path/to/fangfrisch-has-news.sh
+on_update_exec = [ ! -x ${script} ] || ${script} ${local_directory}
+prefix = https://www.seichter.de/fangfrisch/
 url_alerts = ${prefix}fangfrisch_alerts.txt
 url_news = ${prefix}fangfrisch_news.txt
 

{fangfrisch-1.9.0.dev3 → fangfrisch-1.9.0.dev6}/docs/fangfrisch.adoc

@@ -1,6 +1,6 @@
 # Fangfrisch
 Ralph Seichter <fangfrisch@seichter.de>
-v1.9.0.dev3, {docdate}
+v1.9.0.dev6, {docdate}
 :copyright: © 2020-2024 Ralph Seichter
 :encoding: UTF-8
 :hyphens: en
@@ -377,9 +377,9 @@ This will only enable Fangfrisch to occasionally download small text files, noth
 You will not need to read the content, nor will anything else happen, unless you modify the `script` option.
 Here is an example script which you could use to have downloaded news items mailed to you.
 It needs to be readable for the user account running Fangfrisch, and the sender/recipient addresses obviously have to be adapted.
-For your convenience, the latest version of the script can be downloaded https://github.com/rseichter/fangfrisch/blob/master/contrib/process-news.sh[here].
+For your convenience, the latest version of the script can be downloaded https://raw.githubusercontent.com/rseichter/fangfrisch/master/contrib/fangfrisch-has-news.sh[here].
 ----
-include::../contrib/process-news.sh[]
+include::../contrib/fangfrisch-has-news.sh[]
 ----
 
 [[dbstructure]]

{fangfrisch-1.9.0.dev3 → fangfrisch-1.9.0.dev6}/docs/fangfrisch.pdf

@@ -7,8 +7,8 @@
 /Keywords (antivirus, clamav, fangfrisch, freshclam, refresh, update)
 /Creator (Asciidoctor PDF 2.3.11, based on Prawn 2.4.0)
 /Producer (Ralph Seichter)
-/ModDate (D:20240229171436+01'00')
-/CreationDate (D:20240229171553+01'00')
+/ModDate (D:20240301205503+01'00')
+/CreationDate (D:20240302003350+01'00')
 >>
 endobj
 2 0 obj
@@ -8744,7 +8744,7 @@ endobj
 [72 0 R /XYZ 0 151.43 null]
 endobj
 79 0 obj
-<< /Length 10760
+<< /Length 10726
 >>
 stream
 q
@@ -9398,7 +9398,7 @@ ET
 BT
 59.24 139.505 Td
 /F3.0 11 Tf
-<6d61785f73697a65203d2035304b42> Tj
+<6d61785f73697a65203d203130304b42> Tj
 ET
 
 0.0 0.0 0.0 SCN
@@ -9409,7 +9409,7 @@ ET
 BT
 59.24 124.765 Td
 /F3.0 11 Tf
-<736372697074203d202f706174682f746f2f7363726970742f66616e676672697363682d6861732d6e6577732e7368> Tj
+<736372697074203d202f706174682f746f2f66616e676672697363682d6861732d6e6577732e7368> Tj
 ET
 
 0.0 0.0 0.0 SCN
@@ -9420,7 +9420,7 @@ ET
 BT
 59.24 110.025 Td
 /F3.0 11 Tf
-<6f6e5f7570646174655f65786563203d207368202d6320225b2021202d7220247b7363726970747d205d207c7c20247b7363726970747d20247b6c6f63616c5f6469726563746f72797d22> Tj
+<6f6e5f7570646174655f65786563203d205b2021202d7820247b7363726970747d205d207c7c20247b7363726970747d20247b6c6f63616c5f6469726563746f72797d> Tj
 ET
 
 0.0 0.0 0.0 SCN
@@ -9431,7 +9431,7 @@ ET
 BT
 59.24 95.285 Td
 /F3.0 11 Tf
-<707265666978203d20687474703a2f2f6d6972726f722e73656e74726965732e6f72672f66616e676672697363682f> Tj
+<707265666978203d2068747470733a2f2f7777772e73656963687465722e64652f66616e676672697363682f> Tj
 ET
 
 0.0 0.0 0.0 SCN
@@ -10762,7 +10762,7 @@ endobj
 >>
 endobj
 91 0 obj
-<< /Length 8617
+<< /Length 8583
 >>
 stream
 q
@@ -10996,7 +10996,7 @@ ET
 BT
 59.24 534.185 Td
 /F3.0 11 Tf
-<6d61785f73697a65203d2035304b42> Tj
+<6d61785f73697a65203d203130304b42> Tj
 ET
 
 0.0 0.0 0.0 SCN
@@ -11007,7 +11007,7 @@ ET
 BT
 59.24 519.445 Td
 /F3.0 11 Tf
-<736372697074203d202f706174682f746f2f7363726970742f66616e676672697363682d6861732d6e6577732e7368> Tj
+<736372697074203d202f706174682f746f2f66616e676672697363682d6861732d6e6577732e7368> Tj
 ET
 
 0.0 0.0 0.0 SCN
@@ -11018,7 +11018,7 @@ ET
 BT
 59.24 504.705 Td
 /F3.0 11 Tf
-<6f6e5f7570646174655f65786563203d207368202d6320225b2021202d7220247b7363726970747d205d207c7c20247b7363726970747d20247b6c6f63616c5f6469726563746f72797d22> Tj
+<6f6e5f7570646174655f65786563203d205b2021202d7820247b7363726970747d205d207c7c20247b7363726970747d20247b6c6f63616c5f6469726563746f72797d> Tj
 ET
 
 0.0 0.0 0.0 SCN
@@ -11029,7 +11029,7 @@ ET
 BT
 59.24 489.965 Td
 /F3.0 11 Tf
-<707265666978203d20687474703a2f2f6d6972726f722e73656e74726965732e6f72672f66616e676672697363682f> Tj
+<707265666978203d2068747470733a2f2f7777772e73656963687465722e64652f66616e676672697363682f> Tj
 ET
 
 0.0 0.0 0.0 SCN
@@ -12690,7 +12690,7 @@ endobj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
-/URI (https://github.com/rseichter/fangfrisch/blob/master/contrib/process-news.sh)
+/URI (https://raw.githubusercontent.com/rseichter/fangfrisch/master/contrib/fangfrisch-has-news.sh)
 >>
 /Subtype /Link
 /Rect [112.9725 91.08 135.81 105.36]
@@ -12698,7 +12698,7 @@ endobj
 >>
 endobj
 102 0 obj
-<< /Length 7774
+<< /Length 7798
 >>
 stream
 q
@@ -13175,7 +13175,7 @@ ET
 BT
 59.24 130.765 Td
 /F3.0 11 Tf
-<ca20202020202020646f6e65203c203c2866696e6420222464697222202d747970652066202d6e616d65202266616e676672697363682a2e74787422202d7072696e743029> Tj
+<ca20202020202020646f6e65203c203c2866696e6420222464697222202d6d617864657074682031202d747970652066202d6e616d65202266616e676672697363682a2e74787422202d7072696e743029> Tj
 ET
 
 0.0 0.0 0.0 SCN
@@ -14916,133 +14916,133 @@ xref
 0000125491 00000 n 
 0000125535 00000 n 
 0000125579 00000 n 
-0000136393 00000 n 
-0000136784 00000 n 
-0000136828 00000 n 
-0000137032 00000 n 
-0000137233 00000 n 
-0000137277 00000 n 
-0000147219 00000 n 
-0000147549 00000 n 
-0000157492 00000 n 
-0000157863 00000 n 
-0000157907 00000 n 
-0000158032 00000 n 
-0000166702 00000 n 
-0000167061 00000 n 
-0000167189 00000 n 
-0000177731 00000 n 
-0000178061 00000 n 
-0000189375 00000 n 
-0000189747 00000 n 
-0000189791 00000 n 
-0000190223 00000 n 
-0000190560 00000 n 
-0000190778 00000 n 
-0000198606 00000 n 
-0000198938 00000 n 
-0000208494 00000 n 
-0000208863 00000 n 
-0000208909 00000 n 
-0000208955 00000 n 
-0000209080 00000 n 
-0000209208 00000 n 
-0000209344 00000 n 
-0000209480 00000 n 
-0000209609 00000 n 
-0000209742 00000 n 
-0000209883 00000 n 
-0000210025 00000 n 
-0000210169 00000 n 
-0000210315 00000 n 
-0000210450 00000 n 
-0000210637 00000 n 
-0000210775 00000 n 
-0000210912 00000 n 
-0000211052 00000 n 
-0000211194 00000 n 
-0000211328 00000 n 
-0000211462 00000 n 
-0000211598 00000 n 
-0000211736 00000 n 
-0000211878 00000 n 
-0000212021 00000 n 
-0000212147 00000 n 
-0000212277 00000 n 
-0000212410 00000 n 
-0000212544 00000 n 
-0000212670 00000 n 
-0000212797 00000 n 
-0000212919 00000 n 
-0000213044 00000 n 
-0000213170 00000 n 
-0000213298 00000 n 
-0000213445 00000 n 
-0000213593 00000 n 
-0000213733 00000 n 
-0000213874 00000 n 
-0000214025 00000 n 
-0000214178 00000 n 
-0000214310 00000 n 
-0000214442 00000 n 
-0000214571 00000 n 
-0000214699 00000 n 
-0000214825 00000 n 
-0000214950 00000 n 
-0000215080 00000 n 
-0000215210 00000 n 
-0000215349 00000 n 
-0000215487 00000 n 
-0000215565 00000 n 
-0000215714 00000 n 
-0000215905 00000 n 
-0000216071 00000 n 
-0000216267 00000 n 
-0000216480 00000 n 
-0000216694 00000 n 
-0000216938 00000 n 
-0000217132 00000 n 
-0000217352 00000 n 
-0000217569 00000 n 
-0000217767 00000 n 
-0000217999 00000 n 
-0000218179 00000 n 
-0000218361 00000 n 
-0000218585 00000 n 
-0000218741 00000 n 
-0000218934 00000 n 
-0000219172 00000 n 
-0000219396 00000 n 
-0000219654 00000 n 
-0000219910 00000 n 
-0000220174 00000 n 
-0000220406 00000 n 
-0000220666 00000 n 
-0000220855 00000 n 
-0000221139 00000 n 
-0000221183 00000 n 
-0000221457 00000 n 
-0000221731 00000 n 
-0000230932 00000 n 
-0000231151 00000 n 
-0000232506 00000 n 
-0000233421 00000 n 
-0000244134 00000 n 
-0000244348 00000 n 
-0000245703 00000 n 
-0000246619 00000 n 
-0000253184 00000 n 
-0000253397 00000 n 
-0000254752 00000 n 
-0000255667 00000 n 
-0000260575 00000 n 
-0000260799 00000 n 
-0000262154 00000 n 
+0000136359 00000 n 
+0000136750 00000 n 
+0000136794 00000 n 
+0000136998 00000 n 
+0000137199 00000 n 
+0000137243 00000 n 
+0000147185 00000 n 
+0000147515 00000 n 
+0000157458 00000 n 
+0000157829 00000 n 
+0000157873 00000 n 
+0000157998 00000 n 
+0000166634 00000 n 
+0000166993 00000 n 
+0000167121 00000 n 
+0000177663 00000 n 
+0000177993 00000 n 
+0000189307 00000 n 
+0000189679 00000 n 
+0000189723 00000 n 
+0000190155 00000 n 
+0000190492 00000 n 
+0000190727 00000 n 
+0000198579 00000 n 
+0000198911 00000 n 
+0000208467 00000 n 
+0000208836 00000 n 
+0000208882 00000 n 
+0000208928 00000 n 
+0000209053 00000 n 
+0000209181 00000 n 
+0000209317 00000 n 
+0000209453 00000 n 
+0000209582 00000 n 
+0000209715 00000 n 
+0000209856 00000 n 
+0000209998 00000 n 
+0000210142 00000 n 
+0000210288 00000 n 
+0000210423 00000 n 
+0000210610 00000 n 
+0000210748 00000 n 
+0000210885 00000 n 
+0000211025 00000 n 
+0000211167 00000 n 
+0000211301 00000 n 
+0000211435 00000 n 
+0000211571 00000 n 
+0000211709 00000 n 
+0000211851 00000 n 
+0000211994 00000 n 
+0000212120 00000 n 
+0000212250 00000 n 
+0000212383 00000 n 
+0000212517 00000 n 
+0000212643 00000 n 
+0000212770 00000 n 
+0000212892 00000 n 
+0000213017 00000 n 
+0000213143 00000 n 
+0000213271 00000 n 
+0000213418 00000 n 
+0000213566 00000 n 
+0000213706 00000 n 
+0000213847 00000 n 
+0000213998 00000 n 
+0000214151 00000 n 
+0000214283 00000 n 
+0000214415 00000 n 
+0000214544 00000 n 
+0000214672 00000 n 
+0000214798 00000 n 
+0000214923 00000 n 
+0000215053 00000 n 
+0000215183 00000 n 
+0000215322 00000 n 
+0000215460 00000 n 
+0000215538 00000 n 
+0000215687 00000 n 
+0000215878 00000 n 
+0000216044 00000 n 
+0000216240 00000 n 
+0000216453 00000 n 
+0000216667 00000 n 
+0000216911 00000 n 
+0000217105 00000 n 
+0000217325 00000 n 
+0000217542 00000 n 
+0000217740 00000 n 
+0000217972 00000 n 
+0000218152 00000 n 
+0000218334 00000 n 
+0000218558 00000 n 
+0000218714 00000 n 
+0000218907 00000 n 
+0000219145 00000 n 
+0000219369 00000 n 
+0000219627 00000 n 
+0000219883 00000 n 
+0000220147 00000 n 
+0000220379 00000 n 
+0000220639 00000 n 
+0000220828 00000 n 
+0000221112 00000 n 
+0000221156 00000 n 
+0000221430 00000 n 
+0000221704 00000 n 
+0000230905 00000 n 
+0000231124 00000 n 
+0000232479 00000 n 
+0000233394 00000 n 
+0000244107 00000 n 
+0000244321 00000 n 
+0000245676 00000 n 
+0000246592 00000 n 
+0000253157 00000 n 
+0000253370 00000 n 
+0000254725 00000 n 
+0000255640 00000 n 
+0000260548 00000 n 
+0000260772 00000 n 
+0000262127 00000 n 
 trailer
 << /Size 202
 /Root 2 0 R
 /Info 1 0 R
 >>
 startxref
-263069
+263042
 %%EOF

{fangfrisch-1.9.0.dev3 → fangfrisch-1.9.0.dev6}/docs/index.html

@@ -442,8 +442,8 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <div class="details">
 <span id="author" class="author">Ralph Seichter</span><br>
 <span id="email" class="email"><a href="mailto:fangfrisch@seichter.de">fangfrisch@seichter.de</a></span><br>
-<span id="revnumber">version 1.9.0.dev3,</span>
-<span id="revdate">2024-02-29</span>
+<span id="revnumber">version 1.9.0.dev6,</span>
+<span id="revdate">2024-03-01</span>
 </div>
 <div id="toc" class="toc2">
 <div id="toctitle">Table of Contents</div>
@@ -1082,10 +1082,10 @@ max_size = 10MB
 [fangfrischnews]
 interval = 12h
 local_directory = /tmp
-max_size = 50KB
-script = /path/to/script/fangfrisch-has-news.sh
-on_update_exec = sh -c "[ ! -r ${script} ] || ${script} ${local_directory}"
-prefix = http://mirror.sentries.org/fangfrisch/
+max_size = 100KB
+script = /path/to/fangfrisch-has-news.sh
+on_update_exec = [ ! -x ${script} ] || ${script} ${local_directory}
+prefix = https://www.seichter.de/fangfrisch/
 url_alerts = ${prefix}fangfrisch_alerts.txt
 url_news = ${prefix}fangfrisch_news.txt
 
@@ -1210,10 +1210,10 @@ on_update_timeout = 42
 [fangfrischnews]
 interval = 12h
 local_directory = /tmp
-max_size = 50KB
-script = /path/to/script/fangfrisch-has-news.sh
-on_update_exec = sh -c "[ ! -r ${script} ] || ${script} ${local_directory}"
-prefix = http://mirror.sentries.org/fangfrisch/
+max_size = 100KB
+script = /path/to/fangfrisch-has-news.sh
+on_update_exec = [ ! -x ${script} ] || ${script} ${local_directory}
+prefix = https://www.seichter.de/fangfrisch/
 url_alerts = ${prefix}fangfrisch_alerts.txt
 url_news = ${prefix}fangfrisch_news.txt
 
@@ -1344,7 +1344,7 @@ enabled = yes
 You will not need to read the content, nor will anything else happen, unless you modify the <code>script</code> option.
 Here is an example script which you could use to have downloaded news items mailed to you.
 It needs to be readable for the user account running Fangfrisch, and the sender/recipient addresses obviously have to be adapted.
-For your convenience, the latest version of the script can be downloaded <a href="https://github.com/rseichter/fangfrisch/blob/master/contrib/process-news.sh">here</a>.</p>
+For your convenience, the latest version of the script can be downloaded <a href="https://raw.githubusercontent.com/rseichter/fangfrisch/master/contrib/fangfrisch-has-news.sh">here</a>.</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -1394,7 +1394,7 @@ report_news() {
 			(( counter+=1 ))
 			echo -e "\n### $fn:\n" &gt;&gt;"$body"
 			cat "$fn" &gt;&gt;"$body"
-		done &lt; &lt;(find "$dir" -type f -name "fangfrisch*.txt" -print0)
+		done &lt; &lt;(find "$dir" -maxdepth 1 -type f -name "fangfrisch*.txt" -print0)
 	done
 	if [ $counter -gt 0 ]; then
 		print_header
@@ -1450,8 +1450,8 @@ fangfrisch --conf /etc/fangfrisch.conf dumpmappings | awk '{print $3}' | xargs /
 </div>
 <div id="footer">
 <div id="footer-text">
-Version 1.9.0.dev3<br>
-Last updated 2024-02-29 17:14:36 +0100
+Version 1.9.0.dev6<br>
+Last updated 2024-03-01 20:55:03 +0100
 </div>
 </div>
 </body>

{fangfrisch-1.9.0.dev3 → fangfrisch-1.9.0.dev6}/docs/internal.conf

@@ -9,10 +9,10 @@ max_size = 10MB
 [fangfrischnews]
 interval = 12h
 local_directory = /tmp
-max_size = 50KB
-script = /path/to/script/fangfrisch-has-news.sh
-on_update_exec = sh -c "[ ! -r ${script} ] || ${script} ${local_directory}"
-prefix = http://mirror.sentries.org/fangfrisch/
+max_size = 100KB
+script = /path/to/fangfrisch-has-news.sh
+on_update_exec = [ ! -x ${script} ] || ${script} ${local_directory}
+prefix = https://www.seichter.de/fangfrisch/
 url_alerts = ${prefix}fangfrisch_alerts.txt
 url_news = ${prefix}fangfrisch_news.txt
 

{fangfrisch-1.9.0.dev3 → fangfrisch-1.9.0.dev6}/fangfrisch/__init__.py

@@ -16,11 +16,12 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with Fangfrisch. If not, see <https://www.gnu.org/licenses/>.
 """
-__version__ = '1.9.0.dev3'
+__version__ = '1.9.0.dev6'
 
 
 class ClamavItem:
-    def __init__(self, section, option, url, check, path, interval, max_size, on_update, connection_timeout) -> None:
+    def __init__(self, section, option, url, check, path, interval, max_size, on_update, connection_timeout,
+                 stem) -> None:
         self.check = check
         self.connection_timeout = connection_timeout
         self.interval = interval
@@ -29,4 +30,5 @@ class ClamavItem:
         self.option = option
         self.path = path
         self.section = section
+        self.stem = stem
         self.url = url

{fangfrisch-1.9.0.dev3 → fangfrisch-1.9.0.dev6}/fangfrisch/config/fangfrischnews.py

@@ -26,10 +26,10 @@ fangfrischnews = {
     'fangfrischnews': {
         INTERVAL: '12h',
         LOCAL_DIR: '/tmp',
-        MAX_SIZE: '50KB',
-        'script': '/path/to/script/fangfrisch-has-news.sh',
-        ON_UPDATE_EXEC: f'sh -c "[ ! -r ${{script}} ] || ${{script}} ${{{LOCAL_DIR}}}"',
-        PREFIX: r'http://mirror.sentries.org/fangfrisch/',
+        MAX_SIZE: '100KB',
+        'script': '/path/to/fangfrisch-has-news.sh',
+        ON_UPDATE_EXEC: f'[ ! -x ${{script}} ] || ${{script}} ${{{LOCAL_DIR}}}',
+        PREFIX: r'https://www.seichter.de/fangfrisch/',
         'url_alerts': f'${{{PREFIX}}}fangfrisch_alerts.txt',
         'url_news': f'${{{PREFIX}}}fangfrisch_news.txt',
     }

{fangfrisch-1.9.0.dev3 → fangfrisch-1.9.0.dev6}/fangfrisch/refresh.py

@@ -18,6 +18,7 @@ along with Fangfrisch. If not, see <https://www.gnu.org/licenses/>.
 """
 import os
 from typing import List
+from typing import Set
 from urllib.parse import urlparse
 
 from fangfrisch import ClamavItem
@@ -30,6 +31,8 @@ from fangfrisch.log import log_error
 from fangfrisch.log import log_exception
 from fangfrisch.log import log_info
 from fangfrisch.log import log_warning
+from fangfrisch.task import Task
+from fangfrisch.task import add_task
 from fangfrisch.util import check_integrity
 from fangfrisch.util import remove_if_exists
 from fangfrisch.util import run_command
@@ -68,15 +71,16 @@ def _clamav_items() -> List[ClamavItem]:
                 if local_dir:
                     filename = os.path.join(local_dir, filename)
                 item_list.append(ClamavItem(
-                    section=section,
-                    option=option,
-                    url=url,
                     check=config.integrity_check(section),
-                    path=filename,
+                    connection_timeout=config.connection_timeout(),
                     interval=config.interval(section),
                     max_size=max_size,
                     on_update=config.get(section, f'on_update_{stem}'),
-                    connection_timeout=config.connection_timeout()
+                    option=option,
+                    path=filename,
+                    section=section,
+                    stem=stem,
+                    url=url,
                 ))
     return item_list
 
@@ -138,16 +142,40 @@ class ClamavRefresh:
         return True
 
     def refresh_all(self) -> int:
-        count = self.cleanup_providers()
+        steps = self.cleanup_providers()
+        trigger_sections: Set[str] = set()
         for ci in _clamav_items():
             if self.refresh(ci):
-                command = ci.on_update
-                if command:
-                    run_command(command, config.on_update_timeout(),
-                                log_info, log_error, log_exception, path=ci.path)
-                count += 1
-        command = config.on_update_exec(section=ci.section)
-        if count > 0 and command:
-            run_command(command, config.on_update_timeout(),
-                        log_info, log_error, log_exception)
-        return count
+                if ci.on_update:
+                    # Run individual command for the item, if defined.
+                    log_debug(f'[{ci.section}] on_update_{ci.stem}: "{ci.on_update}"')
+                    run_command(
+                        command=ci.on_update,
+                        timeout=config.on_update_timeout(section=ci.section),
+                        callback_stdout=log_info,
+                        callback_stderr=log_error,
+                        callback_exception=log_exception,
+                        path=ci.path
+                    )
+                else:
+                    # If no individual command is defined, remember the section name instead.
+                    log_debug(f'[{ci.section}] caused updates')
+                    trigger_sections.add(ci.section)
+            steps += 1
+
+        # Compose a task list
+        tasks: List[Task] = list()
+        for section in trigger_sections:
+            add_task(
+                tasks=tasks,
+                command=config.on_update_exec(section),
+                timeout=config.on_update_timeout(section)
+            )
+
+        # Process tasks
+        completed = 0
+        for task in tasks:
+            task.complete()
+            completed += 1
+
+        return steps, completed

fangfrisch-1.9.0.dev6/fangfrisch/task.py

@@ -0,0 +1,57 @@
+"""
+Copyright © 2020-2024 Ralph Seichter
+
+This file is part of "Fangfrisch".
+
+Fangfrisch is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Fangfrisch is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Fangfrisch. If not, see <https://www.gnu.org/licenses/>.
+"""
+from typing import List
+from typing import Optional
+
+from fangfrisch.log import log_debug
+from fangfrisch.log import log_error
+from fangfrisch.log import log_exception
+from fangfrisch.log import log_info
+from fangfrisch.util import run_command
+
+
+class Task:
+    def __init__(self, command: str, timeout: int) -> None:
+        self.command = command
+        self.timeout = timeout
+
+    def __str__(self):  # pragma: no cover
+        return f'Task(command={{{self.command}}}, timeout={self.timeout})'
+
+    def complete(self) -> int:
+        rc = run_command(
+            command=self.command,
+            timeout=self.timeout,
+            callback_stdout=log_info,
+            callback_stderr=log_error,
+            callback_exception=log_exception
+        )
+        log_debug(f'{self} returned code {rc}')
+        return rc
+
+
+def add_task(tasks: List[Task], command: str, timeout: int) -> Optional[Task]:
+    for task in tasks:
+        if task.command == command:
+            log_debug(f"Ignoring duplicate: {command}")
+            return None
+    task = Task(command=command, timeout=timeout)
+    tasks.append(task)
+    log_debug(f'{task} added')
+    return task

{fangfrisch-1.9.0.dev3 → fangfrisch-1.9.0.dev6/fangfrisch.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fangfrisch
-Version: 1.9.0.dev3
+Version: 1.9.0.dev6
 Summary: Update and verify unofficial Clam Anti-Virus signatures
 Home-page: https://github.com/rseichter/fangfrisch
 Author: Ralph Seichter

{fangfrisch-1.9.0.dev3 → fangfrisch-1.9.0.dev6}/fangfrisch.egg-info/SOURCES.txt

@@ -18,6 +18,7 @@ fangfrisch/download.py
 fangfrisch/dump.py
 fangfrisch/log.py
 fangfrisch/refresh.py
+fangfrisch/task.py
 fangfrisch/util.py
 fangfrisch.egg-info/PKG-INFO
 fangfrisch.egg-info/SOURCES.txt
@@ -33,10 +34,14 @@ fangfrisch/config/malwarepatrol.py
 fangfrisch/config/sanesecurity.py
 fangfrisch/config/securiteinfo.py
 fangfrisch/config/urlhaus.py
+tests/__init__.py
 tests/test_config.py
 tests/test_db.py
 tests/test_download.py
 tests/test_dump.py
 tests/test_log.py
 tests/test_refresh.py
-tests/test_util.py
+tests/test_task.py
+tests/test_util.py
+tests/tests.conf
+tests/tests.sql

{fangfrisch-1.9.0.dev3 → fangfrisch-1.9.0.dev6}/fangfrisch.egg-info/top_level.txt

@@ -1 +1,2 @@
 fangfrisch
+tests

{fangfrisch-1.9.0.dev3 → fangfrisch-1.9.0.dev6}/setup.cfg

@@ -24,21 +24,24 @@ project_urls =
 	Source = https://github.com/rseichter/fangfrisch
 	Tracker = https://github.com/rseichter/fangfrisch/issues
 url = https://github.com/rseichter/fangfrisch
-version = 1.9.0.dev3
+version = 1.9.0.dev6
 
 [options]
 install_requires = 
 	requests>=2.22.0
 	SQLAlchemy>=1.4.0
-packages = 
-	fangfrisch
-	fangfrisch.config
+packages = find:
 python_requires = >=3.7
 
 [options.entry_points]
 console_scripts = 
 	fangfrisch = fangfrisch.__main__:main
 
+[options.package_data]
+tests = 
+	*.conf
+	*.sql
+
 [egg_info]
 tag_build = 
 tag_date = 0

fangfrisch-1.9.0.dev6/tests/__init__.py

@@ -0,0 +1,80 @@
+"""
+Copyright © 2020-2024 Ralph Seichter
+
+This file is part of "Fangfrisch".
+
+Fangfrisch is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Fangfrisch is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Fangfrisch. If not, see <https://www.gnu.org/licenses/>.
+"""
+import os
+import unittest
+import uuid
+
+import fangfrisch.log
+from fangfrisch import ClamavItem
+from fangfrisch.config.config import config
+from fangfrisch.db import DbMeta
+from fangfrisch.log import LogHandlerType
+from fangfrisch.log import init_logger
+
+DIGEST_DUMMY = 'digest_dummy'
+DIGEST_MD5 = '6087a61850f22a132f8522f35779c04d'
+MAX_SIZE = 1024 * 1024
+PATH_DUMMY = 'path_dummy'
+URL_BAD_SHA256 = 'https://seichter.de/favicon.ico'
+URL_MD5 = 'https://seichter.de/favicon-32x32.png'
+URL_MISSING = 'https://seichter.de/index.html'
+URL_SHA256 = 'https://seichter.de/favicon-16x16.png'
+
+
+def env_var(name: str, default: object = None):
+    if name in os.environ:
+        return os.environ[name]
+    return default
+
+
+NETWORK_TESTS = env_var('NETWORK_TESTS') == '1'
+
+
+class _ClamavTestItem(ClamavItem):
+    def __init__(self, section, option, url, check=None, path=None, interval=0, max_size=MAX_SIZE,
+                 on_update=None, connection_timeout=10, stem='test_item') -> None:
+        super().__init__(
+            check=check,
+            connection_timeout=connection_timeout,
+            interval=interval,
+            max_size=max_size,
+            on_update=on_update,
+            option=option,
+            path=path,
+            section=section,
+            stem=stem,
+            url=url,
+        )
+
+
+class FangfrischTest(unittest.TestCase):
+    CONF = 'tests/tests.conf'
+    TMPDIR = '/tmp/fangfrisch/unittest'
+    UNITTEST = 'unittest'
+    UNKNOWN = uuid.uuid4().hex
+
+    @classmethod
+    def setUpClass(cls) -> None:
+        config.init(FangfrischTest.CONF)
+        os.makedirs(FangfrischTest.TMPDIR, exist_ok=True)
+        if fangfrisch.log._handler is not None:
+            fangfrisch.log._handler.close()
+            fangfrisch.log._handler = None
+        init_logger(LogHandlerType.CONSOLE, 'FATAL', '')
+        DbMeta.init(True)

{fangfrisch-1.9.0.dev3 → fangfrisch-1.9.0.dev6}/tests/test_refresh.py

@@ -84,7 +84,9 @@ class RefreshTests(FangfrischTest):
     @unittest.skipUnless(NETWORK_TESTS, 'network tests disabled')
     def test_refresh_force(self):
         cr = ClamavRefresh(Namespace(force=True))
-        self.assertEqual(3, cr.refresh_all())
+        (n, t) = cr.refresh_all()
+        self.assertEqual(3, n)
+        self.assertEqual(2, t)
 
     @unittest.skipUnless(NETWORK_TESTS, 'network tests disabled')
     def test_refresh_age(self):
@@ -108,15 +110,17 @@ class RefreshTests(FangfrischTest):
         ci = _ClamavTestItem(self.UNITTEST, 'x', URL_MD5, 'md5', f'{self.TMPDIR}/x')
         self.s.add(RefreshLog(ci, DIGEST_DUMMY))
         self.s.commit()
-        n = self.ref.refresh_all()
+        (n, t) = self.ref.refresh_all()
         self.assertEqual(3, n)
+        self.assertEqual(2, t)
 
     @unittest.skipUnless(NETWORK_TESTS, 'network tests disabled')
     def test_url_blank(self):
         ci = _ClamavTestItem('unittest4', 'url_blank', '', 'md5', f'{self.TMPDIR}/blank')
         self.s.add(RefreshLog(ci, DIGEST_DUMMY))
         self.s.commit()
-        n = self.ref.refresh_all()
+        (n, t) = self.ref.refresh_all()
+        self.assertEqual(3, n)
         self.assertEqual(3, n)
 
     def test_url_disabled(self):

fangfrisch-1.9.0.dev6/tests/test_task.py

@@ -0,0 +1,53 @@
+"""
+Copyright © 2020-2024 Ralph Seichter
+
+This file is part of "Fangfrisch".
+
+Fangfrisch is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Fangfrisch is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Fangfrisch. If not, see <https://www.gnu.org/licenses/>.
+"""
+import unittest
+from typing import List
+
+from fangfrisch.task import Task
+from fangfrisch.task import add_task
+from tests import FangfrischTest
+
+
+class TaskTests(FangfrischTest):
+    FIRST_COMMAND = '/invalid/command/path'
+
+    def setUp(self) -> None:
+        super().setUpClass()
+        self.tasks: List[Task] = list()
+        self.tasks.append(Task(command=self.FIRST_COMMAND, timeout=1))
+
+    def test_add_task1(self):
+        t = add_task(self.tasks, 'c2', timeout=2)
+        self.assertTrue(isinstance(t, Task))
+
+    def test_add_task2(self):
+        t = add_task(tasks=self.tasks, command=self.FIRST_COMMAND, timeout=3)
+        self.assertIsNone(t)
+
+    def test_complete1(self):
+        for t in self.tasks:
+            self.assertNotEqual(0, t.complete())
+
+    def test_complete2(self):
+        t = add_task(self.tasks, 'echo', timeout=3)
+        self.assertEqual(0, t.complete())
+
+
+if __name__ == '__main__':
+    unittest.main()

fangfrisch-1.9.0.dev6/tests/tests.conf

@@ -0,0 +1,39 @@
+[DEFAULT]
+connection_timeout = 9
+db_url = sqlite:////tmp/fangfrisch/unittest/db.sqlite
+local_directory = /tmp/fangfrisch/unittest
+log_format = %(message)s
+log_level = FATAL
+log_target = unittest
+on_update_exec = echo on_update_exec
+on_update_timeout = 5
+
+[unittest]
+enabled = yes
+integrity_check = sha256
+max_age = 0m
+prefix = https://seichter.de/
+url_index = ${prefix}favicon-16x16.png
+
+[unittest2]
+enabled = yes
+integrity_check = md5
+max_age = 52560000
+on_update_exec = echo overridden
+on_update_timeout = 6
+prefix = https://seichter.de/
+url_index = ${prefix}favicon-32x32.png
+
+[unittest3]
+enabled = yes
+integrity_check = disabled
+max_age = 0m
+prefix = https://seichter.de/
+url_blank =
+url_disabled = disabled
+url_index = ${prefix}favicon-32x32.png
+on_update_index = echo {path}
+
+[unittest4]
+enabled = yes
+max_size = not_a_number

fangfrisch-1.9.0.dev6/tests/tests.sql

@@ -0,0 +1,16 @@
+PRAGMA foreign_keys=OFF;
+BEGIN TRANSACTION;
+CREATE TABLE automx2 (
+	db_version INTEGER NOT NULL, 
+	PRIMARY KEY (db_version)
+);
+INSERT INTO automx2 VALUES(2);
+CREATE TABLE refreshlog (
+	url VARCHAR NOT NULL, 
+	digest VARCHAR, 
+	path VARCHAR NOT NULL, 
+	provider VARCHAR, 
+	updated DATETIME, 
+	PRIMARY KEY (url)
+);
+COMMIT;

fangfrisch-1.9.0.dev3/docs/Makefile

@@ -1,33 +0,0 @@
-# vim:ts=4:noet
-
-asciidoctor_opts = -o $@ -v
-ff = ../local/fangfrisch
-cf_combined = combined.conf
-cf_example = example.conf
-cf_internal = internal.conf
-out_html = index.html
-out_pdf = fangfrisch.pdf
-sources = fangfrisch.adoc $(cf_combined) $(cf_example) $(cf_internal) usage.txt
-
-.PHONY:	all clean force
-
-all: $(out_html) $(out_pdf)
-
-$(cf_combined): $(cf_example)
-	$(ff) -c $< dumpconf > $@
-
-$(cf_internal):
-	$(ff) -c /dev/null dumpconf > $@
-
-$(out_html): $(sources)
-	asciidoctor -a toc=right $(asciidoctor_opts) $<
-
-$(out_pdf): $(sources)
-	asciidoctor-pdf -a toc=preamble $(asciidoctor_opts) $<
-
-clean:
-	/bin/rm $(out_html) $(out_pdf) || true
-
-force:
-	rm -f $(cf_combined) $(cf_internal)
-	make