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

.travis.yml

@@ -1,9 +1,9 @@
 language: php
 
 php:
-    - 7.1
     - 7.2
     - 7.3
+    - 7.4
     - nightly
 
 services:
@@ -95,7 +95,6 @@ install:
     - sudo usermod -a -G www-data $USER
     - sudo -E su $USER -c 'app/Console/cake userInit -q | sudo tee ./key.txt'
     - sudo -E su $USER -c 'app/Console/cake Admin runUpdates'
-    - sudo -E su $USER -c 'app/Console/cake Admin setSetting "MISP.python_bin" "/usr/bin/python3"'
     - sudo -E su $USER -c 'app/Console/cake Admin setSetting "Session.autoRegenerate" 0'
     - sudo -E su $USER -c 'app/Console/cake Admin setSetting "Session.timeout" 600'
     - sudo -E su $USER -c 'app/Console/cake Admin setSetting "Session.cookieTimeout" 3600'
@@ -122,27 +121,18 @@ install:
     - app/Console/worker/start.sh &
     - sleep 10
     # Dirty install python stuff
+    - virtualenv -p python3.6 ./venv
+    - sudo -E su $USER -c 'app/Console/cake Admin setSetting "MISP.python_bin" "$TRAVIS_BUILD_DIR/venv/bin/python"'
+    - . ./venv/bin/activate
     - pushd cti-python-stix2
-    - sudo pip3 install .
-    - popd
-    - pushd app/files/scripts
-    - sudo -H -u $USER git clone https://github.com/CybOXProject/python-cybox.git
-    - sudo -H -u $USER git clone https://github.com/STIXProject/python-stix.git
-    - sudo -H -u $USER git clone https://github.com/MAECProject/python-maec.git
-    - sudo -H -u $USER git clone https://github.com/CybOXProject/mixbox.git
-    - pushd mixbox
-    - sudo pip3 install .
-    - popd
-    - pushd python-cybox
-    - sudo pip3 install .
-    - popd
-    - pushd python-stix
-    - sudo pip3 install .
-    - popd
-    - pushd python-maec
-    - sudo pip3 install .
+    - pip install .
     - popd
+    - pushd PyMISP
+    - pip install .[fileobjects]
     - popd
+    - pip install stix zmq redis plyara
+    - pip install -I antlr4-python3-runtime==4.7.2
+    - deactivate
 
 before_script:
     - curl http://misp.local

app/Controller/AppController.php

@@ -46,7 +46,7 @@ class AppController extends Controller
 
     public $helpers = array('Utility', 'OrgImg', 'FontAwesome', 'UserName');
 
-    private $__queryVersion = '95';
+    private $__queryVersion = '96';
     public $pyMispVersion = '2.4.120';
     public $phpmin = '7.2';
     public $phprec = '7.4';

app/Lib/Export/StixExport.php

@@ -90,7 +90,8 @@ class StixExport
             $decoded = json_decode($result, true);
             if (!isset($decoded['success']) || !$decoded['success']) {
                 $this->__delete_temporary_files($f);
-                return 'Error while processing your query: ' . $decoded['error'];
+                $error = $decoded && !empty($decoded['error']) ? $decoded['error'] : $result;
+                return 'Error while processing your query: ' . $error;
             }
             $file = new File($this->__tmp_dir . $filename . '.out');
             $stix_event = ($this->__return_type == 'stix') ? $file->read() : substr($file->read(), 1, -1);

app/files/misp-galaxy

@@ -1 +1 @@
-Subproject commit 5da0c7bd545ee93cf40786c1c535b9d4897943b1
+Subproject commit dbaab413b6b4680ae458a7d7a8ac6e1917fcc357

app/files/misp-objects

@@ -1 +1 @@
-Subproject commit bce101832597b5f62679ac0299b2b4ef4681a145
+Subproject commit fa634803911d211f993049242d41eebaf342a9c4