Merge branch '2.4' into guides

VERSION.json

@@ -1 +1 @@
-{"major":2, "minor":4, "hotfix":108}
+{"major":2, "minor":4, "hotfix":109}

app/View/Elements/ajaxTags.ctp

@@ -21,14 +21,24 @@
 ?>
 <span style="display:inline-block;">
     <?php
-        $full = $isAclTagger && $tagAccess;
+        $full = $isAclTagger && $tagAccess && empty($static_tags_only);
         $tagData = "";
         foreach ($tags as $tag) {
+            if (empty($tag['Tag'])) {
+                $tag['Tag'] = $tag;
+            }
+            if (empty($tag['Tag']['colour'])) {
+                $tag['Tag']['colour'] = '#0088cc';
+            }
             $aStyle = 'display:inline-block; background-color:' . h($tag['Tag']['colour']) . ';color:' . $this->TextColour->getTextColour($tag['Tag']['colour']) . ';';
             $aClass = $full ? 'tagFirstHalf' : 'tag';
             $aText = h($tag['Tag']['name']);
-            $aSearchTagUrl = $baseurl . '/events/index/searchtag: ' . h($tag['Tag']['id']);
-            $span1 = sprintf('<a href="%s" style="%s" class="%s">%s</a>', $aSearchTagUrl, $aStyle, $aClass, $aText);
+            if (!empty($tag['Tag']['id'])) {
+                $aSearchTagUrl = $baseurl . '/events/index/searchtag: ' . h($tag['Tag']['id']);
+                $span1 = sprintf('<a href="%s" style="%s" class="%s">%s</a>', $aSearchTagUrl, $aStyle, $aClass, $aText);
+            } else {
+                $span1 = sprintf('<span style="%s" class="%s">%s</span>', $aStyle, $aClass, $aText);
+            }
             $span2 = '';
             if ($full) {
                 $spanClass = "tagSecondHalf useCursorPointer noPrint";

app/files/misp-galaxy

@@ -1 +1 @@
-Subproject commit 8c69da1fd9c0be2ec742370f4918f0f88554644f
+Subproject commit 0ebe2c50a7a04ae2108e0c32da058826cf15387c

app/files/scripts/stix2misp.py

@@ -22,12 +22,15 @@ import time
 import uuid
 import base64
 import stix2misp_mapping
-import stix_edh
 import stix.extensions.marking.ais
 from mixbox.namespaces import NamespaceNotFoundError
 from operator import attrgetter
 from stix.core import STIXPackage
 from collections import defaultdict
+try:
+    import stix_edh
+except ModuleNotFoundError:
+    pass
 
 _MISP_dir = "/".join([p for p in os.path.dirname(os.path.realpath(__file__)).split('/')[:-3]])
 _PyMISP_dir = '{_MISP_dir}/PyMISP'.format(_MISP_dir=_MISP_dir)
@@ -1225,13 +1228,16 @@ def generate_event(filename, tries=0):
             sys.exit()
         _update_namespaces()
         return generate_event(filename, 1)
+    except NotImplementedError:
+        print('ERROR - Missing python library: stix_edh', file=sys.stderr)
     except Exception:
         try:
             import maec
             print(2)
         except ImportError:
+            print('ERROR - Missing python library: maec', file=sys.stderr)
             print(3)
-        sys.exit(0)
+    sys.exit(0)
 
 def main(args):
     filename = '{}/tmp/{}'.format(os.path.dirname(args[0]), args[1])