cms_scanner 0.0.40.2 → 0.0.40.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3835b59c723b4b5f73240e16295345892c5945cf
-  data.tar.gz: 7dee21423e396897ab18747d271889f957a48ae5
+  metadata.gz: 01e63c37ec8c7413a1b6126e934cdd523cb6fd54
+  data.tar.gz: b50738731d6a0c9886d304c56c716760f6602dc4
 SHA512:
-  metadata.gz: d5ea0f55099c3e1b8657921c60ace4f0c1588c8e9edeb634842796028df1b22da2e63516b7e90b48ef5739b2a93fe723a9786aed7aebc21747e9649b4775a8c5
-  data.tar.gz: 42740280effe12021ae733597f850229d06d6204df5ce1582b088e247f34c61821e4b857a207d98bda81618ab0f5e0798864882f21a1bd5d52fc531e038afeca
+  metadata.gz: 01fe765af31f1c9eda786feca8898c7c852e65666a667582a842e516b9dbfa4d1494137708bd0893c83cd13d356599daaa6d1ec9496494348ad3424df42fd7b5
+  data.tar.gz: c9a9a25b7ae82f9d21fa526f0206f330d697e0390e1de70ed443f228b9edb96f5ea96ca69a6317b34fedb7675d7ad843c6a967c90bd70f584be41ee9a1aa1f15

data/app/controllers/core.rb

@@ -65,12 +65,15 @@ module CMSScanner
       end
 
       def after_scan
-        @stop_time     = Time.now
-        @elapsed       = @stop_time - @start_time
-        @used_memory   = memory_usage - @start_memory
-        @requests_done = CMSScanner.total_requests
-
-        output('finished')
+        @stop_time   = Time.now
+        @elapsed     = @stop_time - @start_time
+        @used_memory = memory_usage - @start_memory
+
+        output('finished',
+               cached_requests: NS.cached_requests,
+               requests_done: NS.total_requests,
+               data_sent: NS.total_data_sent,
+               data_received: NS.total_data_received)
       end
     end
   end

data/app/models/interesting_finding.rb

@@ -31,6 +31,11 @@ module CMSScanner
       @to_s || url
     end
 
+    # @return [ String ]
+    def type
+      @type ||= self.class.to_s.demodulize.underscore
+    end
+
     # @return [ Boolean ]
     def ==(other)
       self.class == other.class && to_s == other.to_s

data/app/views/cli/core/finished.erb

@@ -1,4 +1,7 @@
 <%= info_icon %> Finished: <%= @stop_time.asctime %>
 <%= info_icon %> Requests Done: <%= @requests_done %>
+<%= info_icon %> Cached Requests: <%= @cached_requests %>
+<%= info_icon %> Data Sent: <%= @data_sent.bytes_to_human %>
+<%= info_icon %> Data Received: <%= @data_received.bytes_to_human %>
 <%= info_icon %> Memory used: <%= @used_memory.bytes_to_human %>
 <%= info_icon %> Elapsed time: <%= Time.at(@elapsed).utc.strftime('%H:%M:%S') %>

data/app/views/json/core/finished.erb

@@ -1,4 +1,10 @@
 "stop_time": <%= @stop_time.to_i %>,
 "elapsed": <%= @elapsed.to_i %>,
 "requests_done": <%= @requests_done.to_i %>,
-"used_memory": <%= @used_memory.to_i %>,
+"cached_requests": <%= @cached_requests.to_i %>,
+"data_sent": <%= @data_sent.to_i %>,
+"data_sent_humanised": <%= @data_sent.bytes_to_human.to_json %>,
+"data_received": <%= @data_received.to_i %>,
+"data_received_humanised": <%= @data_received.bytes_to_human.to_json %>,
+"used_memory": <%= @used_memory.to_i %>,
+"used_memory_humanised": <%= @used_memory.bytes_to_human.to_json %>,

data/app/views/json/interesting_findings/findings.erb

