Changeset 413

Timestamp:

05/11/2010 06:43:26 PM (3 years ago)

Author:

sullo

Message:

Check for disabled cache on add to cache as well as fetch, simplify logic a little

File:

• trunk/plugins/nikto_core.plugin (modified) (5 diffs)

trunk/plugins/nikto_core.plugin

@@ -1930 +1930 @@
 #######################################################################
 sub cache_add {
-    unless (defined $CLI{'nocache'}) {
+    if ((!defined $CLI{'nocache'}) && (!defined $flags->{'nocache'})) {
         my $method   = shift;
         my $code     = shift;
@@ -1939 +1939 @@
 
         my $key =
-          LW2::md5(  $mark->{'ip'} .
-                   $mark->{'hostname'} .
-                   $mark->{'port'} .
-                   $mark->{'ssl'} . 
-                   $method . 
-                   $uri . 
-                   $postdata);
+          LW2::md5(  $mark->{'ip'}
+                   . $mark->{'hostname'}
+                   . $mark->{'port'}
+                   . $mark->{'ssl'}
+                   . $method
+                   . $uri
+                   . $postdata);
 
         $CACHE{$key}{'method'}  = $method;
@@ -1955 +1955 @@
 #######################################################################
 sub cache_fetch {
+
+    # quick exit if cache is disabled
+    if ((defined $CLI{'nocache'}) || (defined $flags->{'nocache'})) {
+        return 0;
+    }
+
     my $method   = shift;
     my $uri      = shift;
@@ -1960 +1966 @@
     my ($mark)   = @_;
     my $key =
-      LW2::md5(  $mark->{'ip'} .
-               $mark->{'hostname'} . 
-               $mark->{'port'} . 
-               $mark->{'ssl'} . 
-               $method . 
-               $uri . 
-               $postdata);
+      LW2::md5(  $mark->{'ip'}
+               . $mark->{'hostname'}
+               . $mark->{'port'}
+               . $mark->{'ssl'}
+               . $method
+               . $uri
+               . $postdata);
 
     if ($CACHE{$key}{'code'} ne '') {
@@ -2009 +2015 @@
     # Check cache
     my $incache = 0;
-    if ((!defined $CLI{'nocache'}) && (!defined $flags->{'nocache'})) {
-        nprint("- Retrieving $uri from cache.", "v");
-        ($incache, my $code, my $content) =
-          cache_fetch($request{'whisker'}->{'method'}, $uri, $data, $mark);
-        if ($incache) {
-            $result{'whisker'}->{'code'} = $code;
-            $result{'whisker'}->{'data'} = $content;
-        }
+    nprint("- Checking $uri in cache.", "d");
+    ($incache, my $code, my $content) =
+      cache_fetch($request{'whisker'}->{'method'}, $uri, $data, $mark);
+    if ($incache) {
+        $result{'whisker'}->{'code'} = $code;
+        $result{'whisker'}->{'data'} = $content;
     }