mirror of https://github.com/MISP/MISP
Merge branch '2.4' of github.com:MISP/MISP into 2.4
commit
702d4360f6
|
@ -5,7 +5,7 @@ INSTALLATION INSTRUCTIONS for RHEL 7.x
|
|||
| 0/ Overview and Assumptions |
|
||||
+----------------------------------------+
|
||||
This document details the steps to install MISP on Red Hat Enterprise Linux 7.x (RHEL 7.x). At time of this writing it
|
||||
was tested on version 7.4.
|
||||
was tested on version 7.5.
|
||||
|
||||
The following assumptions with regard to this installation have been made.
|
||||
|
||||
|
@ -106,6 +106,7 @@ yum install rh-python36
|
|||
3.01/ Download MISP code using git in /var/www/ directory
|
||||
cd /var/www
|
||||
git clone https://github.com/MISP/MISP.git
|
||||
cd MISP
|
||||
git checkout tags/$(git describe --tags `git rev-list --tags --max-count=1`)
|
||||
# if the last shortcut doesn't work, specify the latest version manually
|
||||
# example: git checkout tags/v2.4.XY
|
||||
|
|
|
@ -345,7 +345,7 @@ class RestResponseComponent extends Component
|
|||
|
||||
private function __sendResponse($response, $code, $format = false, $raw = false, $download = false)
|
||||
{
|
||||
if (strtolower($format) === 'application/xml') {
|
||||
if (strtolower($format) === 'application/xml' || strtolower($format) === 'xml') {
|
||||
if (!$raw) {
|
||||
if (isset($response[0])) {
|
||||
if (count(array_keys($response[0])) == 1) {
|
||||
|
|
|
@ -345,6 +345,7 @@ class Galaxy extends AppModel
|
|||
foreach ($galaxyElements as $element) {
|
||||
if ($element['key'] == 'kill_chain') {
|
||||
$kc = explode(":", $element['value'])[2];
|
||||
$attackClusters[$kc][] = $cluster;
|
||||
$toBeAdded = true;
|
||||
}
|
||||
if ($element['key'] == 'external_id') {
|
||||
|
@ -352,7 +353,6 @@ class Galaxy extends AppModel
|
|||
}
|
||||
}
|
||||
if ($toBeAdded) {
|
||||
$attackClusters[$kc][] = $cluster;
|
||||
array_push($attackTactic['attackTags'], $cluster['tag_name']);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue