From 7eabb893c359143844e8cbdd1405e48a80086092 Mon Sep 17 00:00:00 2001 From: Steve Clement Date: Thu, 20 Jun 2019 11:57:38 +0900 Subject: [PATCH 1/4] chg: [doc] Added plyara to kali installer, amended RHEL misp-modules --- INSTALL/INSTALL.tpl.sh | 3 +++ docs/INSTALL.rhel7.md | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/INSTALL/INSTALL.tpl.sh b/INSTALL/INSTALL.tpl.sh index e14a0f7bc..d0d1fdd9e 100755 --- a/INSTALL/INSTALL.tpl.sh +++ b/INSTALL/INSTALL.tpl.sh @@ -465,6 +465,9 @@ installMISPonKali () { # install python-magic $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install python-magic 2> /dev/null > /dev/null + # install plyara + $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install plyara 2> /dev/null > /dev/null + # install zmq needed by mispzmq $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install zmq 2> /dev/null > /dev/null diff --git a/docs/INSTALL.rhel7.md b/docs/INSTALL.rhel7.md index 0417f4e3d..104b70142 100644 --- a/docs/INSTALL.rhel7.md +++ b/docs/INSTALL.rhel7.md @@ -703,7 +703,7 @@ sudo systemctl enable --now misp-workers.service ## 9.07/ misp-modules (WIP!) ```bash # some misp-modules dependencies -sudo yum install openjpeg-devel gcc-c++ poppler-cpp-devel -y +sudo yum install openjpeg-devel gcc-c++ poppler-cpp-devel pkgconfig python-devel redhat-rpm-config -y sudo chmod 2777 /usr/local/src sudo chown root:users /usr/local/src From 4b5f36fcd30e1d1adaa443da9d8cfb308d1c976b Mon Sep 17 00:00:00 2001 From: Steve Clement Date: Thu, 20 Jun 2019 12:31:27 +0900 Subject: [PATCH 2/4] chg: [installer] Updated installer --- INSTALL/INSTALL.sh | 5 ++++- 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 +- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/INSTALL/INSTALL.sh b/INSTALL/INSTALL.sh index a435db6e8..0d8e25d0e 100644 --- a/INSTALL/INSTALL.sh +++ b/INSTALL/INSTALL.sh @@ -393,7 +393,7 @@ ask_o () { while true; do case "${ANSWER}" in "${OPT1}" | "${OPT2}") break ;; esac - echo -n "${1} (${OPT1}/${OPT2}) " + echo -e -n "${1} (${OPT1}/${OPT2}) " read ANSWER ANSWER=$(echo "${ANSWER}" | tr '[:upper:]' '[:lower:]') done @@ -2141,6 +2141,9 @@ installMISPonKali () { # install python-magic $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install python-magic 2> /dev/null > /dev/null + # install plyara + $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install plyara 2> /dev/null > /dev/null + # install zmq needed by mispzmq $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install zmq 2> /dev/null > /dev/null diff --git a/INSTALL/INSTALL.sh.sfv b/INSTALL/INSTALL.sh.sfv index 3a4a55f07..1df185bd3 100644 --- a/INSTALL/INSTALL.sh.sfv +++ b/INSTALL/INSTALL.sh.sfv @@ -1,5 +1,5 @@ -; Generated by RHash v1.3.8 on 2019-06-15 at 11:59.41 +; Generated by RHash v1.3.8 on 2019-06-20 at 12:31.17 ; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/ ; -; 94958 11:59.41 2019-06-15 INSTALL.sh -INSTALL.sh AD8916A355616615634DD364BB78945301039BDD E12BB967B309DB78E723476B79AC6F1001F02248A0001593B5EFA5C18D0BEBB6 37BC162A792BDBC86AEC04F629E5C410D754C92CA76D796F8FA9F11272A35064D6D3371165A330F747E5C71BF69311F0 71C1FF6F5FB0C2A61A9C0AACE2D017C7EA4A7094B49F22CD22E5723702CFAC27F66D05C52368F169FD8F40166AFC493F5512E078EDF5C279939AB85110A27EBD +; 95062 12:31.17 2019-06-20 INSTALL.sh +INSTALL.sh 297AAAC2B11BC8571D76666D499AD3288E08FA6E AAEF70E4E4E5E9141BD2DB3C408DF16947265BC55308378AE8F117B2184DA6AF 14DB03604CB5FD37C5870B518CC96B88B5C972AF21F36F3DBB9EF2FE1FAC7C70F452DD6FB14058702F84126AF6940D31 14F01AD5B6E33A7FCDAB7742F321555143C571BC380072C09FE4FAA7CBB9DABC4393006D185FEA53CEBA1722D4D7197C4E5F4B46184E5C077A56C7C849A13BDC diff --git a/INSTALL/INSTALL.sh.sha1 b/INSTALL/INSTALL.sh.sha1 index 06d6bd0b2..ed46bf437 100644 --- a/INSTALL/INSTALL.sh.sha1 +++ b/INSTALL/INSTALL.sh.sha1 @@ -1 +1 @@ -ad8916a355616615634dd364bb78945301039bdd INSTALL.sh +297aaac2b11bc8571d76666d499ad3288e08fa6e INSTALL.sh diff --git a/INSTALL/INSTALL.sh.sha256 b/INSTALL/INSTALL.sh.sha256 index d64f0508c..e6901e6f6 100644 --- a/INSTALL/INSTALL.sh.sha256 +++ b/INSTALL/INSTALL.sh.sha256 @@ -1 +1 @@ -e12bb967b309db78e723476b79ac6f1001f02248a0001593b5efa5c18d0bebb6 INSTALL.sh +aaef70e4e4e5e9141bd2db3c408df16947265bc55308378ae8f117b2184da6af INSTALL.sh diff --git a/INSTALL/INSTALL.sh.sha384 b/INSTALL/INSTALL.sh.sha384 index 2c2bff2ed..b6fba5713 100644 --- a/INSTALL/INSTALL.sh.sha384 +++ b/INSTALL/INSTALL.sh.sha384 @@ -1 +1 @@ -37bc162a792bdbc86aec04f629e5c410d754c92ca76d796f8fa9f11272a35064d6d3371165a330f747e5c71bf69311f0 INSTALL.sh +14db03604cb5fd37c5870b518cc96b88b5c972af21f36f3dbb9ef2fe1fac7c70f452dd6fb14058702f84126af6940d31 INSTALL.sh diff --git a/INSTALL/INSTALL.sh.sha512 b/INSTALL/INSTALL.sh.sha512 index 5c29b57ba..0ca16f643 100644 --- a/INSTALL/INSTALL.sh.sha512 +++ b/INSTALL/INSTALL.sh.sha512 @@ -1 +1 @@ -71c1ff6f5fb0c2a61a9c0aace2d017c7ea4a7094b49f22cd22e5723702cfac27f66d05c52368f169fd8f40166afc493f5512e078edf5c279939ab85110a27ebd INSTALL.sh +14f01ad5b6e33a7fcdab7742f321555143c571bc380072c09fe4faa7cbb9dabc4393006d185fea53ceba1722d4d7197c4e5f4b46184e5c077a56c7c849a13bdc INSTALL.sh From 444b3f9c05e921f4e1c443487a08eedc79909b04 Mon Sep 17 00:00:00 2001 From: Steve Clement Date: Thu, 20 Jun 2019 13:59:31 +0900 Subject: [PATCH 3/4] fix: [installer] Currently misp-packer fails on waiting for user input during upgrade --- docs/INSTALL.ubuntu1804.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/docs/INSTALL.ubuntu1804.md b/docs/INSTALL.ubuntu1804.md index 588745ca1..5f0504a2d 100644 --- a/docs/INSTALL.ubuntu1804.md +++ b/docs/INSTALL.ubuntu1804.md @@ -46,7 +46,16 @@ aptUpgrade () { debug "Upgrading system" checkAptLock sudo apt-get update - sudo apt-get upgrade -qy + + # If we run in non-interactive mode, make sure we do not stop all of a sudden + if [[ "${PACKER}" == "1" || "${UNATTENDED}" == "1" ]]; then + export DEBIAN_FRONTEND=noninteractive + export DEBIAN_PRIORITY=critical + sudo -E apt-get -qy -o "Dpkg::Options::=--force-confdef" -o "Dpkg::Options::=--force-confold" upgrade + sudo -E apt-get -qy autoclean + else + sudo apt-get upgrade -qy + fi } # ``` From 08e7ca34b84fdbade732d42dc4883f7ebaf991a6 Mon Sep 17 00:00:00 2001 From: Steve Clement Date: Thu, 20 Jun 2019 14:00:42 +0900 Subject: [PATCH 4/4] chg: [installer] Update installer to Fix Auto-VMs --- INSTALL/INSTALL.sh | 11 ++++++++++- 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 +- 6 files changed, 17 insertions(+), 8 deletions(-) diff --git a/INSTALL/INSTALL.sh b/INSTALL/INSTALL.sh index 0d8e25d0e..606ea434b 100644 --- a/INSTALL/INSTALL.sh +++ b/INSTALL/INSTALL.sh @@ -967,7 +967,16 @@ aptUpgrade () { debug "Upgrading system" checkAptLock sudo apt-get update - sudo apt-get upgrade -qy + + # If we run in non-interactive mode, make sure we do not stop all of a sudden + if [[ "${PACKER}" == "1" || "${UNATTENDED}" == "1" ]]; then + export DEBIAN_FRONTEND=noninteractive + export DEBIAN_PRIORITY=critical + sudo -E apt-get -qy -o "Dpkg::Options::=--force-confdef" -o "Dpkg::Options::=--force-confold" upgrade + sudo -E apt-get -qy autoclean + else + sudo apt-get upgrade -qy + fi } # check if sudo is installed diff --git a/INSTALL/INSTALL.sh.sfv b/INSTALL/INSTALL.sh.sfv index 1df185bd3..cbc9ddd71 100644 --- a/INSTALL/INSTALL.sh.sfv +++ b/INSTALL/INSTALL.sh.sfv @@ -1,5 +1,5 @@ -; Generated by RHash v1.3.8 on 2019-06-20 at 12:31.17 +; Generated by RHash v1.3.8 on 2019-06-20 at 14:00.36 ; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/ ; -; 95062 12:31.17 2019-06-20 INSTALL.sh -INSTALL.sh 297AAAC2B11BC8571D76666D499AD3288E08FA6E AAEF70E4E4E5E9141BD2DB3C408DF16947265BC55308378AE8F117B2184DA6AF 14DB03604CB5FD37C5870B518CC96B88B5C972AF21F36F3DBB9EF2FE1FAC7C70F452DD6FB14058702F84126AF6940D31 14F01AD5B6E33A7FCDAB7742F321555143C571BC380072C09FE4FAA7CBB9DABC4393006D185FEA53CEBA1722D4D7197C4E5F4B46184E5C077A56C7C849A13BDC +; 95437 14:00.36 2019-06-20 INSTALL.sh +INSTALL.sh 8CFDF8FC14572C9AA51673D7449C354257C6CE67 61B8976709B44B3F2C0491EDB6FA013AC15BA4833F074929810C65C93C274FCB 75D5538717565401F180E7C777BE41A167B2365473806141C9357E75220DD198BE68DC2B59452F39396B42FB50208194 460D731E91EAA0F589B96D13CC451BCB7014C683A357099B13492E7683A459ECB7C2A43AFFB237C966CE67DD06140199686E968B518A33ED73C84135948E0749 diff --git a/INSTALL/INSTALL.sh.sha1 b/INSTALL/INSTALL.sh.sha1 index ed46bf437..716062ee5 100644 --- a/INSTALL/INSTALL.sh.sha1 +++ b/INSTALL/INSTALL.sh.sha1 @@ -1 +1 @@ -297aaac2b11bc8571d76666d499ad3288e08fa6e INSTALL.sh +8cfdf8fc14572c9aa51673d7449c354257c6ce67 INSTALL.sh diff --git a/INSTALL/INSTALL.sh.sha256 b/INSTALL/INSTALL.sh.sha256 index e6901e6f6..bd3388041 100644 --- a/INSTALL/INSTALL.sh.sha256 +++ b/INSTALL/INSTALL.sh.sha256 @@ -1 +1 @@ -aaef70e4e4e5e9141bd2db3c408df16947265bc55308378ae8f117b2184da6af INSTALL.sh +61b8976709b44b3f2c0491edb6fa013ac15ba4833f074929810c65c93c274fcb INSTALL.sh diff --git a/INSTALL/INSTALL.sh.sha384 b/INSTALL/INSTALL.sh.sha384 index b6fba5713..98ebc9458 100644 --- a/INSTALL/INSTALL.sh.sha384 +++ b/INSTALL/INSTALL.sh.sha384 @@ -1 +1 @@ -14db03604cb5fd37c5870b518cc96b88b5c972af21f36f3dbb9ef2fe1fac7c70f452dd6fb14058702f84126af6940d31 INSTALL.sh +75d5538717565401f180e7c777be41a167b2365473806141c9357e75220dd198be68dc2b59452f39396b42fb50208194 INSTALL.sh diff --git a/INSTALL/INSTALL.sh.sha512 b/INSTALL/INSTALL.sh.sha512 index 0ca16f643..3e622b45f 100644 --- a/INSTALL/INSTALL.sh.sha512 +++ b/INSTALL/INSTALL.sh.sha512 @@ -1 +1 @@ -14f01ad5b6e33a7fcdab7742f321555143c571bc380072c09fe4faa7cbb9dabc4393006d185fea53ceba1722d4d7197c4e5f4b46184e5c077a56c7c849a13bdc INSTALL.sh +460d731e91eaa0f589b96d13cc451bcb7014c683a357099b13492e7683a459ecb7c2a43affb237c966ce67dd06140199686e968b518a33ed73c84135948e0749 INSTALL.sh