mihari 5.6.1 → 5.6.2

data/lib/mihari/structs/urlscan.rb

@@ -81,11 +81,11 @@ module Mihari
         end
 
         #
-        # @return [Array<Mihari::Artifact>]
+        # @return [Array<Mihari::Models::Artifact>]
         #
         def artifacts
           values = [page.url, page.domain, page.ip].compact
-          values.map { |value| Mihari::Artifact.new(data: value, metadata: metadata) }
+          values.map { |value| Mihari::Models::Artifact.new(data: value, metadata: metadata) }
         end
 
         class << self
@@ -125,7 +125,7 @@ module Mihari
         end
 
         #
-        # @return [Array<Mihari::Artifact>]
+        # @return [Array<Mihari::Models::Artifact>]
         #
         def artifacts
           results.map(&:artifacts).flatten

data/lib/mihari/structs/virustotal_intelligence.rb

@@ -77,10 +77,10 @@ module Mihari
         end
 
         #
-        # @return [Mihari::Artifact]
+        # @return [Mihari::Models::Artifact]
         #
         def artifact
-          Artifact.new(data: value, metadata: metadata)
+          Models::Artifact.new(data: value, metadata: metadata)
         end
 
         class << self
@@ -151,7 +151,7 @@ module Mihari
         end
 
         #
-        # @return [Array<Mihari::Artifact>]
+        # @return [Array<Mihari::Models::Artifact>]
         #
         def artifacts
           data.map(&:artifact)

data/lib/mihari/version.rb

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

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

@@ -31,8 +31,8 @@ module Mihari
           filter = filter.to_h.symbolize_keys
 
           search_filter_with_pagination = Structs::Filters::Alert::SearchFilterWithPagination.new(**filter)
