mihari 4.7.2 → 4.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7eeecbacefc194f5d2e9356fe8f17884c358b45bb3b7ccbd83a47aa3567ae1f6
-  data.tar.gz: d99abc5ef4368bf1a23a48cf0f15a64a33d3539313a624d489887e86a8cc564c
+  metadata.gz: 3e827da38142045be9b680636eb69b61d18e465b83f33d3a2a435c251041c7fc
+  data.tar.gz: 91d0c1fa7e50512c9a2bb8aceb914f69bec149c3fd7dc16f136a4b391a086e56
 SHA512:
-  metadata.gz: e0347f1c03a949d7e3c85cb9a615247c41bea2a0ac8288f0e3c7a8f9bd5d93ad8f952c99f3b595bf19997fe10e32490898b58a858f63f402a6082344f68cdb87
-  data.tar.gz: a507cfb86593c602ba46ef59f279a17ed1a34e433c8e34898a872048306733d26fb1a6546f1ae96605d524ccd80c3c3a0487ab4b4ad66219c0e3a63215ce8c6e
+  metadata.gz: c6c06c7d217091158d3fc354ccf3e0640494cfcd26b38cf5927d4d2a43f961ce8d2bf7d87bc965037554e745bf54b7dcf06e02b96d93962e6b0948bff11119d7
+  data.tar.gz: 5dd97d8c4a4d9ae9eac0e3823e8da97210de5dae87c448f48f6df565a12c99e7f0620d0477862762465aa77b0727912ccc935cd941e9a291a48a763fbf9ab8f3

data/.github/workflows/test.yml

@@ -56,6 +56,7 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
+          bundler: latest
           bundler-cache: true
 
       - name: Test with PostgreSQL

data/.rubocop.yml

@@ -0,0 +1,4 @@
+Style/HashSyntax:
+  EnforcedShorthandSyntax: either
+Style/StringLiterals:
+  EnforcedStyle: double_quotes

data/lib/mihari/commands/validator.rb

@@ -18,7 +18,8 @@ module Mihari
 
             begin
               rule.validate!
-              Mihari.logger.info "Valid format. The input is parsed as the following:\n#{rule.data.to_yaml}"
+              Mihari.logger.info "Valid format. The input is parsed as the following:"
+              Mihari.logger.info rule.data.to_yaml
             rescue RuleValidationError
               nil
             end

data/lib/mihari/schemas/rule.rb

@@ -13,6 +13,11 @@ module Mihari
       optional(:tags).value(array[:string]).default([])
       optional(:id).value(:string)
 
+      optional(:status).value(:string)
+
+      optional(:related).value(array[:string])
+      optional(:references).value(array[:string])
+
       optional(:author).value(:string)
       optional(:created_on).value(:date)
       optional(:updated_on).value(:date)

data/lib/mihari/structs/rule.rb

@@ -2,6 +2,7 @@
 
 require "date"
 require "erb"
+require "json"
 require "pathname"
 require "yaml"
 
@@ -20,12 +21,17 @@ module Mihari
       # @return [String]
       attr_writer :id
 
+      #
+      # Initialize
+      #
+      # @param [Hash] data
+      # @param [String] yaml
+      #
       def initialize(data, yaml)
         @data = data.deep_symbolize_keys
         @yaml = yaml
 
         @errors = nil
-        @no_method_error = nil
 
         validate
       end
@@ -39,41 +45,19 @@ module Mihari
         !@errors.empty?
       end
 
-      #
-      # @return [Array<String>]
-      #
-      def error_messages
-        return [] if @errors.nil?
-
-        @errors.messages.filter_map do |message|
-          path = message.path.map(&:to_s).join
-          "#{path} #{message.text}"
-        rescue NoMethodError
-          nil
-        end
-      end
-
       def validate
-        begin
-          contract = Schemas::RuleContract.new
-          result = contract.call(data)
-        rescue NoMethodError => e
-          @no_method_error = e
-          return
-        end
+        contract = Schemas::RuleContract.new
+        result = contract.call(data)
 
         @data = result.to_h
         @errors = result.errors
       end
 
       def validate!
-        raise RuleValidationError, "Data should be a hash" unless data.is_a?(Hash)
-        raise RuleValidationError, error_messages.join("\n") if errors?
-        raise RuleValidationError, "Something wrong with queries, emitters or enrichers." unless @no_method_error.nil?
+        raise RuleValidationError if errors?
       rescue RuleValidationError => e
-        message = "Failed to parse the input as a rule"
-        message += ": #{e.message}" unless e.message.empty?
-        Mihari.logger.error message
+        Mihari.logger.error "Failed to parse the input as a rule:"
+        Mihari.logger.error JSON.pretty_generate(errors.to_h)
 
         raise e
       end

data/lib/mihari/version.rb

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

data/lib/mihari/web/public/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><meta name="viewport" content="width=device-width,initial-scale=1"/><link rel="icon" href="/static/favicon.ico"/><title>Mihari</title><script defer="defer" src="/static/js/chunk-vendors.37b7208e.js"></script><script defer="defer" src="/static/js/app.3ac3bd7a.js"></script><link href="/static/css/chunk-vendors.5013d549.css" rel="stylesheet"><link href="/static/css/app.2a5d3d21.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but Mihari doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><meta name="viewport" content="width=device-width,initial-scale=1"/><link rel="icon" href="/static/favicon.ico"/><title>Mihari</title><script defer="defer" src="/static/js/chunk-vendors.723e02cf.js"></script><script defer="defer" src="/static/js/app.6413bf4f.js"></script><link href="/static/css/chunk-vendors.380724be.css" rel="stylesheet"><link href="/static/css/app.2a5d3d21.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but Mihari doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>