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

PyMISP

@@ -1 +1 @@
-Subproject commit cc6391233c01362a1b4b483c4ea8e67f306e3459
+Subproject commit 190f82923687cebaf06138724e7c03239e529cb4

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';

app/Model/AppModel.php

@@ -86,7 +86,7 @@ class AppModel extends Model
         99 => false, 100 => false, 101 => false, 102 => false, 103 => false, 104 => false,
         105 => false, 106 => false, 107 => false, 108 => false, 109 => false, 110 => false,
         111 => false, 112 => false, 113 => true, 114 => false, 115 => false, 116 => false,
-        117 => false
+        117 => false, 118 => false
     );
 
     const ADVANCED_UPDATES_DESCRIPTION = array(
@@ -2003,6 +2003,9 @@ class AppModel extends Model
                     INDEX `user_id` (`user_id`)
                   ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;";
                 break;
+            case 118:
+                $sqlArray[] = "ALTER TABLE `event_reports` MODIFY `content` mediumtext;";
+                break;
             case 'fixNonEmptySharingGroupID':
                 $sqlArray[] = 'UPDATE `events` SET `sharing_group_id` = 0 WHERE `distribution` != 4;';
                 $sqlArray[] = 'UPDATE `attributes` SET `sharing_group_id` = 0 WHERE `distribution` != 4;';

app/Model/Behavior/DefaultCorrelationBehavior.php

@@ -626,6 +626,6 @@ class DefaultCorrelationBehavior extends ModelBehavior
         ]);
         $Model->deleteAll([
             'Correlation.value_id' => $valueIds
-        ]);
+        ], false);
     }
 }

app/Model/Behavior/NoAclCorrelationBehavior.php

@@ -416,6 +416,6 @@ class NoAclCorrelationBehavior extends ModelBehavior
         ]);
         $Model->deleteAll([
             'Correlation.value_id' => $valueIds
-        ]);
+        ], false);
     }
 }

app/files/misp-galaxy

@@ -1 +1 @@
-Subproject commit dbbb075b1c7154f27a096a35b483c826bdedec13
+Subproject commit e5b4209f3a88147985120215eb898e563e4976af

app/files/misp-objects

@@ -1 +1 @@
-Subproject commit c18a240153cbe9ef68e46f05565d08653c2ad103
+Subproject commit 587b298e1e7f87426182d55d44aa045a1522dc98

app/files/scripts/misp-stix

@@ -1 +1 @@
-Subproject commit b0a1dcffa44aee1af5b316babf323fcb24a6c0e1
+Subproject commit 260920bf7c9d8f678b0d69730acb17e9a34811f2

app/files/warninglists

@@ -1 +1 @@
-Subproject commit fbf99aae8f054072d0d3097f04d9f81e12835bdc
+Subproject commit e7255574c79b946365fdd066429d822730010726

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