mihari 5.4.9 → 5.6.0

data/lib/mihari.rb

@@ -69,16 +69,43 @@ module Mihari
     end
     memoize :emitters
 
+    #
+    # @return [Hash<String, Mihari::Enrichers::Base>]
+    #
+    def emitter_to_class
+      @emitter_to_class ||= emitters.flat_map do |klass|
+        klass.class_keys.map { |key| [key.downcase, klass] }
+      end.to_h
+    end
+
     def analyzers
       []
     end
     memoize :analyzers
 
+    #
+    # @return [Hash<String, Mihari::Analyzers::Base>]
+    #
+    def analyzer_to_class
+      @analyzer_to_class ||= analyzers.flat_map do |klass|
+        klass.class_keys.map { |key| [key.downcase, klass] }
+      end.to_h
+    end
+
     def enrichers
       []
     end
     memoize :enrichers
 
+    #
+    # @return [Hash<String, Mihari::Enrichers::Base>]
+    #
+    def enricher_to_class
+      @enricher_to_class ||= enrichers.flat_map do |klass|
+        klass.class_keys.map { |key| [key.downcase, klass] }
+      end.to_h
+    end
+
     def config
       @config ||= Config.new
     end
@@ -103,46 +130,11 @@ module Mihari
   end
 end
 
-# Constants
-require "mihari/constants"
-
-# Types
-require "mihari/types"
-
 # Core classes
+require "mihari/base"
 require "mihari/database"
-require "mihari/type_checker"
 require "mihari/http"
-
-# Services
-require "mihari/services/rule_builder"
-require "mihari/services/rule_proxy"
-require "mihari/services/rule_runner"
-
-require "mihari/services/alert_builder"
-require "mihari/services/alert_proxy"
-require "mihari/services/alert_runner"
-
-# Structs
-require "mihari/structs/binaryedge"
-require "mihari/structs/censys"
-require "mihari/structs/config"
-require "mihari/structs/filters"
-require "mihari/structs/google_public_dns"
-require "mihari/structs/greynoise"
-require "mihari/structs/ipinfo"
-require "mihari/structs/hunterhow"
-require "mihari/structs/onyphe"
-require "mihari/structs/shodan"
-require "mihari/structs/urlscan"
-require "mihari/structs/virustotal_intelligence"
-
-# Schemas
-require "mihari/schemas/macros"
-
-require "mihari/schemas/alert"
-require "mihari/schemas/analyzer"
-require "mihari/schemas/rule"
+require "mihari/type_checker"
 
 # Enrichers
 require "mihari/enrichers/base"
@@ -220,6 +212,44 @@ require "mihari/analyzers/zoomeye"
 
 require "mihari/analyzers/rule"
 
+# Types
+require "mihari/types"
+
+# Constants
+require "mihari/constants"
+
+# Structs
+require "mihari/structs/binaryedge"
+require "mihari/structs/censys"
+require "mihari/structs/config"
+require "mihari/structs/filters"
+require "mihari/structs/google_public_dns"
+require "mihari/structs/greynoise"
+require "mihari/structs/ipinfo"
+require "mihari/structs/hunterhow"
+require "mihari/structs/onyphe"
+require "mihari/structs/shodan"
+require "mihari/structs/urlscan"
+require "mihari/structs/virustotal_intelligence"
+
+# Schemas
+require "mihari/schemas/macros"
+
+require "mihari/schemas/options"
+
+require "mihari/schemas/alert"
+require "mihari/schemas/analyzer"
+require "mihari/schemas/rule"
+
+# Services
+require "mihari/services/rule_builder"
+require "mihari/services/rule_proxy"
+require "mihari/services/rule_runner"
+
+require "mihari/services/alert_builder"
+require "mihari/services/alert_proxy"
+require "mihari/services/alert_runner"
+
 # Entities
 require "mihari/entities/message"
 

data/mihari.gemspec

