From 95d08a735a37d06e23c1bf9d290150c8178ad108 Mon Sep 17 00:00:00 2001 From: mboelen Date: Wed, 22 Jul 2015 12:20:27 +0200 Subject: Optimizing code, cleaning up --- include/consts | 89 +++++++++++++++++++++------------------------------------- 1 file changed, 32 insertions(+), 57 deletions(-) diff --git a/include/consts b/include/consts index cd85acb9..d0d2b2c9 100644 --- a/include/consts +++ b/include/consts @@ -18,10 +18,7 @@ ################################################################################# # -# Program information - # Paths where system and program binaries are located -# Includes Sun Solaris dirs BINPATHS="/bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin \ /usr/local/libexec /usr/libexec /usr/sfw/bin /usr/sfw/sbin \ /usr/sfw/libexec /opt/sfw/bin /opt/sfw/sbin /opt/sfw/libexec \ @@ -29,31 +26,9 @@ BINPATHS="/bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin \ /usr/pkg/bin /usr/pkg/sbin" # Do not use specific language, fall back to default +# Some tools with translated strings are very hard to parse unset LANG -# -################################################################################# -# -# Deprecated -# -################################################################################# -# - HOME_HISTORY_AUDIT_TITLE="Incorrect history file types" - HOME_HISTORY_AUDIT_DESCRIPTION="" - - HOME_HISTORY_LOG_TITLE="History files type check" - HOME_HISTORY_LOG_DESCRIPTION="History files type check" - HOME_HISTORY_LOG_TEXT="History files are normally of the type 'file'. Symbolic links and other types can be riskful" - - HOME_PATH_LOG_MESSAGE="A single dot in the PATH variable of a user can be a risk, while executing commands in for example a home directory." - - USER_PASSWD_DOUBLEUID_AUDIT_TITLE="Non unique UIDs" - USER_PASSWD_DOUBLEUID_AUDIT_DESCRIPTION="Non unique UIDs in passwd file" - USER_PASSWD_DOUBLEUID_AUDIT_TEXT="Non unique UIDs can riskful for the system or part of a configuration mistake" - - KERNEL_ACTIVE_MODULES_TITLE="Active kernel modules (KLDs)" - KERNEL_ACTIVE_MODULES_DESCRIPTION="View all active kernel modules (including kernel)" - KERNEL_ACTIVE_MODULES_TEXT="Displays the loaded kernel modules in memory. Make sure to check the integrity of the kld tools." # ################################################################################# # @@ -147,29 +122,29 @@ unset LANG # ################################################################################# # -# == Options == +# * Options # -# Option Description -# -------------------------------------------------------------------------- - CRONJOB=0 # Run as a cronjob - CTESTS_PERFORMED=0 # Number of tests which are performed +################################################################################# +# + CRONJOB=0 # Run as a cronjob + CTESTS_PERFORMED=0 # Number of tests which are performed DEBUG=0 # Debugging mode (to screen) HPPOINTS=0 # Number of hardening points HPTOTAL=0 # Maximum number of hardening points - LOG_INCORRECT_OS=1 # Log tests with incorrect OS - NEVERBREAK=0 # Don't wait for user input + LOG_INCORRECT_OS=1 # Log tests with incorrect OS + NEVERBREAK=0 # Don't wait for user input PENTESTINGMODE=0 # Try tests without root privileges - QUICKMODE=0 # Don't wait for user input - QUIET=0 # Show normal messages and warnings as well - SHOW_TOOL_TIPS=1 # Show inline tool tips (default true) - SKIPLOGTEST=0 # Skip logging for one test - SKIP_UPGRADE_TEST=0 # Skip upgrade test - TESTS_TO_PERFORM="" # Which tests only to perform - TEST_PAUSE_TIME=0 # Default pause time - TOTAL_TESTS=0 # Total amount of tests (counter) + QUICKMODE=0 # Don't wait for user input + QUIET=0 # Show normal messages and warnings as well + SHOW_TOOL_TIPS=1 # Show inline tool tips (default true) + SKIPLOGTEST=0 # Skip logging for one test + SKIP_UPGRADE_TEST=0 # Skip upgrade test + TESTS_TO_PERFORM="" # Which tests only to perform + TEST_PAUSE_TIME=0 # Default pause time + TOTAL_TESTS=0 # Total amount of tests (counter) UPLOAD_DATA=0 # Upload of data to central node - VIEWHELP=0 # Show help - WRONGOPTION=0 # A wrong option is used + VIEWHELP=0 # Show help + WRONGOPTION=0 # A wrong option is used # ################################################################################# # @@ -178,24 +153,24 @@ unset LANG # ################################################################################# # -# Colors +# * Colors +# +# For improved display # ################################################################################# # -# Color name Description -# -------------------------------------------------------------------------- - NORMAL="" - WARNING="" # Bad (red) - SECTION="" # Section (yellow) - NOTICE="" # Notice (yellow) - OK="" # Ok (green) - BAD="" # Bad (red) + NORMAL="" + WARNING="" # Bad (red) + SECTION="" # Section (yellow) + NOTICE="" # Notice (yellow) + OK="" # Ok (green) + BAD="" # Bad (red) - # Real color names - YELLOW="" # Yellow - WHITE="" # White - GREEN="" # Green - RED="" # Red + # Normal color names + YELLOW="" + WHITE="" + GREEN="" + RED="" PURPLE="" MAGENTA="" BROWN="" -- cgit v1.2.3