mihari 6.0.0 → 6.2.0

data/lib/mihari/models/dns.rb

@@ -20,16 +20,11 @@ module Mihari
         # @return [Array<Mihari::Models::DnsRecord>]
         #
         def build_by_domain(domain, enricher: Enrichers::GooglePublicDNS.new)
-          result = enricher.result(domain).bind do |responses|
+          enricher.result(domain).bind do |res|
             Success(
-              responses.map do |res|
-                res.answers.map do |answer|
-                  new(resource: answer.resource_type, value: answer.data)
-                end
-              end.flatten
+              res.answers.map { |answer| new(resource: answer.resource_type, value: answer.data) }
             )
-          end
-          result.value_or []
+          end.value_or([])
         end
       end
     end

data/lib/mihari/rule.rb

@@ -110,9 +110,7 @@ module Mihari
     # @return [Array<Mihari::Models::Artifact>]
     #
     def artifacts
-      analyzers.flat_map do |analyzer|
-        # @type [Dry::Monads::Result::Success<Array<Mihari::Models::Artifact>>, Dry::Monads::Result::Failure]
-        result = analyzer.result
+      analyzer_results.flat_map do |result|
         case result
         when Success
           artifacts = result.value!
@@ -123,7 +121,7 @@ module Mihari
         else
           raise result.failure unless analyzer.ignore_error?
         end
-      end.compact
+      end
     end
 
     #
@@ -292,15 +290,30 @@ module Mihari
     # @return [Array<Mihari::Analyzers::Base>]
     #
     def analyzers
-      @analyzers ||= queries.map do |query_params|
-        analyzer_name = query_params[:analyzer]
+      @analyzers ||= queries.map do |params|
+        analyzer_name = params[:analyzer]
         klass = get_analyzer_class(analyzer_name)
-        analyzer = klass.from_query(query_params)
+        analyzer = klass.from_query(params)
         analyzer.validate_configuration!
         analyzer
       end
     end
 
+    def parallel_analyzers
+      analyzers.select(&:parallel?)
+    end
+
+    def serial_analyzers
+      analyzers.reject(&:parallel?)
+    end
+
+    # @return [Array<Dry::Monads::Result::Success<Array<Mihari::Models::Artifact>>, Dry::Monads::Result::Failure>]
+    def analyzer_results
+      parallel_results = Parallel.map(parallel_analyzers) { |analyzer| analyzer.result }
+      serial_results = serial_analyzers.map(&:result)
+      parallel_results + serial_results
+    end
+
     #
     # Get emitter class
     #

data/lib/mihari/schemas/options.rb

@@ -15,7 +15,11 @@ module Mihari
       optional(:ignore_error).value(:bool).default(Mihari.config.ignore_error)
     end
 
-    AnalyzerOptions = Options | IgnoreErrorOptions
+    ParallelOptions = Dry::Schema.Params do
+      optional(:parallel).value(:bool).default(Mihari.config.parallel)
+    end
+
+    AnalyzerOptions = Options | IgnoreErrorOptions | ParallelOptions
 
     PaginationOptions = Dry::Schema.Params do
       optional(:pagination_interval).value(:integer).default(Mihari.config.pagination_interval)

data/lib/mihari/structs/google_public_dns.rb

@@ -3,13 +3,9 @@
 module Mihari
   module Structs
     module GooglePublicDNS
-      INT_TYPE_TO_TYPE = {
-        1 => "A",
-        2 => "NS",
-        5 => "CNAME",
-        16 => "TXT",
-        28 => "AAAA"
-      }.freeze
+      INT_TYPE_TO_TYPE =
+        { 1 => :A, 38 => :A6, 28 => :AAAA, 18 => :AFSDB, 255 => :ANY, 42 => :APL, 34 => :ATMA, 252 => :AXFR, 37 => :CERT,
+          5 => :CNAME, 49 => :DHCID, 32_769 => :DLV, 39 => :DNAME, 48 => :DNSKEY, 43 => :DS, 31 => :EID, 102 => :GID, 27 => :GPOS, 13 => :HINFO, 45 => :IPSECKEY, 20 => :ISDN, 251 => :IXFR, 25 => :KEY, 36 => :KX, 29 => :LOC, 254 => :MAILA, 253 => :MAILB, 7 => :MB, 3 => :MD, 4 => :MF, 8 => :MG, 14 => :MINFO, 9 => :MR, 15 => :MX, 35 => :NAPTR, 32 => :NIMLOC, 2 => :NS, 22 => :NSAP, 23 => :NSAP_PTR, 47 => :NSEC, 50 => :NSEC3, 51 => :NSEC3PARAMS, 10 => :NULL, 30 => :NXT, 41 => :OPT, 12 => :PTR, 26 => :PX, 17 => :RP, 46 => :RRSIG, 21 => :RT, 24 => :SIG, 40 => :SINK, 6 => :SOA, 33 => :SRV, 44 => :SSHFP, 250 => :TSIG, 16 => :TXT, 101 => :UID, 100 => :UINFO, 103 => :UNSPEC, 11 => :WKS, 19 => :X25 }
 
       class Answer < Dry::Struct
         # @!attribute [r] name
@@ -30,7 +26,7 @@ module Mihari
           #
           def from_dynamic!(d)
             d = Types::Hash[d]
-            resource_type = INT_TYPE_TO_TYPE[d.fetch("type")]
+            resource_type = INT_TYPE_TO_TYPE[d.fetch("type")].to_s
             new(
               name: d.fetch("name"),
               data: d.fetch("data"),

data/lib/mihari/version.rb

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

data/lib/mihari/web/app.rb

@@ -53,17 +53,17 @@ module Mihari
 
       class << self
         def instance
-          @instance ||= Rack::Builder.new do
+          Rack::Builder.new do
             use Rack::Cors do
               allow do
                 origins "*"
                 resource "*", headers: :any, methods: %i[get post put delete options]
               end
             end
-
             use Middleware::ConnectionAdapter
             use Middleware::ErrorNotificationAdapter
 
+            use Sentry::Rack::CaptureExceptions if Sentry.initialized?
             use BetterErrors::Middleware if ENV["RACK_ENV"] == "development" && defined?(BetterErrors::Middleware)
 
             run App.new