@@ -66,7 +66,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "awrence", "2.0.1"
   spec.add_dependency "dotenv", "2.8.1"
   spec.add_dependency "dry-container", "0.11.0"
-  spec.add_dependency "dry-files", "1.0.2"
+  spec.add_dependency "dry-files", "1.1.0"
   spec.add_dependency "dry-monads", "1.6.0"
   spec.add_dependency "dry-schema", "1.13.3"
   spec.add_dependency "dry-struct", "1.6.0"
@@ -93,7 +93,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sentry-ruby", "5.12.0"
   spec.add_dependency "slack-notifier", "2.4.0"
   spec.add_dependency "sqlite3", "1.6.7"
-  spec.add_dependency "thor", "1.2.2"
+  spec.add_dependency "thor", "1.3.0"
+  spec.add_dependency "thor-hollaback", "0.2.1"
   spec.add_dependency "uuidtools", "2.2.0"
   spec.add_dependency "whois", "5.1.0"
   spec.add_dependency "whois-parser", "2.0.0"

data/mkdocs.yml

@@ -13,17 +13,19 @@ plugins:
         case: lower
 
 nav:
-  - Mihari: index.md
   - Requirements: requirements.md
   - Installation: installation.md
   - How to Write a Rule: rule.md
   - Usage: usage.md
   - Configuration: configuration.md
-  - GitHub Actions: github_actions.md
-  - Analyzers: "analyzers/index.md"
-  - Enrichers: "enrichers/index.md"
-  - Emitters: "emitters/index.md"
-  - Tags: "./tags.md"
+  - Tips:
+      - GitHub Actions: github_actions.md
+      - Alternatives: alternatives.md
+  - References:
+      - Analyzers: "analyzers/index.md"
+      - Enrichers: "enrichers/index.md"
+      - Emitters: "emitters/index.md"
+      - Tags: "./tags.md"
 
 markdown_extensions:
   - toc:

data/requirements.txt

@@ -1,2 +1,2 @@
 mkdocs==1.5.3
-mkdocs-material==9.4.4
+mkdocs-material==9.4.6

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mihari
 version: !ruby/object:Gem::Version
-  version: 5.4.9
+  version: 5.6.0
 platform: ruby
 authors:
 - Manabu Niseki
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-13 00:00:00.000000000 Z
+date: 2023-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -380,14 +380,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: dry-monads
   requirement: !ruby/object:Gem::Requirement
@@ -758,14 +758,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: thor-hollaback
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
@@ -976,6 +990,7 @@ files:
 - lib/mihari/analyzers/virustotal.rb
 - lib/mihari/analyzers/virustotal_intelligence.rb
 - lib/mihari/analyzers/zoomeye.rb
+- lib/mihari/base.rb
 - lib/mihari/cli/alert.rb
 - lib/mihari/cli/base.rb
 - lib/mihari/cli/database.rb
@@ -1061,6 +1076,7 @@ files:
 - lib/mihari/schemas/emitter.rb
 - lib/mihari/schemas/enricher.rb
 - lib/mihari/schemas/macros.rb
+- lib/mihari/schemas/options.rb
 - lib/mihari/schemas/rule.rb
 - lib/mihari/services/alert_builder.rb
 - lib/mihari/services/alert_proxy.rb
@@ -1094,8 +1110,8 @@ files:
 - lib/mihari/web/endpoints/tags.rb
 - lib/mihari/web/middleware/connection_adapter.rb
 - lib/mihari/web/middleware/error_notification_adapter.rb
-- lib/mihari/web/public/assets/index-33165282.css
-- lib/mihari/web/public/assets/index-a92abd57.js
+- lib/mihari/web/public/assets/index-56fc2187.css
+- lib/mihari/web/public/assets/index-9cc489e6.js
 - lib/mihari/web/public/assets/mode-yaml-a21faa53.js
 - lib/mihari/web/public/favicon.ico
 - lib/mihari/web/public/index.html