Fixes for #837

- Exit 0 on successful program completion - Eplicitly set exit code in all cases
sullo · Jul 30, 2024 · 6f9108f · 6f9108f
1 parent 66592bf
commit 6f9108f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 19 deletions.
diff --git a/program/nikto.pl b/program/nikto.pl
@@ -78,8 +78,6 @@
 $COUNTERS{'total_targets'} = $COUNTERS{'hosts_completed'} = 0;
 load_plugins();
 
-my $is_failure = 0;
-
 # Parse the supplied list of targets
 my @MARKS = set_targets($CLI{'host'}, $CLI{'ports'}, $CLI{'ssl'}, $CLI{'root'});
 
@@ -186,10 +184,6 @@
     run_hooks($mark, "recon");
     run_hooks($mark, "scan");
 
-    if ($mark->{'total_errors'} > 0 || $mark->{'total_vulns'} > 0) {
-        $is_failure = 1;
-    }
-
     $mark->{'end_time'} = time();
     $mark->{'elapsed'}  = $mark->{'end_time'} - $mark->{'start_time'};
     if (!$mark->{'terminate'}) {
@@ -223,7 +217,7 @@
 
 nprint("T:" . localtime() . ": Ending", "d");
 
-exit $is_failure;
+exit 0;
 
 #################################################################################
 # Load config files in order

diff --git a/program/plugins/nikto_core.plugin b/program/plugins/nikto_core.plugin
@@ -941,7 +941,7 @@ sub general_config {
         nprint("- ***** TLS/SSL support not available (see docs for SSL install) *****");
         if ($CLI{'ssl'} || ($CLI{'host'} =~ /^https/i)) {
             nprint("- ERROR: -ssl was specified but TLS/SSL is not available.");
-            exit;
+            exit 1;
         }
     }
 
@@ -1013,7 +1013,7 @@ sub safe_quit {
     report_summary($mark);
     report_close($mark);
     $NIKTO{'POSIX'}{'term'}->setlflag($NIKTO{'POSIX'}{'oterm'}) if ($^O !~ /MSWin32/);
-    exit(1);
+    exit 1;
 }
 
 ###############################################################################
@@ -1125,7 +1125,7 @@ sub resolve {
     {
         if ($CLI{'skiplookup'}) {
             nprint("+ ERROR: -nolookup set, but given name\n");
-            exit;
+            exit 1;
         }
 
         if ($LW2::LW2_CAN_IPv6) {    # IPv4/v6 resolve
@@ -1183,7 +1183,7 @@ sub resolve {
                     "+ ERROR: IPv4 scanning mode requested but only IPv6 addresses found ($ipcache)"
                     );
             }
-            exit;
+            exit 1;
         }
 
         if ($ipcache != "") {
@@ -1194,7 +1194,7 @@ sub resolve {
             && $ip !~ /^$LW2::IPv6_re$/) {
             nprint("+ ERROR: Invalid IP: $ip\n\n",
                    "", ($mark->{'hostname'}, $mark->{'ip'}, $mark->{'displayname'}));
-            exit;
+            exit 1;
         }
 
         $name = $ident;
@@ -2843,7 +2843,7 @@ sub version {
     # Check dependencies
     check_modules();
 
-    exit;
+    exit 0;
 }
 
 #######################################################################
@@ -2938,8 +2938,6 @@ sub send_updates {
 
 #######################################################################
 sub usage {
-    my $is_failure = shift;
-
     print "
    Options:
        -ask+               Whether to ask about submitting updates
@@ -3039,7 +3037,7 @@ sub usage {
 
     check_modules();
 
-    exit $is_failure;
+    exit 0;
 }
 
 #######################################################################
@@ -3190,7 +3188,7 @@ sub list_plugins {
         }
     }
 
-    exit(0);
+    exit 0;
 }
 
 ###############################################################################

diff --git a/program/plugins/nikto_fileops.plugin b/program/plugins/nikto_fileops.plugin
@@ -137,7 +137,7 @@ sub save_createdir {
     }
     elsif (-f $savedir) {
         nprint("+ ERROR: Directory from -Savedir is a file.");
-        exit;
+        exit 1;
     }
 
     # create?
@@ -146,7 +146,7 @@ sub save_createdir {
         if (!-d $savedir) {
             nprint("+ ERROR: Unable to create -Save directory '$savedir'",
                    "", ($mark->{'hostname'}, $mark->{'ip'}, $mark->{'displayname'}));
-            exit;
+            exit 1;
         }
     }
     return $savedir;