diff --git a/src/opnsense/mvc/app/controllers/OPNsense/IDS/forms/dialogUserDefined.xml b/src/opnsense/mvc/app/controllers/OPNsense/IDS/forms/dialogUserDefined.xml index 110997654..e8b25311d 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/IDS/forms/dialogUserDefined.xml +++ b/src/opnsense/mvc/app/controllers/OPNsense/IDS/forms/dialogUserDefined.xml @@ -23,18 +23,6 @@ text The SSL fingerprint, for example "B5:E1:B3:70:5E:7C:FF:EB:92:C4:29:E5:5B:AC:2F:AE:70:17:E9:9E". - - rule.geoip - - select_multiple - Countries to alert or block using GeoIP. - - - rule.geoip_direction - - dropdown - Connections coming from (src) or going to (dst) listed countries, default selects both. - rule.action diff --git a/src/opnsense/mvc/app/models/OPNsense/IDS/IDS.xml b/src/opnsense/mvc/app/models/OPNsense/IDS/IDS.xml index 05f39f4ad..6fe559f1b 100644 --- a/src/opnsense/mvc/app/models/OPNsense/IDS/IDS.xml +++ b/src/opnsense/mvc/app/models/OPNsense/IDS/IDS.xml @@ -43,20 +43,6 @@ /^([0-9a-fA-F:]){59,59}$/u A SSL fingerprint should be a 59 character long hex value. - - N - Y - Y - - - N - Both - - - Source - Destination - - Y /^([\t\n\v\f\r 0-9a-zA-Z.\-,_\x{00A0}-\x{FFFF}]){1,255}$/u diff --git a/src/opnsense/service/conf/actions.d/actions_ids.conf b/src/opnsense/service/conf/actions.d/actions_ids.conf index ec31b722d..91b18b0b3 100644 --- a/src/opnsense/service/conf/actions.d/actions_ids.conf +++ b/src/opnsense/service/conf/actions.d/actions_ids.conf @@ -65,7 +65,7 @@ type:script_output message:get suricata daemon status [update] -command:/usr/local/opnsense/scripts/suricata/rule-updater.py && /usr/local/opnsense/scripts/suricata/installRules.py && /usr/local/bin/geoipupdate.sh && pkill -USR2 suricata +command:/usr/local/opnsense/scripts/suricata/rule-updater.py && /usr/local/opnsense/scripts/suricata/installRules.py && pkill -USR2 suricata parameters: type:script message:update and reload intrusion detection rules diff --git a/src/opnsense/service/templates/OPNsense/IDS/OPNsense.rules b/src/opnsense/service/templates/OPNsense/IDS/OPNsense.rules index 906469e4c..747600000 100644 --- a/src/opnsense/service/templates/OPNsense/IDS/OPNsense.rules +++ b/src/opnsense/service/templates/OPNsense/IDS/OPNsense.rules @@ -11,8 +11,6 @@ {{rule.action}}{% if rule.fingerprint|default('') != "" %} tls {% else %} ip {% endif %} {% if rule.source|default('') != "" %} {{ rule.source }} {% else %} any {% endif %} any -> {% if rule.destination|default('') != "" %} {{ rule.destination }} {% else %} any {% endif %} any (msg:"{{rule.description.replace('"','\"')}}"; {% if rule.fingerprint|default('') != "" %} tls.fingerprint:"{{rule.fingerprint.lower()}}";{% endif - %}{% - if rule.geoip|default('') != ""%} geoip:{% if rule.geoip_direction|default('') != '' %}{{rule.geoip_direction}},{% endif %}{{rule.geoip}} ;{% endif %} sid:{{ 4294967295 - loop.index }}; rev:1;)