mihari 7.0.5 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aca048c797a73db1c57f0a5ad5f29066fbfba69451c71df1a26c3ea57853a1e3
-  data.tar.gz: 5ce2d298f325cc9d0ae50a98a6c18a64ec11cc06386504535c8ca647c7c68ad0
+  metadata.gz: 6930da0e95068ca8e30d1f226be5692e85375f796b7246cafdd2bec566d00ff7
+  data.tar.gz: 2bf34b1231bffcd88d402ffda335960ad929b1de91cd51b257c9c24f7b2fc16f
 SHA512:
-  metadata.gz: ac1d6ab49351a2c9c60e703a5fe5fe0f94c84c4294271f297d529a781d3a87a37b515d090a78676bcaf3da225f03617f8900966d108e31557e86319a2407b00b
-  data.tar.gz: f5aad0f8648783f4d3c3cc42a087f646358e5e93586cb394a2644e8f6c32a296b3668ea7758348c0dd55d4868527b4aa6a3d774ee113d5a4a14c39ae3ecd2857
+  metadata.gz: fd515cdbde67d10c3fcae14c8e45a7929a34931701be176c9f9a294d3db310f522a3e186aefe548d6f119c5c8552723114da4ee6f790dbbe0391138dca9cc00e
+  data.tar.gz: 5f4a3e1049ad55af018cf9ed2186dda49bd18517d37bc84cad6e6f60b10589834ac3bd1f09333e7f9773fab43442400c097c1063f1c304d5be5eb8991af7ec77

data/lib/mihari/cli/application.rb

@@ -43,6 +43,9 @@ module Mihari
         rescue StandardError => e
           error = unwrap_error(e)
 
