From 55799a524c19ee4f7ebc291ad9b0153796303383 Mon Sep 17 00:00:00 2001 From: mboelen Date: Tue, 26 Apr 2016 13:40:21 +0200 Subject: [PATCH] Added developer mode (--developer) --- include/consts | 1 + include/functions | 13 +++++++++++++ include/helper_show | 2 +- include/parameters | 5 +++++ lynis.8 | 3 +++ 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/include/consts b/include/consts index 1fbc4e9f..4dd60428 100644 --- a/include/consts +++ b/include/consts @@ -74,6 +74,7 @@ unset LANG CUSTOM_URL_PREPEND="" CUSTOM_URL_PROTOCOL="" DB2_RUNNING=0 + DEVELOPER_MODE=0 DISCOVERED_BINARIES="" DOCKER_DAEMON_RUNNING=0 ERROR_ON_WARNINGS=0 diff --git a/include/functions b/include/functions index b29a29e9..e7fdd97a 100644 --- a/include/functions +++ b/include/functions @@ -44,6 +44,7 @@ # FileIsReadable Check if a file is readable or directory accessible # GetHostID Retrieve an unique ID for this host # IsDebug Check if --debug is used +# IsDeveloperMode Check if --developer is used # IsRunning Check if a process is running # InsertSection Insert a section block # InsertPluginSection Insert a section block for plugins @@ -180,6 +181,7 @@ return $RETVAL } + ################################################################################ # Name : TestCase_Equal() # Description : Test case for checking if value whether value is equal to value @@ -897,6 +899,17 @@ } + ################################################################################ + # Name : IsDeveloperMode() + # Description : Check if we are in development mode (--developer) + # Returns : (0 - True, 1 - False) + ################################################################################ + + IsDeveloperMode() { + if [ ${DEVELOPER_MODE} -eq 1 ]; then return 0; else return 1; fi + } + + ################################################################################ # Name : IsRunning() # Description : Check if a process is running diff --git a/include/helper_show b/include/helper_show index fb194fa8..5a217931 100644 --- a/include/helper_show +++ b/include/helper_show @@ -29,7 +29,7 @@ ###################################################################### COMMANDS="audit show update" -OPTIONS="--auditor\n--check-all (-c)\n--config\n--cronjob (--cron)\n--debug\n--help (-h)\n--info\n--license-key --log-file\n--manpage_(--man)\n--no-colors --no-log\n--pentest\n--profile\n--plugins-dir\n--quiet (-q)\n--quick (-Q)\n--report-file\n--reverse-colors\n--tests\n--tests-category\n--upload\n--verbose\n--version (-V)\n--view-categories" +OPTIONS="--auditor\n--check-all (-c)\n--config\n--cronjob (--cron)\n--debug\n--developer\n--help (-h)\n--info\n--license-key --log-file\n--manpage_(--man)\n--no-colors --no-log\n--pentest\n--profile\n--plugins-dir\n--quiet (-q)\n--quick (-Q)\n--report-file\n--reverse-colors\n--tests\n--tests-category\n--upload\n--verbose\n--version (-V)\n--view-categories" SHOW_ARGS="commands help license man options pidfile plugindir profiles release releasedate tests version" SHOW_HELP="lynis show ${BROWN}commands${NORMAL} (all available commands) diff --git a/include/parameters b/include/parameters index 7ffb1905..0fa63c7f 100644 --- a/include/parameters +++ b/include/parameters @@ -140,6 +140,11 @@ DEBUG=1 ;; + # Developer mode (more details when creating tests) + --developer) + DEVELOPER_MODE=1 + ;; + # Display all available options with short alias --dump-options | --dumpoptions) OPTIONS="--auditor diff --git a/lynis.8 b/lynis.8 index b9eb847c..029f8bb4 100644 --- a/lynis.8 +++ b/lynis.8 @@ -68,6 +68,9 @@ breaks). .B \-\-debug Display debug information to screen for troubleshooting purposes. .TP +.B \-\-developer +Display developer information when creating tests. +.TP .B \-\-dump\-options Show all available parameters. .TP