MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

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

pull/4647/head
iglocska 2019-05-17 11:46:12 +02:00
parent e89b4525ad 6dfa4c6ccb
commit f71bb17ea4
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
14 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
INSTALL/INSTALL.sh
View File

@ -25,10 +25,10 @@
#-------------------------------------------------------------------------------------------------|
#
# The following installs only MISP-core:
# $ curl -fsSL https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.sh | bash -s -- -c
# $ wget -O /tmp/INSTALL.sh https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.sh ; bash /tmp/INSTALL.sh -c
#
# This will install MISP Core and misp-modules (recommended)
# $ curl -fsSL https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.sh | bash -s -- -c -M
# $ wget -O /tmp/INSTALL.sh https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.sh ; bash /tmp/INSTALL.sh -c -M
#
#
#-------------------------------------------------------|

6
INSTALL/INSTALL.sh.sfv
View File

@ -1,5 +1,5 @@
; Generated by RHash v1.3.8 on 2019-05-15 at 14:33.51
; Generated by RHash v1.3.8 on 2019-05-17 at 14:34.56
; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/
;
; 93790 14:33.51 2019-05-15 INSTALL.sh
INSTALL.sh DB6D3E754A83F26C5DCFDE255506B02B5514C7E3 01F94621212B55242039449BE6AF29F778402ABA5A62018D9EB1D6096363F38A 5CC3BD2E9034A3CA7B1E0452CFBCBA20410A2723B822EE31E79FEC860E9E29488E5EDBB04A6F81446A3EA407C7B0EA2C 474C789EF24667ECFBD01E88E0ACD73F58EB7C40936E979FC3A391E75F6713C67316BDDA30427D59FA72215574DAD4B93280AAAEC3002C5E6019BED50D48A1BE
; 93836 14:34.56 2019-05-17 INSTALL.sh
INSTALL.sh 8A07C25FD7A1A7F15C3390CEA9C6E76E87B76DF4 4295487DA17C0876211E1919F17DDA5ABBBB882BE3C2767B080ADE285181979A 53749E778BF6B1578B07F88AE9D47125F2F9D52F2B31000ECDAF661B8584E0B0A9BC32B6F674DB2D3C7B33C65A0C506C E3F3282C6657F6C81B6E9AE353BDA50BB99EB10703912890C30C82D90B4696A3FC7B15EAB607AEB1DC8968A12DBEE45DDB49189A3E572BAD653130C35B0A1FEA

2
INSTALL/INSTALL.sh.sha1
View File

@ -1 +1 @@
db6d3e754a83f26c5dcfde255506b02b5514c7e3 INSTALL.sh
8a07c25fd7a1a7f15c3390cea9c6e76e87b76df4 INSTALL.sh

2
INSTALL/INSTALL.sh.sha256
View File

@ -1 +1 @@
01f94621212b55242039449be6af29f778402aba5a62018d9eb1d6096363f38a INSTALL.sh
4295487da17c0876211e1919f17dda5abbbb882be3c2767b080ade285181979a INSTALL.sh

2
INSTALL/INSTALL.sh.sha384
View File

@ -1 +1 @@
5cc3bd2e9034a3ca7b1e0452cfbcba20410a2723b822ee31e79fec860e9e29488e5edbb04a6f81446a3ea407c7b0ea2c INSTALL.sh
53749e778bf6b1578b07f88ae9d47125f2f9d52f2b31000ecdaf661b8584e0b0a9bc32b6f674db2d3c7b33c65a0c506c INSTALL.sh

2
INSTALL/INSTALL.sh.sha512
View File

@ -1 +1 @@
474c789ef24667ecfbd01e88e0acd73f58eb7c40936e979fc3a391e75f6713c67316bdda30427d59fa72215574dad4b93280aaaec3002c5e6019bed50d48a1be INSTALL.sh
e3f3282c6657f6c81b6e9ae353bda50bb99eb10703912890c30c82d90b4696a3fc7b15eab607aeb1dc8968a12dbee45ddb49189a3e572bad653130c35b0a1fea INSTALL.sh

4
INSTALL/INSTALL.tpl.sh
View File

