From e054e9757c3fdc0ac794e18fa7ed9e04c11b1de1 Mon Sep 17 00:00:00 2001
From: hlein <hlein@korelogic.com>
Date: Tue, 7 Mar 2017 12:23:08 -0700
Subject: Lots of cleanups (#366)

* Description fix: SafePerms works on files not dirs.

All uses of SafePerms are on files (and indeed, it would reject
directories which would have +x set).

* Lots of whitespace cleanups.

Enforce everywhere(?) the same indentations for if/fi blocks.
The standard for the Lynis codebase is 4 spaces.  But sometimes
it's 1, sometimes 3, sometimes 8.

These patches standardize all(?) if blocks but _not_ else's (which
are usually indented 2, but sometimes zero); I was too lazy to
identify those (see below).

This diff is giant, but should not change code behavior at all;
diff -w shows no changes apart from whitespace.

FWIW I identified instances to check by using:

  perl -ne 'if ($oldfile ne $ARGV) { $.=1; $oldfile=$ARGV; }; chomp; if ($spaces) { next unless /^( *)([^ ]+)/; $newspaces=length($1); $firsttok = $2; next unless defined($firsttok); $offset = ($firsttok eq "elif" ? 0 : 4); if ($newspaces != $spaces + $offset) { print "$ARGV:$ifline\n$ARGV:$.:$_\n\n" }; $ifline=""; $spaces="";  } if (/^( *)if (?!.*[; ]fi)/) { $ifline = "$.:$_"; $spaces = length($1); }' $(find . -type f -print0 | xargs -0 file | egrep shell | cut -d: -f1)

Which produced output like:

  ./extras/build-lynis.sh:217:            if [ ${VERSION_IN_SPECFILE} = "" -o ! "${VERSION_IN_SPECFILE}" = "${LYNIS_VERSION}" ]; then
  ./extras/build-lynis.sh:218:               echo "[X] Version in specfile is outdated"

  ./plugins/plugin_pam_phase1:69:        if [ -d ${PAM_DIRECTORY} ]; then
  ./plugins/plugin_pam_phase1:70:                LogText "Result: /etc/pam.d exists"

...There's probably formal shellscript-beautification tools that
I'm oblivious about.

* More whitespace standardization.

* Fix a syntax error.

This looks like an if [ foo -o bar ]; was converted to if .. elif,
but incompletely.

* Add whitespace before closing ].

Without it, the shell thinks the ] is part of the last string, and
emits warnings like:

  .../lynis/include/tests_authentication: line 1028: [: missing `]'
---
 lynis | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lynis')

diff --git a/lynis b/lynis
index a7625381..f4250bc9 100755
--- a/lynis
+++ b/lynis
@@ -165,7 +165,7 @@ Make sure to execute ${PROGRAM_NAME} from untarred directory or check your insta
     done
 
     if [ ${SHOWPERMERROR} -eq 1 ]; then
-            printf "%s" "
+        printf "%s" "
 
 [!] Change ownership of ${INCLUDEDIR}/${ISSUE_FILE} to 'root' or similar (found: ${ISSUE_OWNER} with UID ${ISSUE_OWNERID}).
 
@@ -621,7 +621,7 @@ ${NORMAL}
     if [ ! "${OS_MODE}" = "" ]; then LogText "Operating system mode:     ${OS_MODE}"; fi
     LogText "Kernel version:            ${OS_KERNELVERSION}"
     if [ ! "${OS_KERNELVERSION_FULL}" = "" ]; then
-      LogText "Kernel version (full):     ${OS_KERNELVERSION_FULL}"
+        LogText "Kernel version (full):     ${OS_KERNELVERSION_FULL}"
     fi
     LogText "Hardware platform:         ${HARDWARE}"
     LogText "-----------------------------------------------------"
-- 
cgit v1.2.3