mihari 3.8.0 → 3.9.2

data/lib/mihari.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
+require "awrence"
 require "colorize"
 require "dry/configurable"
 require "dry/files"
 require "mem"
+require "plissken"
 require "yaml"
 
 # Load .env
@@ -108,6 +110,7 @@ require "mihari/constants"
 require "mihari/types"
 
 # Structs
+require "mihari/structs/alert"
 require "mihari/structs/censys"
 require "mihari/structs/ipinfo"
 require "mihari/structs/onyphe"
@@ -134,18 +137,6 @@ require "mihari/models/tag"
 require "mihari/models/tagging"
 require "mihari/models/whois"
 
-# Serializers
-require "mihari/serializers/autonomous_system"
-require "mihari/serializers/dns"
-require "mihari/serializers/geolocation"
-require "mihari/serializers/reverse_dns"
-require "mihari/serializers/tag"
-require "mihari/serializers/whois"
-
-require "mihari/serializers/artifact"
-
-require "mihari/serializers/alert"
-
 # Analyzers
 require "mihari/analyzers/base"
 require "mihari/analyzers/basic"

data/mihari.gemspec

@@ -42,7 +42,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr", "~> 6.0"
   spec.add_development_dependency "webmock", "~> 3.14"
 
-  spec.add_dependency "active_model_serializers", "~> 0.10"
   spec.add_dependency "activerecord", "~> 6.1"
   spec.add_dependency "activerecord-filter", "~> 6.1"
   spec.add_dependency "addressable", "~> 2.8"
@@ -56,11 +55,16 @@ Gem::Specification.new do |spec|
   spec.add_dependency "dnstwister", "~> 0.1"
   spec.add_dependency "dotenv", "~> 2.7"
   spec.add_dependency "dry-configurable", "~> 0.13"
+  spec.add_dependency "dry-container", "~> 0.9"
   spec.add_dependency "dry-files", "~> 0.1"
   spec.add_dependency "dry-initializer", "~> 3.0"
   spec.add_dependency "dry-struct", "~> 1.4"
   spec.add_dependency "dry-validation", "~> 1.7"
   spec.add_dependency "email_address", "~> 0.2"
+  spec.add_dependency "grape", "~> 1.6"
+  spec.add_dependency "grape-entity", "~> 0.10"
+  spec.add_dependency "grape-swagger", "~> 1.4"
+  spec.add_dependency "grape-swagger-entity", "~> 0.5"
   spec.add_dependency "hachi", "~> 1.0"
   spec.add_dependency "http", "~> 5.0"
   spec.add_dependency "launchy", "~> 2.5"
@@ -71,20 +75,19 @@ Gem::Specification.new do |spec|
   spec.add_dependency "normalize_country", "0.3"
   spec.add_dependency "onyphe", "~> 2.0"
   spec.add_dependency "otx_ruby", "~> 0.9"
-  spec.add_dependency "parallel", "~> 1.20"
+  spec.add_dependency "parallel", "~> 1.21"
   spec.add_dependency "passive_circl", "~> 0.1"
   spec.add_dependency "passivetotalx", "~> 0.1"
+  spec.add_dependency "plissken", "~> 1.4"
   spec.add_dependency "public_suffix", "~> 4.0"
   spec.add_dependency "pulsedive", "~> 0.1"
-  spec.add_dependency "puma", "~> 5.4"
+  spec.add_dependency "puma", "~> 5.5"
   spec.add_dependency "rack", "~> 2.2"
   spec.add_dependency "rack-contrib", "~> 2.3"
+  spec.add_dependency "rack-cors", "~> 1.1"
   spec.add_dependency "safe_shell", "~> 1.1"
   spec.add_dependency "securitytrails", "~> 1.0"
   spec.add_dependency "shodanx", "~> 0.2"
-  spec.add_dependency "sinatra", "~> 2.1"
-  spec.add_dependency "sinatra-contrib", "~> 2.1"
-  spec.add_dependency "sinatra-param", "~> 1.6"
   spec.add_dependency "slack-notifier", "~> 2.4"
   spec.add_dependency "spysex", "~> 0.2"
   spec.add_dependency "sqlite3", "~> 1.4"

data/sig/lib/mihari/analyzers/rule.rbs

@@ -1,5 +1,7 @@
 module Mihari
   module Analyzers
