diff --git a/security/q-feeds-connector/Makefile b/security/q-feeds-connector/Makefile index 31b975bcf..ae86674ce 100644 --- a/security/q-feeds-connector/Makefile +++ b/security/q-feeds-connector/Makefile @@ -1,6 +1,6 @@ PLUGIN_NAME= q-feeds-connector PLUGIN_VERSION= 1.5 -PLUGIN_REVISION= 2 +PLUGIN_REVISION= 3 PLUGIN_COMMENT= Connector for Q-Feeds threat intel PLUGIN_MAINTAINER= devel@qfeeds.com PLUGIN_TIER= 2 diff --git a/security/q-feeds-connector/pkg-descr b/security/q-feeds-connector/pkg-descr index 38fda7f4c..3fcad47dd 100644 --- a/security/q-feeds-connector/pkg-descr +++ b/security/q-feeds-connector/pkg-descr @@ -11,6 +11,8 @@ Plugin Changelog * Feature: Add dest address for unbound * Bugfix: Invalidate alias cache on reconfigure * Bugfix: Ignore "pass" log lines for `qfeedsctl.py logs` +* Bugfix: Use proper configctl command option for flushing +* Buffix: add optional locked mode in qfeedsctl.py for cron runners and wait for configfile changes when HTTP 401 is thrown 1.4 diff --git a/security/q-feeds-connector/src/etc/inc/plugins.inc.d/qfeeds.inc b/security/q-feeds-connector/src/etc/inc/plugins.inc.d/qfeeds.inc index 0d70f598a..381d2539c 100644 --- a/security/q-feeds-connector/src/etc/inc/plugins.inc.d/qfeeds.inc +++ b/security/q-feeds-connector/src/etc/inc/plugins.inc.d/qfeeds.inc @@ -28,8 +28,8 @@ function qfeeds_cron() { - $jobs = []; - $jobs[]['autocron'] = ['/usr/local/sbin/configctl -d qfeeds update', '*/5']; - $jobs[]['autocron'] = ['/usr/local/sbin/configctl -d ! qfeeds stats', '*/15']; - return $jobs; + return [ + ['autocron' => ['/usr/local/sbin/configctl -d qfeeds update', '*/5']], + ['autocron' => ['/usr/local/sbin/configctl -df qfeeds stats', '*/15']], + ]; } diff --git a/security/q-feeds-connector/src/opnsense/scripts/qfeeds/lib/api.py b/security/q-feeds-connector/src/opnsense/scripts/qfeeds/lib/api.py index c4285e811..280c94467 100755 --- a/security/q-feeds-connector/src/opnsense/scripts/qfeeds/lib/api.py +++ b/security/q-feeds-connector/src/opnsense/scripts/qfeeds/lib/api.py @@ -23,6 +23,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. """ + import os import requests from configparser import ConfigParser @@ -30,8 +31,8 @@ from configparser import ConfigParser class QFeedsConfig: config_filename = '/usr/local/etc/qfeeds.conf' - api_key = None conf_timestamp = None + api_key = None def __init__(self): if os.path.isfile(self.config_filename):