cms_scanner 0.0.30 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 923e0418aadab5dea66f0d3b73f83f8dcbedf57d
-  data.tar.gz: 15c8093c7eff7bcc89e07ddff624164211b0cfff
+  metadata.gz: 262fa29651e85bd873da5de15eddfc52f164b4e1
+  data.tar.gz: a30d0c63d358be3d8b759229093afeb90a104b8b
 SHA512:
-  metadata.gz: ddeed99199904603d8fc976be4ec02ce86f2fdd48c5a841e50ca7db6dd8bce9b8cc8fd2b5480acca13a791b348dab21d719ea34e76540ee69124052651bd4a0f
-  data.tar.gz: d8b6a63d972b650d48cfe82e56bac87b465b1a99ff7c01a059f45fc276fce23ec4c5eb9c4e247153fb99eca7aa9a3825d98ea87807091ef348f1233130e96fde
+  metadata.gz: 39c20221b8fc77ce4cc06275b3b7c651921044698c5994af60792f09f73c2fecc9159a5ab6bb6f25fe41f7b64f84d0d0d7733ebe19dbacd100f51f4526af9b60
+  data.tar.gz: 1f3c35697e6a0b8783c6f91765b4a3266a18825ff4fe1797518981705cac6314877ddd9f6652f4bd62ee8205ba8f53f5d034c74e26d9c7958c7b26505a085fc6

data/app/controllers/core/cli_options.rb

@@ -16,7 +16,7 @@ module CMSScanner
                         normalize: :to_sym,
                         default: :mixed),
           OptArray.new(['--scope DOMAINS',
-                        'Coma separated (sub-)domains to consider in scope. ' \
+                        'Comma separated (sub-)domains to consider in scope. ' \
                         'Wildcard(s) allowed in the trd of valid domains, e.g: *.target.tld'])
         ] + cli_browser_options
       end

data/lib/cms_scanner/browser.rb

@@ -34,18 +34,24 @@ module CMSScanner
       Typhoeus::Request.new(url, request_params(params))
     end
 
+    # @return [ Hash ]
+    def typhoeus_to_browser_opts
+      { connecttimeout: :connect_timeout, cache_ttl: :cache_ttl,
+        proxy: :proxy, timeout: :request_timeout, cookiejar: :cookie_jar,
+        cookiefile: :cookie_jar, cookie: :cookie_string
+      }
+    end
+
     # @return [ Hash ]
     def default_request_params
       params = {
         ssl_verifypeer: false, ssl_verifyhost: 2, # Disable SSL-Certificate checks
-        headers: { 'Accept-Encoding' => 'gzip, deflate', 'User-Agent' => user_agent },
+        headers: { 'User-Agent' => user_agent },
+        accept_encoding: 'gzip, deflate',
         method: :get
       }
 
-      { connecttimeout: :connect_timeout, cache_ttl: :cache_ttl,
-        proxy: :proxy, timeout: :request_timeout, cookiejar: :cookie_jar,
-        cookiefile: :cookie_jar, cookie: :cookie_string
-      }.each do |typhoeus_opt, browser_opt|
+      typhoeus_to_browser_opts.each do |typhoeus_opt, browser_opt|
         attr_value = public_send(browser_opt)
         params[typhoeus_opt] = attr_value unless attr_value.nil?
       end

data/lib/cms_scanner/finders/finder/smart_url_checker.rb

@@ -24,7 +24,7 @@ module CMSScanner
         #
         # @return [ Array<String> ]
         def passive_urls(_opts = {})
-          target.in_scope_urls(NS::Browser.get_and_follow_location(target.url), passive_urls_xpath)
+          target.in_scope_urls(NS::Browser.get(target.url), passive_urls_xpath)
         end
 
         # @return [ String ]

data/lib/cms_scanner/version.rb

@@ -1,4 +1,4 @@
 # Version
 module CMSScanner
-  VERSION = '0.0.30'
+  VERSION = '0.0.31'
 end

data/lib/cms_scanner/web_site.rb

@@ -74,6 +74,9 @@ module CMSScanner
     # :nocov:
     def redirection(url = nil)
       url ||= @uri.to_s
+
+      return unless [301, 302].include?(NS::Browser.get(url).code)
+
       res   = NS::Browser.get(url, followlocation: true)
 
       res.effective_url == url ? nil : res.effective_url

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cms_scanner
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.31
 platform: ruby
 authors:
 - WPScanTeam - Erwan Le Rousseau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opt_parse_validator