Changeset 700

Timestamp:

12/10/2011 04:11:35 AM (18 months ago)

Author:

sullo

Message:

Ticket 228: Add client SSL certificate support. Thanks to monnerat for code submission!

Location:

trunk

Files:

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

trunk/docs/CHANGES.txt

@@ -1 +1 @@
 2011-12-09
+        - Ticket 228: Add client SSL certificate support. Thanks to monnerat for code submission!
         - Ticket 226: Add GMT offset to time outputs
         - Ticket 224: Space in robots.txt kills scanner

trunk/nikto.pl

@@ -126 +126 @@
 my @MARKS = set_targets($CLI{'host'}, $CLI{'ports'}, $CLI{'ssl'}, $CLI{'root'});
 
+if (defined($CLI{'key'}) || defined($CLI{'cert'})) {
+    $CLI{'key'} = $CLI{'cert'} unless (defined($CLI{'key'}));
+    $CLI{'cert'} = $CLI{'key'} unless (defined($CLI{'cert'}));
+}
+
 # Now check each target is real and remove duplicates/fill in extra information
 foreach my $mark (@MARKS) {
@@ -140 +145 @@
 
     # Check that the port is open
-    my $open = port_check($mark->{'hostname'}, $mark->{'ip'}, $mark->{'port'});
+    my $open = port_check($mark->{'hostname'}, $mark->{'ip'}, $mark->{'port'}, $CLI{'key'}, $CLI{'cert'});
     if (defined $CLI{'vhost'}) { $mark->{'vhost'} = $CLI{'vhost'} }
     if ($open == 0) {
@@ -151 +156 @@
     $mark->{'ssl'} = $open - 1;
 
+    if ($mark->{'ssl'}) {
+        $mark->{'key'} = $CLI{'key'};
+        $mark->{'cert'} = $CLI{'cert'};
+    }
 }
 
@@ -174 +183 @@
         $mark->{'vhost'} = $CLI{'vhost'};
     }
-    $request{'whisker'}->{'port'}    = $mark->{'port'};
-    $request{'whisker'}->{'ssl'}     = $mark->{'ssl'};
-    $request{'whisker'}->{'version'} = $CONFIGFILE{'DEFAULTHTTPVER'};
+    $request{'whisker'}->{'port'}            = $mark->{'port'};
+    $request{'whisker'}->{'ssl'}             = $mark->{'ssl'};
+    $request{'whisker'}->{'ssl_rsacertfile'} = $mark->{'key'};
+    $request{'whisker'}->{'ssl_certfile'}    = $mark->{'cert'};
+    $request{'whisker'}->{'version'}         = $CONFIGFILE{'DEFAULTHTTPVER'};
 
     # Cookies

trunk/plugins/nikto_core.plugin

@@ -508 +508 @@
                "host=s"           => \$CLI{'host'},
                "id=s"             => \$CLI{'hostauth'},
+               "key=s"            => \$CLI{'key'},
                "IgnoreCode=s"     => \$CLI{'ignorecode'},
                "list-plugins"     => \&list_plugins,
@@ -521 +522 @@
                "Pause=f"          => \$CLI{'pause'},
                "Plugins=s"        => \$CLI{'plugins'},
+               "RSAcert=s"        => \$CLI{'cert'},
                "port=s"           => \$CLI{'ports'},
                "root=s"           => \$CLI{'root'},
@@ -1373 +1375 @@
 ###############################################################################
 sub port_check {
-    my ($hostname, $ip, $port) = @_;
+    my ($hostname, $ip, $port, $key, $cert) = @_;
     my (%headers);
     my $m = {};
@@ -1402 +1404 @@
                    );
             $m->{ssl} = ($checkssl eq "HTTP") ? 0 : 1;
+            if ($m->{'ssl'}) {
+                $m->{'key'} = $key;
+                $m->{'cert'} = $cert;
+            }
             proxy_check($m);
             my ($res, $content) =
@@ -2058 +2064 @@
     $reqhash->{'whisker'}->{'port'} = $mark->{'port'};
     $reqhash->{'whisker'}->{'ssl'}  = $mark->{'ssl'};
+    $reqhash->{'whisker'}->{'ssl_rsacertfile'} = $mark->{'key'};
+    $reqhash->{'whisker'}->{'ssl_certfile'}    = $mark->{'cert'};
 
     # Proxy stuff
@@ -2621 +2629 @@
        -IgnoreCode        Ignore Codes--treat as negative responses
        -id+               Host authentication to use, format is id:pass or id:pass:realm
+       -key+              Client certificate key file
        -list-plugins      List all available plugins, perform no testing
        -maxtime+          Maximum testing time per host
@@ -2640 +2649 @@
        -Plugins+          List of plugins to run (default: ALL)
        -root+             Prepend root value to all requests, format is /directory
+       -RSAcert+          Client certificate file
        -ssl               Force ssl mode on port
        -Single            Single request mode
@@ -2671 +2681 @@
         print "
        -config+            Use this config file
-       -Cgidirs+           scan these CGI dirs: 'none', 'all', or values like \"/cgi/ /cgi-a/\"
        -dbcheck            check database and other key files for syntax errors
        -Display+           Turn on/off display outputs
-       -evasion+           ids evasion technique
        -Format+            save file (-o) format
        -host+              target host
@@ -2680 +2688 @@
        -id+                Host authentication to use, format is id:pass or id:pass:realm
        -list-plugins       List all available plugins
-       -mutate+            Guess additional file names
-       -mutate-options+    Provide extra information for mutations
        -output+            Write output to this file
        -nocache            Disables the URI cache