Changeset 385

Timestamp:

04/09/2010 07:35:53 PM (3 years ago)

Author:

sullo

Message:

Ticket 143: Added -ask to override nikto.conf UPDATES value

Location:

trunk

Files:

• docs/CHANGES.txt (modified) (1 diff)
• plugins/nikto_core.plugin (modified) (9 diffs)

trunk/docs/CHANGES.txt

@@ +1 @@
+2010-04-09
+        - Ticket 143: Added -ask to override nikto.conf's UPDATES value (same options)
 2010-04-01
         - Ticket 134: Added documentation of -config to usage_short

trunk/plugins/nikto_core.plugin

@@ -524 +524 @@
                "Version"          => \$CLI{'version'},
                "Plugins=s"        => \$CLI{'plugins'},
-               "list-plugins"     => \$CLI{'list-plugins'}
+               "list-plugins"     => \$CLI{'list-plugins'},
+               "ask=s"            => \$CLI{'ask'}
                ) or usage(0);
 
@@ -534 +535 @@
     # output file
     if (!defined $CLI{'format'}) {
+
         # Check what output has
         $CLI{'format'} = "none";
@@ -556 +558 @@
 
     # verify readable dtd
-    if ($CLI{'format'} eq 'xml' && !-r $NIKTOCONFIG{NIKTODTD}) {
+    if ($CLI{'format'} eq 'xml' && !-r $NIKTOCONFIG{'NIKTODTD'}) {
         nprint("+ ERROR: reading DTD");
         exit;
@@ -625 +627 @@
             $CLI{'plugins'} .= ';dictionary(dictionary:' . $CLI{'mutate-opts'} . ')';
         }
+    }
+
+    # Asking questions?
+    if ($CLI{'ask'} =~ /^(auto|yes|no)$/) {
+        $NIKTOCONFIG{'UPDATES'} = $CLI{'ask'};    # override nikto.conf setting
+        undef($CLI{'ask'});
     }
 
@@ -1205 +1213 @@
     if ($CLI{'nossl'}) { pop(@checktypes); }
 
-    foreach my $method (split(/ /, $NIKTOCONFIG{CHECKMETHODS})) {
+    foreach my $method (split(/ /, $NIKTOCONFIG{'CHECKMETHODS'})) {
         $request{'whisker'}->{'method'} = $method;
         foreach my $checkssl (@checktypes) {
@@ -2286 +2294 @@
 #######################################################################
 sub send_updates {
-    return if ($NIKTOCONFIG{UPDATES} !~ /yes|auto/i);
+    return if ($NIKTOCONFIG{'UPDATES'} !~ /yes|auto/i);
 
     my $have_updates = 0;
@@ -2324 +2332 @@
     $updated_version =~ s/^\s+//;
 
-    if ($NIKTOCONFIG{UPDATES} eq "auto") {
+    if ($NIKTOCONFIG{'UPDATES'} eq "auto") {
         $answer = "y";
     }
@@ -2385 +2393 @@
         print "
    Options:
+       -ask+               Whether to ask about submitting updates
+                               yes   Ask about each (default)
+                               no    Don't ask, don't send
+                               auto  Don't ask, just send
        -config+            Use this config file
        -Cgidirs+           Scan these CGI dirs: 'none', 'all', or values like \"/cgi/ /cgi-a/\"
@@ -2404 +2416 @@
         print "       -findonly          Find http(s) ports only, don't perform a full scan
        -Format+           Save file (-o) format:
-                                csv   Comma-separated-value
-                                htm   HTML Format
-                                nbe   Nessus NBE format
-                                txt   Plain text (default if not specified)
-                                xml   XML Format
+                               csv   Comma-separated-value
+                               htm   HTML Format
+                               nbe   Nessus NBE format
+                               txt   Plain text (default if not specified)
+                               xml   XML Format
        -host+             Target host
        -Help              Extended help information