mihari 7.6.4 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12856ce5fee6e623a5579cab99a03629c611db1f65e087b04167cae69f870647
-  data.tar.gz: 28577ad798c7033ead6aaeced545a9401f17d0a31d29551950c3be583bc107ea
+  metadata.gz: 75cc81f17196e45d76732a65800c54416d73c2b86751ee3745f7d02d9e938b59
+  data.tar.gz: 0300cb460d5cecae999c095967dbb6c2827fe59b0404becdb287f9df07a6ef8d
 SHA512:
-  metadata.gz: 68d780eca473d2b081c3c9bb7a60c9c5bfa371a0c6e08a307ceaa3138f5097b70606902e657aab22d1013a5033904bd7135595812d76a0554bde38f3b75917b6
-  data.tar.gz: 6b0ab8b458109b4c496298560772bd44e845a96c97ab89ec3191416855a66c4de92277d66d63607b17a857d35be10343adbdd71183616f64e7b984b617cde32a
+  metadata.gz: aa653f50889b81341aa06a2d4bbab8c5bfb83bfb2adc60bbbba88933b24fe61503e52de6f5f8b082f5af7f697b249d206e545257def2603a6d0ab76fed090047
+  data.tar.gz: 1737d85fb2322b49cc5b0a47ea3ad8a3cb723cfa8e7c793f57dd8747472e4509c8282c81148e454ef81f70fa55d6bc037d596ffe538f40fab98b8a1661feda25

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
@@ -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
 
@@ -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"
@@ -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/version.rb

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