diff --git a/INSTALL/INSTALL.sh b/INSTALL/INSTALL.sh index 733087984..1df4b2d03 100644 --- a/INSTALL/INSTALL.sh +++ b/INSTALL/INSTALL.sh @@ -953,7 +953,8 @@ composer73 () { # Update composer.phar # If hash changes, check here: https://getcomposer.org/download/ and replace with the correct one # Current Sum for: v1.8.3 - SHA384_SUM='baf1608c33254d00611ac1705c1d9958c817a1a33bce370c0595974b342601bd80b92a3f46067da89e3b06bff421f182' + SHA384_SUM="$(wget -q -O - https://composer.github.io/installer.sig)" +php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" $SUDO_WWW php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" $SUDO_WWW php -r "if (hash_file('SHA384', 'composer-setup.php') === '$SHA384_SUM') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); exit(137); } echo PHP_EOL;" checkFail "composer.phar checksum failed, please investigate manually. " $? diff --git a/INSTALL/INSTALL.sh.sha1 b/INSTALL/INSTALL.sh.sha1 index bae84ccaf..6bfcdb946 100644 --- a/INSTALL/INSTALL.sh.sha1 +++ b/INSTALL/INSTALL.sh.sha1 @@ -1 +1 @@ -e56b76bd7b24e78a7f27c732874124bd57974739 INSTALL.sh +966b18b8623bd83c9235c8a210d741db25a937d7 INSTALL.sh diff --git a/INSTALL/INSTALL.sh.sha256 b/INSTALL/INSTALL.sh.sha256 index 9682c1e7e..d072e20c9 100644 --- a/INSTALL/INSTALL.sh.sha256 +++ b/INSTALL/INSTALL.sh.sha256 @@ -1 +1 @@ -e983eb6bd1158848703fc7d364ae1d0305a2ce4bf35b13f208b82203f3ac5f90 INSTALL.sh +61c7f3242e7eeae16ac3cf65b60eb893c642f90f8b819be0670d25407ffd8b79 INSTALL.sh diff --git a/INSTALL/INSTALL.sh.sha384 b/INSTALL/INSTALL.sh.sha384 index 3e07d1c63..cb858ff37 100644 --- a/INSTALL/INSTALL.sh.sha384 +++ b/INSTALL/INSTALL.sh.sha384 @@ -1 +1 @@ -7c98b8afaaebff10611b8f7f743b94c35167b601b4fed2e02bc2b64689fa17e53be9af583323871a49d6f8de5934e8b2 INSTALL.sh +41d7749f890bb150d3914bae0a986609073b1b7403cb561cd662957c529fc3bf382f7d7a7692e8fe1525cdc49d7b1cad INSTALL.sh diff --git a/INSTALL/INSTALL.sh.sha512 b/INSTALL/INSTALL.sh.sha512 index 8624d2b8b..074013296 100644 --- a/INSTALL/INSTALL.sh.sha512 +++ b/INSTALL/INSTALL.sh.sha512 @@ -1 +1 @@ -b8476679daeb7943cd3fa12ebd354508c69c15b84ab882fd41cc0a74cd35bb245a64b21c059dbc86288cb9c3f52dd752573bc8b40481f74a4019cd6ecc70caa7 INSTALL.sh +f7fd098037a4b57a4b37a254ca4ddc80e418cab557518d4de73ef1ae4e382195729f71919510199e48e5e92af522f8d9bfe7c03ed6ad4423534c75a9016ef40f INSTALL.sh diff --git a/docs/INSTALL.rhel7.md b/docs/INSTALL.rhel7.md index 96d81a38f..aa73a92c5 100644 --- a/docs/INSTALL.rhel7.md +++ b/docs/INSTALL.rhel7.md @@ -317,8 +317,9 @@ installCake_RHEL () sudo chown $WWW_USER:$WWW_USER /usr/share/httpd/.composer cd $PATH_TO_MISP/app # Update composer.phar (optional) + #EXPECTED_SIGNATURE="$(wget -q -O - https://composer.github.io/installer.sig)" #$SUDO_WWW $RUN_PHP -- php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" - #$SUDO_WWW $RUN_PHP -- php -r "if (hash_file('SHA384', 'composer-setup.php') === 'baf1608c33254d00611ac1705c1d9958c817a1a33bce370c0595974b342601bd80b92a3f46067da89e3b06bff421f182') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" + #$SUDO_WWW $RUN_PHP -- php -r "if (hash_file('SHA384', 'composer-setup.php') === '$EXPECTED_SIGNATURE') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" #$SUDO_WWW $RUN_PHP "php composer-setup.php" #$SUDO_WWW $RUN_PHP -- php -r "unlink('composer-setup.php');" $SUDO_WWW $RUN_PHP "php composer.phar install" diff --git a/docs/generic/supportFunctions.md b/docs/generic/supportFunctions.md index dc2044b38..8039a7683 100644 --- a/docs/generic/supportFunctions.md +++ b/docs/generic/supportFunctions.md @@ -798,7 +798,8 @@ composer73 () { # Update composer.phar # If hash changes, check here: https://getcomposer.org/download/ and replace with the correct one # Current Sum for: v1.8.3 - SHA384_SUM='baf1608c33254d00611ac1705c1d9958c817a1a33bce370c0595974b342601bd80b92a3f46067da89e3b06bff421f182' + SHA384_SUM="$(wget -q -O - https://composer.github.io/installer.sig)" +php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" $SUDO_WWW php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" $SUDO_WWW php -r "if (hash_file('SHA384', 'composer-setup.php') === '$SHA384_SUM') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); exit(137); } echo PHP_EOL;" checkFail "composer.phar checksum failed, please investigate manually. " $? diff --git a/docs/xINSTALL.OpenBSD.md b/docs/xINSTALL.OpenBSD.md index 16e8feeed..8815a93c3 100644 --- a/docs/xINSTALL.OpenBSD.md +++ b/docs/xINSTALL.OpenBSD.md @@ -399,8 +399,9 @@ doas /usr/local/virtualenvs/MISP/bin/pip install git+https://github.com/kbandla/ # Install CakeResque along with its dependencies if you intend to use the built in background jobs: cd /var/www/htdocs/MISP/app doas mkdir /var/www/.composer ; doas chown www:www /var/www/.composer +EXPECTED_SIGNATURE="$(wget -q -O - https://composer.github.io/installer.sig)" doas -u www php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" -doas -u www php -r "if (hash_file('SHA384', 'composer-setup.php') === 'baf1608c33254d00611ac1705c1d9958c817a1a33bce370c0595974b342601bd80b92a3f46067da89e3b06bff421f182') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" +doas -u www php -r "if (hash_file('SHA384', 'composer-setup.php') === '$EXPECTED_SIGNATURE') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" doas -u www env HOME=/var/www php composer-setup.php doas -u www php -r "unlink('composer-setup.php');" doas -u www env HOME=/var/www php composer.phar install diff --git a/docs/xINSTALL.centos6.md b/docs/xINSTALL.centos6.md index 2d650d954..f603250b6 100644 --- a/docs/xINSTALL.centos6.md +++ b/docs/xINSTALL.centos6.md @@ -240,8 +240,9 @@ sudo mkdir /var/www/.composer/ sudo chown apache:apache /var/www/.composer/ cd $PATH_TO_MISP/app # Update composer.phar (optional) +#EXPECTED_SIGNATURE="$(wget -q -O - https://composer.github.io/installer.sig)" #$SUDO_WWW $RUN_PHP -- php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" -#$SUDO_WWW $RUN_PHP -- php -r "if (hash_file('SHA384', 'composer-setup.php') === 'baf1608c33254d00611ac1705c1d9958c817a1a33bce370c0595974b342601bd80b92a3f46067da89e3b06bff421f182') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" +#$SUDO_WWW $RUN_PHP -- php -r "if (hash_file('SHA384', 'composer-setup.php') === '$EXPECTED_SIGNATURE') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" #$SUDO_WWW $RUN_PHP "php composer-setup.php" #$SUDO_WWW $RUN_PHP -- php -r "unlink('composer-setup.php');" $SUDO_WWW $RUN_PHP "php composer.phar install" diff --git a/docs/xINSTALL.centos7.md b/docs/xINSTALL.centos7.md index 6789004c4..f4cd05492 100644 --- a/docs/xINSTALL.centos7.md +++ b/docs/xINSTALL.centos7.md @@ -223,8 +223,9 @@ sudo mkdir /usr/share/httpd/.composer sudo chown ${WWW_USER}:${WWW_USER} /usr/share/httpd/.composer cd $PATH_TO_MISP/app # Update composer.phar (optional) +#EXPECTED_SIGNATURE="$(wget -q -O - https://composer.github.io/installer.sig)" #$SUDO_WWW $RUN_PHP -- php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" -#$SUDO_WWW $RUN_PHP -- php -r "if (hash_file('SHA384', 'composer-setup.php') === 'baf1608c33254d00611ac1705c1d9958c817a1a33bce370c0595974b342601bd80b92a3f46067da89e3b06bff421f182') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" +#$SUDO_WWW $RUN_PHP -- php -r "if (hash_file('SHA384', 'composer-setup.php') === '$EXPECTED_SIGNATURE') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" #$SUDO_WWW $RUN_PHP "php composer-setup.php" #$SUDO_WWW $RUN_PHP -- php -r "unlink('composer-setup.php');" $SUDO_WWW $RUN_PHP "php composer.phar install" diff --git a/docs/xINSTALL.debian9.md b/docs/xINSTALL.debian9.md index 756ffcfed..49f051843 100644 --- a/docs/xINSTALL.debian9.md +++ b/docs/xINSTALL.debian9.md @@ -217,8 +217,9 @@ cd $PATH_TO_MISP/app # Make composer cache happy sudo mkdir /var/www/.composer ; sudo chown $WWW_USER:$WWW_USER /var/www/.composer # Update composer.phar +#EXPECTED_SIGNATURE="$(wget -q -O - https://composer.github.io/installer.sig)" # $SUDO_WWW php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" -# $SUDO_WWW php -r "if (hash_file('SHA384', 'composer-setup.php') === 'baf1608c33254d00611ac1705c1d9958c817a1a33bce370c0595974b342601bd80b92a3f46067da89e3b06bff421f182') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" +# $SUDO_WWW php -r "if (hash_file('SHA384', 'composer-setup.php') === '$EXPECTED_SIGNATURE') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" # $SUDO_WWW php composer-setup.php # $SUDO_WWW php -r "unlink('composer-setup.php');" $SUDO_WWW php composer.phar install