+    ANALYZER_TO_CLASS: Hash[String, singleton(Mihari::Analyzers::Base)]
+
     class Rule < Base
       include Mihari::Mixins::DisallowedDataValue
 
@@ -14,14 +16,12 @@ module Mihari
 
       def initialize: (**untyped kwargs) -> void
 
-      ANALYZER_TO_CLASS: Hash[String, singleton(Mihari::Analyzers::Base)]
-
       #
       # Returns a list of artifacts matched with queries
       #
       # @return [Array<Mihari::Artifact>]
       #
-      def artifacts: () -> (Array[String] | Array[Mihari::Artifact])
+      def artifacts: () -> (Array[Mihari::Artifact])
 
       #
       # Normalize artifacts

data/sig/lib/mihari/models/alert.rbs

@@ -7,40 +7,12 @@ module Mihari
     attr_accessor artifacts(): Array[Mihari::Artifact]
     attr_accessor Tags(): Array[Mihari::Tag]
 
-    #
-    # Search alerts
-    #
-    # @param [String, nil] artifact_data
-    # @param [String, nil] description
-    # @param [String, nil] source
-    # @param [String, nil] tag_name
-    # @param [String, nil] title
-    # @param [DateTime, nil] from_at
-    # @param [DateTime, nil] to_at
-    # @param [Integer, nil] limit
-    # @param [Integer, nil] page
-    #
-    # @return [Array<Hash>]
-    #
-    def self.search: (?artifact_data: String? artifact_data, ?description: String? description, ?source: String? source, ?tag_name: String? tag_name, ?title: String? title, ?from_at: DateTime? from_at, ?to_at: DateTime? to_at, ?limit: ::Integer limit, ?page: ::Integer page) -> Array[Hash[(String | Symbol), untyped]]
+    def self.search: (Mihari::Structs::Alert::SearchFilterWithPagination filter) -> Array[Hash[(String | Symbol), untyped]]
 
-    #
-    # Count alerts
-    #
-    # @param [String, nil] artifact_data
-    # @param [String, nil] description
-    # @param [String, nil] source
-    # @param [String, nil] tag_name
-    # @param [String, nil] title
-    # @param [DateTime, nil] from_at
-    # @param [DateTime, nil] to_at
-    #
-    # @return [Integer]
-    #
-    def self.count: (?artifact_data: String? artifact_data, ?description: String? description, ?source: String? source, ?tag_name: String? tag_name, ?title: String? title, ?from_at: DateTime? from_at, ?to_at: DateTime? to_at) -> Integer
+    def self.count: (Mihari::Structs::Alert::SearchFilter filter) -> Integer
 
     private
 
-    def self.build_relation: (?artifact_data: String? artifact_data, ?title: String? title, ?description: String? description, ?source: String? source, ?tag_name: String? tag_name, ?from_at: DateTime? from_at, ?to_at: DateTime? to_at) -> Mihari::Alert
+    def self.build_relation: (Mihari::Structs::Alert::SearchFilter filter) -> Mihari::Alert
   end
 end

data/sig/lib/mihari/structs/alert.rbs

@@ -0,0 +1,27 @@
+module Mihari
+  module Structs
+    module Alert
+      class SearchFilter
+        attr_reader artifact_data: String?
+        attr_reader description: String?
+        attr_reader source: String?
+        attr_reader tag_name: String?
+        attr_reader title: String?
+        attr_reader from_at: DateTime?
+        attr_reader to_at: DateTime?
+        attr_reader asn: Integer?
+        attr_reader dns_record: String?
+        attr_reader reverse_dns_name: String?
+
+        def has_valid_artifact_filters: () -> bool
+      end
+
+      class SearchFilterWithPagination
+        attr_reader page: Integer
+        attr_reader limit: Integer
+
+        def without_pagination: () -> Mihari::Structs::Alert::SearchFilter
+      end
+    end
+  end
+end

data/sig/lib/mihari/web/app.rbs

@@ -1,5 +1,5 @@
 module Mihari