@ -25,10 +25,10 @@
#-------------------------------------------------------------------------------------------------|
#
# The following installs only MISP-core:
# $ curl -fsSL https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.sh | bash -s -- -c
# $ wget -O /tmp/INSTALL.sh https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.sh ; bash /tmp/INSTALL.sh -c
#
# This will install MISP Core and misp-modules (recommended)
# $ curl -fsSL https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.sh | bash -s -- -c -M
# $ wget -O /tmp/INSTALL.sh https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.sh ; bash /tmp/INSTALL.sh -c -M
#
#
#-------------------------------------------------------|

2
app/Controller/AppController.php
View File

@ -46,7 +46,7 @@ class AppController extends Controller
public $helpers = array('Utility', 'OrgImg', 'FontAwesome');
private $__queryVersion = '68';
private $__queryVersion = '69';
public $pyMispVersion = '2.4.106';
public $phpmin = '7.0';
public $phprec = '7.2';

2
app/webroot/js/misp.js
View File

@ -3644,7 +3644,7 @@ function quickSubmitGalaxyForm(cluster_ids, additionalData) {
$('#temp').html(formData);
$('#temp #GalaxyTargetIds').val(JSON.stringify(cluster_ids));
if (target_id == 'selected') {
$('#AttributeAttributeIds').val(getSelected());
$('#AttributeAttributeIds, #GalaxyAttributeIds').val(getSelected());
}
$.ajax({
data: $('#GalaxyAttachMultipleClustersForm').serialize(),

6
docs/INSTALL.rhel7.md
View File

@ -10,10 +10,12 @@ Make sure you are reading the parsed version of this Document. When in doubt [cl
```bash
# Please check the installer options first to make the best choice for your install
curl -fsSL https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.debian.sh | bash -s
wget -O /tmp/INSTALL.sh https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.sh
bash /tmp/INSTALL.sh
# This will install MISP Core and misp-modules (recommended)
curl -fsSL https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.debian.sh | bash -s -- -c -M
wget -O /tmp/INSTALL.sh https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.sh
bash /tmp/INSTALL.sh -c -M
```
**The above does NOT work yet**

6
docs/INSTALL.rhel8.md
View File

@ -10,10 +10,12 @@ Make sure you are reading the parsed version of this Document. When in doubt [cl
```bash
# Please check the installer options first to make the best choice for your install
curl -fsSL https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.debian.sh | bash -s
wget -O /tmp/INSTALL.sh https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.sh
bash /tmp/INSTALL.sh
# This will install MISP Core and misp-modules (recommended)
curl -fsSL https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.debian.sh | bash -s -- -c -M
wget -O /tmp/INSTALL.sh https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.sh
bash /tmp/INSTALL.sh -c -M
```
**The above does NOT work yet**

6
docs/INSTALL.ubuntu1804.md
View File

@ -9,10 +9,12 @@ To install MISP on a fresh Ubuntu install all you need to do is:
```bash
# Please check the installer options first to make the best choice for your install
curl -fsSL https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.sh | bash -s
wget -O /tmp/INSTALL.sh https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.sh
bash /tmp/INSTALL.sh
# This will install MISP Core and misp-modules (recommended)
curl -fsSL https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.sh | bash -s -- -c -M
wget -O /tmp/INSTALL.sh https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.sh
bash /tmp/INSTALL.sh -c -M
```
### 0/ MISP Ubuntu 18.04-server install - status

6
docs/xINSTALL.centos6.md
View File

@ -10,10 +10,12 @@ Make sure you are reading the parsed version of this Document. When in doubt [cl
```bash
# Please check the installer options first to make the best choice for your install
curl -fsSL https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.debian.sh | bash -s
wget -O /tmp/INSTALL.sh https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.sh
bash /tmp/INSTALL.sh
# This will install MISP Core and misp-modules (recommended)
curl -fsSL https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.debian.sh | bash -s -- -c -M
wget -O /tmp/INSTALL.sh https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.sh
bash /tmp/INSTALL.sh -c -M
```
**The above does NOT work yet**

6
docs/xINSTALL.centos7.md
View File

@ -13,10 +13,12 @@ Make sure you are reading the parsed version of this Document. When in doubt [cl
```bash
# Please check the installer options first to make the best choice for your install
curl -fsSL https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.debian.sh | bash -s
wget -O /tmp/INSTALL.sh https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.sh
bash /tmp/INSTALL.sh
# This will install MISP Core and misp-modules (recommended)
curl -fsSL https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.debian.sh | bash -s -- -c -M
wget -O /tmp/INSTALL.sh https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.sh
bash /tmp/INSTALL.sh -c -M
```
**The above does NOT work yet**