From a65fadc6f518bfeb1746d6221b1330ff631bc0db Mon Sep 17 00:00:00 2001 From: StefanKelm Date: Fri, 31 Jan 2020 14:22:29 +0100 Subject: [PATCH 1/9] Update db_schema_diagnostic.ctp tiny typo --- app/View/Elements/healthElements/db_schema_diagnostic.ctp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/View/Elements/healthElements/db_schema_diagnostic.ctp b/app/View/Elements/healthElements/db_schema_diagnostic.ctp index 53b5314e3..8ab0deb32 100644 --- a/app/View/Elements/healthElements/db_schema_diagnostic.ctp +++ b/app/View/Elements/healthElements/db_schema_diagnostic.ctp @@ -158,7 +158,7 @@ $updateLocked ? __('Updates are locked') : __('Updates are not locked'), $updateLocked ? ( $updateFailNumberReached ? - __('Update are locked due to to many update fails') : sprintf(__('Update unlocked in %s'), h($humanReadableTime))) + __('Updates are locked due to to many update fails') : sprintf(__('Updates unlocked in %s'), h($humanReadableTime))) : __('Updates are not locked'), $updateLocked ? 'times' : 'check' ); From 11ff5c63eec6643ed4b5ceafecf3dc55db5636d4 Mon Sep 17 00:00:00 2001 From: StefanKelm Date: Fri, 31 Jan 2020 14:24:23 +0100 Subject: [PATCH 2/9] Update update_progress.ctp tiny typo --- app/View/Servers/update_progress.ctp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/View/Servers/update_progress.ctp b/app/View/Servers/update_progress.ctp index 82a9ae8c9..762343c1c 100644 --- a/app/View/Servers/update_progress.ctp +++ b/app/View/Servers/update_progress.ctp @@ -29,9 +29,9 @@ if (isset($updateProgress['preTestSuccess']) && $updateProgress['preTestSuccess'
-
+
-
+
(-', '-'); ?>) From cc99945f3127c1f36612c5d3b411e9a6621a939a Mon Sep 17 00:00:00 2001 From: Jeroen Pinoy Date: Sun, 2 Feb 2020 00:42:00 +0100 Subject: [PATCH 3/9] fix: [API] make param tag alias of tags for /events/restSearch --- app/Model/Event.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/Model/Event.php b/app/Model/Event.php index dfb215509..7d85cbc0f 100755 --- a/app/Model/Event.php +++ b/app/Model/Event.php @@ -6590,6 +6590,10 @@ class Event extends AppModel } } + if (isset($filters['tag']) and !isset($filters['tags'])) { + $filters['tags'] = $filters['tag']; + } + $subqueryElements = $this->harvestSubqueryElements($filters); $filters = $this->addFiltersFromSubqueryElements($filters, $subqueryElements); From a1c7b7e35625c3a9a51bc4c7ad82f91954aff0a2 Mon Sep 17 00:00:00 2001 From: Steve Clement Date: Mon, 3 Feb 2020 13:06:04 +0900 Subject: [PATCH 4/9] fix: [kali] Fixed kali install script --- INSTALL/INSTALL.sh | 6 ++++++ INSTALL/INSTALL.sh.sfv | 6 +++--- INSTALL/INSTALL.sh.sha1 | 2 +- INSTALL/INSTALL.sh.sha256 | 2 +- INSTALL/INSTALL.sh.sha384 | 2 +- INSTALL/INSTALL.sh.sha512 | 2 +- INSTALL/INSTALL.tpl.sh | 6 ++++++ 7 files changed, 19 insertions(+), 7 deletions(-) diff --git a/INSTALL/INSTALL.sh b/INSTALL/INSTALL.sh index ac867a986..9217a7fba 100644 --- a/INSTALL/INSTALL.sh +++ b/INSTALL/INSTALL.sh @@ -2466,8 +2466,14 @@ x86_64-fedora-30 x86_64-debian-stretch x86_64-debian-buster x86_64-ubuntu-bionic +x86_64-kali-2019.1 x86_64-kali-2019.2 x86_64-kali-2019.3 +x86_64-kali-2019.4 +x86_64-kali-2020.1 +x86_64-kali-2020.2 +x86_64-kali-2020.3 +x86_64-kali-2020.4 armv6l-raspbian-stretch armv7l-raspbian-stretch armv7l-debian-jessie diff --git a/INSTALL/INSTALL.sh.sfv b/INSTALL/INSTALL.sh.sfv index fc2cc8a34..2e7919952 100644 --- a/INSTALL/INSTALL.sh.sfv +++ b/INSTALL/INSTALL.sh.sfv @@ -1,5 +1,5 @@ -; Generated by RHash v1.3.8 on 2019-11-24 at 17:30.46 +; Generated by RHash v1.3.9 on 2020-02-03 at 13:04.03 ; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/ ; -; 99082 17:30.46 2019-11-24 INSTALL.sh -INSTALL.sh 5BB0CEB0AB45AF769C8A3B044F9A494E8733B1CB 9402BCF66DD2C8A82B8871C5C414A5710D5FAA0B1AD40BB0EDEC57A8883F52F7 616975D3EC3CA34C590570F272AC244535ECECCF535B66AA765B4E36C68E78649E65E5D719977D18B6D69FF59F709CC0 5BAA423F8306B0B2E16FC91380E1E551550F31ED013A38233B049040AAB81579BAD4E3C81203C0EC324BC17010BC1063E1D67BDDF45A922EC7CEC3A551AA49EE +; 99559 13:04.02 2020-02-03 INSTALL.sh +INSTALL.sh 33FD627276233AE63DCD422180B505EF97B9E4CF D7E934A76F5FF8DFAA1B73B216633599F3350F4B50A0C9EE5B4E6CFB8A21B336 3DBC77FA3B3C0217BDA00BE3F11DDECB4B60F69EBCCF0162CBEDC56B91820707F66B3A9D118AD7126F63F262C1945713 BCC2ABB9C4FA2A487A42C9742E70F338975839C903344590A43D7F91E40918D27DF3C183BCCD573BCB8AD1063B9485E9D49414E9C2DF982331CCBD9C21C846F6 diff --git a/INSTALL/INSTALL.sh.sha1 b/INSTALL/INSTALL.sh.sha1 index 88b8d44f4..3e35f4df0 100644 --- a/INSTALL/INSTALL.sh.sha1 +++ b/INSTALL/INSTALL.sh.sha1 @@ -1 +1 @@ -6e1976e8429de5e28ad7b4f286904f0d6ae278fe INSTALL.sh +33fd627276233ae63dcd422180b505ef97b9e4cf INSTALL.sh diff --git a/INSTALL/INSTALL.sh.sha256 b/INSTALL/INSTALL.sh.sha256 index 3afa88c64..bf25badb0 100644 --- a/INSTALL/INSTALL.sh.sha256 +++ b/INSTALL/INSTALL.sh.sha256 @@ -1 +1 @@ -0032f7224ef5cac309a1e3edc4d185d6014bae6dccc07fbd12528d7574c6167e INSTALL.sh +d7e934a76f5ff8dfaa1b73b216633599f3350f4b50a0c9ee5b4e6cfb8a21b336 INSTALL.sh diff --git a/INSTALL/INSTALL.sh.sha384 b/INSTALL/INSTALL.sh.sha384 index 4ae03d5f9..c243be3c1 100644 --- a/INSTALL/INSTALL.sh.sha384 +++ b/INSTALL/INSTALL.sh.sha384 @@ -1 +1 @@ -1eeea5e9c5fc2ddf6198442e8b301cb30dec443798bd597b9d6da3c8fd5f1c77ab5eb0f44988876bba7314b3bec4c297 INSTALL.sh +3dbc77fa3b3c0217bda00be3f11ddecb4b60f69ebccf0162cbedc56b91820707f66b3a9d118ad7126f63f262c1945713 INSTALL.sh diff --git a/INSTALL/INSTALL.sh.sha512 b/INSTALL/INSTALL.sh.sha512 index 8fc2369a8..1f8cb93ed 100644 --- a/INSTALL/INSTALL.sh.sha512 +++ b/INSTALL/INSTALL.sh.sha512 @@ -1 +1 @@ -8c950f3c6a5a8d5cccc298551555cdc7c631e2a93177df7bea2e5c0a80d651c2d459a4328832be96cdeb874c3cc2214fab9da0fa1b97dd642e7488adb558e748 INSTALL.sh +bcc2abb9c4fa2a487a42c9742e70f338975839c903344590a43d7f91e40918d27df3c183bccd573bcb8ad1063b9485e9d49414e9c2df982331ccbd9c21c846f6 INSTALL.sh diff --git a/INSTALL/INSTALL.tpl.sh b/INSTALL/INSTALL.tpl.sh index eef2992e7..d651d5140 100755 --- a/INSTALL/INSTALL.tpl.sh +++ b/INSTALL/INSTALL.tpl.sh @@ -678,8 +678,14 @@ x86_64-fedora-30 x86_64-debian-stretch x86_64-debian-buster x86_64-ubuntu-bionic +x86_64-kali-2019.1 x86_64-kali-2019.2 x86_64-kali-2019.3 +x86_64-kali-2019.4 +x86_64-kali-2020.1 +x86_64-kali-2020.2 +x86_64-kali-2020.3 +x86_64-kali-2020.4 armv6l-raspbian-stretch armv7l-raspbian-stretch armv7l-debian-jessie From 66b4cf1cf01679f9bd0a573bd96fab9c498d6fbe Mon Sep 17 00:00:00 2001 From: Steve Clement Date: Mon, 3 Feb 2020 13:07:25 +0900 Subject: [PATCH 5/9] fix: [sum] Fixed checksums --- INSTALL/INSTALL.sh.sfv | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/INSTALL/INSTALL.sh.sfv b/INSTALL/INSTALL.sh.sfv index d40939303..361568139 100644 --- a/INSTALL/INSTALL.sh.sfv +++ b/INSTALL/INSTALL.sh.sfv @@ -1,13 +1,5 @@ -<<<<<<< HEAD -; Generated by RHash v1.3.9 on 2020-02-03 at 13:04.03 +; Generated by RHash v1.3.9 on 2020-02-03 at 13:07.23 ; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/ ; -; 99559 13:04.02 2020-02-03 INSTALL.sh +; 99559 13:07.22 2020-02-03 INSTALL.sh INSTALL.sh 33FD627276233AE63DCD422180B505EF97B9E4CF D7E934A76F5FF8DFAA1B73B216633599F3350F4B50A0C9EE5B4E6CFB8A21B336 3DBC77FA3B3C0217BDA00BE3F11DDECB4B60F69EBCCF0162CBEDC56B91820707F66B3A9D118AD7126F63F262C1945713 BCC2ABB9C4FA2A487A42C9742E70F338975839C903344590A43D7F91E40918D27DF3C183BCCD573BCB8AD1063B9485E9D49414E9C2DF982331CCBD9C21C846F6 -======= -; Generated by RHash v1.3.9 on 2020-01-21 at 17:22.04 -; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/ -; -; 99445 17:22.04 2020-01-21 INSTALL.sh -INSTALL.sh 6E1976E8429DE5E28AD7B4F286904F0D6AE278FE 0032F7224EF5CAC309A1E3EDC4D185D6014BAE6DCCC07FBD12528D7574C6167E 1EEEA5E9C5FC2DDF6198442E8B301CB30DEC443798BD597B9D6DA3C8FD5F1C77AB5EB0F44988876BBA7314B3BEC4C297 8C950F3C6A5A8D5CCCC298551555CDC7C631E2A93177DF7BEA2E5C0A80D651C2D459A4328832BE96CDEB874C3CC2214FAB9DA0FA1B97DD642E7488ADB558E748 ->>>>>>> 2.4 From facebee1802796932abf69c236513539fdcc82ee Mon Sep 17 00:00:00 2001 From: Steve Clement Date: Mon, 3 Feb 2020 13:16:16 +0900 Subject: [PATCH 6/9] fix: [tools] Removed Viper until working again, fixed #5582 --- INSTALL/INSTALL.sh | 17 ++++++++++------- INSTALL/INSTALL.sh.sfv | 6 +++--- INSTALL/INSTALL.sh.sha1 | 2 +- INSTALL/INSTALL.sh.sha256 | 2 +- INSTALL/INSTALL.sh.sha384 | 2 +- INSTALL/INSTALL.sh.sha512 | 2 +- INSTALL/INSTALL.tpl.sh | 10 ++++++---- docs/generic/supportFunctions.md | 5 +++-- docs/generic/viper-debian.md | 2 +- docs/xINSTALL.tsurugi.md | 2 +- 10 files changed, 28 insertions(+), 22 deletions(-) diff --git a/INSTALL/INSTALL.sh b/INSTALL/INSTALL.sh index 9217a7fba..5a27f2063 100644 --- a/INSTALL/INSTALL.sh +++ b/INSTALL/INSTALL.sh @@ -185,7 +185,8 @@ usage () { echo -e "${SCRIPT_NAME} -c | Install ONLY ${LBLUE}MISP${NC} Core" # core echo -e " -M | ${LBLUE}MISP${NC} modules" # modules echo -e " -D | ${LBLUE}MISP${NC} dashboard" # dashboard - echo -e " -V | Viper" # viper + ## FIXME: The current stat of Viper is broken, disabling any use. + ##echo -e " -V | Viper" # viper echo -e " -m | Mail 2 ${LBLUE}MISP${NC}" # mail2 echo -e " -S | Experimental ssdeep correlations" # ssdeep echo -e " -A | Install ${YELLOW}all${NC} of the above" # all @@ -196,7 +197,7 @@ usage () { echo -e "${HIDDEN} -U | Attempt and upgrade of selected item${NC}" # UPGRADE echo -e "${HIDDEN} -N | Nuke this MISP Instance${NC}" # NUKE echo -e "${HIDDEN} -f | Force test install on current Ubuntu LTS schim, add -B for 18.04 -> 18.10, or -BB 18.10 -> 19.10)${NC}" # FORCE - echo -e "Options can be combined: ${SCRIPT_NAME} -c -V -D # Will install Core+Viper+Dashboard" + echo -e "Options can be combined: ${SCRIPT_NAME} -c -D # Will install Core+Dashboard" space echo -e "Recommended is either a barebone MISP install (ideal for syncing from other instances) or" echo -e "MISP + modules - ${SCRIPT_NAME} -c -M" @@ -1845,7 +1846,7 @@ viper () { $SUDO_CMD /usr/local/src/viper/venv/bin/pip install -r requirements.txt echo "Launching viper-web" $SUDO_CMD /usr/local/src/viper-web/viper-web -p 8888 -H 0.0.0.0 & - echo 'PATH="/home/misp/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/usr/local/src/viper:/var/www/MISP/app/Console"' |sudo tee /etc/environment + echo 'PATH="/home/misp/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/usr/local/src/viper:/var/www/MISP/app/Console"' |sudo tee -a /etc/environment echo ". /etc/environment" >> /home/${MISP_USER}/.profile # TODO: Perms, MISP_USER_HOME, nasty hack cuz Kali on R00t @@ -2112,8 +2113,9 @@ installSupported () { progress 4 # Install Viper - functionLocation('generic/viper-debian.md') - [[ -n $VIPER ]] || [[ -n $ALL ]] && viper - progress 4 + ## FIXME: The current stat of Viper is broken, disabling any use. + ##[[ -n $VIPER ]] || [[ -n $ALL ]] && viper + ##progress 4 # Install ssdeep - functionLocation('generic/ssdeep-debian.md') [[ -n $SSDEEP ]] || [[ -n $ALL ]] && ssdeep @@ -2388,8 +2390,9 @@ installMISPonKali () { debug "Installing misp-modules" mispmodules - debug "Installing Viper" - viper + ## FIXME: The current stat of Viper is broken, disabling any use. + ##debug "Installing Viper" + ##viper debug "Installing ssdeep" ssdeep diff --git a/INSTALL/INSTALL.sh.sfv b/INSTALL/INSTALL.sh.sfv index 361568139..48a7bd5bf 100644 --- a/INSTALL/INSTALL.sh.sfv +++ b/INSTALL/INSTALL.sh.sfv @@ -1,5 +1,5 @@ -; Generated by RHash v1.3.9 on 2020-02-03 at 13:07.23 +; Generated by RHash v1.3.9 on 2020-02-03 at 13:15.37 ; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/ ; -; 99559 13:07.22 2020-02-03 INSTALL.sh -INSTALL.sh 33FD627276233AE63DCD422180B505EF97B9E4CF D7E934A76F5FF8DFAA1B73B216633599F3350F4B50A0C9EE5B4E6CFB8A21B336 3DBC77FA3B3C0217BDA00BE3F11DDECB4B60F69EBCCF0162CBEDC56B91820707F66B3A9D118AD7126F63F262C1945713 BCC2ABB9C4FA2A487A42C9742E70F338975839C903344590A43D7F91E40918D27DF3C183BCCD573BCB8AD1063B9485E9D49414E9C2DF982331CCBD9C21C846F6 +; 99767 13:15.37 2020-02-03 INSTALL.sh +INSTALL.sh F27125A2CD54B088B95072FF1D87C2A9EDDE3FDC 4A2F544B20AF69618BD0F744A433CBC442DAE17CC35028906DB20FB2C56DA2D6 CE625D7EB46FCC9B0228BFDD1AF62B9FC78F1D53B14CABA881C19C115F3E8F8D031EEF6A07E6E08A3B1F1D28C4EE8335 84D8940C178BFCFDA1A218D7AD7DEFA27EA62486DC7E06E165F1BE2C7738DCD384A95E62A95F7203AEDAD8593F648302E963BC3C00CCA987A415952A86192BC8 diff --git a/INSTALL/INSTALL.sh.sha1 b/INSTALL/INSTALL.sh.sha1 index 3e35f4df0..fdf9790a2 100644 --- a/INSTALL/INSTALL.sh.sha1 +++ b/INSTALL/INSTALL.sh.sha1 @@ -1 +1 @@ -33fd627276233ae63dcd422180b505ef97b9e4cf INSTALL.sh +f27125a2cd54b088b95072ff1d87c2a9edde3fdc INSTALL.sh diff --git a/INSTALL/INSTALL.sh.sha256 b/INSTALL/INSTALL.sh.sha256 index bf25badb0..9d98ed17b 100644 --- a/INSTALL/INSTALL.sh.sha256 +++ b/INSTALL/INSTALL.sh.sha256 @@ -1 +1 @@ -d7e934a76f5ff8dfaa1b73b216633599f3350f4b50a0c9ee5b4e6cfb8a21b336 INSTALL.sh +4a2f544b20af69618bd0f744a433cbc442dae17cc35028906db20fb2c56da2d6 INSTALL.sh diff --git a/INSTALL/INSTALL.sh.sha384 b/INSTALL/INSTALL.sh.sha384 index c243be3c1..12b3aa28b 100644 --- a/INSTALL/INSTALL.sh.sha384 +++ b/INSTALL/INSTALL.sh.sha384 @@ -1 +1 @@ -3dbc77fa3b3c0217bda00be3f11ddecb4b60f69ebccf0162cbedc56b91820707f66b3a9d118ad7126f63f262c1945713 INSTALL.sh +ce625d7eb46fcc9b0228bfdd1af62b9fc78f1d53b14caba881c19c115f3e8f8d031eef6a07e6e08a3b1f1d28c4ee8335 INSTALL.sh diff --git a/INSTALL/INSTALL.sh.sha512 b/INSTALL/INSTALL.sh.sha512 index 1f8cb93ed..66b4100f9 100644 --- a/INSTALL/INSTALL.sh.sha512 +++ b/INSTALL/INSTALL.sh.sha512 @@ -1 +1 @@ -bcc2abb9c4fa2a487a42c9742e70f338975839c903344590a43d7f91e40918d27df3c183bccd573bcb8ad1063b9485e9d49414e9c2df982331ccbd9c21c846f6 INSTALL.sh +84d8940c178bfcfda1a218d7ad7defa27ea62486dc7e06e165f1be2c7738dcd384a95e62a95f7203aedad8593f648302e963bc3c00cca987a415952a86192bc8 INSTALL.sh diff --git a/INSTALL/INSTALL.tpl.sh b/INSTALL/INSTALL.tpl.sh index d651d5140..5c97dee91 100755 --- a/INSTALL/INSTALL.tpl.sh +++ b/INSTALL/INSTALL.tpl.sh @@ -324,8 +324,9 @@ installSupported () { progress 4 # Install Viper - functionLocation('generic/viper-debian.md') - [[ -n $VIPER ]] || [[ -n $ALL ]] && viper - progress 4 + ## FIXME: The current stat of Viper is broken, disabling any use. + ##[[ -n $VIPER ]] || [[ -n $ALL ]] && viper + ##progress 4 # Install ssdeep - functionLocation('generic/ssdeep-debian.md') [[ -n $SSDEEP ]] || [[ -n $ALL ]] && ssdeep @@ -600,8 +601,9 @@ installMISPonKali () { debug "Installing misp-modules" mispmodules - debug "Installing Viper" - viper + ## FIXME: The current stat of Viper is broken, disabling any use. + ##debug "Installing Viper" + ##viper debug "Installing ssdeep" ssdeep diff --git a/docs/generic/supportFunctions.md b/docs/generic/supportFunctions.md index 8039a7683..adebe3180 100644 --- a/docs/generic/supportFunctions.md +++ b/docs/generic/supportFunctions.md @@ -26,7 +26,8 @@ usage () { echo -e "${SCRIPT_NAME} -c | Install ONLY ${LBLUE}MISP${NC} Core" # core echo -e " -M | ${LBLUE}MISP${NC} modules" # modules echo -e " -D | ${LBLUE}MISP${NC} dashboard" # dashboard - echo -e " -V | Viper" # viper + ## FIXME: The current stat of Viper is broken, disabling any use. + ##echo -e " -V | Viper" # viper echo -e " -m | Mail 2 ${LBLUE}MISP${NC}" # mail2 echo -e " -S | Experimental ssdeep correlations" # ssdeep echo -e " -A | Install ${YELLOW}all${NC} of the above" # all @@ -37,7 +38,7 @@ usage () { echo -e "${HIDDEN} -U | Attempt and upgrade of selected item${NC}" # UPGRADE echo -e "${HIDDEN} -N | Nuke this MISP Instance${NC}" # NUKE echo -e "${HIDDEN} -f | Force test install on current Ubuntu LTS schim, add -B for 18.04 -> 18.10, or -BB 18.10 -> 19.10)${NC}" # FORCE - echo -e "Options can be combined: ${SCRIPT_NAME} -c -V -D # Will install Core+Viper+Dashboard" + echo -e "Options can be combined: ${SCRIPT_NAME} -c -D # Will install Core+Dashboard" space echo -e "Recommended is either a barebone MISP install (ideal for syncing from other instances) or" echo -e "MISP + modules - ${SCRIPT_NAME} -c -M" diff --git a/docs/generic/viper-debian.md b/docs/generic/viper-debian.md index f8fe864ba..9ccf43da3 100644 --- a/docs/generic/viper-debian.md +++ b/docs/generic/viper-debian.md @@ -37,7 +37,7 @@ viper () { $SUDO_CMD /usr/local/src/viper/venv/bin/pip install -r requirements.txt echo "Launching viper-web" $SUDO_CMD /usr/local/src/viper-web/viper-web -p 8888 -H 0.0.0.0 & - echo 'PATH="/home/misp/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/usr/local/src/viper:/var/www/MISP/app/Console"' |sudo tee /etc/environment + echo 'PATH="/home/misp/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/usr/local/src/viper:/var/www/MISP/app/Console"' |sudo tee -a /etc/environment echo ". /etc/environment" >> /home/${MISP_USER}/.profile # TODO: Perms, MISP_USER_HOME, nasty hack cuz Kali on R00t diff --git a/docs/xINSTALL.tsurugi.md b/docs/xINSTALL.tsurugi.md index c3e0fea75..ded127fb7 100644 --- a/docs/xINSTALL.tsurugi.md +++ b/docs/xINSTALL.tsurugi.md @@ -591,7 +591,7 @@ function installMISPonTsurugi() { sed -i '1 s/^.*$/\#!\/usr\/local\/src\/viper\/venv\/bin\/python/' viper-web $SUDO /usr/local/src/viper/viper-cli -h > /dev/null $SUDO /usr/local/src/viper/viper-web -p 8888 -H 0.0.0.0 & - echo 'PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/usr/local/src/viper:/var/www/MISP/app/Console"' |tee /etc/environment + echo 'PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/usr/local/src/viper:/var/www/MISP/app/Console"' |tee -a /etc/environment echo ". /etc/environment" >> /home/${MISP_USER}/.profile $SUDO sed -i "s/^misp_url\ =/misp_url\ =\ http:\/\/localhost/g" /home/${MISP_USER}/.viper/viper.conf $SUDO sed -i "s/^misp_key\ =/misp_key\ =\ $AUTH_KEY/g" /home/${MISP_USER}/.viper/viper.conf From 65a01d7de4cab54ff54f3d43293c8ca1f7cb2ab6 Mon Sep 17 00:00:00 2001 From: Alexandre Dulaunoy Date: Mon, 3 Feb 2020 11:12:41 +0100 Subject: [PATCH 7/9] chg: [misp-objects] updated to the latest version --- app/files/misp-objects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/files/misp-objects b/app/files/misp-objects index fa6348039..01ac551cf 160000 --- a/app/files/misp-objects +++ b/app/files/misp-objects @@ -1 +1 @@ -Subproject commit fa634803911d211f993049242d41eebaf342a9c4 +Subproject commit 01ac551cfb5d2db4d83b03569f799940d6e16f62 From 5371d0af0f0f1f1842ec99ee48d970f7c7b4e109 Mon Sep 17 00:00:00 2001 From: Alexandre Dulaunoy Date: Mon, 3 Feb 2020 20:14:35 +0100 Subject: [PATCH 8/9] chg: [warning-lists] updated to the latest version --- app/files/warninglists | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/files/warninglists b/app/files/warninglists index eee124de3..5a2991291 160000 --- a/app/files/warninglists +++ b/app/files/warninglists @@ -1 +1 @@ -Subproject commit eee124de3401f9f957bb30a5a4989d422324eca8 +Subproject commit 5a299129122558bcebefcbc95f827a63f1d99097 From bb64a80b245fe16402d47e492add8e889c05f73f Mon Sep 17 00:00:00 2001 From: Alexandre Dulaunoy Date: Tue, 4 Feb 2020 11:48:35 +0100 Subject: [PATCH 9/9] chg: [misp-object] updated to the latest version --- app/files/misp-objects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/files/misp-objects b/app/files/misp-objects index 01ac551cf..195fc46a1 160000 --- a/app/files/misp-objects +++ b/app/files/misp-objects @@ -1 +1 @@ -Subproject commit 01ac551cfb5d2db4d83b03569f799940d6e16f62 +Subproject commit 195fc46a139dba2fdbdc46cb0d6e510738508366