mihari 7.1.2 → 7.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52d1c8320fdb5233c9738f3b4599868260fef892599cdfb42da6c3af17583b75
-  data.tar.gz: 625cd92558eff5a4d5613e588cc5ee85b9b714a9af211788da1a294d8d54ac45
+  metadata.gz: d7463506c12a2476cfea5dda939e88e01150fb6539c232e102c15fca4c57ab99
+  data.tar.gz: fdb700f461140badc1d90b3199999a97e483e57ae9c9bfed2d0157a94f35529d
 SHA512:
-  metadata.gz: 96811d3ebfffcb27a7577b814be280916dd46bd3477233374ffafd2bf784d9e5133f89b1d7650c722c25e2f678f82380f5ced2eff8f9b7e1f3c96583f54a1114
-  data.tar.gz: 5c13581e670c7aff158e93335fe9c626294cad622f153e61a338f31bb5a1e459302f34a3a9ddf18e0bb322e1359c43a6b782387cdc800f9b047c04e5521f4c70
+  metadata.gz: 18d9dd1f63056cd2731caa823904fd9df80ca21e63a540eab89d06e7951fa10cde498344049f3ba7de8740da2e8cfb9da9fe660f77c3a1abca5e308e36a6973c
+  data.tar.gz: 5a8ce97455cb0e68538af1ca2c8af5b89ea96f817d4f11cf6c00851035a20288f9bc2d2de16b58b52f3e72e988c77a2e4d8744a3fbebfd27c2cb6895d4c4dccb

data/Rakefile

@@ -50,14 +50,15 @@ namespace :build do
   end
 end
 
-def ci?
-  ENV.fetch("CI", false)
-end
-
-unless ci?
-  task :build do
-    sh "./build_frontend.sh"
-  end
+task :build do
+  # Build Swagger dos
+  Rake::Task["build:swagger"].invoke
+  # Build ReDocs docs & frontend assets
+  sh "cd frontend && npm install && npm run docs && npm run build-only"
+  # Copy built assets into ./lib/web/public/
+  sh "rm -rf ./lib/mihari/web/public/"
+  sh "mkdir -p ./lib/mihari/web/public/"
+  sh "cp -r frontend/dist/* ./lib/mihari/web/public"
 end
 
 # require it later enables doing pre-build step (= build the frontend app)

data/build_frontend.sh

@@ -3,7 +3,7 @@
 CURRENT_DIR=${PWD}
 
 cd frontend
-npm ci
+npm install
 npm run build
 
 trash -r ${CURRENT_DIR}/lib/mihari/web/public/

data/lib/mihari/actor.rb

@@ -53,10 +53,10 @@ module Mihari
     def validate_configuration!
       return if configured?
 
-      joined = self.class.configuration_keys.join(", ")
-      be = (self.class.configuration_keys.length > 1) ? "are" : "is"
-      message = "#{self.class.key} is not configured correctly. #{joined} #{be} missing."
-      raise ConfigurationError, message
+      message = "#{self.class.type.capitalize}:#{self.class.key} is not configured correctly"
+      detail = self.class.configuration_keys.map { |key| "#{key.upcase} is missing" }
+
+      raise ConfigurationError.new(message, detail)
     end
 
     def call(*args, **kwargs)
@@ -92,6 +92,14 @@ module Mihari
       def keys
         ([key] + [key_aliases]).flatten.compact.map(&:downcase)
       end
+
+      def type
+        return "analyzer" if ancestors.include?(Mihari::Analyzers::Base)
+        return "emitter" if ancestors.include?(Mihari::Emitters::Base)
+        return "enricher" if ancestors.include?(Mihari::Enrichers::Base)
+
+        nil
+      end
     end
   end
 end

data/lib/mihari/commands/web.rb

@@ -10,10 +10,10 @@ module Mihari
         def included(thor)
           thor.class_eval do
             desc "web", "Start the web app"
-            method_option :port, type: :numeric, default: 9292, desc: "Hostname to listen on"
-            method_option :host, type: :string, default: "localhost", desc: "Port to listen on"
+            method_option :port, type: :numeric, default: 9292, desc: "Port to listen on"
+            method_option :host, type: :string, default: "localhost", desc: "Hostname to listen on"
             method_option :threads, type: :string, default: "0:5", desc: "min:max threads to use"
-            method_option :verbose, type: :boolean, default: true, desc: "Report each request"
+            method_option :verbose, type: :boolean, default: false, desc: "Don't report each request"
             method_option :worker_timeout, type: :numeric, default: 60, desc: "Worker timeout value (in seconds)"
             method_option :open, type: :boolean, default: true, desc: "Whether to open the app in browser or not"
             method_option :env, type: :string, default: "production", desc: "Environment"

data/lib/mihari/errors.rb

@@ -7,7 +7,20 @@ module Mihari
 
   class ValueError < Error; end
 
-  class ConfigurationError < Error; end
+  class ConfigurationError < Error
+    # @return [Array<String>, nil]
+    attr_reader :detail
+
+    #
+    # @param [String] msg
+    # @param [Array<String>, nil] detail
+    #
+    def initialize(msg, detail)
+      super(msg)
+
+      @detail = detail
+    end
+  end
 
   class ResponseError < Error; end
 

data/lib/mihari/structs/config.rb

@@ -20,21 +20,6 @@ module Mihari
       attribute :items, Types.Array(Types::Hash).optional
 
       class << self
-        #
-        # Get a type of a class
-        #
-        # @param [Class<Mihari::Analyzers::Base>, Class<Mihari::Emitters::Base>, Class<Mihari::Enrichers::Base>] klass
-        #
-        # @return [String, nil]
-        #
-        def get_type(klass)
-          return "analyzer" if klass.ancestors.include?(Mihari::Analyzers::Base)
-          return "emitter" if klass.ancestors.include?(Mihari::Emitters::Base)
-          return "enricher" if klass.ancestors.include?(Mihari::Enrichers::Base)
-
-          nil
-        end
-
         #
         # Get a dummy instance
         #
@@ -43,8 +28,7 @@ module Mihari
         # @return [Mihari::Analyzers::Base, Mihari::Emitter::Base, Mihari::Enricher::Base] dummy
         #
         def get_dummy(klass)
-          type = get_type(klass)
-          case type
+          case klass.type
           when "analyzer"
             klass.new("dummy")
           when "emitter"
@@ -62,8 +46,7 @@ module Mihari
         def from_class(klass)
           return nil if klass == Mihari::Rule
 
-          type = get_type(klass)
-          return nil if type.nil?
+          return nil if klass.type.nil?
 
           begin
             instance = get_dummy(klass)
@@ -71,7 +54,7 @@ module Mihari
               name: klass.key,
               items: klass.configuration_items,
               configured: instance.configured?,
-              type: type
+              type: klass.type
             )
           rescue ArgumentError
             nil

data/lib/mihari/version.rb

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