-  class App # < Sinatra::Base
-    def self.run!: (?port: ::Integer port, ?host: ::String host) -> void
+  class App
+    def self.run!: (?port: ::Integer port, ?host: ::String host, ?threads: ::String threads, ?verbose: bool verbose) -> void
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mihari
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 3.9.2
 platform: ruby
 authors:
 - Manabu Niseki
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-18 00:00:00.000000000 Z
+date: 2021-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -234,20 +234,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.14'
-- !ruby/object:Gem::Dependency
-  name: active_model_serializers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -430,6 +416,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
+- !ruby/object:Gem::Dependency
+  name: dry-container
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: dry-files
   requirement: !ruby/object:Gem::Requirement
@@ -500,6 +500,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: grape
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: grape-entity
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: grape-swagger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: grape-swagger-entity
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: hachi
   requirement: !ruby/object:Gem::Requirement
@@ -646,14 +702,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.20'
+        version: '1.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.20'
+        version: '1.21'
 - !ruby/object:Gem::Dependency
   name: passive_circl
   requirement: !ruby/object:Gem::Requirement
@@ -682,6 +738,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: plissken
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: public_suffix
   requirement: !ruby/object:Gem::Requirement
@@ -716,14 +786,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '5.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '5.5'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -753,7 +823,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: safe_shell
+  name: rack-cors
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -767,75 +837,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: securitytrails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: shodanx
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: sinatra
+  name: safe_shell
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: sinatra-contrib
+  name: securitytrails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: sinatra-param
+  name: shodanx
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: slack-notifier
   requirement: !ruby/object:Gem::Requirement
@@ -1112,15 +1154,8 @@ files:
 - lib/mihari/schemas/configuration.rb
 - lib/mihari/schemas/macros.rb
 - lib/mihari/schemas/rule.rb
-- lib/mihari/serializers/alert.rb
-- lib/mihari/serializers/artifact.rb
-- lib/mihari/serializers/autonomous_system.rb
-- lib/mihari/serializers/dns.rb
-- lib/mihari/serializers/geolocation.rb
-- lib/mihari/serializers/reverse_dns.rb
-- lib/mihari/serializers/tag.rb
-- lib/mihari/serializers/whois.rb
 - lib/mihari/status.rb
+- lib/mihari/structs/alert.rb
 - lib/mihari/structs/censys.rb
 - lib/mihari/structs/ipinfo.rb
 - lib/mihari/structs/onyphe.rb
@@ -1130,17 +1165,29 @@ files:
 - lib/mihari/type_checker.rb
 - lib/mihari/types.rb
 - lib/mihari/version.rb
+- lib/mihari/web/api.rb
 - lib/mihari/web/app.rb
-- lib/mihari/web/controllers/alerts_controller.rb
-- lib/mihari/web/controllers/analyzers_controller.rb
-- lib/mihari/web/controllers/artifacts_controller.rb
-- lib/mihari/web/controllers/base_controller.rb
-- lib/mihari/web/controllers/command_controller.rb
-- lib/mihari/web/controllers/config_controller.rb
-- lib/mihari/web/controllers/ip_address_controller.rb
-- lib/mihari/web/controllers/sources_controller.rb
-- lib/mihari/web/controllers/tags_controller.rb
-- lib/mihari/web/helpers/json.rb
+- lib/mihari/web/endpoints/alerts.rb
+- lib/mihari/web/endpoints/artifacts.rb
+- lib/mihari/web/endpoints/command.rb
+- lib/mihari/web/endpoints/configs.rb
+- lib/mihari/web/endpoints/ip_addresses.rb
+- lib/mihari/web/endpoints/sources.rb
+- lib/mihari/web/endpoints/tags.rb
+- lib/mihari/web/entities/alert.rb
+- lib/mihari/web/entities/artifact.rb
+- lib/mihari/web/entities/autonomous_system.rb
+- lib/mihari/web/entities/command.rb
+- lib/mihari/web/entities/config.rb
+- lib/mihari/web/entities/dns.rb
+- lib/mihari/web/entities/geolocation.rb
+- lib/mihari/web/entities/ip_address.rb
+- lib/mihari/web/entities/message.rb
+- lib/mihari/web/entities/reverse_dns.rb
+- lib/mihari/web/entities/source.rb
+- lib/mihari/web/entities/tag.rb
+- lib/mihari/web/entities/whois.rb
+- lib/mihari/web/public/grape.rb
 - lib/mihari/web/public/index.html
 - lib/mihari/web/public/redoc-static.html
 - lib/mihari/web/public/static/favicon.ico
