cms_scanner 0.0.41.9 → 0.0.41.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f8a08db554fc79d30135e3250569454f9b4d07b2899a436ae8065a5e9dc029d
-  data.tar.gz: 45a05783fdac31c93a69a988e26759f6854a9d0b58c6c0a77d23ccbee3d6902d
+  metadata.gz: 7e47006d4ef6041b74990ece7fb987edbe92e4ac12640d12b601cb917fd07384
+  data.tar.gz: 5c36f333c1a404df5e7a373be1d06dd874d662515ac33171babab21a497161b0
 SHA512:
-  metadata.gz: '08d4b7c12c8bec00e255f83a8049cdc4ace640d6bd6c15b86d7bf2a372efe417719a0f717de1d40c06a02008b440066bb4dabfd3ff2189ce4c1bded5a8551d1a'
-  data.tar.gz: 16a1e0fec3dcff040189de7dbb33e50710fa4cb762da49debaadfd626bb743579bd18c41561b108a166a583ff270b391e988d60a2e6b3df304765d2ccb9adaa5
+  metadata.gz: a9ec0fc35cc97167ff34deccd9f2ecdb20d7be1499ce9e77ec56f2b1f05568a82c5870036cdb54d9faf5a6a1639242f9be27449a927c7b60c605bbcd1c9374c3
+  data.tar.gz: 61bf5514e607909b1fe92a7afe114f813e2f7ff08cdbf89ba64d27881eb997e6f790fa80fa0050dea4df6aa6f698ae292561bb8b8136c2bbf2e219053f9bae7c

data/app/views/cli/scan_aborted.erb

@@ -1,3 +1,4 @@
+
 Scan Aborted: <%= @reason %>
 <% if @verbose -%>
 Trace: <%= @trace.join("\n") %>

data/lib/cms_scanner.rb

@@ -17,6 +17,7 @@ require 'timeout'
 require 'xmlrpc/client'
 # Monkey Patches
 require 'cms_scanner/typhoeus/response' # Adds a Response#html using Nokogiri to parse the body
+require 'cms_scanner/typhoeus/hydra' # https://github.com/typhoeus/typhoeus/issues/439
 require 'cms_scanner/public_suffix/domain' # Adds a Domain#match method and logic, used in scope stuff
 require 'cms_scanner/numeric' # Adds a Numeric#bytes_to_human
 # Custom Libs
@@ -41,6 +42,10 @@ module CMSScanner
   APP_DIR = Pathname.new(__FILE__).dirname.join('..', 'app').expand_path
   NS      = self
 
+  # Avoid memory leak when using Hydra, see https://github.com/typhoeus/typhoeus/issues/562
+  # Requests are still cached via the provided Cache system
+  Typhoeus::Config.memoize = false
+
   # 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?
@@ -149,7 +154,7 @@ module CMSScanner
                        verbose: controllers.first.parsed_options[:verbose] ||
                                 run_error_exit_code == NS::ExitCode::EXCEPTION)
     ensure
-      # Browser.instance.hydra.abort
+      Browser.instance.hydra.abort
 
       formatter.beautify
     end

data/lib/cms_scanner/browser/options.rb

@@ -29,7 +29,7 @@ module CMSScanner
 
     # @return [ Typhoeus::Hydra ]
     def hydra
-      Typhoeus::Hydra.new(max_concurrency: max_threads || 1)
+      @hydra ||= Typhoeus::Hydra.new(max_concurrency: max_threads || 1)
     end
 
     # @param [ Hash ] options
@@ -39,14 +39,14 @@ module CMSScanner
       end
     end
 
-    # Set the threads attribute
+    # Set the threads attribute and update hydra accordinly
     # If the throttle attribute is > 0, max_threads will be forced to 1
     #
     # @param [ Integer ] number
     def max_threads=(number)
       @max_threads = number.to_i.positive? && throttle.zero? ? number.to_i : 1
 
-      # hydra.max_concurrency = @max_threads
+      hydra.max_concurrency = @max_threads
     end
 
     # @return [ String ] The user agent

data/lib/cms_scanner/typhoeus/hydra.rb

@@ -0,0 +1,10 @@
+module Typhoeus
+  # Ensure a clean abort of hydra
+  # See https://github.com/typhoeus/typhoeus/issues/439
+  class Hydra
+    def abort
+      super
+      run
+    end
+  end
+end

data/lib/cms_scanner/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cms_scanner
 version: !ruby/object:Gem::Version
-  version: 0.0.41.9
+  version: 0.0.41.10
 platform: ruby
 authors:
 - WPScanTeam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-18 00:00:00.000000000 Z
+date: 2019-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.65.0
+        version: 0.66.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.65.0
+        version: 0.66.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -315,6 +315,7 @@ files:
 - lib/cms_scanner/target/server/generic.rb
 - lib/cms_scanner/target/server/iis.rb
 - lib/cms_scanner/target/server/nginx.rb
+- lib/cms_scanner/typhoeus/hydra.rb
 - lib/cms_scanner/typhoeus/response.rb
 - lib/cms_scanner/version.rb
 - lib/cms_scanner/vulnerability.rb