cms_scanner 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae764ad02069f0fcdee9d4eabacba1045acf85087a0298b1fac24c90604cf0ec
-  data.tar.gz: 9a1fb6774274c793321ee1454f85dbee6f164269decb33a4b87734120cb7bd46
+  metadata.gz: 48ae2616183230e6297b76c906506069a1f24f087449e20eca76bbc6b0c53970
+  data.tar.gz: dc8fdd0b8627b9f8205cefa819061597455209465775c5ec75507889a9c7da2b
 SHA512:
-  metadata.gz: 2a036270d5e2c935f6631533528700f58db4768f095d9babc9757136123d3b6b6ccbc10ee72989d2d11ad3e54868d593d4d2f283d684076c1f9de231c143357b
-  data.tar.gz: f68402bc28c9feeaa5444299d52b950726e36d861fb0e01e7d8adbac10851c0fd6cb8dd32b10effec01c2cf7f04fee07961f2bc2a125002d00d39b0ab252d858
+  metadata.gz: 769a471c55e5ba0fd5d22e07b8df37719638111033467b334c6c9619b8e8aa27ab781e755dc85655f91288d766dde7b9d52d434782d69083dfbc8c159e83f4b2
+  data.tar.gz: 39f7fc48f95db233e34646fc6e9c80af33999ae55743972b1f4b948a2e04e3746b65b2cabf3251e7fad8eb411aed361bbfd0c7c9d83bcce09694e49b15a8f976

data/app/controllers/core.rb

@@ -63,7 +63,7 @@ module CMSScanner
         @start_time = Time.now
         @start_memory = NS.start_memory
 
-        output('started', url: target.url, effective_url: target.homepage_url)
+        output('started', url: target.url, ip: target.ip, effective_url: target.homepage_url)
       end
 
       def after_scan

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

@@ -1,4 +1,4 @@
-<%= info_icon %> URL: <%= @url %>
+<%= info_icon %> URL: <%= @url %> [<%= @ip %>]
 <% if @url != @effective_url -%>
 <%= info_icon %> Effective URL: <%= @effective_url %>
 <% end -%>

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

@@ -1,4 +1,5 @@
 "start_time": <%= @start_time.to_i %>,
 "start_memory": <%= @start_memory.to_i %>,
 "target_url": <%= @url.to_s.to_json %>,
+"target_ip": <%= @ip.to_s.to_json %>,
 "effective_url": <%= @effective_url.to_s.to_json %>,

data/lib/cms_scanner.rb

@@ -16,6 +16,7 @@ require 'erb'
 require 'uri'
 require 'fileutils'
 require 'pathname'
+require 'socket'
 require 'timeout'
 require 'xmlrpc/client'
 # Monkey Patches/Fixes

data/lib/cms_scanner/browser.rb

@@ -38,20 +38,9 @@ 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 = {
-        headers: { 'User-Agent' => user_agent, 'Referer' => url }.merge(headers || {}),
-        accept_encoding: 'gzip, deflate',
-        method: :get
-      }
+    # @return [ Hash ] The request params used to connect tothe  target as well as potential other systems such as API
+    def default_connect_request_params
+      params = {}
 
       if disable_tls_checks
         # See http://curl.haxx.se/libcurl/c/CURLOPT_SSL_VERIFYHOST.html
@@ -61,7 +50,28 @@ module CMSScanner
         params[:sslversion] = :tlsv1
       end
 
-      typhoeus_to_browser_opts.each do |typhoeus_opt, browser_opt|
+      {
+        connecttimeout: :connect_timeout, cache_ttl: :cache_ttl,
+        proxy: :proxy, timeout: :request_timeout
+      }.each do |typhoeus_opt, browser_opt|
+        attr_value = public_send(browser_opt)
+        params[typhoeus_opt] = attr_value unless attr_value.nil?
+      end
+
+      params
+    end
+
+    # @return [ Hash ]
+    # The params are not cached (using @params ||= for example), so that they are set accordingly if updated
+    # by a controller/other piece of code
+    def default_request_params
+      params = default_connect_request_params.merge(
+        headers: { 'User-Agent' => user_agent, 'Referer' => url }.merge(headers || {}),
+        accept_encoding: 'gzip, deflate',
+        method: :get
+      )
+
+      { cookiejar: :cookie_jar, cookiefile: :cookie_jar, cookie: :cookie_string }.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/version.rb

@@ -2,5 +2,5 @@
 
 # Version
 module CMSScanner
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

data/lib/cms_scanner/web_site.rb

@@ -32,6 +32,13 @@ module CMSScanner
       @uri.join(Addressable::URI.encode(path).gsub('#', '%23')).to_s
     end
 
+    # @return [ String ] The IP address of the target
+    def ip
+      @ip ||= IPSocket.getaddress(uri.host)
+    rescue SocketError
+      'Unknown'
+    end
+
     attr_writer :homepage_res
 
     # @return [ Typhoeus::Response ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cms_scanner
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - WPScanTeam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-02 00:00:00.000000000 Z
+date: 2020-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: get_process_mem
@@ -56,22 +56,16 @@ dependencies:
   name: public_suffix
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.0.3
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -218,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.78.0
+        version: 0.79.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.78.0
+        version: 0.79.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -260,14 +254,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.8.0
 description: Framework to provide an easy way to implement CMS Scanners
 email:
 - team@wpscan.org