mihari 8.0.0 → 8.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75cc81f17196e45d76732a65800c54416d73c2b86751ee3745f7d02d9e938b59
-  data.tar.gz: 0300cb460d5cecae999c095967dbb6c2827fe59b0404becdb287f9df07a6ef8d
+  metadata.gz: d3d454e8ac560ec2d1b7463dfdc686e69fc033da82e318f9479ba14f72194c49
+  data.tar.gz: d2f191e78eb2180a9062d885fd527f5e55c70fa70a5e9f8f910b15a50d57d6a2
 SHA512:
-  metadata.gz: aa653f50889b81341aa06a2d4bbab8c5bfb83bfb2adc60bbbba88933b24fe61503e52de6f5f8b082f5af7f697b249d206e545257def2603a6d0ab76fed090047
-  data.tar.gz: 1737d85fb2322b49cc5b0a47ea3ad8a3cb723cfa8e7c793f57dd8747472e4509c8282c81148e454ef81f70fa55d6bc037d596ffe538f40fab98b8a1661feda25
+  metadata.gz: 723186046c14e4532c3662280264a51fb7a5966173d7010c50d6537a8b96304b6ff7f7f24d9686d1773fe8f13ceaba09d7d33c0265e286b58c9d18f3849645b8
+  data.tar.gz: 8a9f7001f3edb2a4035178c810ff5a12cf2cf913533f853e778c8d15ef4e74edfaef4d1b9061ab406d824406e7abd9eba94adb2e45da6c9b963a5d029123d322

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

@@ -91,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

data/lib/mihari/commands/artifact.rb

@@ -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

data/lib/mihari/commands/rule.rb

@@ -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

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/structs/censys.rb

@@ -22,6 +22,8 @@ module Mihari
           # @param [Hash] d
           #
           def from_dynamic!(d)
+            return nil if d.nil?
+
             d = Types::Hash[d]
             new(
               asn: d.fetch("asn")
@@ -102,8 +104,8 @@ module Mihari
         attribute :location, Location
 
         # @!attribute [r] autonomous_system
-        #   @return [AutonomousSystem]
-        attribute :autonomous_system, AutonomousSystem
+        #   @return [AutonomousSystem, nil]
+        attribute :autonomous_system, AutonomousSystem.optional
 
         # @!attribute [r] metadata
         #   @return [Hash]
@@ -127,7 +129,7 @@ module Mihari
           Models::Artifact.new(
             data: ip,
             metadata:,
-            autonomous_system: autonomous_system.as,
+            autonomous_system: autonomous_system&.as,
             geolocation: location.geolocation,
             ports:
           )
@@ -142,7 +144,7 @@ module Mihari
             new(
               ip: d.fetch("ip"),
               location: Location.from_dynamic!(d.fetch("location")),
-              autonomous_system: AutonomousSystem.from_dynamic!(d.fetch("autonomous_system")),
+              autonomous_system: AutonomousSystem.from_dynamic!(d["autonomous_system"]),
               metadata: d,
               services: d.fetch("services", []).map { |x| Service.from_dynamic!(x) }
             )

data/lib/mihari/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mihari
-  VERSION = "8.0.0"
+  VERSION = "8.0.2"
 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