mihari 5.7.2 → 6.1.0

data/lib/mihari.rb

@@ -32,7 +32,7 @@ require "grape-entity"
 require "addressable/uri"
 require "awrence"
 require "email_address"
-require "memist"
+require "memo_wise"
 require "parallel"
 require "plissken"
 require "public_suffix"
@@ -55,13 +55,14 @@ require "mihari/mixins/configurable"
 require "mihari/mixins/falsepositive"
 require "mihari/mixins/refang"
 require "mihari/mixins/retriable"
+require "mihari/mixins/unwrap_error"
 
 #
 # Mihari module
 #
 module Mihari
   class << self
-    include Memist::Memoizable
+    prepend MemoWise
 
     #
     # @return [Array<Mihari::Emitters::Base>]
@@ -69,7 +70,7 @@ module Mihari
     def emitters
       []
     end
-    memoize :emitters
+    memo_wise :emitters
 
     #
     # @return [Hash{String => Mihari::Enrichers::Base}]
@@ -86,7 +87,7 @@ module Mihari
     def analyzers
       []
     end
-    memoize :analyzers
+    memo_wise :analyzers
 
     #
     # @return [Hash{String => Mihari::Analyzers::Base}]
@@ -103,7 +104,7 @@ module Mihari
     def enrichers
       []
     end
-    memoize :enrichers
+    memo_wise :enrichers
 
     #
     # @return [Hash{String => Mihari::Enrichers::Base}]
@@ -126,7 +127,7 @@ module Mihari
       SemanticLogger.add_appender(io: $stderr, formatter: :color)
       SemanticLogger["Mihari"]
     end
-    memoize :logger
+    memo_wise :logger
 
     def initialize_sentry
       return if Mihari.config.sentry_dsn.nil?
@@ -134,8 +135,7 @@ module Mihari
 
       Sentry.init do |config|
         config.dsn = Mihari.config.sentry_dsn
-
-        config.traces_sample_rate = 0.5
+        config.traces_sample_rate = Mihari.config.sentry_trace_sample_rate
       end
     end
   end
@@ -260,7 +260,6 @@ require "mihari/schemas/rule"
 
 # Services
 require "mihari/services/rule_builder"
-require "mihari/services/rule_runner"
 
 require "mihari/services/alert_builder"
 require "mihari/services/alert_runner"
@@ -291,5 +290,5 @@ require "mihari/web/app"
 # CLIs
 require "mihari/cli/main"
 
-# initialize Sentry
+# initialize Sentry (if it's possible)
 Mihari.initialize_sentry

data/mihari.gemspec

@@ -10,10 +10,6 @@ def ci_env?
   ENV["CI"]
 end
 
-def is_ruby2?
-  RUBY_VERSION.to_s.start_with?("2.")
-end
-
 Gem::Specification.new do |spec|
   spec.name = "mihari"
   spec.version = Mihari::VERSION
@@ -24,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.homepage = "https://github.com/ninoseki/mihari"
   spec.license = "MIT"
 
-  spec.required_ruby_version = ">= 2.7"
+  spec.required_ruby_version = ">= 3.1"
 
   spec.metadata["rubygems_mfa_required"] = "true"
 
@@ -40,6 +36,8 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_development_dependency "better_errors", "~> 2.10"
+  spec.add_development_dependency "binding_of_caller", "~> 1.0"
   spec.add_development_dependency "bundler", "~> 2.4"
   spec.add_development_dependency "coveralls_reborn", "~> 0.28"
   spec.add_development_dependency "fakefs", "~> 2.5"
@@ -48,20 +46,20 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "mysql2", "~> 0.5"
   spec.add_development_dependency "pg", "~> 1.5"
   spec.add_development_dependency "rack-test", "~> 2.1"
-  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rake", "~> 13.1"
   spec.add_development_dependency "rb-fsevent", "~> 0.11"
   spec.add_development_dependency "rerun", "~> 0.14"
   spec.add_development_dependency "rspec", "~> 3.12"
+  spec.add_development_dependency "rspec-parameterized", "~> 1.0"
   spec.add_development_dependency "rubocop-rspec", "~> 2.25"
+  spec.add_development_dependency "rubocop-yard", "~> 0.8"
   spec.add_development_dependency "simplecov-lcov", "~> 0.8"
-  spec.add_development_dependency "standard", "~> 1.31"
+  spec.add_development_dependency "standard", "~> 1.32"
   spec.add_development_dependency "test-prof", "~> 1.2"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "vcr", "~> 6.2"
   spec.add_development_dependency "webmock", "~> 3.19"
 
-  spec.add_development_dependency "rubocop-yard", "~> 0.7" unless is_ruby2?
-
   unless ci_env?
     spec.add_development_dependency "lefthook", "~> 1.5"
     spec.add_development_dependency "solargraph", "~> 0.49"
