mihari 5.2.3 → 5.2.4

data/lib/mihari/commands/search.rb

@@ -13,7 +13,7 @@ module Mihari
           # @return [Boolean]
           attr_reader :force_overwrite
 
-          def initialize(rule:, force_overwrite:)
+          def initialize(rule, force_overwrite:)
             @rule = rule
             @force_overwrite = force_overwrite
           end
@@ -37,14 +37,23 @@ module Mihari
           end
 
           def run
+            begin
+              analyzer = rule.analyzer
+            rescue ConfigurationError => e
+              # if there is a configuration error, output that error without the stack trace
+              Mihari.logger.error e.to_s
+              return
+            end
+
             with_error_notification do
-              alert = rule.analyzer.run
-              if alert
-                data = Mihari::Entities::Alert.represent(alert)
-                puts JSON.pretty_generate(data.as_json)
-              else
+              alert = analyzer.run
+              if alert.nil?
                 Mihari.logger.info "There is no new artifact found"
+                return
               end
+
+              data = Mihari::Entities::Alert.represent(alert)
+              puts JSON.pretty_generate(data.as_json)
             end
           end
         end
@@ -69,7 +78,7 @@ module Mihari
                 end
 
                 force_overwrite = options["force_overwrite"] || false
-                wrapper = RuleWrapper.new(rule: rule, force_overwrite: force_overwrite)
+                wrapper = RuleWrapper.new(rule, force_overwrite: force_overwrite)
 
                 if wrapper.diff? && !force_overwrite
                   message = "There is diff in the rule (#{rule.id}). Are you sure you want to overwrite the rule? (y/n)"

data/lib/mihari/entities/rule.rb

@@ -31,7 +31,7 @@ module Mihari
     end
 
     class RuleIDs < Grape::Entity
-      expose :rule_ids, documentation: { type: Array[String], required: true }, as: :ruleIds
+      expose :rule_ids, documentation: { type: [String], required: true }, as: :ruleIds
     end
   end
 end

data/lib/mihari/entities/tag.rb

@@ -7,7 +7,7 @@ module Mihari
     end
 
     class Tags < Grape::Entity
-      expose :tags, documentation: { type: Array[String], required: true }
+      expose :tags, documentation: { type: [String], required: true }
     end
   end
 end

data/lib/mihari/schemas/analyzer.rb

@@ -7,7 +7,7 @@ module Mihari
     end
 
     AnalyzerWithoutAPIKey = Dry::Schema.Params do
-      required(:analyzer).value(Types::String.enum("crtsh", "dnpedia", "dnstwister"))
+      required(:analyzer).value(Types::String.enum("dnstwister"))
       required(:query).value(:string)
       optional(:options).hash(AnalyzerOptions)
     end
@@ -23,6 +23,7 @@ module Mihari
           "securitytrails",
           "shodan",
           "st",
+          "urlscan",
           "virustotal_intelligence",
           "virustotal",
           "vt_intel",
@@ -72,12 +73,6 @@ module Mihari
       optional(:options).hash(AnalyzerOptions)
     end
 
-    Urlscan = Dry::Schema.Params do
-      required(:analyzer).value(Types::String.enum("urlscan"))
-      required(:query).value(:string)
-      optional(:options).hash(AnalyzerOptions)
-    end
-
     Feed = Dry::Schema.Params do
       required(:analyzer).value(Types::String.enum("feed"))
       required(:query).value(:string)

data/lib/mihari/schemas/rule.rb

@@ -22,7 +22,7 @@ module Mihari
       optional(:updated_on).value(:date)
 
       required(:queries).value(:array).each do
-        AnalyzerWithoutAPIKey | AnalyzerWithAPIKey | Censys | CIRCL | PassiveTotal | ZoomEye | Urlscan | Crtsh | Feed
+        AnalyzerWithoutAPIKey | AnalyzerWithAPIKey | Censys | CIRCL | PassiveTotal | ZoomEye | Crtsh | Feed
       end
 
       optional(:emitters).value(:array).each { Database | MISP | TheHive | Slack | Webhook }.default(DEFAULT_EMITTERS)

data/lib/mihari/structs/config.rb

@@ -38,30 +38,53 @@ module Mihari
 
       class << self
         #
-        # @param [Class<Mihari::Analyzers::Base>, Class<Mihari::Emitters::Base>] klass
+        # Get a type of a class
+        #
+        # @param [Class<Mihari::Analyzers::Base>, Class<Mihari::Emitters::Base>, Class<Mihari::Enrichers::Base>] klass
+        #
+        # @return [String, nil]
+        #
+        def get_type(klass)
+          return "Analyzer" if klass.ancestors.include?(Mihari::Analyzers::Base)
+          return "Emitter" if klass.ancestors.include?(Mihari::Emitters::Base)
+          return "Enricher" if klass.ancestors.include?(Mihari::Enrichers::Base)
+
+          nil
+        end
+
+        #
+        # Get a dummy instance
+        #
+        # @param [Class<Mihari::Analyzers::Base>, Class<Mihari::Emitters::Base>, Class<Mihari::Enrichers::Base>] klass
+        #
+        # @return [Mihari::Analyzers::Base, Mihari::Emitter::Base, Mihari::Enricher::Base] dummy
+        #
+        def get_dummy(klass)
+          type = get_type(klass)
+          is_analyzer = type == "Analyzer"
+          is_analyzer ? klass.new("dummy") : klass.new(artifacts: [], rule: nil)
+        end
+
+        #
+        # @param [Class<Mihari::Analyzers::Base>, Class<Mihari::Emitters::Base>, Class<Mihari::Enrichers::Base>] klass
         #
         # @return [Mihari::Structs::Config, nil] config
         #
         def from_class(klass)
           return nil if klass == Mihari::Analyzers::Rule
 
-          name = klass.to_s.split("::").last.to_s
-
-          is_analyzer = klass.ancestors.include?(Mihari::Analyzers::Base)
-          is_emitter = klass.ancestors.include?(Mihari::Emitters::Base)
-          is_enricher = klass.ancestors.include?(Mihari::Enrichers::Base)
-
-          type = "Analyzer"
-          type = "Emitter" if is_emitter
-          type = "Enricher" if is_enricher
+          type = get_type(klass)
+          return nil if type.nil?
 
           begin
-            instance = is_analyzer ? klass.new("dummy") : klass.new(artifacts: [], rule: nil)
-            is_configured = instance.configured?
-            values = instance.configuration_values
-
-            new(name: name, values: values, is_configured: is_configured, type: type)
-          rescue ArgumentError => _e
+            instance = get_dummy(klass)
+            new(
+              name: klass.to_s.split("::").last.to_s,
+              values: instance.configuration_values,
+              is_configured: instance.configured?,
+              type: type
+            )
+          rescue ArgumentError
             nil
           end
         end

data/lib/mihari/structs/rule.rb

@@ -162,7 +162,7 @@ module Mihari
       # @return [Mihari::Analyzers::Rule]
       #
       def analyzer
-        Mihari::Analyzers::Rule.new(rule: self)
+        Mihari::Analyzers::Rule.new(self)
       end
 
       class << self

data/lib/mihari/version.rb

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