@@ -1176,10 +1223,18 @@ files:
 - lib/mihari/web/public/static/img/fa-solid-900.37bc7099.svg
 - lib/mihari/web/public/static/js/app.06d5cf1c.js
 - lib/mihari/web/public/static/js/app.06d5cf1c.js.map
+- lib/mihari/web/public/static/js/app.14008741.js
+- lib/mihari/web/public/static/js/app.14008741.js.map
 - lib/mihari/web/public/static/js/app.365f1907.js
 - lib/mihari/web/public/static/js/app.365f1907.js.map
+- lib/mihari/web/public/static/js/app.378da3dc.js
+- lib/mihari/web/public/static/js/app.378da3dc.js.map
+- lib/mihari/web/public/static/js/app.6b636b62.js
+- lib/mihari/web/public/static/js/app.6b636b62.js.map
 - lib/mihari/web/public/static/js/app.8e3e5150.js
 - lib/mihari/web/public/static/js/app.8e3e5150.js.map
+- lib/mihari/web/public/static/js/app.a862ebca.js
+- lib/mihari/web/public/static/js/app.a862ebca.js.map
 - lib/mihari/web/public/static/js/app.ab213f7c.js
 - lib/mihari/web/public/static/js/app.ab213f7c.js.map
 - lib/mihari/web/public/static/js/app.b5914c39.js
@@ -1269,6 +1324,7 @@ files:
 - sig/lib/mihari/notifiers/exception_notifier.rbs
 - sig/lib/mihari/notifiers/slack.rbs
 - sig/lib/mihari/status.rbs
+- sig/lib/mihari/structs/alert.rbs
 - sig/lib/mihari/structs/censys.rbs
 - sig/lib/mihari/structs/ipinfo.rbs
 - sig/lib/mihari/structs/onyphe.rbs

data/lib/mihari/serializers/alert.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require "active_model_serializers"
-
-module Mihari
-  module Serializers
-    class AlertSerializer < ActiveModel::Serializer
-      attributes :id, :title, :description, :source, :created_at
-
-      has_many :artifacts, serializer: ArtifactSerializer
-      has_many :tags, through: :taggings, serializer: TagSerializer
-    end
-  end
-end

data/lib/mihari/serializers/artifact.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-require "active_model_serializers"
-
-module Mihari
-  module Serializers
-    class ArtifactSerializer < ActiveModel::Serializer
-      attributes :id, :data, :data_type, :source
-
-      has_one :autonomous_system, serializer: AutonomousSystemSerializer
-      has_one :geolocation, serializer: GeolocationSerializer
-      has_one :whois_record, serializer: WhoisRecordSerializer
-
-      has_many :dns_records, serializer: DnsRecordSerializer
-      has_many :reverse_dns_names, serializer: ReverseDnsNameSerializer
-    end
-  end
-end

data/lib/mihari/serializers/autonomous_system.rb

@@ -1,9 +0,0 @@
-require "active_model_serializers"
-
-module Mihari
-  module Serializers
-    class AutonomousSystemSerializer < ActiveModel::Serializer
-      attributes :asn
-    end
-  end
-end

data/lib/mihari/serializers/dns.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require "active_model_serializers"
-
-module Mihari
-  module Serializers
-    class DnsRecordSerializer < ActiveModel::Serializer
-      attributes :resource, :value
-    end
-  end
-end

data/lib/mihari/serializers/geolocation.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require "active_model_serializers"
-
-module Mihari
-  module Serializers
-    class GeolocationSerializer < ActiveModel::Serializer
-      attributes :country, :country_code
-    end
-  end
-end

data/lib/mihari/serializers/reverse_dns.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require "active_model_serializers"
-
-module Mihari
-  module Serializers
-    class ReverseDnsNameSerializer < ActiveModel::Serializer
-      attributes :name
-    end
-  end
-end

data/lib/mihari/serializers/tag.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require "active_model_serializers"
-
-module Mihari
-  module Serializers
-    class TagSerializer < ActiveModel::Serializer
-      attributes :id, :name
-    end
-  end
-end

data/lib/mihari/serializers/whois.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require "active_model_serializers"
-
-module Mihari
-  module Serializers
-    class WhoisRecordSerializer < ActiveModel::Serializer
-      attributes :domain, :created_on, :updated_on, :expires_on, :registrar, :contacts
-    end
-  end
-end