@@ -79,18 +77,18 @@ Gem::Specification.new do |spec|
   spec.add_dependency "dry-struct", "1.6.0"
   spec.add_dependency "dry-validation", "1.10.0"
   spec.add_dependency "email_address", "0.2.4"
-  spec.add_dependency "grape", "1.8.0"
+  spec.add_dependency "grape", "2.0.0"
   spec.add_dependency "grape-entity", "1.0.0"
-  spec.add_dependency "grape-swagger", "1.6.1"
+  spec.add_dependency "grape-swagger", "2.0.0"
   spec.add_dependency "grape-swagger-entity", "0.5.2"
   spec.add_dependency "http", "5.1.1"
   spec.add_dependency "jr-cli", "0.6.0"
   spec.add_dependency "launchy", "2.5.2"
-  spec.add_dependency "memist", "2.0.2"
+  spec.add_dependency "memo_wise", "1.8.0"
   spec.add_dependency "normalize_country", "0.3.2"
   spec.add_dependency "parallel", "1.23.0"
   spec.add_dependency "plissken", "2.0.1"
-  spec.add_dependency "public_suffix", "5.0.3"
+  spec.add_dependency "public_suffix", "5.0.4"
   spec.add_dependency "puma", "6.4.0"
   spec.add_dependency "rack", "3.0.8"
   spec.add_dependency "rack-cors", "2.0.1"

data/mkdocs.yml

@@ -19,6 +19,7 @@ nav:
       - Docker: tips/docker.md
       - GitHub Actions: tips/github_actions.md
       - Superset: tips/superset.md
+      - Sentry: tips/sentry.md
       - Alternatives: tips/alternatives.md
   - References:
       - Analyzers: analyzers/index.md

data/requirements.txt

@@ -1,2 +1,2 @@
 mkdocs==1.5.3
-mkdocs-material==9.4.7
+mkdocs-material==9.4.10

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: mihari
 version: !ruby/object:Gem::Version
-  version: 5.7.2
+  version: 6.1.0
 platform: ruby
 authors:
 - Manabu Niseki
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-11 00:00:00.000000000 Z
+date: 2023-11-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: better_errors
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.10'
+- !ruby/object:Gem::Dependency
+  name: binding_of_caller
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13.1'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +206,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
+- !ruby/object:Gem::Dependency
+  name: rspec-parameterized
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +234,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.25'
+- !ruby/object:Gem::Dependency
+  name: rubocop-yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: simplecov-lcov
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +268,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.31'
+        version: '1.32'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.31'
+        version: '1.32'
 - !ruby/object:Gem::Dependency
   name: test-prof
   requirement: !ruby/object:Gem::Requirement
@@ -276,20 +332,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.19'
-- !ruby/object:Gem::Dependency
-  name: rubocop-yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: lefthook
   requirement: !ruby/object:Gem::Requirement
@@ -492,14 +534,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: grape-entity
   requirement: !ruby/object:Gem::Requirement
@@ -520,14 +562,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: grape-swagger-entity
   requirement: !ruby/object:Gem::Requirement
@@ -585,19 +627,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.5.2
 - !ruby/object:Gem::Dependency
-  name: memist
+  name: memo_wise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: normalize_country
   requirement: !ruby/object:Gem::Requirement
@@ -646,14 +688,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.3
+        version: 5.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.3
+        version: 5.0.4
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -949,6 +991,7 @@ files:
 - lib/mihari/mixins/falsepositive.rb
 - lib/mihari/mixins/refang.rb
 - lib/mihari/mixins/retriable.rb
+- lib/mihari/mixins/unwrap_error.rb
 - lib/mihari/models/alert.rb
 - lib/mihari/models/artifact.rb
 - lib/mihari/models/autonomous_system.rb
@@ -974,7 +1017,6 @@ files:
 - lib/mihari/services/alert_builder.rb
 - lib/mihari/services/alert_runner.rb
 - lib/mihari/services/rule_builder.rb
-- lib/mihari/services/rule_runner.rb
 - lib/mihari/structs/binaryedge.rb
 - lib/mihari/structs/censys.rb
 - lib/mihari/structs/config.rb
@@ -1001,8 +1043,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-56fc2187.css
-- lib/mihari/web/public/assets/index-ec641cb0.js
+- lib/mihari/web/public/assets/index-216d49d1.js
+- lib/mihari/web/public/assets/index-4c8509ee.css
 - lib/mihari/web/public/assets/mode-yaml-24faa242.js
 - lib/mihari/web/public/favicon.ico
 - lib/mihari/web/public/index.html
@@ -1024,14 +1066,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A query aggregator for OSINT based threat hunting

data/lib/mihari/services/rule_runner.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Mihari
-  module Services
-    #
-    # Rule runner
-    #
-    class RuleRunner < Service
-      #
-      # @params [Mihari::Rule]
-      #
-      # @return [Mihari::Models::Alert, nil]
-      #
-      def call(rule)
-        rule.call
-      end
-    end
-  end
-end