mihari 7.6.4 → 8.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12856ce5fee6e623a5579cab99a03629c611db1f65e087b04167cae69f870647
-  data.tar.gz: 28577ad798c7033ead6aaeced545a9401f17d0a31d29551950c3be583bc107ea
+  metadata.gz: 29091282748973618fb309a3584d0e24ea27f7e18f284feeb57dbb0f10138f33
+  data.tar.gz: c8079484f9241000479f543785c7d97f892b9a182401047ecf752090fe5bf37b
 SHA512:
-  metadata.gz: 68d780eca473d2b081c3c9bb7a60c9c5bfa371a0c6e08a307ceaa3138f5097b70606902e657aab22d1013a5033904bd7135595812d76a0554bde38f3b75917b6
-  data.tar.gz: 6b0ab8b458109b4c496298560772bd44e845a96c97ab89ec3191416855a66c4de92277d66d63607b17a857d35be10343adbdd71183616f64e7b984b617cde32a
+  metadata.gz: 4892f605f6dc1169ca22859eb6ddac36b42828575790c2cd7f6ecdf73a158bbdd80704f3c1a0fcba2fd1af3972270131c7df7e657ee30e9cdc7675bbb0aaca3c
+  data.tar.gz: 9fdd385288a708f900518c348a8a7ba2b0fd2ac7c0fb81e51c0b71a6e6b313fa8df87e8829539db52ecfc267481229bf2daee21c6bac3ab9ad313a7ee5c2451b

data/lib/mihari/actor.rb

@@ -63,7 +63,7 @@ module Mihari
       raise NotImplementedError, "You must implement #{self.class}##{__method__}"
     end
 
-    def result(...)
+    def get_result(...)
       Try[StandardError] do
         retry_on_error(times: retry_times, interval: retry_interval, exponential_backoff: retry_exponential_backoff) do
           call(...)

data/lib/mihari/analyzers/base.rb

@@ -77,7 +77,7 @@ module Mihari
         normalized_artifacts
       end
 
