mihari 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c45276dc9bbc108475c4db517d7bf0e7e809c85de3ee3e7f6141df444e1890db
-  data.tar.gz: 90f9bc7cfa1d25a1186b98b3418069b0c8e30bde28bdb2ebd3ded6930e48b015
+  metadata.gz: df5ec8a92b6bf1622274b5b488aa544520d15f0360e5274ba466f324f49d0e0e
+  data.tar.gz: eb6149534d02b0ee551f37b7f01a65e3c936851fdb589bf21b1b938cb2f9d963
 SHA512:
-  metadata.gz: fa740d55a2fad831f1bf18aeae5aa2695b00c8cc92f09512ebd1c178eaa66083cb65309c4ccd6b2e2e81db450fb21c213d556ad6d5974f7e9037eb814fe75a20
-  data.tar.gz: 03edf15c5fe58fe9b237829510eda124fc91507a6f9903a5f2ecccef275e29ceb94d30a73a4cfc9485a3ca1905c406b58fd87655c4d0ec4d05514755ca768e22
+  metadata.gz: 51bd37cf056ad05ba6c5abd499b045ef963de6bb30414168229826a390ff0ee66a751204d6210336e668092a397f4d879c3a0ad39fcd84b381f11c77b42d7c74
+  data.tar.gz: c1ad6709246b86ede8a204b2db51af678149fd5bccfec2701c6562cf52123b1215c18a644091e49f23f352e8d248bc40e1fc84523491c5893670b9bb8f3ee7d8

data/lib/mihari.rb

@@ -27,6 +27,7 @@ require "mihari/cache"
 require "mihari/type_checker"
 
 require "mihari/configurable"
+require "mihari/retriable"
 
 require "mihari/the_hive/base"
 require "mihari/the_hive/alert"

data/lib/mihari/analyzers/base.rb

@@ -6,6 +6,7 @@ module Mihari
   module Analyzers
     class Base
       include Configurable
+      include Retriable
 
       # @return [Array<String>, Array<Mihari::Artifact>]
       def artifacts
@@ -30,16 +31,13 @@ module Mihari
       def run
         set_unique_artifacts
 
-        Parallel.each(Mihari.emitters) do |emitter_class|
-          emitter = emitter_class.new
-          next unless emitter.valid?
-
+        Parallel.each(valid_emitters) do |emitter|
           run_emitter emitter
         end
       end
 
       def run_emitter(emitter)
-        emitter.emit(title: title, description: description, artifacts: unique_artifacts, tags: tags)
+        emitter.run(title: title, description: description, artifacts: unique_artifacts, tags: tags)
       rescue StandardError => e
         puts "Emission by #{emitter.class} is failed: #{e}"
       end
@@ -60,7 +58,7 @@ module Mihari
 
       # @return [Array<Mihari::Artifact>]
       def normalized_artifacts
-        @normalized_artifacts ||= artifacts.compact.uniq.map do |artifact|
+        @normalized_artifacts ||= artifacts.compact.uniq.sort.map do |artifact|
           artifact.is_a?(Artifact) ? artifact : Artifact.new(artifact)
         end.select(&:valid?)
       end
@@ -79,11 +77,18 @@ module Mihari
       end
 
       def set_unique_artifacts
-        unique_artifacts
+        retry_on_timeout { unique_artifacts }
       rescue ArgumentError => _e
         klass = self.class.to_s.split("::").last.to_s
         raise Error, "Please configure #{klass} API settings properly"
       end
+
+      def valid_emitters
+        @valid_emitters ||= Mihari.emitters.map do |klass|
+          emitter = klass.new
+          emitter.valid? ? emitter : nil
+        end.compact
+      end
     end
   end
 end

data/lib/mihari/analyzers/censys.rb

@@ -30,7 +30,7 @@ module Mihari
         when "certificates"
           certificates_lookup
         else
-          raise TypeError, "#{type} type is not supported." unless valid_type?
+          raise InvalidInputError, "#{type} type is not supported." unless valid_type?
         end
       end
 

data/lib/mihari/analyzers/circl.rb

@@ -41,7 +41,7 @@ module Mihari
         when "hash"
           passive_ssl_lookup
         else
-          raise TypeError, "#{@query}(type: #{@type || 'unknown'}) is not supported."
+          raise InvalidInputError, "#{@query}(type: #{@type || 'unknown'}) is not supported."
         end
       rescue ::PassiveCIRCL::Error => _e
         nil

data/lib/mihari/analyzers/passivetotal.rb