+          # Raise error if it's a Thor::Error to follow Thor's manner
+          raise error if error.is_a?(Thor::Error)
+          # Raise error if debug is set as true
           raise error if options["debug"]
 
           data = Entities::ErrorMessage.represent(

data/lib/mihari/commands/alert.rb

@@ -12,6 +12,20 @@ module Mihari
           thor.class_eval do
             include Concerns::DatabaseConnectable
 
+            no_commands do
+              #
+              # @param [String] q
+              # @param [Integer] page
+              # @param [Integer] limit
+              #
+              # @return [Mihari::Services::ResultValue]
+              #
+              def _search(q, page: 1, limit: 10)
+                filter = Structs::Filters::Search.new(q: q, page: page, limit: limit)
+                Services::AlertSearcher.result(filter).value!
+              end
+            end
+
             desc "create [PATH]", "Create an alert"
             around :with_db_connection
             #
@@ -40,8 +54,7 @@ module Mihari
             # @param [String] q
             #
             def list(q = "")
-              filter = Structs::Filters::Search.new(q: q, page: options["page"], limit: options["limit"])
-              value = Services::AlertSearcher.result(filter).value!
+              value = _search(q, page: options["page"], limit: options["limit"])
               data = Entities::AlertsWithPagination.represent(
                 results: value.results,
                 total: value.total,
@@ -51,6 +64,28 @@ module Mihari
               puts JSON.pretty_generate(data.as_json)
             end
 
+            desc "list-transform QUERY", "List/search alerts with transformation"
+            around :with_db_connection
+            method_option :template, type: :string, required: true, aliases: "-t",
+              description: "Jbuilder template itself or a path to a template file"
+            method_option :page, type: :numeric, default: 1
+            method_option :limit, type: :numeric, default: 10
+            #
+            # @param [String] q
+            #
+            def list_transform(q = "")
+              value = _search(q, page: options["page"], limit: options["limit"])
+              puts Services::JbuilderRenderer.call(
+                options["template"],
+                {
+                  results: value.results,
+                  total: value.total,
+                  current_page: value.filter[:page].to_i,
+                  page_size: value.filter[:limit].to_i
+                }
+              )
+            end
+
             desc "get [ID]", "Get an alert"
             around :with_db_connection
             #

data/lib/mihari/commands/artifact.rb

@@ -11,6 +11,20 @@ module Mihari
           thor.class_eval do
             include Concerns::DatabaseConnectable
 
+            no_commands do
+              #
+              # @param [String] q
+              # @param [Integer] page
+              # @param [Integer] limit
+              #
+              # @return [Mihari::Services::ResultValue]
+              #
+              def _search(q, page: 1, limit: 10)
+                filter = Structs::Filters::Search.new(q: q, page: page, limit: limit)
+                Services::ArtifactSearcher.result(filter).value!
+              end
+            end
+
             desc "list [QUERY]", "List/search artifacts"
             around :with_db_connection
             method_option :page, type: :numeric, default: 1
@@ -19,8 +33,7 @@ module Mihari
             # @param [String] q
             #
             def list(q = "")
-              filter = Structs::Filters::Search.new(q: q, page: options["page"], limit: options["limit"])
-              value = Services::ArtifactSearcher.result(filter).value!
+              value = _search(q, page: options["page"], limit: options["limit"])
               data = Entities::ArtifactsWithPagination.represent(
                 results: value.results,
                 total: value.total,
@@ -30,6 +43,28 @@ module Mihari
               puts JSON.pretty_generate(data.as_json)
             end
 
+            desc "list-transform QUERY", "List/search artifacts with transformation"
+            around :with_db_connection
+            method_option :template, type: :string, required: true, aliases: "-t",
+              description: "Jbuilder template itself or a path to a template file"
+            method_option :page, type: :numeric, default: 1
+            method_option :limit, type: :numeric, default: 10
+            #
+            # @param [String] q
+            #
+            def list_transform(q = "")
+              value = _search(q, page: options["page"], limit: options["limit"])
+              puts Services::JbuilderRenderer.call(
+                options["template"],
+                {
+                  results: value.results,
+                  total: value.total,
+                  current_page: value.filter[:page].to_i,
+                  page_size: value.filter[:limit].to_i
+                }
+              )
+            end
+
             desc "get [ID]", "Get an artifact"
             around :with_db_connection
             #

data/lib/mihari/commands/config.rb

@@ -9,7 +9,7 @@ module Mihari
       class << self
         def included(thor)
           thor.class_eval do
-            desc "list", "List config"
+            desc "list", "List configs"
             def list
               configs = Services::ConfigSearcher.call
               data = configs.map { |config| Entities::Config.represent(config) }

data/lib/mihari/commands/rule.rb

@@ -12,6 +12,20 @@ module Mihari
           thor.class_eval do
             include Concerns::DatabaseConnectable
 
+            no_commands do
+              #
+              # @param [String] q
+              # @param [Integer] page
+              # @param [Integer] limit
+              #
+              # @return [Mihari::Services::ResultValue]
+              #
+              def _search(q, page: 1, limit: 10)
+                filter = Structs::Filters::Search.new(q: q, page: page, limit: limit)
+                Services::RuleSearcher.result(filter).value!
+              end
+            end
+
             desc "validate [PATH]", "Validate a rule file"
             #
             # Validate format of a rule
@@ -44,8 +58,7 @@ module Mihari
             # @param [String] q
             #
             def list(q = "")
-              filter = Structs::Filters::Search.new(q: q, page: options["page"], limit: options["limit"])
-              value = Services::RuleSearcher.result(filter).value!
+              value = _search(q, page: options["page"], limit: options["limit"])
               data = Entities::RulesWithPagination.represent(
                 results: value.results,
                 total: value.total,
@@ -55,6 +68,28 @@ module Mihari
               puts JSON.pretty_generate(data.as_json)
             end
 
+            desc "list-transform QUERY", "List/search rules with transformation"
+            around :with_db_connection
+            method_option :template, type: :string, required: true, aliases: "-t",
+              description: "Jbuilder template itself or a path to a template file"
+            method_option :page, type: :numeric, default: 1
+            method_option :limit, type: :numeric, default: 10
+            #
+            # @param [String] q
+            #
+            def list_transform(q = "")
+              value = _search(q, page: options["page"], limit: options["limit"])
+              puts Services::JbuilderRenderer.call(
+                options["template"],
+                {
+                  results: value.results,
+                  total: value.total,
+                  current_page: value.filter[:page].to_i,
+                  page_size: value.filter[:limit].to_i
+                }
+              )
+            end
+
             desc "get [ID]", "Get a rule"
             around :with_db_connection
             def get(id)

data/lib/mihari/commands/tag.rb

@@ -11,6 +11,20 @@ module Mihari
           thor.class_eval do
             include Concerns::DatabaseConnectable
 
+            no_commands do
+              #
+              # @param [String] q
+              # @param [Integer] page
+              # @param [Integer] limit
+              #
+              # @return [Mihari::Services::ResultValue]
+              #
+              def _search(q, page: 1, limit: 10)
+                filter = Structs::Filters::Search.new(q: q, page: page, limit: limit)
+                Services::TagSearcher.result(filter).value!
+              end
+            end
+
             desc "list", "List/search tags"
             around :with_db_connection
             method_option :page, type: :numeric, default: 1
@@ -19,8 +33,7 @@ module Mihari
             # @param [String] q
             #
             def list(q = "")
-              filter = Structs::Filters::Search.new(q: q, page: options["page"], limit: options["limit"])
-              value = Services::TagSearcher.result(filter).value!
+              value = _search(q, page: options["page"], limit: options["limit"])
               data = Entities::TagsWithPagination.represent(
                 results: value.results,
                 total: value.total,
@@ -30,6 +43,28 @@ module Mihari
               puts JSON.pretty_generate(data.as_json)
             end
 
+            desc "list-transform QUERY", "List/search tags with transformation"
+            around :with_db_connection
+            method_option :template, type: :string, required: true, aliases: "-t",
+              description: "Jbuilder template itself or a path to a template file"
+            method_option :page, type: :numeric, default: 1
+            method_option :limit, type: :numeric, default: 10
+            #
+            # @param [String] q
+            #
+            def list_transform(q = "")
+              value = _search(q, page: options["page"], limit: options["limit"])
+              puts Services::JbuilderRenderer.call(
+                options["template"],
+                {
+                  results: value.results,
+                  total: value.total,
+                  current_page: value.filter[:page].to_i,
+                  page_size: value.filter[:limit].to_i
+                }
+              )
+            end
+
             desc "delete [ID]", "Delete a tag"
             around :with_db_connection
             #

data/lib/mihari/concerns/retriable.rb

@@ -20,7 +20,7 @@ module Mihari
         return true if RETRIABLE_ERRORS.any? { |klass| error.is_a? klass }
 
         case error
-        when StatusCodeError
+        when StatusError
           error.status_code != 404
         else
           false

data/lib/mihari/data_type.rb

@@ -28,7 +28,7 @@ module Mihari
     def ip?
       Try[IPAddr::InvalidAddressError] do
         IPAddr.new(data).to_s == data
-      end.to_result.value_or(false)
+      end.recover { false }.value!
     end
 
     # @return [Boolean]
@@ -36,7 +36,7 @@ module Mihari
       Try[Addressable::URI::InvalidURIError] do
         uri = Addressable::URI.parse("http://#{data}")
         uri.host == data && PublicSuffix.valid?(uri.host)
-      end.to_result.value_or(false)
+      end.recover { false }.value!
     end
 
     # @return [Boolean]
@@ -44,7 +44,7 @@ module Mihari
       Try[Addressable::URI::InvalidURIError] do
         uri = Addressable::URI.parse(data)
         uri.scheme && uri.host && uri.path && PublicSuffix.valid?(uri.host)
-      end.to_result.value_or(false)
+      end.recover { false }.value!
     end
 
     # @return [Boolean]

data/lib/mihari/emitters/webhook.rb

@@ -1,49 +1,7 @@
 # frozen_string_literal: true
 
-require "erb"
-
 module Mihari
   module Emitters
-    class ERBTemplate < ERB
-      class << self
-        def template
-          %{
-            {
-              "rule": {
-                "id": "<%= @rule.id %>",
-                "title": "<%= @rule.title %>",
-                "description": "<%= @rule.description %>"
-              },
-              "artifacts": [
-                <% @artifacts.each_with_index do |artifact, idx| %>
-                  "<%= artifact.data %>"
-                  <%= ',' if idx < (@artifacts.length - 1) %>
-                <% end %>
-              ],
-              "tags": [
-                <% @rule.tags.each_with_index do |tag, idx| %>
-                  "<%= tag.name %>"
-                  <%= ',' if idx < (@rule.tags.length - 1) %>
-                <% end %>
-              ]
-            }
-          }
-        end
-      end
-
-      def initialize(artifacts:, rule:, options: {})
-        @artifacts = artifacts
-        @rule = rule
-
-        @template = options.fetch(:template, self.class.template)
-        super(@template)
-      end
-
-      def result
-        super(binding)
-      end
-    end
-
     class Webhook < Base
       # @return [Addressable::URI, nil]
       attr_reader :url
@@ -54,12 +12,24 @@ module Mihari
       # @return [String]
       attr_reader :method
 
-      # @return [String, nil]
+      # @return [String]
       attr_reader :template
 
       # @return [Array<Mihari::Models::Artifact>]
       attr_accessor :artifacts
 
+      DEFAULT_TEMPLATE = %{
+          json.rule do
+          json.id rule.id
+          json.title rule.title
+          json.description rule.description
+        end
+
+        json.artifacts artifacts.map(&:data)
+
+        json.tags rule.tags.map(&:name)
+      }
+
       #
       # @param [Mihari::Rule] rule
       # @param [Hash, nil] options
@@ -71,7 +41,7 @@ module Mihari
         @url = Addressable::URI.parse(params[:url])
         @headers = params[:headers] || {}
         @method = params[:method] || "POST"
-        @template = params[:template]
+        @template = params[:template] || DEFAULT_TEMPLATE
 
         @artifacts = []
       end
@@ -114,15 +84,7 @@ module Mihari
       # @return [String]
       #
       def render
-        options = {}
-        options[:template] = File.read(template) unless template.nil?
-
-        erb_template = ERBTemplate.new(
-          artifacts: artifacts,
-          rule: rule,
-          options: options
-        )
-        erb_template.result
+        Services::JbuilderRenderer.call(template, { rule: rule, artifacts: artifacts })
       end
 
       #

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/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.0"
 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