simple_whatweb 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa93fc00fb8c3719932816eda5f66233849319c2c97536b74a9fd3590864f3ab
-  data.tar.gz: a24e458f6488eeb31b5ca814b14af6662363b807d8f72f57053fe364f8f6aa41
+  metadata.gz: dc8a116eb5a0ba92f6c846d78124f349204dd2716da9d04f968bc0b9a2e0856e
+  data.tar.gz: caf26d9f9c8ba4f3bf91b0968d1bb188b3535a06be57889e612756e91711a2e0
 SHA512:
-  metadata.gz: d42ceb9c118d0081712d4e5551b6899d0ec774af54ed3cf623744dbb59be8321ecdd785b32f3531a0a17ba7e4d0f77daa976bbf3fd1ea958b9bc84750a72d0a9
-  data.tar.gz: 98609d498e9a948cf813d80031864f8d346905fecfa3e551497e970b2dff8f7525bb49b24d135baa67b97c3af523fc2b7701d00ab7fd3d7d1c95d721c8df9824
+  metadata.gz: c1398c10d4ac8a6cd4549ebe90e0da52a7fb025dc0c537dbdb05c42589c75579deee78ee9547467fd4274fb5f126948a9c97cab7b912fa76f0261309d3373045
+  data.tar.gz: b0822fe238bc0664bdaf74501c3ac0fb188ec56bb03313866be5f36323c0ab5482f73825496a1fab050d403ca6e57266b552117cf141b23e50c0914efaff4b57

data/lib/whatweb/cli.rb

@@ -7,10 +7,13 @@ module WhatWeb
   class CLI < Thor
     desc "scan URL", "Scan against a given URL"
     method_options aggressive: :boolean, default: false
+    method_options user_agent: :string
     def scan(url)
+      user_agent = options[:user_agent]
       is_aggressive = options[:aggressive]
+
       with_error_handling do
-        hash = execute_plugins(url, is_aggressive)
+        hash = execute_plugins(url, user_agent: user_agent, is_aggressive: is_aggressive)
         puts hash.to_json
       end
     end
@@ -23,9 +26,12 @@ module WhatWeb
     end
 
     no_commands do
-      def execute_plugins(url, is_aggressive = false)
+      def execute_plugins(url, options = {})
+        user_agent = options[:user_agent]
+        is_aggressive = options[:is_aggressive]
+
         plugins = PluginManager.instance.load_plugins
-        target = Target.new(url)
+        target = Target.new(url, user_agent: user_agent)
 
         results = {}
         plugins.each do |name, plugin|

data/lib/whatweb/plugin.rb

@@ -93,7 +93,6 @@ module WhatWeb
       results += matches.map { |match| matching(target, match) } if matches
       results += passive(target)
       results += aggressive(target) if is_aggressive
-      # TODO: aggressive mode support
       results.flatten!
       results.compact!
       results.each { |result| result[:certainty] = 100 unless result.key?(:certainty) }

data/lib/whatweb/plugins/allow.rb

@@ -19,7 +19,7 @@ WhatWeb::Plugin.define "Allow" do
     m = []
 
     # Allow HTTP Header
-    m << { module: target.headers["allow"].to_s } unless target.headers["allow"].nil?
+    m << { module: target.headers["allow"].to_s } if target.headers["allow"]
 
     m
   end

data/lib/whatweb/plugins/apache-tomcat.rb

@@ -48,9 +48,7 @@ WhatWeb::Plugin.define "Apache-Tomcat" do
     new_target = WhatWeb::Target.new(new_url)
     if new_target.status == 404
       v = new_target.body.scan(/Apache Tomcat\/([456]\.\d+\.\d+)/)[0]
-      unless v.nil?
-        info << { name: "Tomcat version", certainty: 100, version: v }
-      end
+      info << { name: "Tomcat version", certainty: 100, version: v } if v
     end
     info
   end

data/lib/whatweb/plugins/appleidiskserver.rb

@@ -39,7 +39,7 @@ WhatWeb::Plugin.define "AppleIDiskServer" do
       m << { name: "WWW Authenticate" } if target.headers["www-authenticate"] =~ /Basic realm="me\.com"/
 
       # Account Detection # X-dmUser
-      m << { account: target.headers["x-dmuser"] } unless target.headers["x-dmuser"].nil?
+      m << { account: target.headers["x-dmuser"] } if target.headers["x-dmuser"]
     end
 
     # Return passive matches

data/lib/whatweb/plugins/asp.net.rb

@@ -93,7 +93,7 @@ WhatWeb::Plugin.define "ASP_NET" do
     m = []
 
     # Version Detection # X-AspNetmvc-version HTTP header