-          alerts = Mihari::Alert.search(search_filter_with_pagination)
-          total = Mihari::Alert.count(search_filter_with_pagination.without_pagination)
+          alerts = Mihari::Models::Alert.search(search_filter_with_pagination)
+          total = Mihari::Models::Alert.count(search_filter_with_pagination.without_pagination)
 
           present(
             {
@@ -59,7 +59,7 @@ module Mihari
           id = params["id"].to_i
 
           result = Try do
-            alert = Mihari::Alert.find(id)
+            alert = Mihari::Models::Alert.find(id)
             alert.destroy
           end.to_result
 
@@ -89,7 +89,7 @@ module Mihari
           extend Dry::Monads[:result, :try]
 
           result = Try do
-            proxy = Services::AlertProxy.new(params.to_snake_keys)
+            proxy = Services::AlertProxy.new(**params.to_snake_keys)
             runner = Services::AlertRunner.new(proxy)
             runner.run
           end.to_result

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

@@ -18,7 +18,7 @@ module Mihari
           id = params[:id].to_i
 
           result = Try do
-            artifact = Mihari::Artifact.includes(
+            artifact = Mihari::Models::Artifact.includes(
               :autonomous_system,
               :geolocation,
               :whois_record,
@@ -26,9 +26,9 @@ module Mihari
               :reverse_dns_names
             ).find(id)
             # TODO: improve queries
-            alert_ids = Mihari::Artifact.where(data: artifact.data).pluck(:alert_id)
-            tag_ids = Mihari::Tagging.where(alert_id: alert_ids).pluck(:tag_id)
-            tag_names = Mihari::Tag.where(id: tag_ids).distinct.pluck(:name)
+            alert_ids = Mihari::Models::Artifact.where(data: artifact.data).pluck(:alert_id)
+            tag_ids = Mihari::Models::Tagging.where(alert_id: alert_ids).pluck(:tag_id)
+            tag_names = Mihari::Models::Tag.where(id: tag_ids).distinct.pluck(:name)
 
             artifact.tags = tag_names
 
@@ -60,7 +60,7 @@ module Mihari
           id = params["id"].to_i
 
           result = Try do
-            artifact = Mihari::Artifact.includes(
+            artifact = Mihari::Models::Artifact.includes(
               :autonomous_system,
               :geolocation,
               :whois_record,
@@ -102,7 +102,7 @@ module Mihari
           id = params["id"].to_i
 
           result = Try do
-            alert = Mihari::Artifact.find(id)
+            alert = Mihari::Models::Artifact.find(id)
             alert.destroy
           end.to_result
 

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

@@ -10,7 +10,7 @@ module Mihari
           summary: "Get rule IDs"
         }
         get "/ids" do
-          rule_ids = Mihari::Rule.distinct.pluck(:id)
+          rule_ids = Mihari::Models::Rule.distinct.pluck(:id)
           present({ rule_ids: rule_ids }, with: Entities::RuleIDs)
         end
 
@@ -40,8 +40,8 @@ module Mihari
           filter = filter.to_h.symbolize_keys
 
           search_filter_with_pagenation = Structs::Filters::Rule::SearchFilterWithPagination.new(**filter)
-          rules = Mihari::Rule.search(search_filter_with_pagenation)
-          total = Mihari::Rule.count(search_filter_with_pagenation.without_pagination)
+          rules = Mihari::Models::Rule.search(search_filter_with_pagenation)
+          total = Mihari::Models::Rule.count(search_filter_with_pagenation.without_pagination)
 
           present(
             { rules: rules,
@@ -66,7 +66,7 @@ module Mihari
           id = params["id"].to_s
 
           result = Try do
-            Mihari::Rule.find(id)
+            Mihari::Models::Rule.find(id)
           end.to_result
 
           return present(result.value!, with: Entities::Rule) if result.success?
@@ -92,10 +92,7 @@ module Mihari
 
           id = params["id"].to_s
 
-          result = Try do
-            Mihari::Services::RuleProxy.from_model(Mihari::Rule.find(id))
-          end.to_result
-
+          result = Try { Rule.from_model(Mihari::Models::Rule.find(id)) }.to_result
           if result.success?
             result.value!.analyzer.run
             status 201
@@ -122,11 +119,9 @@ module Mihari
           extend Dry::Monads[:result, :try]
 
           yaml = params[:yaml]
-          result = Try do
-            Services::RuleProxy.from_yaml(yaml)
-          end.to_result.bind do |rule|
+          result = Try { Rule.from_yaml(yaml) }.to_result.bind do |rule|
             Try do
-              found = Mihari::Rule.find_by_id(rule.id)
+              found = Mihari::Models::Rule.find_by_id(rule.id)
               error!({ message: "ID:#{rule.id} is already registered" }, 400) unless found.nil?
               rule
             end.to_result
@@ -168,11 +163,9 @@ module Mihari
           yaml = params[:yaml]
 
           result = Try do
-            Mihari::Rule.find(id)
+            Mihari::Models::Rule.find(id)
           end.to_result.bind do |_|
-            Try do
-              Services::RuleProxy.from_yaml(yaml)
-            end.to_result
+            Try { Rule.from_yaml(yaml) }.to_result
           end.bind do |rule|
             Try do
               rule.model.save
@@ -212,7 +205,7 @@ module Mihari
           id = params["id"].to_s
 
           result = Try do
-            rule = Mihari::Rule.find(id)
+            rule = Mihari::Models::Rule.find(id)
             rule.destroy
           end.to_result
 

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

@@ -10,7 +10,7 @@ module Mihari
           summary: "Get tags"
         }
         get "/" do
-          tags = Mihari::Tag.distinct.pluck(:name)
+          tags = Mihari::Models::Tag.distinct.pluck(:name)
           present({ tags: tags }, with: Entities::Tags)
         end
 
@@ -28,7 +28,7 @@ module Mihari
           name = params[:name].to_s
 
           result = Try do
-            Mihari::Tag.where(name: name).destroy_all
+            Mihari::Models::Tag.where(name: name).destroy_all
           end.to_result
 
           if result.success?