Merge branch '2.4' into develop

README.md

@@ -20,6 +20,10 @@ MISP - Threat Intelligence Sharing Platform
   <td>Twitter</td>
   <td><a href="https://twitter.com/MISPProject"><img src="https://img.shields.io/twitter/follow/MISPProject.svg?style=social&label=Follow" /></a></td>
 </tr>
+<tr>
+  <td>Localization</td>
+  <td><a href="https://crowdin.com/project/misp"><img src="https://badges.crowdin.net/misp/localized.svg" /></a></td>
+</tr>
 <tr>
   <td>Contributors</td>
   <td><img src="https://img.shields.io/github/contributors/MISP/MISP.svg" /></td>

app/Locale/cake.pot

@@ -13,20 +13,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: View/Errors/error400.ctp:20
-#: View/Errors/error500.ctp:19
-#: View/Errors/missing_connection.ctp:4
+#: View/Errors/error400.ctp:7
+#: View/Errors/error500.ctp:4
+#: View/Errors/missing_connection.ctp:5
 #: View/Errors/missing_datasource_config.ctp:4
 #: View/Errors/pdo_error.ctp:4
 msgid "Error"
 msgstr ""
 
-#: View/Errors/error400.ctp:22
+#: View/Errors/error400.ctp:11
 msgid "The requested address %s was not found on this server."
 msgstr ""
 
-#: View/Errors/error500.ctp:20
-#: View/Errors/missing_connection.ctp:5
+#: View/Errors/error400.ctp:14
+msgid "You don't have permission to access %s."
+msgstr ""
+
+#: View/Errors/error500.ctp:5
+msgid "An Internal Error Has Occurred. Please try your action again. If the problem persists, please contact administrator."
+msgstr ""
+
+#: View/Errors/missing_connection.ctp:6
 #: View/Errors/missing_datasource_config.ctp:5
 #: View/Errors/pdo_error.ctp:5
 msgid "An Internal Error Has Occurred."

app/Locale/fra/LC_MESSAGES/default.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: misp\n"
-"PO-Revision-Date: 2020-04-24 02:08\n"
+"PO-Revision-Date: 2021-03-26 04:21\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: French\n"
 "MIME-Version: 1.0\n"
@@ -9,8 +9,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Crowdin-Project: misp\n"
+"X-Crowdin-Project-ID: 306440\n"
 "X-Crowdin-Language: fr\n"
 "X-Crowdin-File: default.pot\n"
+"X-Crowdin-File-ID: 1\n"
 "Language: fr_FR\n"
 
 #: Console/Command/AdminShell.php:72

docs/INSTALL.rhel7.md

@@ -1,9 +1,17 @@
 # INSTALLATION INSTRUCTIONS for RHEL 7.x and CentOS 7.x
 -------------------------
 