-      def result(...)
+      def get_result(...)
         result = Try[StandardError] do
           retry_on_error(
             times: retry_times,

data/lib/mihari/commands/alert.rb

@@ -22,7 +22,7 @@ module Mihari
               #
               def _search(q, page: 1, limit: 10)
                 filter = Structs::Filters::Search.new(q:, page:, limit:)
-                Services::AlertSearcher.result(filter).value!
+                Services::AlertSearcher.call filter
               end
             end
 
@@ -33,15 +33,14 @@ module Mihari
             #
             def create(path)
               # @type [Mihari::Models::Alert]
-              alert = Dry::Monads::Try[StandardError] do
-                raise ArgumentError, "#{path} not found" unless Pathname(path).exist?
+              raise ArgumentError, "#{path} not found" unless Pathname(path).exist?
+
+              params = YAML.safe_load(
+                ERB.new(File.read(path)).result,
+                permitted_classes: [Date, Symbol]
+              )
+              alert = Services::AlertCreator.call(params)
 
-                params = YAML.safe_load(
-                  ERB.new(File.read(path)).result,
-                  permitted_classes: [Date, Symbol]
-                )
-                Services::AlertCreator.call params
-              end.value!
               data = Entities::Alert.represent(alert)
               puts JSON.pretty_generate(data.as_json)
             end
@@ -92,7 +91,7 @@ module Mihari
             # @param [Integer] id
             #
             def get(id)
-              value = Services::AlertGetter.result(id).value!
+              value = Services::AlertGetter.get_result(id).value!
               data = Entities::Alert.represent(value)
               puts JSON.pretty_generate(data.as_json)
             end
@@ -103,7 +102,7 @@ module Mihari
             # @param [Integer] id
             #
             def delete(id)
-              Services::AlertDestroyer.result(id).value!
+              Services::AlertDestroyer.call id
             end
           end
         end

data/lib/mihari/commands/artifact.rb

@@ -21,7 +21,7 @@ module Mihari
               #
               def _search(q, page: 1, limit: 10)
                 filter = Structs::Filters::Search.new(q:, page:, limit:)
-                Services::ArtifactSearcher.result(filter).value!
+                Services::ArtifactSearcher.call filter
               end
             end
 
@@ -71,7 +71,7 @@ module Mihari
             # @param [Integer] id
             #
             def get(id)
-              value = Services::ArtifactGetter.result(id).value!
+              value = Services::ArtifactGetter.get_result(id).value!
               data = Entities::Artifact.represent(value)
               puts JSON.pretty_generate(data.as_json)
             end
@@ -82,7 +82,7 @@ module Mihari
             # @param [Integer] id
             #
             def enrich(id)
-              Services::ArtifactEnricher.result(id).value!
+              Services::ArtifactEnricher.call id
             end
 
             desc "delete ID", "Delete an artifact"
@@ -91,7 +91,7 @@ module Mihari
             # @param [Integer] id
             #
             def delete(id)
-              Services::ArtifactDestroyer.result(id).value!
+              Services::ArtifactDestroyer.call id
             end
           end
         end

data/lib/mihari/commands/rule.rb

@@ -22,7 +22,7 @@ module Mihari
               #
               def _search(q, page: 1, limit: 10)
                 filter = Structs::Filters::Search.new(q:, page:, limit:)
-                Services::RuleSearcher.result(filter).value!
+                Services::RuleSearcher.call filter
               end
             end
 
@@ -70,7 +70,7 @@ module Mihari
               warning = "Do you want to overwrite it? (y/n)"
               return if Pathname(path).exist? && !(yes? warning)
 
-              Services::RuleInitializer.call(path)
+              Services::RuleInitializer.call path
             end
 
             desc "list QUERY", "List/search rules"
@@ -116,7 +116,7 @@ module Mihari
             desc "get ID", "Get a rule"
             around :with_db_connection
             def get(id)
-              value = Services::RuleGetter.result(id).value!
+              value = Services::RuleGetter.get_result(id).value!
               data = Entities::Rule.represent(value)
               puts JSON.pretty_generate(data.as_json)
             end
@@ -127,7 +127,7 @@ module Mihari
             # @param [String] id
             #
             def delete(id)
-              Services::RuleDestroyer.result(id).value!
+              Services::RuleDestroyer.call id
             end
           end
         end

data/lib/mihari/commands/search.rb

@@ -24,16 +24,13 @@ module Mihari
               force_overwrite = options["force_overwrite"] || false
               message = "Are you sure you want to overwrite this rule? (y/n)"
 
-              # @type [Mihari::Models::Alert]
-              alert = Dry::Monads::Try[StandardError] do
-                # @type [Mihari::Rule]
-                rule = Services::RuleBuilder.call(path_or_id)
+              # @type [Mihari::Rule]
+              rule = Services::RuleBuilder.call(path_or_id)
+              exit 0 if rule.diff? && !force_overwrite && !yes?(message)
 
-                exit 0 if rule.diff? && !force_overwrite && !yes?(message)
+              rule.update_or_create
+              alert = rule.call
 
-                rule.update_or_create
-                rule.call
-              end.value!
               data = Entities::Alert.represent(alert)
               puts JSON.pretty_generate(data.as_json)
             end

data/lib/mihari/commands/tag.rb

@@ -21,7 +21,7 @@ module Mihari
               #
               def _search(q, page: 1, limit: 10)
                 filter = Structs::Filters::Search.new(q:, page:, limit:)
-                Services::TagSearcher.result(filter).value!
+                Services::TagSearcher.call filter
               end
             end
 
@@ -71,7 +71,7 @@ module Mihari
             # @param [Integer] id
             #
             def delete(id)
-              Services::TagDestroyer.result(id).value!
+              Services::TagDestroyer.call id
             end
           end
         end

data/lib/mihari/database.rb

@@ -6,7 +6,7 @@ ActiveSupport::Inflector.inflections(:en) { |inflect| inflect.acronym "CPE" }
 #
 # Mihari v7 DB schema
 #
-class V7Schema < ActiveRecord::Migration[7.2]
+class V7Schema < ActiveRecord::Migration[8.0]
   def change
     create_table :rules, id: :string, if_not_exists: true do |t|
       t.string :title, null: false

data/lib/mihari/emitters/base.rb

@@ -44,7 +44,7 @@ module Mihari
       #
       # @return [Dry::Monads::Result::Success<Object>, Dry::Monads::Result::Failure]
       #
-      def result(artifacts)
+      def get_result(artifacts)
         result = Try[StandardError] do
           retry_on_error(
             times: retry_times,

data/lib/mihari/enrichers/base.rb

@@ -29,7 +29,7 @@ module Mihari
       #
       # @return [Dry::Monads::Result::Success<Object>, Dry::Monads::Result::Failure]
       #
-      def result(artifact)
+      def get_result(artifact)
         return unless callable?(artifact)
 
         result = Try[StandardError] do

data/lib/mihari/models/artifact.rb

@@ -191,7 +191,7 @@ module Mihari
         # NOTE: doing parallel with ActiveRecord objects is troublesome (e.g. connection issue, etc.)
         #       so converting the object to an OpenStruct object
         s = struct
-        results = Parallel.map(enrichers) { |enricher| enricher.result s }
+        results = Parallel.map(enrichers) { |enricher| enricher.get_result s }
         enriched = results.compact.map { |result| result.value_or(nil) }.compact
 
         self.dns_records = enriched.map(&:dns_records).flatten.compact

data/lib/mihari/models/port.rb

@@ -18,7 +18,7 @@ module Mihari
         # @return [Array<Mihari::Port>]
         #
         def build_by_ip(ip, enricher: Enrichers::Shodan.new)
-          enricher.result(ip).fmap do |res|
+          enricher.get_result(ip).fmap do |res|
             (res&.ports || []).map { |port| new(port:) }
           end.value_or []
         end

data/lib/mihari/rule.rb

@@ -191,8 +191,8 @@ module Mihari
       return [] if enriched_artifacts.empty?
 
       [].tap do |out|
-        out << serial_emitters.map { |emitter| emitter.result(enriched_artifacts).value_or(nil) }
-        out << Parallel.map(parallel_emitters) { |emitter| emitter.result(enriched_artifacts).value_or(nil) }
+        out << serial_emitters.map { |emitter| emitter.get_result(enriched_artifacts).value_or(nil) }
+        out << Parallel.map(parallel_emitters) { |emitter| emitter.get_result(enriched_artifacts).value_or(nil) }
       end.flatten.compact
     end
 
@@ -349,8 +349,8 @@ module Mihari
     # @return [Array<Dry::Monads::Result::Success<Array<Mihari::Models::Artifact>>, Dry::Monads::Result::Failure>]
     def analyzer_results
       [].tap do |out|
-        out << Parallel.map(parallel_analyzers, &:result)
-        out << serial_analyzers.map(&:result)
+        out << Parallel.map(parallel_analyzers, &:get_result)
+        out << serial_analyzers.map(&:get_result)
       end.flatten
     end
 

data/lib/mihari/service.rb

@@ -11,7 +11,7 @@ module Mihari
       raise NotImplementedError, "You must implement #{self.class}##{__method__}"
     end
 
-    def result(...)
+    def get_result(...)
       Try[StandardError] { call(...) }.to_result
     end
 
@@ -20,8 +20,8 @@ module Mihari
         new.call(...)
       end
 
-      def result(...)
-        new.result(...)
+      def get_result(...)
+        new.get_result(...)
       end
     end
   end

data/lib/mihari/version.rb

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

data/lib/mihari/web/endpoints/alerts.rb

@@ -41,7 +41,7 @@ module Mihari
           end
           get "/:id" do
             id = params[:id].to_i
-            result = Services::AlertGetter.result(id)
+            result = Services::AlertGetter.get_result(id)
             return present(result.value!, with: Entities::Alert) if result.success?
 
             case result.failure
@@ -61,7 +61,7 @@ module Mihari
           end
           delete "/:id" do
             id = params["id"].to_i
-            result = Services::AlertDestroyer.result(id)
+            result = Services::AlertDestroyer.get_result(id)
             return if result.success?
 
             case result.failure
@@ -86,7 +86,7 @@ module Mihari
           post "/" do
             status 201
 
-            result = Services::AlertCreator.result(params)
+            result = Services::AlertCreator.get_result(params)
             return present(result.value!, with: Entities::Alert) if result.success?
 
             case result.failure

data/lib/mihari/web/endpoints/artifacts.rb

@@ -41,7 +41,7 @@ module Mihari
           end
           get "/:id" do
             id = params[:id].to_i
-            result = Services::ArtifactGetter.result(id)
+            result = Services::ArtifactGetter.get_result(id)
             return present(result.value!, with: Entities::Artifact) if result.success?
 
             case result.failure
@@ -98,7 +98,7 @@ module Mihari
             status 204
 
             id = params["id"].to_i
-            result = Services::ArtifactDestroyer.result(id)
+            result = Services::ArtifactDestroyer.get_result(id)
             return if result.success?
 
             case result.failure

data/lib/mihari/web/endpoints/ip_addresses.rb

@@ -21,7 +21,7 @@ module Mihari
           end
           get "/:ip", requirements: {ip: %r{[^/]+}} do
             ip = params[:ip].to_s
-            result = Services::IPGetter.result(ip)
+            result = Services::IPGetter.get_result(ip)
             if result.success?
               value = result.value!
               return present(

data/lib/mihari/web/endpoints/rules.rb

@@ -59,7 +59,7 @@ module Mihari
           end
           get "/:id" do
             id = params[:id].to_s
-            result = Services::RuleGetter.result(params[:id].to_s)
+            result = Services::RuleGetter.get_result(params[:id].to_s)
             return present(result.value!, with: Entities::Rule) if result.success?
 
             case result.failure
@@ -120,7 +120,7 @@ module Mihari
 
             yaml = params[:yaml].to_s
 
-            result = RuleCreateUpdater.result(yaml, overwrite: false)
+            result = RuleCreateUpdater.get_result(yaml, overwrite: false)
             return present(result.value!.model, with: Entities::Rule) if result.success?
 
             failure = result.failure
@@ -151,7 +151,7 @@ module Mihari
 
             yaml = params[:yaml].to_s
 
-            result = RuleCreateUpdater.result(yaml, overwrite: true)
+            result = RuleCreateUpdater.get_result(yaml, overwrite: true)
             return present(result.value!.model, with: Entities::Rule) if result.success?
 
             failure = result.failure
@@ -178,7 +178,7 @@ module Mihari
             status 204
 
             id = params[:id].to_s
-            result = Services::RuleDestroyer.result(id)
+            result = Services::RuleDestroyer.get_result(id)
             return if result.success?
 
             case result.failure

data/lib/mihari/web/endpoints/tags.rb

@@ -43,7 +43,7 @@ module Mihari
             status 204
 
             id = params[:id].to_i
-            result = Services::TagDestroyer.result(id)
+            result = Services::TagDestroyer.get_result(id)
             return if result.success?
 
             case result.failure