From db3fb848d9ab1527b607c788db48270acbc71f20 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 11 May 2022 12:07:59 +0200 Subject: [PATCH] plugins: style sweep --- .../scripts/OPNsense/AcmeClient/run_remote_ssh.php | 10 +++++----- security/crowdsec/+POST_INSTALL.post | 1 - security/crowdsec/+PRE_DEINSTALL.pre | 1 - security/crowdsec/pkg-descr | 1 - .../crowdsec/src/etc/inc/plugins.inc.d/crowdsec.inc | 5 +++-- .../crowdsec/src/etc/rc.syshook.d/start/50-crowdsec | 1 - .../mvc/app/views/OPNsense/CrowdSec/general.volt | 5 ++--- .../opnsense/scripts/OPNsense/CrowdSec/hub-upgrade.sh | 1 - .../opnsense/scripts/OPNsense/CrowdSec/reconfigure.sh | 1 - .../service/conf/actions.d/actions_crowdsec.conf | 1 - .../service/templates/OPNsense/CrowdSec/settings.json | 2 -- security/stunnel/Makefile | 2 +- vendor/sunnyvalley/pkg-descr | 2 +- www/web-proxy-useracl/Makefile | 2 +- 14 files changed, 13 insertions(+), 22 deletions(-) diff --git a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/run_remote_ssh.php b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/run_remote_ssh.php index 3f045347b..9a16b8689 100755 --- a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/run_remote_ssh.php +++ b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/run_remote_ssh.php @@ -29,17 +29,17 @@ const ABOUT = <</dev/null 2>&1 | : # the rest of the cleanup is done in the post-deinstall script, otherwise # the plugin recreates the objects during "filter reload". - diff --git a/security/crowdsec/pkg-descr b/security/crowdsec/pkg-descr index 2cd4f07c1..cc35c3abe 100644 --- a/security/crowdsec/pkg-descr +++ b/security/crowdsec/pkg-descr @@ -46,4 +46,3 @@ Plugin Changelog * fixed an issue that prevented the bouncer from banning IPs on opnsense * fixed support for notification plugins - diff --git a/security/crowdsec/src/etc/inc/plugins.inc.d/crowdsec.inc b/security/crowdsec/src/etc/inc/plugins.inc.d/crowdsec.inc index a1e2eb6b0..79348aaf7 100644 --- a/security/crowdsec/src/etc/inc/plugins.inc.d/crowdsec.inc +++ b/security/crowdsec/src/etc/inc/plugins.inc.d/crowdsec.inc @@ -7,7 +7,8 @@ use OPNsense\Core\Config; use OPNsense\Firewall\Alias; use OPNsense\Firewall\Plugin; -function add_alias_if_not_exist($name, $description, $proto) { +function add_alias_if_not_exist($name, $description, $proto) +{ $model = new Alias(); if ($model->getByName($name) != null) { @@ -40,7 +41,7 @@ function crowdsec_firewall(Plugin $fw) $rules_tag = ""; if (isset($general['rules_tag'])) { $rules_tag = $general['rules_tag']; - }; + } add_alias_if_not_exist('crowdsec_blacklists', 'CrowdSec (IPv4)', 'IPv4'); diff --git a/security/crowdsec/src/etc/rc.syshook.d/start/50-crowdsec b/security/crowdsec/src/etc/rc.syshook.d/start/50-crowdsec index 58359695f..35922bb44 100755 --- a/security/crowdsec/src/etc/rc.syshook.d/start/50-crowdsec +++ b/security/crowdsec/src/etc/rc.syshook.d/start/50-crowdsec @@ -3,4 +3,3 @@ # https://docs.opnsense.org/development/backend/autorun.html /usr/local/opnsense/scripts/OPNsense/CrowdSec/hub-upgrade.sh - diff --git a/security/crowdsec/src/opnsense/mvc/app/views/OPNsense/CrowdSec/general.volt b/security/crowdsec/src/opnsense/mvc/app/views/OPNsense/CrowdSec/general.volt index e6753a4bf..4952bfb18 100644 --- a/security/crowdsec/src/opnsense/mvc/app/views/OPNsense/CrowdSec/general.volt +++ b/security/crowdsec/src/opnsense/mvc/app/views/OPNsense/CrowdSec/general.volt @@ -59,7 +59,7 @@ CrowdSec Central API (meaning timestamp, scenario, attacking IP).

-

Other attack behaviors can be recognized on the OPNsense server and its plugins, or +

Other attack behaviors can be recognized on the OPNsense server and its plugins, or any other agent connected to the same LAPI node. Other types of remediation are possible (ex. captcha test for scraping attempts).