-### -1/ Installer and Manual install instructions
+### -2/ RHEL7/CentOS7 - status
+-------------------------
+!!! notice
+    MISP-core and misp-modules Tested working by [@SteveClement](https://twitter.com/SteveClement) on 20210326
 
-Make sure you are reading the parsed version of this Document. When in doubt [click here](https://misp.github.io/MISP/INSTALL.rhel7/).
+!!! notice
+    This document also serves as a source for the [INSTALL-misp.sh](https://github.com/MISP/MISP/blob/2.4/INSTALL/INSTALL.sh) script.
+    Which explains why you will see the use of shell *functions* in various steps.
+    Henceforth the document will also follow a more logical flow. In the sense that all the dependencies are installed first then config files are generated, etc...
+
+### -1/ Installer and Manual install instructions
 
 !!! warning
     In the **future**, to install MISP on a fresh RHEL 7 install all you need to do is:
@@ -19,10 +27,13 @@ Make sure you are reading the parsed version of this Document. When in doubt [cl
     ```
     **The above does NOT work yet**
 
-### 0/ Overview and Assumptions
+!!! notice
+    If the next line is `[!generic/community.md!]()` [click here](https://misp.github.io/MISP/INSTALL.rhel7/).
 
 {!generic/community.md!}
 
+### 0/ Overview and Assumptions
+
 {!generic/rhelVScentos.md!}
 
 !!! warning

docs/INSTALL.rhel8.md

@@ -1,9 +1,17 @@
-# INSTALLATION INSTRUCTIONS for RHEL 8.x and partially Fedora Server 30
+# INSTALLATION INSTRUCTIONS for RHEL 8.x, CentOS8/Stream
 -------------------------
 
-### -1/ Installer and Manual install instructions
+### -2/ RHEL8/CentOS8 - status
+-------------------------
+!!! notice
+    MISP-core and misp-modules Tested working by [@SteveClement](https://twitter.com/SteveClement) on 20210326
 
-Make sure you are reading the parsed version of this Document. When in doubt [click here](https://misp.github.io/MISP/INSTALL.rhel8/).
+!!! notice
+    This document also serves as a source for the [INSTALL-misp.sh](https://github.com/MISP/MISP/blob/2.4/INSTALL/INSTALL.sh) script.
+    Which explains why you will see the use of shell *functions* in various steps.
+    Henceforth the document will also follow a more logical flow. In the sense that all the dependencies are installed first then config files are generated, etc...
+
+### -1/ Installer and Manual install instructions
 
 !!! warning
     In the **future**, to install MISP on a fresh RHEL 8 install all you need to do is:
@@ -19,21 +27,19 @@ Make sure you are reading the parsed version of this Document. When in doubt [cl
     ```
     **The above does NOT work yet**
 
-### 0/ Overview and Assumptions
+!!! notice
+    If the next line is `[!generic/community.md!]()` [click here](https://misp.github.io/MISP/INSTALL.rhel8/).
 
 {!generic/community.md!}
 
+### 0/ Overview and Assumptions
+
 {!generic/rhelVScentos.md!}
 
 !!! warning
     The core MISP team cannot verify if this guide is working or not. Please help us in keeping it up to date and accurate.
     Thus we also have difficulties in supporting RHEL issues but will do a best effort on a similar yet slightly different setup.
 
-!!! notice
-    This document also serves as a source for the [INSTALL-misp.sh](https://github.com/MISP/MISP/blob/2.4/INSTALL/INSTALL.sh) script.
-    Which explains why you will see the use of shell *functions* in various steps.
-    Henceforth the document will also follow a more logical flow. In the sense that all the dependencies are installed first then config files are generated, etc...
-
 !!! notice
     Maintenance for CentOS 8 will end on: December 31st, 2021 [Source[0]](https://wiki.centos.org/About/Product) [Source[1]](https://linuxlifecycle.com/)
     CentOS 8 [NetInstallURL](http://mirrorlist.centos.org/?release=8&arch=x86_64&repo=BaseOS)
@@ -105,16 +111,18 @@ yumUpdate () {
 # <snippet-end 0_yum-update.sh>
 ```
 
-## 1.6/ **[RHEL]** Install the EPEL and remi repo
+## 1.6/ Install the EPEL and remi repo
 ```bash
-# <snippet-begin 0_RHEL_EPEL.sh>
-enableEPEL () {
+# <snippet-begin 0_EPEL_REMI.sh>
+enableEPEL_REMI () {
   sudo yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm -y
   sudo yum install http://rpms.remirepo.net/enterprise/remi-release-8.rpm -y
   sudo yum install yum-utils -y
   sudo dnf module enable php:remi-7.4 -y
+  [[ ${DISTRI} == "centos8stream" ]] &&sudo dnf config-manager --set-enabled powertools
+  [[ ${DISTRI} == "centos8" ]] &&sudo dnf config-manager --set-enabled powertools
 }
-# <snippet-end 0_RHEL_EPEL.sh>
+# <snippet-end 0_EPEL_REMI.sh>
 ```
 
 ### 2/ Dependencies
@@ -130,6 +138,8 @@ enableEPEL () {
 # <snippet-begin 0_yumInstallCoreDeps.sh>
 yumInstallCoreDeps () {
   # Install the dependencies:
+  PHP_BASE="/etc/"
+  PHP_INI="/etc/php.ini"
   sudo yum install @httpd -y
   sudo yum install gcc git zip \
                    httpd \
@@ -146,7 +156,6 @@ yumInstallCoreDeps () {
   # Enable and start redis
   sudo systemctl enable --now redis.service
 
-  PHP_INI="/etc/opt/remi/php74/php.ini"
   # Install PHP 7.4 from Remi's repo, see https://rpms.remirepo.net/enterprise/8/php74/x86_64/repoview/
   sudo yum install php php-fpm php-devel \
                    php-mysqlnd \
@@ -160,8 +169,8 @@ yumInstallCoreDeps () {
                    php-intl \
                    php-gd -y
 
-  # cake has php baked in, thus we link to it, ignore if this fails or exists.
-  sudo ln -s /usr/bin/php74 /usr/bin/php
+  # cake has php baked in, thus we link to it if necessary.
+  [[ ! -e "/usr/bin/php" ]] && sudo ln -s /usr/bin/php74 /usr/bin/php
 }
 # <snippet-end 0_yumInstallCoreDeps.sh>
 ```
@@ -252,13 +261,15 @@ installCoreRHEL () {
 
   # lief needs manual compilation
   sudo yum groupinstall "Development Tools" -y
-  sudo yum install cmake3 -y
+  [[ ${DISTRI} == 'rhel8.3' ]] && sudo yum install cmake3 -y && CMAKE_BIN='cmake3'
+  [[ ${DISTRI} == 'centos8stream' ]] && sudo yum install cmake -y && CMAKE_BIN='cmake'
+  [[ ${DISTRI} == 'centos8' ]] && sudo yum install cmake -y && CMAKE_BIN='cmake'
 
   cd $PATH_TO_MISP/app/files/scripts/lief
   $SUDO_WWW git config core.filemode false
   $SUDO_WWW mkdir build
   cd build
-  $SUDO_WWW cmake3 \
+  $SUDO_WWW ${CMAKE_BIN} \
   -DLIEF_PYTHON_API=on \
   -DPYTHON_VERSION=3.6 \
   -DPYTHON_EXECUTABLE=$PATH_TO_MISP/venv/bin/python \
@@ -295,7 +306,7 @@ installCoreRHEL () {
 
   # FIXME: Remove libfaup etc once the egg has the library baked-in
   # BROKEN: This needs to be tested on RHEL/CentOS
-  sudo yum install libcaca-devel cmake3 -y
+  sudo yum install libcaca-devel -y
   cd /tmp
   [[ ! -d "faup" ]] && $SUDO_CMD git clone https://github.com/stricaud/faup.git faup
   [[ ! -d "gtcaca" ]] && $SUDO_CMD git clone https://github.com/stricaud/gtcaca.git gtcaca
@@ -303,21 +314,22 @@ installCoreRHEL () {
   cd gtcaca
   $SUDO_CMD mkdir -p build
   cd build
-  $SUDO_CMD cmake .. && $SUDO_CMD make
+  $SUDO_CMD ${CMAKE_BIN} .. && $SUDO_CMD make
   sudo make install
   cd ../../faup
   $SUDO_CMD mkdir -p build
   cd build
-  $SUDO_CMD cmake .. && $SUDO_CMD make
+  $SUDO_CMD ${CMAKE_BIN} .. && $SUDO_CMD make
   sudo make install
   sudo ldconfig
 
   # Enable dependencies detection in the diagnostics page
   # This allows MISP to detect GnuPG, the Python modules' versions and to read the PHP settings.
-  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" |sudo tee -a /etc/opt/remi/php74/php-fpm.d/www.conf
-  sudo sed -i.org -e 's/^;\(clear_env = no\)/\1/' /etc/opt/remi/php74/php-fpm.d/www.conf
-  sudo systemctl restart php74-php-fpm.service
-  # TODO investigate: listen = 127.0.0.1:9000
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" |sudo tee -a ${PHP_BASE}/php-fpm.d/www.conf
+  sudo sed -i.org -e 's/^;\(clear_env = no\)/\1/' ${PHP_BASE}/php-fpm.d/www.conf  # TODO check if below is different on RHEL8 php74-php-fpm.service also dbl check paths
+  sudo sed -i.org -e 's/^\(listen =\) \/run\/php-fpm\/www\.sock/\1 127.0.0.1:9000/' ${PHP_BASE}/php-fpm.d/www.conf
+
+  sudo systemctl restart php-fpm.service
 
   umask $UMASK
 }

docs/generic/globalVariables.md

@@ -10,6 +10,12 @@ MISPvars () {
   MISP_USER="${MISP_USER:-misp}"
   MISP_PASSWORD="${MISP_PASSWORD:-$(openssl rand -hex 32)}"
 
+  # Cheap distribution detector
+  FLAVOUR="$(. /etc/os-release && echo "$ID"| tr '[:upper:]' '[:lower:]')"
+  STREAM="$(. /etc/os-release && echo "$NAME"| grep -o -i stream |tr '[:upper:]' '[:lower:]')"
+  DIST_VER="$(. /etc/os-release && echo "$VERSION_ID")"
+  DISTRI=${FLAVOUR}${DIST_VER}${STREAM}
+
   # The web server user
   # RHEL/CentOS
   if [[ -f "/etc/redhat-release" ]]; then

docs/generic/misp-modules-centos.md

@@ -21,7 +21,7 @@ mispmodulesRHEL () {
   # some misp-modules dependencies for RHEL<8
   sudo yum install rubygem-rouge rubygem-asciidoctor zbar-devel opencv-devel -y
   # some misp-modules dependencies for RHEL8
-  sudo dnf install https://packages.endpoint.com/rhel/8/main/x86_64/endpoint-repo-8-1.ep8.noarch.rpm
+  sudo dnf install https://packages.endpoint.com/rhel/8/main/x86_64/endpoint-repo-8-1.ep8.noarch.rpm -y
   sudo yum install zbar-devel opencv-devel -y
 
   echo "[Unit]

mkdocs.yml

@@ -14,7 +14,7 @@ edit_uri: ""
 #dev_addr: "192.168.10.34:8000"
 
 # Copyright
-copyright: "Copyright © 2020 MISP Project"
+copyright: "Copyright © 2021 MISP Project"
 
 # Options
 extra:
@@ -70,14 +70,13 @@ nav:
       - 'Ubuntu 18.04': 'INSTALL.ubuntu1804.md'
       - 'Ubuntu 20.04': 'INSTALL.ubuntu2004.md'
       - 'Kali Linux': 'INSTALL.kali.md'
-      - 'RHEL7/CentOS7': 'INSTALL.rhel7.md'
       - 'RHEL8/CentOS8': 'INSTALL.rhel8.md'
+      - 'RHEL7/CentOS7': 'INSTALL.rhel7.md'
     - xInstall Guides: 
       - 'Warning': 'xINSTALL.md'
       - 'Debian 10': 'xINSTALL.debian10.md'
-      - 'Ubuntu 18.04 \w webmin': 'xINSTALL.ubuntu1804.with.webmin.md'
       - 'Tsurugi Linux': 'xINSTALL.tsurugi.md'
-      - 'OpenBSD 6.7': 'xINSTALL.OpenBSD.md'
+      - 'OpenBSD 6.8': 'xINSTALL.OpenBSD.md'
     - Config Guides:
       - 'Elastic Search Logging': 'CONFIG.elasticsearch-logging.md'
       - 'Amazon S3 attachments': 'CONFIG.s3-attachments.md'
@@ -86,9 +85,10 @@ nav:
     - Upgrading MISP: 'UPGRADE.md'
     - Old guides:
       - '2.3 to 2.4 upgrade': 'archive/old-2_3to2_4-UPGRADE.md'
+      - 'Ubuntu 18.04 \w webmin': 'archive/xINSTALL.ubuntu1804.with.webmin.md'
       - 'Ubuntu 16.04': 'archive/INSTALL.ubuntu1604.md'
-      - 'Debian 9': 'xINSTALL.debian9.md'
-      - 'Centos 6': 'xINSTALL.centos6.md'
+      - 'Debian 9': 'archive/xINSTALL.debian9.md'
+      - 'Centos 6': 'archive/xINSTALL.centos6.md'
       - 'FreeBSD': 'archive/xINSTALL.FreeBSD.md'
     - About:
       - 'MISP Release Notes': 'Changelog.md'