Merge branch 'develop' of github.com:MISP/MISP into develop

SteveClement · Dec 14, 2023 · 9db0ced · 9db0ced
2 parents d1c0953 + 34533df
commit 9db0ced
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git a/PyMISP b/PyMISP
diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
@@ -34,7 +34,7 @@ class AppController extends Controller
     public $helpers = array('OrgImg', 'FontAwesome', 'UserName');
 
     private $__queryVersion = '157';
-    public $pyMispVersion = '2.4.179';
+    public $pyMispVersion = '2.4.182';
     public $phpmin = '7.2';
     public $phprec = '7.4';
     public $phptoonew = '8.0';

diff --git a/app/files/geo-open/GeoOpen-Country.mmdb b/app/files/geo-open/GeoOpen-Country.mmdb
diff --git a/app/files/misp-galaxy b/app/files/misp-galaxy
diff --git a/app/files/misp-objects b/app/files/misp-objects
diff --git a/app/files/scripts/misp-stix b/app/files/scripts/misp-stix
diff --git a/app/files/warninglists b/app/files/warninglists
diff --git a/requirements.txt b/requirements.txt
@@ -6,7 +6,7 @@ misp-lib-stix2>=3.0.1.1
 mixbox>=1.0.5
 plyara>=2.1.1
 pydeep2>=0.5.1
-pymisp==2.4.179
+pymisp==2.4.182
 python-magic>=0.4.27
 pyzmq>=25.1.1
 redis>=5.0.1
+3 −3		.github/workflows/codeql-analysis.yml
+1 −1		.github/workflows/pytest.yml
+34 −0		CHANGELOG.txt
+359 −360		poetry.lock
+1 −1		pymisp/data/misp-objects
+1 −2		pymisp/mispevent.py
+8 −8		pyproject.toml
+4,130 −0		clusters/disarm-techniques.json
+2,228 −1,848		clusters/sigma-rules.json
+198 −26		clusters/threat-actor.json
+29 −0		galaxies/disarm-techniques.json
+9 −0		tools/gen_disarm.py
+33 −1		objects/cs-beacon-config/definition.json
+9 −2		objects/report/definition.json
+32 −1		objects/shadowserver-malware-url-report/definition.json
+6 −1		objects/victim/definition.json
+10 −2		misp_stix_converter/__init__.py
+30 −14		misp_stix_converter/misp_stix_converter.py
+7 −8		misp_stix_converter/stix2misp/converters/stix2converter.py
+18 −1		misp_stix_converter/stix2misp/external_stix2_to_misp.py
+209 −215		poetry.lock
+1 −1		pyproject.toml
+16 −4		lists/amazon-aws/list.json
+51 −51		lists/cisco_top1000/list.json
+533 −533		lists/cisco_top10k/list.json
+1,103 −1,103		lists/cisco_top20k/list.json
+252 −252		lists/cisco_top5k/list.json
+1 −1		lists/cloudflare/list.json
+1 −1		lists/covid-19-cyber-threat-coalition-whitelist/list.json
+1 −1		lists/covid-19-krassi-whitelist/list.json
+1 −1		lists/crl-hostname/list.json
+124 −122		lists/crl-ip/list.json
+1 −1		lists/digitalside/list.json
+1 −1		lists/disposable-email/list.json
+4 −1		lists/findip-host/list.json
+1 −1		lists/google-chrome-crux-1million/list.json
+2 −2		lists/google-gcp/list.json
+1 −1		lists/google-gmail-sending-ips/list.json
+1 −1		lists/googlebot/list.json
+2 −1		lists/microsoft-azure-appid/list.json
+3 −1		lists/microsoft-azure-china/list.json
+1 −1		lists/microsoft-azure-germany/list.json
+7 −1		lists/microsoft-azure-us-gov/list.json
+61 −45		lists/microsoft-azure/list.json
+1 −1		lists/microsoft-office365-cn/list.json
+1 −1		lists/microsoft-office365-ip/list.json
+1 −2		lists/microsoft-office365/list.json
+69 −69		lists/moz-top500/list.json
+1 −1		lists/mozilla-CA/list.json
+55 −13		lists/mozilla-IntermediateCA/list.json
+3 −10		lists/openai-gptbot/list.json
+1 −1		lists/phone_numbers/list.json
+1 −1		lists/public-dns-hostname/list.json
+2 −5		lists/public-dns-v4/list.json
+1 −4		lists/public-dns-v6/list.json
+1 −2		lists/second-level-tlds/list.json
+37 −50		lists/smtp-receiving-ips/list.json
+72 −103		lists/smtp-sending-ips/list.json
+1 −1		lists/stackpath/list.json
+1 −1		lists/tenable-cloud-ipv4/list.json
+1 −1		lists/tenable-cloud-ipv6/list.json
+1 −2		lists/tlds/list.json
+72,281 −72,281		lists/tranco/list.json
+418 −418		lists/tranco10k/list.json
+1 −1		lists/umbrella-blockpage-hostname/list.json
+1 −1		lists/umbrella-blockpage-v4/list.json
+1 −1		lists/umbrella-blockpage-v6/list.json
+1 −1		lists/university_domains/list.json
+787 −787		lists/vpn-ipv4/list.json
+1 −1		lists/wikimedia/list.json