@@ -52,7 +52,7 @@ module Mihari
         when "hash"
           ssl_lookup
         else
-          raise TypeError, "#{query}(type: #{type || 'unknown'}) is not supported." unless valid_type?
+          raise InvalidInputError, "#{query}(type: #{type || 'unknown'}) is not supported." unless valid_type?
         end
       rescue ::PassiveTotal::Error => _e
         nil

data/lib/mihari/analyzers/securitytrails.rb

@@ -50,7 +50,7 @@ module Mihari
         when "mail"
           mail_lookup
         else
-          raise TypeError, "#{query}(type: #{type || 'unknown'}) is not supported." unless valid_type?
+          raise InvalidInputError, "#{query}(type: #{type || 'unknown'}) is not supported." unless valid_type?
         end
       rescue ::SecurityTrails::Error => _e
         nil

data/lib/mihari/analyzers/securitytrails_domain_feed.rb

@@ -17,8 +17,8 @@ module Mihari
         @_regexp = regexp
         @type = type
 
-        raise TypeError, "#{@_regexp} is not a valid regexp" unless regexp
-        raise TypeError, "#{type} is not a valid type" unless valid_type?
+        raise InvalidInputError, "#{@_regexp} is not a valid regexp" unless regexp
+        raise InvalidInputError, "#{type} is not a valid type" unless valid_type?
 
         @title = title || "SecurityTrails domain feed lookup"
         @description = description || "Regexp = /#{@_regexp}/"
@@ -45,7 +45,7 @@ module Mihari
 
       def regexp
         @regexp ||= Regexp.compile(@_regexp)
-      rescue TypeError => _e
+      rescue InvalidInputError => _e
         nil
       end
 

data/lib/mihari/analyzers/urlscan.rb

@@ -20,7 +20,7 @@ module Mihari
         @tags = tags
         @target_type = target_type
 
-        raise TypeError, "type should be url, domain or ip." unless valid_target_type?
+        raise InvalidInputError, "type should be url, domain or ip." unless valid_target_type?
       end
 
       def artifacts

data/lib/mihari/analyzers/virustotal.rb

@@ -48,7 +48,7 @@ module Mihari
         when "ip"
           ip_lookup
         else
-          raise TypeError, "#{indicator}(type: #{type || 'unknown'}) is not supported." unless valid_type?
+          raise InvalidInputError, "#{indicator}(type: #{type || 'unknown'}) is not supported." unless valid_type?
         end
       rescue ::VirusTotal::Error => _e
         nil

data/lib/mihari/analyzers/zoomeye.rb

@@ -28,7 +28,7 @@ module Mihari
         when "web"
           web_lookup
         else
-          raise TypeError, "#{type} type is not supported." unless valid_type?
+          raise InvalidInputError, "#{type} type is not supported." unless valid_type?
         end
       end
 

data/lib/mihari/emitters/base.rb

@@ -4,6 +4,7 @@ module Mihari
   module Emitters
     class Base
       include Configurable
+      include Retriable
 
       def self.inherited(child)
         Mihari.emitters << child
@@ -14,6 +15,10 @@ module Mihari
         raise NotImplementedError, "You must implement #{self.class}##{__method__}"
       end
 
+      def run(**params)
+        retry_on_timeout { emit(params) }
+      end
+
       def emit(*)
         raise NotImplementedError, "You must implement #{self.class}##{__method__}"
       end

data/lib/mihari/errors.rb

@@ -2,4 +2,5 @@
 
 module Mihari
   class Error < StandardError; end
+  class InvalidInputError < Error; end
 end

data/lib/mihari/retriable.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Mihari
+  module Retriable
+    def retry_on_timeout(times: 3, interval: 10)
+      try = 0
+      begin
+        try += 1
+        yield
+      rescue Timeout::Error => _e
+        sleep interval
+        retry if try < times
+        raise
+      end
+    end
+  end
+end

data/lib/mihari/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mihari
-  VERSION = "0.13.0"
+  VERSION = "0.13.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mihari
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Manabu Niseki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-22 00:00:00.000000000 Z
+date: 2019-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -494,6 +494,7 @@ files:
 - lib/mihari/notifiers/base.rb
 - lib/mihari/notifiers/exception_notifier.rb
 - lib/mihari/notifiers/slack.rb
+- lib/mihari/retriable.rb
 - lib/mihari/status.rb
 - lib/mihari/the_hive.rb
 - lib/mihari/the_hive/alert.rb