@@ -87,7 +87,7 @@
  • The parsers, scenarios and all objects from the CrowdSec Hub are periodically upgraded. The - crowdsecurity/freebsd and + crowdsecurity/freebsd and crowdsecurity/opnsense collections are installed by default.
    • @@ -139,4 +139,3 @@ - diff --git a/security/crowdsec/src/opnsense/scripts/OPNsense/CrowdSec/hub-upgrade.sh b/security/crowdsec/src/opnsense/scripts/OPNsense/CrowdSec/hub-upgrade.sh index 1c00e7a1b..b57e86bb1 100755 --- a/security/crowdsec/src/opnsense/scripts/OPNsense/CrowdSec/hub-upgrade.sh +++ b/security/crowdsec/src/opnsense/scripts/OPNsense/CrowdSec/hub-upgrade.sh @@ -15,4 +15,3 @@ if service crowdsec enabled; then service crowdsec restart >/dev/null 2>&1 || : fi fi - diff --git a/security/crowdsec/src/opnsense/scripts/OPNsense/CrowdSec/reconfigure.sh b/security/crowdsec/src/opnsense/scripts/OPNsense/CrowdSec/reconfigure.sh index c6d0c2c2c..1c339cc01 100755 --- a/security/crowdsec/src/opnsense/scripts/OPNsense/CrowdSec/reconfigure.sh +++ b/security/crowdsec/src/opnsense/scripts/OPNsense/CrowdSec/reconfigure.sh @@ -30,4 +30,3 @@ fi rm -f /usr/local/etc/crowdsec/opnsense-settings.json echo "OK" - diff --git a/security/crowdsec/src/opnsense/service/conf/actions.d/actions_crowdsec.conf b/security/crowdsec/src/opnsense/service/conf/actions.d/actions_crowdsec.conf index e0e0f6293..de9c3f6fd 100644 --- a/security/crowdsec/src/opnsense/service/conf/actions.d/actions_crowdsec.conf +++ b/security/crowdsec/src/opnsense/service/conf/actions.d/actions_crowdsec.conf @@ -91,4 +91,3 @@ message:crowdsec version command:/usr/local/opnsense/scripts/OPNsense/CrowdSec/reconfigure.sh type:script_output message:crowdsec reconfigure - diff --git a/security/crowdsec/src/opnsense/service/templates/OPNsense/CrowdSec/settings.json b/security/crowdsec/src/opnsense/service/templates/OPNsense/CrowdSec/settings.json index 0c3ed00b0..5b3e0c90e 100644 --- a/security/crowdsec/src/opnsense/service/templates/OPNsense/CrowdSec/settings.json +++ b/security/crowdsec/src/opnsense/service/templates/OPNsense/CrowdSec/settings.json @@ -1,5 +1,3 @@ {% if helpers.exists('OPNsense.crowdsec.general') -%} {{ OPNsense.crowdsec.general | tojson }} {%- endif %} - - diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile index d3215d794..f0a6ca8a2 100644 --- a/security/stunnel/Makefile +++ b/security/stunnel/Makefile @@ -1,6 +1,6 @@ PLUGIN_NAME= stunnel PLUGIN_VERSION= 1.0.4 -PLUGIN_REVISION= 1 +PLUGIN_REVISION= 1 PLUGIN_COMMENT= Stunnel TLS proxy PLUGIN_MAINTAINER= ad@opnsense.org PLUGIN_DEPENDS= stunnel diff --git a/vendor/sunnyvalley/pkg-descr b/vendor/sunnyvalley/pkg-descr index 743f57697..18686981a 100644 --- a/vendor/sunnyvalley/pkg-descr +++ b/vendor/sunnyvalley/pkg-descr @@ -1,4 +1,4 @@ -This plugin adds a proprietary repository to install Zenarmor (previously Sensei), +This plugin adds a proprietary repository to install Zenarmor (previously Sensei), a plugin for OPNsense, complementing the firewall with state of the art next generation firewall features. diff --git a/www/web-proxy-useracl/Makefile b/www/web-proxy-useracl/Makefile index 7620cecc0..fd340b0d1 100644 --- a/www/web-proxy-useracl/Makefile +++ b/www/web-proxy-useracl/Makefile @@ -2,7 +2,7 @@ PLUGIN_NAME= web-proxy-useracl PLUGIN_VERSION= 1.1 PLUGIN_REVISION= 2 PLUGIN_COMMENT= Group and user ACL for the web proxy -PLUGIN_OBSOLETE= No changes since 2018 +PLUGIN_OBSOLETE= No changes since 2018 PLUGIN_MAINTAINER= kekek2@ya.ru PLUGIN_WWW= https://smart-soft.ru