diff --git a/src/opnsense/mvc/app/models/OPNsense/IDS/Migrations/M1_0_4.php b/src/opnsense/mvc/app/models/OPNsense/IDS/Migrations/M1_0_4.php deleted file mode 100644 index 9544a160401..00000000000 --- a/src/opnsense/mvc/app/models/OPNsense/IDS/Migrations/M1_0_4.php +++ /dev/null @@ -1,101 +0,0 @@ -object(); - if (!isset($cfgObj->OPNsense->IDS->files->file)) { - return; - } - $csets = array(); - $nsets = array(); - $changed_sets = ['emerging-current_events.rules', 'emerging-trojan.rules', - 'emerging-malware.rules', 'emerging-info.rules', 'emerging-policy.rules']; - $new_sets = ['emerging-ja3.rules', 'emerging-hunting.rules', 'emerging-adware_pup.rules', - 'emerging-phishing.rules', 'emerging-exploit_kit.rules', 'emerging-coinminer.rules', - 'emerging-malware.rules']; - foreach ($model->files->file->iterateItems() as $file) { - if (in_array((string)$file->filename, $changed_sets)) { - $csets[(string)$file->filename] = $file; - } - if (in_array((string)$file->filename, $new_sets)) { - $nsets[(string)$file->filename] = $file; - } - } - // add all new to config in deselected state - foreach ($new_sets as $filename) { - if (empty($nsets[$filename])) { - $node = $model->files->file->Add(); - $node->filename = $filename; - $nsets[$filename] = $node; - } - } - // map rulesets - if (!empty($csets['emerging-malware.rules']) && $csets['emerging-malware.rules']->enabled == "1") { - $nsets['emerging-adware_pup.rules']->enabled = "1"; - $nsets['emerging-adware_pup.rules']->filter = (string)$csets['emerging-malware.rules']->filter; - } - if (!empty($csets['emerging-current_events.rules']) && $csets['emerging-current_events.rules']->enabled == "1") { - $nsets['emerging-phishing.rules']->enabled = "1"; - $nsets['emerging-phishing.rules']->filter = (string)$csets['emerging-current_events.rules']->filter; - $nsets['emerging-exploit_kit.rules']->enabled = "1"; - $nsets['emerging-exploit_kit.rules']->filter = (string)$csets['emerging-current_events.rules']->filter; - } - if (!empty($csets['emerging-trojan.rules']) && $csets['emerging-trojan.rules']->enabled == "1") { - $nsets['emerging-coinminer.rules']->enabled = "1"; - $nsets['emerging-coinminer.rules']->filter = (string)$csets['emerging-trojan.rules']->filter; - $nsets['emerging-malware.rules']->enabled = "1"; - $nsets['emerging-malware.rules']->filter = (string)$csets['emerging-malware.rules']->filter; - } - if (!empty($csets['emerging-info.rules']) && $csets['emerging-info.rules']->enabled == "1") { - $nsets['emerging-hunting.rules']->enabled = "1"; - $nsets['emerging-hunting.rules']->filter = (string)$csets['emerging-info.rules']->filter; - } - if (!empty($csets['emerging-policy.rules']) && $csets['emerging-policy.rules']->enabled == "1") { - $nsets['emerging-hunting.rules']->enabled = "1"; - $nsets['emerging-hunting.rules']->filter = (string)$csets['emerging-policy.rules']->filter; - } - if (!empty($csets['emerging-trojan.rules'])) { - // deprecated ruleset - $model->files->file->del($csets['emerging-trojan.rules']->getAttribute('uuid')); - } - } -} diff --git a/src/opnsense/scripts/suricata/metadata/rules/et-open.xml b/src/opnsense/scripts/suricata/metadata/rules/et-open.xml index 0432edfade7..a1d26f20508 100644 --- a/src/opnsense/scripts/suricata/metadata/rules/et-open.xml +++ b/src/opnsense/scripts/suricata/metadata/rules/et-open.xml @@ -1,7 +1,7 @@ - - + + botcc.portgrouped.rules botcc.rules @@ -10,31 +10,25 @@ drop.rules dshield.rules emerging-activex.rules - emerging-adware_pup.rules emerging-attack_response.rules emerging-chat.rules - emerging-coinminer.rules emerging-current_events.rules emerging-deleted.rules emerging-dns.rules emerging-dos.rules emerging-exploit.rules - emerging-exploit_kit.rules emerging-ftp.rules emerging-games.rules - emerging-hunting.rules emerging-icmp.rules emerging-icmp_info.rules emerging-imap.rules emerging-inappropriate.rules emerging-info.rules - emerging-ja3.rules emerging-malware.rules emerging-misc.rules emerging-mobile_malware.rules emerging-netbios.rules emerging-p2p.rules - emerging-phishing.rules emerging-policy.rules emerging-pop3.rules emerging-rpc.rules @@ -46,6 +40,7 @@ emerging-sql.rules emerging-telnet.rules emerging-tftp.rules + emerging-trojan.rules emerging-user_agents.rules emerging-voip.rules emerging-web_client.rules @@ -53,7 +48,5 @@ emerging-web_specific_apps.rules emerging-worm.rules tor.rules - - emerging-trojan.rules