@@ -5,6 +5,7 @@
     {
       "url": <%= finding.url.to_s.to_json %>,
       "to_s": <%= finding.to_s.to_json %>,
+      "type": <%= finding.type.to_json %>,
       "found_by": <%= finding.found_by.to_s.to_json %>,
       "confidence": <%= finding.confidence.to_json %>,
       "confirmed_by": {

data/lib/cms_scanner.rb

@@ -40,11 +40,15 @@ module CMSScanner
   APP_DIR = Pathname.new(__FILE__).dirname.join('..', 'app').expand_path
   NS      = self
 
-  # Number of requests performed to display at the end of the scan
+  # Number of requests performed and data sent/received to display at the end of the scan
   Typhoeus.on_complete do |response|
+    self.cached_requests += 1 if response.cached?
+
     next if response.cached?
 
     self.total_requests += 1
+    self.total_data_sent += response.request_size
+    self.total_data_received += response.size
 
     NS::Browser.instance.trottle!
   end
@@ -52,16 +56,46 @@ module CMSScanner
   # Module to be able to use these class methods when the CMSScanner
   # is included in another module
   module ClassMethods
+    # @return [ Integer ]
+    def cached_requests
+      @@cached_requests ||= 0
+    end
+
+    # @param [ Integer ] value
+    def cached_requests=(value)
+      @@cached_requests = value
+    end
+
     # @return [ Integer ]
     def total_requests
       @@total_requests ||= 0
     end
 
-    # @param [ Integer ]
+    # @param [ Integer ] value
     def total_requests=(value)
       @@total_requests = value
     end
 
+    # @return [ Integer ]
+    def total_data_sent
+      @@total_data_sent ||= 0
+    end
+
+    # @param [ Integer ] value
+    def total_data_sent=(value)
+      @@total_data_sent = value
+    end
+
+    # @return [ Integer ]
+    def total_data_received
+      @@total_data_received ||= 0
+    end
+
+    # @param [ Integer ] value
+    def total_data_received=(value)
+      @@total_data_received = value
+    end
+
     # The lowercase name of the scanner
     # Mainly used in directory paths like the default cookie-jar file and
     # path to load the cli options from files

data/lib/cms_scanner/target/platform/php.rb

@@ -3,9 +3,9 @@ module CMSScanner
     module Platform
       # Some PHP specific implementation
       module PHP
-        DEBUG_LOG_PATTERN = /\[[^\]]+\] PHP (?:Warning|Error|Notice):/
-        FPD_PATTERN       = /Fatal error:.+? in (.+?) on/
-        ERROR_LOG_PATTERN = /PHP Fatal error/i
+        DEBUG_LOG_PATTERN = /\[[^\]]+\] PHP (?:Warning|Error|Notice):/.freeze
+        FPD_PATTERN       = /Fatal error:.+? in (.+?) on/.freeze
+        ERROR_LOG_PATTERN = /PHP Fatal error/i.freeze
 
         # @param [ String ] path
         # @param [ Regexp ] pattern

data/lib/cms_scanner/typhoeus/response.rb

@@ -1,7 +1,7 @@
 module Typhoeus
   # Custom Response class
   class Response
-    # @return [ Nokogiri::HTML ] The response's body parsed by Nokogiri::HTML
+    # @return [ Nokogiri::XML ] The response's body parsed by Nokogiri::HTML
     def html
       @html ||= Nokogiri::HTML(body.encode('UTF-8', invalid: :replace, undef: :replace))
     end
@@ -10,5 +10,16 @@ module Typhoeus
     def xml
       @xml ||= Nokogiri::XML(body.encode('UTF-8', invalid: :replace, undef: :replace))
     end
+
+    # Override of the original to ensure an integer is returned
+    # @return [ Integer ]
+    def request_size
+      super || 0
+    end
+
+    # @return [ Integer ]
+    def size
+      (body.nil? ? 0 : body.size) + (response_headers.nil? ? 0 : response_headers.size)
+    end
   end
 end

data/lib/cms_scanner/version.rb

@@ -1,4 +1,4 @@
 # Version
 module CMSScanner
-  VERSION = '0.0.40.2'.freeze
+  VERSION = '0.0.40.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cms_scanner
 version: !ruby/object:Gem::Version
-  version: 0.0.40.2
+  version: 0.0.40.3
 platform: ruby
 authors:
 - WPScanTeam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-20 00:00:00.000000000 Z
+date: 2018-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.59.2
+        version: 0.60.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.59.2
+        version: 0.60.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement