From 0593c69f2f434e79c5e3af1cdd1e5e0ffd714543 Mon Sep 17 00:00:00 2001
From: Nicolas CARPi <nicolas.carpi@curie.fr>
Date: Thu, 5 Mar 2020 00:53:27 +0100
Subject: [PATCH 1/2] Skip the PHP cli configuration file when looking for
 expose_php

The expose_php configuration option is only relevant for non-cli PHP and
thus lynis should not look for it in config files that are for cli

Fix #849
---
 CHANGELOG.md      | 1 +
 include/tests_php | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b00ec84..34dc6829 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -102,6 +102,7 @@ Using the relevant options, the scan will change base on the intended goal.
 - NAME-4404 - improved screen and log output
 - NAME-4408 - corrected Report function call
 - NETW-3032 - small rewrite of test and extended with addrwatch
+- PHP-2372 - don't look in the cli configuration files
 - PKGS-7410 - use multiple package managers when available
 - PKGS-7410 - added support for Zypper to test number of kernels
 - PROC-3602 - allow different root directory
diff --git a/include/tests_php b/include/tests_php
index d84b181a..6e4d44f9 100644
--- a/include/tests_php
+++ b/include/tests_php
@@ -291,6 +291,8 @@
     if [ ${SKIPTEST} -eq 0 ]; then
         FOUND=0
         for FILE in ${PHPINI_ALLFILES}; do
+            # Don't look at this setting in cli configuration
+            if [[ ${FILE} == *"/cli/"* ]]; then continue; fi
             LogText "Test: Checking file ${FILE}"
             FIND=$(${EGREPBINARY} -i 'expose_php.*(on|yes|1)' ${FILE} | ${GREPBINARY} -v '^;')
             if HasData "${FIND}"; then

From 600cb84310b0b97aad7184b5224fdc3ba18a04be Mon Sep 17 00:00:00 2001
From: Nicolas CARPi <nicolas.carpi@curie.fr>
Date: Thu, 5 Mar 2020 21:42:54 +0100
Subject: [PATCH 2/2] Use a POSIX implementation to check for substring

This works with all shells, even busybox.
---
 include/tests_php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/tests_php b/include/tests_php
index 6e4d44f9..120b7dcb 100644
--- a/include/tests_php
+++ b/include/tests_php
@@ -292,7 +292,11 @@
         FOUND=0
         for FILE in ${PHPINI_ALLFILES}; do
             # Don't look at this setting in cli configuration
-            if [[ ${FILE} == *"/cli/"* ]]; then continue; fi
+            case "${FILE}" in
+                */cli/*)
+                    continue
+                    ;;
+            esac
             LogText "Test: Checking file ${FILE}"
             FIND=$(${EGREPBINARY} -i 'expose_php.*(on|yes|1)' ${FILE} | ${GREPBINARY} -v '^;')
             if HasData "${FIND}"; then