mihari 7.0.5 → 7.1.1

data/lib/mihari/enrichers/base.rb

@@ -19,17 +19,23 @@ module Mihari
         raise NotImplementedError, "You must implement #{self.class}##{__method__}"
       end
 
+      #
+      # @param [Mihari::Models::Artifact] value
       #
       # @return [Dry::Monads::Result::Success<Object>, Dry::Monads::Result::Failure]
       #
       def result(value)
-        Try[StandardError] do
+        result = Try[StandardError] do
           retry_on_error(
             times: retry_times,
             interval: retry_interval,
             exponential_backoff: retry_exponential_backoff
           ) { call value }
         end.to_result
+
+        Mihari.logger.warn("Enricher:#{self.class.class_key} failed: #{result.failure}") if result.failure?
+
+        result
       end
 
       class << self

data/lib/mihari/errors.rb

@@ -37,9 +37,9 @@ module Mihari
   class IntegrityError < Error; end
 
   #
-  # HTTP status code error
+  # HTTP status error
   #
-  class StatusCodeError < ::HTTP::Error
+  class StatusError < ::HTTP::Error
     # @return [Integer]
     attr_reader :status_code
 

data/lib/mihari/http.rb

@@ -11,7 +11,7 @@ module Mihari
       def wrap_response(response)
         return response if response.status.success?
 
-        raise StatusCodeError.new(
+        raise StatusError.new(
           "Unsuccessful response code returned: #{response.code}",
           response.code,
           response.body.to_s

data/lib/mihari/rule.rb

@@ -188,20 +188,8 @@ module Mihari
     def bulk_emit
       return [] if enriched_artifacts.empty?
 
-      # NOTE: separate parallel execution and logging
-      #       because the logger does not work along with Parallel
-      results = Parallel.map(emitters) { |emitter| emitter.result enriched_artifacts }
-      results.zip(emitters).map do |result_and_emitter|
-        result, emitter = result_and_emitter
-
-        case result
-        when Success
-          Mihari.logger.info "Emission by #{emitter.class} succeed"
-        else
-          Mihari.logger.info "Emission by #{emitter.class} failed: #{result.failure}"
-        end
-
-        result.value_or nil
+      Parallel.map(emitters) do |emitter|
+        emitter.result(enriched_artifacts).value_or nil
       end.compact
     end
 

data/lib/mihari/services/renderer.rb

@@ -0,0 +1,31 @@
+require "tilt/jbuilder"
+
+module Mihari
+  module Services
+    #
+    # Jbuilder based JSON renderer
+    #
+    class JbuilderRenderer < Service
+      attr_reader :template
+
+      #
+      # @param [String] template
+      # @param [Hash] params
+      #
+      # @return [String]
+      #
+      def call(template, params = {})
+        @template = template
+
+        jbuilder_template = Tilt::JbuilderTemplate.new { template_string }
+        jbuilder_template.render(nil, params)
+      end
+
+      def template_string
+        return File.read(template) if Pathname(template).exist?
+
+        template
+      end
+    end
+  end
+end

data/lib/mihari/version.rb

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

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

@@ -36,7 +36,7 @@ module Mihari
 
             failure = result.failure
             case failure
-            when Mihari::StatusCodeError
+            when Mihari::StatusError
               error!({ message: "IP:#{ip} not found" }, failure.status_code) if failure.status_code == 404
               error!({ message: "IP format invalid" }, failure.status_code) if failure.status_code == 422
             end