cms_scanner 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e65984931fa24f33ef5325d00f07d25e954e76b89df0185491cb9eccce9ed274
-  data.tar.gz: c8d1a85d06ac5fec7c1f4b68e942e6e276804b29b945b089f057ee7025af74bb
+  metadata.gz: 852cc56f2b2507dc7bee74f7c77a7263f93f0ee270346f6f32abbe2738c2f08e
+  data.tar.gz: 4b638a4d597a8ad98ab5ada204444698d0148f241ff4ee151ea8adf76d20a475
 SHA512:
-  metadata.gz: 3fdddf99a93d0fab51617313c1af2ef9695d9bd137cd3f4cc32e7edf73828eeb4f5be51c31cd4773a13c1626ad635342f673d479a5d17dc91b148bd5efc30e8a
-  data.tar.gz: 876ea5b47fe468001c846aca035a3fee83ab07019335505da3a3420d441ba40905e93e4b722fe06396f84d3168ffe894264481cc1d019f606c238b3506e5986d
+  metadata.gz: c49c901660cdd9d98b87941d86461d8aa0151fa7bbd1b7487f1f7523878aaed88d52a8131f15ce100fb0b6d11d05c77f597cf22da229dacf78a8da622af79492
+  data.tar.gz: dfa0f0e39125fc1b97c4c68c77c7fcfc4ebe8c68469ef6d3f0d8c966237600adc3822df50366aaab6b76c9eaeef0a657d329a5d051e2c1df9ac77203323eeafa

data/lib/cms_scanner/target/scope.rb

@@ -43,15 +43,25 @@ module CMSScanner
     #
     # @return [ Regexp ] The pattern related to the target url and in scope domains,
     #                    it also matches escaped /, such as in JSON JS data: http:\/\/t.com\/
+    # rubocop:disable Metrics/AbcSize
     def scope_url_pattern
       return @scope_url_pattern if @scope_url_pattern
 
-      domains = [uri.host + uri.path] + scope.domains[1..-1]&.map(&:to_s) + scope.invalid_domains
+      domains = [uri.host + uri.path]
+
+      domains += if scope.domains.empty?
+                   [*scope.invalid_domains[1..-1]]
+                 else
+                   [*scope.domains[1..-1]].map(&:to_s) + scope.invalid_domains
+                 end
 
       domains.map! { |d| Regexp.escape(d.gsub(%r{/$}, '')).gsub('\*', '.*').gsub('/', '\\\\\?/') }
 
+      domains[0].gsub!(Regexp.escape(uri.host), Regexp.escape(uri.host) + '(?::\\d+)?') if uri.port
+
       @scope_url_pattern = %r{https?:\\?/\\?/(?:#{domains.join('|')})\\?/?}i
     end
+    # rubocop:enable Metrics/AbcSize
 
     # Scope Implementation
     class Scope

data/lib/cms_scanner/target/server/generic.rb

@@ -51,10 +51,7 @@ module CMSScanner
         #
         # @return [ Array<String> ] The first level of directories/files listed,
         #                           or an empty array if none
-        def directory_listing_entries(
-          path = nil, params = {},
-          selector = 'pre a', ignore = /parent directory/i
-        )
+        def directory_listing_entries(path = nil, params = {}, selector = 'pre a', ignore = /parent directory/i)
           return [] unless directory_listing?(path, params)
 
           found = []

data/lib/cms_scanner/version.rb

@@ -2,5 +2,5 @@
 
 # Version
 module CMSScanner
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cms_scanner
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - WPScanTeam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-24 00:00:00.000000000 Z
+date: 2019-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -184,14 +184,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.67.2
+        version: 0.68.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.67.2
+        version: 0.68.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement