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/4877/head
iglocska 2019-07-12 16:03:47 +02:00
parent 49104318ca 8d588aca83
commit 5941037610
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
9 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
INSTALL/INSTALL.sh
View File

@ -991,8 +991,8 @@ genRCLOCAL () {
# Run PyMISP tests
runTests () {
sudo sed -i -E "s~url\ =\ (.*)~url\ =\ '${MISP_BASEURL}'~g" $PATH_TO_MISP/PyMISP/tests/testlive_comprehensive.py
sudo sed -i -E "s/key\ =\ (.*)/key\ =\ '${AUTH_KEY}'/g" $PATH_TO_MISP/PyMISP/tests/testlive_comprehensive.py
echo "url = ${MISP_BASEURL}
key = ${AUTH_KEY}" |sudo tee ${PATH_TO_MISP}/PyMISP/tests/keys.py
sudo chown -R $WWW_USER:$WWW_USER $PATH_TO_MISP/PyMISP/
sudo -H -u $WWW_USER sh -c "cd $PATH_TO_MISP/PyMISP && git submodule foreach git pull origin master"

6
INSTALL/INSTALL.sh.sfv
View File

@ -1,5 +1,5 @@
; Generated by RHash v1.3.8 on 2019-07-12 at 13:22.33
; Generated by RHash v1.3.8 on 2019-07-12 at 21:04.47
; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/
;
; 99756 13:22.33 2019-07-12 INSTALL.sh
INSTALL.sh E83E4EA31F2871A76F4CF22FE64F044D1CDD4B29 177D80E4BF987AE42A31AC68DFB5C7D89C816D645C089F6FE22F32B294B61BB1 E1D90329E0146DC5971AF665EE27A6A4C43EAA3AAEF92012619A811310D36BFF4BC4B956F4E78E18242ECFB721048FE2 C3CB3684B791444EE08F7741EEE8D6687ACDFB1D767D70A350DF91585F6DD47080E601EEF96C1485D1284A085D7A31B8904DCDF4EAD096A81C6F4B2BDDBA2AF2
; 99626 21:04.47 2019-07-12 INSTALL.sh
INSTALL.sh C35B4D9E1137128F2A997A83B550A9AF17584DB5 E642CC47F80AE0DAB2BD74EDCCB0BA87C1CC7F6E3B81D3362D24814C56AF62D8 4654FFF34BB3BA90520637BF2C3D644D37AFA2D1556C13135B5D7A7F4E24359C7D08A2F3CDF25B8F728B7BC6511F6904 DF16ECB0BD79BC11DF048E9D2C52E35833C41D95A0E852F87E3FF8689A615848F37F93B47E998E3283B34E7C22A10CAA744DEAFE7272EEA618667C175B9C31E2

2
INSTALL/INSTALL.sh.sha1
View File

@ -1 +1 @@
e83e4ea31f2871a76f4cf22fe64f044d1cdd4b29 INSTALL.sh
c35b4d9e1137128f2a997a83b550a9af17584db5 INSTALL.sh

2
INSTALL/INSTALL.sh.sha256
View File

@ -1 +1 @@
177d80e4bf987ae42a31ac68dfb5c7d89c816d645c089f6fe22f32b294b61bb1 INSTALL.sh
e642cc47f80ae0dab2bd74edccb0ba87c1cc7f6e3b81d3362d24814c56af62d8 INSTALL.sh

2
INSTALL/INSTALL.sh.sha384
View File

@ -1 +1 @@
e1d90329e0146dc5971af665ee27a6a4c43eaa3aaef92012619a811310d36bff4bc4b956f4e78e18242ecfb721048fe2 INSTALL.sh
4654fff34bb3ba90520637bf2c3d644d37afa2d1556c13135b5d7a7f4e24359c7d08a2f3cdf25b8f728b7bc6511f6904 INSTALL.sh

2
INSTALL/INSTALL.sh.sha512
View File

@ -1 +1 @@
c3cb3684b791444ee08f7741eee8d6687acdfb1d767d70a350df91585f6dd47080e601eef96c1485d1284a085d7a31b8904dcdf4ead096a81c6f4b2bddba2af2 INSTALL.sh
df16ecb0bd79bc11df048e9d2c52e35833c41d95a0e852f87e3ff8689a615848f37f93b47e998e3283b34e7c22a10caa744deafe7272eea618667c175b9c31e2 INSTALL.sh

1
INSTALL/xINSTALL.debian_testing.txt
View File

@ -1 +0,0 @@
../docs/xINSTALL.debian_testing.md

2
app/Controller/AttributesController.php
View File

@ -2907,7 +2907,7 @@ class AttributesController extends AppController
$data['config'] = $options;
}
if ($format == 'misp_standard') {
$data['attribute'] = $attribute[0]['Attribute'];
$data['attribute'] = in_array('value', $attribute) ? $attribute : $attribute[0]['Attribute'];
} else {
$data[$attribute[0]['Attribute']['type']] = $attribute[0]['Attribute']['value'];
}

4
docs/generic/supportFunctions.md
View File

@ -836,8 +836,8 @@ genRCLOCAL () {
# Run PyMISP tests
runTests () {
sudo sed -i -E "s~url\ =\ (.*)~url\ =\ '${MISP_BASEURL}'~g" $PATH_TO_MISP/PyMISP/tests/testlive_comprehensive.py
sudo sed -i -E "s/key\ =\ (.*)/key\ =\ '${AUTH_KEY}'/g" $PATH_TO_MISP/PyMISP/tests/testlive_comprehensive.py
echo "url = ${MISP_BASEURL}
key = ${AUTH_KEY}" |sudo tee ${PATH_TO_MISP}/PyMISP/tests/keys.py
sudo chown -R $WWW_USER:$WWW_USER $PATH_TO_MISP/PyMISP/
sudo -H -u $WWW_USER sh -c "cd $PATH_TO_MISP/PyMISP && git submodule foreach git pull origin master"