mihari 7.0.2 → 7.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 184d0084b9ab68c359ddaa10436a2a6172fa09e71f0cc4492af57a1afcf924d8
-  data.tar.gz: 035620673b2351bd6c70a837c7e73f36819e320a868298b6e9a07271759bf6ed
+  metadata.gz: a5859aa404d85ccc45008979195ace2c4104cc86336b65afacbeece226c7def5
+  data.tar.gz: 75f6687159420d8f0d7b5f2f13fbab7f523881ad55a66574a7a9ec612cf720ae
 SHA512:
-  metadata.gz: 8f16c21d9475313b8d6ef81cd12fe79c18964552f27633aa2c23fd530c92f9eece651af02fc51b3059f4e57acd6a7c5080607f2822488d26d56a0945c97c424b
-  data.tar.gz: 25640e747ea9113d294dcb910574d7958d0883187e03f0fa891f809b1bc997722bc9af48299685d4f67d51562a6a9d6cdbec0eb499d6e1afb38410e38a7c1936
+  metadata.gz: 9db820d33af592d9b2953a01e745ce05c3a297a6cbefb409e147fd90ab5d02070722abbba18b3f282bf9abcc1cc85f50d2579ab2774ea26074d74b6aea8d6073
+  data.tar.gz: 8218aaf062e8ecad9cf01f58188de497ffba135ce42269e7ff87b82d49cf96c0a46c0aa273e752da1f97b288ffead8569fa00c8d6452701273e9694bcf4dba74

data/lib/mihari/commands/rule.rb

@@ -34,8 +34,6 @@ module Mihari
               return if Pathname(path).exist? && !(yes? warning)
 
               Services::RuleInitializer.call(path)
-
-              puts "A new rule file has been initialized: #{path}."
             end
 
             desc "list [QUERY]", "List/search rules"

data/lib/mihari/rule.rb

@@ -231,7 +231,7 @@ module Mihari
     #
     def diff?
       model = Mihari::Models::Rule.find(id)
-      model.data != data.deep_stringify_keys
+      model.data != diff_comparable_data
     rescue ActiveRecord::RecordNotFound
       false
     end
@@ -272,6 +272,18 @@ module Mihari
 
     private
 
+    #
+    # @return [Hash]
+    #
+    def diff_comparable_data
+      # data is serialized as JSON so dates (created_on & updated_on) are stringified in there
+      # thus dates & (hash) keys have to be stringified when comparing
+      data.deep_dup.tap do |data|
+        data[:created_on] = data[:created_on].to_s
+        data[:updated_on] = data[:updated_on].to_s
+      end.deep_stringify_keys
+    end
+
     #
     # Check whether a value is a falsepositive value or not
     #

data/lib/mihari/version.rb

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

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

@@ -8,13 +8,16 @@ module Mihari
       #
       class IPAddresses < Grape::API
         namespace :ip_addresses do
-          desc "Get an IP address", {
+          desc "Get IP address data", {
             success: Entities::IPAddress,
-            failure: [{ code: 404, model: Entities::ErrorMessage }],
-            summary: "Get an IP address"
+            failure: [
+              { code: 404, model: Entities::ErrorMessage },
+              { code: 422, model: Entities::ErrorMessage }
+            ],
+            summary: "Get IP address data"
           }
           params do
-            requires :ip, type: String, regexp: /\A[0-9.]+\z/
+            requires :ip, type: String
           end
           get "/:ip", requirements: { ip: %r{[^/]+} } do
             ip = params[:ip].to_s
@@ -34,7 +37,8 @@ module Mihari
             failure = result.failure
             case failure
             when Mihari::StatusCodeError
-              error!({ message: "ID:#{id} not found" }, 404) if failure.status_code == 404
+              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
             raise failure
           end

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

@@ -17,7 +17,10 @@ module Mihari
           def call(yaml, overwrite: true)
             rule = Rule.from_yaml(yaml)
 
-            raise IntegrityError, "ID:#{rule.id} is already registered" if rule.exists? && !overwrite
+            # To invoke ActiveRecord::RecordNotFound
+            Models::Rule.find(rule.id) if overwrite
+
+            raise IntegrityError, "ID:#{rule.id} already registered" if rule.exists? && !overwrite
 
             rule.update_or_create
             rule
@@ -141,13 +144,11 @@ module Mihari
             summary: "Update a rule"
           }
           params do
-            requires :id, type: String, documentation: { param_type: "body" }
             requires :yaml, type: String, documentation: { param_type: "body" }
           end
           put "/" do
             status 201
 
-            id = params[:id].to_s
             yaml = params[:yaml].to_s
 
             result = RuleCreateUpdater.result(yaml, overwrite: true)
@@ -156,11 +157,11 @@ module Mihari
             failure = result.failure
             case failure
             when ActiveRecord::RecordNotFound
-              error!({ message: "ID:#{id} not found" }, 404)
+              error!({ message: "Rule not found" }, 404)
             when Psych::SyntaxError
               error!({ message: failure.message }, 422)
             when ValidationError
-              error!({ message: "Rule format is invalid", detail: failure.errors.to_h }, 422)
+              error!({ message: "Rule format invalid", detail: failure.errors.to_h }, 422)
             end
             raise failure
           end

data/lib/mihari/web/middleware/capture_exceptions.rb

@@ -9,8 +9,6 @@ module Mihari
       class CaptureExceptions < Sentry::Rack::CaptureExceptions
         include Concerns::ErrorUnwrappable
 
-        private
-
         def capture_exception(exception, env)
           unwrapped = unwrap_error(exception)
           Mihari.logger.error unwrapped