-    m << { string: "MVC" + target.headers['x-aspnetmvc-version'].to_s } unless target.headers['x-aspnetmvc-version'].nil?
+    m << { string: "MVC" + target.headers['x-aspnetmvc-version'].to_s } if target.headers['x-aspnetmvc-version']
 
     # Return passive results
     m

data/lib/whatweb/plugins/atlassian-jira.rb

@@ -50,7 +50,7 @@ WhatWeb::Plugin.define "Atlassian-JIRA" do
     m << { name: "x-arequestid header" } if target.headers["x-arequestid"] =~ /^[\d]+x[\d]+x[\d]+$/
 
     # x-ausername
-    m << { name: "x-ausername header" } unless target.headers["x-ausername"].nil?
+    m << { name: "x-ausername header" } if target.headers["x-ausername"]
 
     # atlassian.xsrf.token cookie
     m << { name: "atlassian.xsrf.token" } if target.headers["set-cookie"] =~ /atlassian\.xsrf\.token=/

data/lib/whatweb/plugins/confluence.rb

@@ -47,10 +47,10 @@ WhatWeb::Plugin.define "Confluence" do
     m = []
 
     # x-confluence-cluster-node
-    m << { name: "x-confluence-cluster-node header" } unless target.headers["x-confluence-cluster-node"].nil?
+    m << { name: "x-confluence-cluster-node header" } if target.headers["x-confluence-cluster-node"]
 
     # x-confluence-request-time
-    m << { name: "x-confluence-request-time header" } unless target.headers["x-confluence-request-time"].nil?
+    m << { name: "x-confluence-request-time header" } if target.headers["x-confluence-request-time"]
 
     # Return passive matches
     m

data/lib/whatweb/plugins/contao.rb

@@ -80,9 +80,7 @@ WhatWeb::Plugin.define "Contao" do
     end
 
     # Set version if present
-    unless version.nil?
-      m << { name: "md5 sums of files", version: version }
-    end
+    m << { name: "md5 sums of files", version: version } if version
 
     m
   end

data/lib/whatweb/plugins/password_field.rb

@@ -15,7 +15,7 @@ WhatWeb::Plugin.define "PasswordField" do
   # Matches #
   @matches = [
 
-    { name: "rss link type", regexp: /<input [^>]*?type=["']password["'][^>]*>/i },
+    { name: "input type", regexp: /<input [^>]*?type=["']password["'][^>]*>/i },
 
   ]
 
@@ -28,8 +28,8 @@ WhatWeb::Plugin.define "PasswordField" do
                field.scan(/name=["'](.*?)["']/i).first.first
              rescue StandardError
                nil
-             end # rescues when there is no name= element
-      m << { name: "field name", string: name } unless name.nil?
+             end
+      m << { name: "field name", string: name } if name
     end
     m
   end

data/lib/whatweb/plugins/punbb.rb

@@ -92,9 +92,7 @@ WhatWeb::Plugin.define "PunBB" do
     end
 
     # Set version if present
-    unless version.nil?
-      m << { name: "md5 sums of files", version: version }
-    end
+    m << { name: "md5 sums of files", version: version } if version
 
     # Return aggressive matches
     m

data/lib/whatweb/plugins/x-powered-by-header.rb

@@ -25,9 +25,7 @@ WhatWeb::Plugin.define "X-Powered-By" do
     m = []
 
     # X-Powered-By Headers
-    unless target.headers["x-powered-by"].nil?
-      m << { name: "x-powered-by string", string: target.headers["x-powered-by"] }
-    end
+    m << { name: "x-powered-by string", string: target.headers["x-powered-by"] } if target.headers["x-powered-by"]
 
     # Return passive matches
     m

data/lib/whatweb/target.rb

@@ -5,16 +5,18 @@ module WhatWeb
     using WhatWeb::Helper
 
     attr_accessor :response
+    attr_reader :user_agent
     attr_reader :url, :body, :headers, :raw_headers, :raw_response, :status, :uri
 
-    def initialize(url, response = nil)
+    def initialize(url, opts = {})
       @url = url.to_s
-      @response = response || open_url
+      @user_agent = opts[:user_agent] || "WhatWeb/#{VERSION}"
+      @response = opts[:response] || open_url
       build
     end
 
     def open_url
-      HTTP.get url
+      HTTP.headers(user_agent: user_agent).get url
     end
 
     def build

data/lib/whatweb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WhatWeb
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_whatweb
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Manabu Niseki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-01 00:00:00.000000000 Z
+date: 2018-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler