mihari 4.7.1 → 4.7.2

data/lib/mihari.rb

@@ -59,7 +59,6 @@ require "mihari/mixins/disallowed_data_value"
 require "mihari/mixins/error_notification"
 require "mihari/mixins/refang"
 require "mihari/mixins/retriable"
-require "mihari/mixins/rule"
 
 def truthy?(value)
   return true if value == "true"
@@ -171,8 +170,8 @@ require "mihari/constants"
 require "mihari/types"
 
 # Structs
-require "mihari/structs/alert"
 require "mihari/structs/censys"
+require "mihari/structs/filters"
 require "mihari/structs/google_public_dns"
 require "mihari/structs/greynoise"
 require "mihari/structs/ipinfo"

data/mihari.gemspec

@@ -29,11 +29,11 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 2.3"
   spec.add_development_dependency "coveralls_reborn", "~> 0.24"
-  spec.add_development_dependency "fakefs", "~> 1.5"
+  spec.add_development_dependency "fakefs", "~> 1.8"
   spec.add_development_dependency "mysql2", "~> 0.5"
   spec.add_development_dependency "overcommit", "~> 0.59"
-  spec.add_development_dependency "pg", "~> 1.3"
-  spec.add_development_dependency "rack-test", "~> 1.1"
+  spec.add_development_dependency "pg", "~> 1.4"
+  spec.add_development_dependency "rack-test", "~> 2.0"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rb-fsevent", "~> 0.11"
   spec.add_development_dependency "rerun", "~> 0.13"
@@ -58,7 +58,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "dry-container", "0.9.0"
   spec.add_dependency "dry-files", "0.1.0"
   spec.add_dependency "dry-initializer", "3.1.1"
-  spec.add_dependency "dry-schema", "1.9.2"
+  spec.add_dependency "dry-schema", "1.9.3"
   spec.add_dependency "dry-struct", "1.4.0"
   spec.add_dependency "dry-validation", "1.8.1"
   spec.add_dependency "email_address", "0.2.3"

data/sig/lib/mihari/cli/base.rbs

@@ -3,8 +3,6 @@ module Mihari
     class Base
       include Mihari::Mixins::Hash
 
-      include Mihari::CLI::Mixins::Utils
-
       def self.exit_on_failure?: () -> ::TrueClass
     end
   end

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

@@ -7,12 +7,12 @@ module Mihari
     attr_accessor artifacts(): Array[Mihari::Artifact]
     attr_accessor Tags(): Array[Mihari::Tag]
 
-    def self.search: (Mihari::Structs::Alert::SearchFilterWithPagination filter) -> Array[Mihari::Alert]
+    def self.search: (Mihari::Structs::Filters::Alert::SearchFilterWithPagination filter) -> Array[Mihari::Alert]
 
-    def self.count: (Mihari::Structs::Alert::SearchFilter filter) -> Integer
+    def self.count: (Mihari::Structs::Filters::Alert::SearchFilter filter) -> Integer
 
     private
 
-    def self.build_relation: (Mihari::Structs::Alert::SearchFilter filter) -> Mihari::Alert
+    def self.build_relation: (Mihari::Structs::Filters::Alert::SearchFilter filter) -> Mihari::Alert
   end
 end

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

@@ -10,8 +10,8 @@ module Mihari
 
     def to_h: () -> Hash
 
-    def self.search: (Mihari::Structs::Rule::SearchFilterWithPagination filter) -> Array[Mihari::Rule]
+    def self.search: (Mihari::Structs::Filters::Rule::SearchFilterWithPagination filter) -> Array[Mihari::Rule]
 
-    def self.count: (Mihari::Structs::Rule::SearchFilter filter) -> Integer
+    def self.count: (Mihari::Structs::Filters::Rule::SearchFilter filter) -> Integer
   end
 end

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

@@ -0,0 +1,40 @@
+module Mihari
+  module Structs
+    module Filters
+      module Alert
+        class SearchFilter < Dry::Struct
+          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 valid_artifact_filters?: () -> bool
+        end
+
+        class SearchFilterWithPagination < SearchFilter
+          def without_pagination: () ->  Mihari::Structs::Filters::Alert::SearchFilter
+        end
+      end
+
+      module Rule
+        class SearchFilter < Dry::Struct
+          attr_reader page: Integer?
+          attr_reader tag: String?
+          attr_reader source: String?
+          attr_reader from_at: DateTime?
+          attr_reader to_at: DateTime?
+        end
+
+        class SearchFilterWithPagination < SearchFilter
+          def without_pagination: () ->  Mihari::Structs::Filters::Rule::SearchFilter
+        end
+      end
+    end
+  end
+end

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

@@ -4,8 +4,8 @@ module Mihari
       class Response
         attr_reader ip: String
         attr_reader hostname: String?
-        attr_reader loc: String
-        attr_reader country_code: String
+        attr_reader loc: String?
+        attr_reader country_code: String?
         attr_reader asn: Integer?
 
         def self.from_dynamic!: (Hash[(String | Symbol), untyped] d) -> Mihari::Structs::IPInfo::Response

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

@@ -1,64 +1,57 @@
 module Mihari
   module Structs
-    module Rule
-      class SearchFilter < Dry::Struct
-      end
+    class Rule
+      attr_reader data: Hash
 
-      class SearchFilterWithPagination < SearchFilter
-        def without_pagination: () -> SearchFilter
-      end
+      attr_reader yaml: String
 
-      class Rule
-        attr_reader data: Hash
+      attr_reader errors: Array[untypes]?
 
-        attr_reader yaml: String
+      def initialize: (Hash data) -> void
 
-        attr_reader errors: Array[untypes]?
+      #
+      # @return [Boolean]
+      #
+      def errors?: () -> (bool)
 
-        def initialize: (Hash data) -> void
+      #
+      # @return [Array[String]]
+      #
+      def error_messages: () -> (Array[String])
 
-        #
-        # @return [Boolean]
-        #
-        def errors?: () -> (bool)
+      def validate: () -> void
 
-        #
-        # @return [Array[String]]
-        #
-        def error_messages: () -> (Array[String])
+      def validate!: () -> void
 
-        def validate: () -> void
+      def []: (untyped key) -> untyped
 
-        def validate!: () -> void
+      #
+      # @return [String]
+      #
+      def id: () -> String
 
-        def []: (untyped key) -> untyped
+      #
+      # @return [String]
+      #
+      def title: () -> String
 
-        #
-        # @return [String]
-        #
-        def id: () -> String
+      #
+      # @return [String]
+      #
+      def description: () -> String
 
-        #
-        # @return [String]
-        #
-        def title: () -> String
+      #
+      # @return [Mihari::Rule]
+      #
+      def to_model: () -> Mihari::Rule
 
-        #
-        # @return [String]
-        #
-        def description: () -> String
+      def to_analyzer: () -> Mihari::Analyzers::Rule
 
-        #
-        # @return [Mihari::Rule]
-        #
-        def to_model: () -> Mihari::Rule
+      def self.from_model: (Mihari::Rule model) -> Mihari::Structs::Rule
 
-        def to_analyzer: () -> Mihari::Analyzers::Rule
+      def self.from_yaml: (String yaml) -> Mihari::Structs::Rule
 
-        def self.from_model: (Mihari::Rule model) -> Mihari::Structs::Rule::Rule
-
-        def self.from_yaml: (String yaml) -> Mihari::Structs::Rule::Rule
-      end
+      def self.from_path_or_id: (String path_or_id) -> Mihari::Structs::Rule
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mihari
 version: !ruby/object:Gem::Version
-  version: 4.7.1
+  version: 4.7.2
 platform: ruby
 authors:
 - Manabu Niseki
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-18 00:00:00.000000000 Z
+date: 2022-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -436,14 +436,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: 1.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: 1.9.3
 - !ruby/object:Gem::Dependency
   name: dry-struct
   requirement: !ruby/object:Gem::Requirement
@@ -1127,7 +1127,6 @@ files:
 - lib/mihari/mixins/error_notification.rb
 - lib/mihari/mixins/refang.rb
 - lib/mihari/mixins/retriable.rb
-- lib/mihari/mixins/rule.rb
 - lib/mihari/models/alert.rb
 - lib/mihari/models/artifact.rb
 - lib/mihari/models/autonomous_system.rb
@@ -1146,8 +1145,8 @@ files:
 - lib/mihari/schemas/macros.rb
 - lib/mihari/schemas/rule.rb
 - lib/mihari/status.rb
-- lib/mihari/structs/alert.rb
 - lib/mihari/structs/censys.rb
+- lib/mihari/structs/filters.rb
 - lib/mihari/structs/google_public_dns.rb
 - lib/mihari/structs/greynoise.rb
 - lib/mihari/structs/ipinfo.rb
@@ -1174,7 +1173,7 @@ files:
 - lib/mihari/web/public/index.html
 - lib/mihari/web/public/redoc-static.html
 - lib/mihari/web/public/static/css/app.2a5d3d21.css
-- lib/mihari/web/public/static/css/chunk-vendors.06251949.css
+- lib/mihari/web/public/static/css/chunk-vendors.5013d549.css
 - lib/mihari/web/public/static/favicon.ico
 - lib/mihari/web/public/static/fonts/fa-brands-400.7fa789ab.ttf
 - lib/mihari/web/public/static/fonts/fa-brands-400.859fc388.woff2
@@ -1183,14 +1182,10 @@ files:
 - lib/mihari/web/public/static/fonts/fa-solid-900.3a463ec3.ttf
 - lib/mihari/web/public/static/fonts/fa-solid-900.40ddefd7.woff2
 - lib/mihari/web/public/static/fonts/fa-v4compatibility.924588dc.ttf
-- lib/mihari/web/public/static/js/app-legacy.9d5c9c3d.js
-- lib/mihari/web/public/static/js/app-legacy.9d5c9c3d.js.map
-- lib/mihari/web/public/static/js/app.823b5af7.js
-- lib/mihari/web/public/static/js/app.823b5af7.js.map
-- lib/mihari/web/public/static/js/chunk-vendors-legacy.b110c129.js
-- lib/mihari/web/public/static/js/chunk-vendors-legacy.b110c129.js.map
-- lib/mihari/web/public/static/js/chunk-vendors.dde2116c.js
-- lib/mihari/web/public/static/js/chunk-vendors.dde2116c.js.map
+- lib/mihari/web/public/static/js/app.3ac3bd7a.js
+- lib/mihari/web/public/static/js/app.3ac3bd7a.js.map
+- lib/mihari/web/public/static/js/chunk-vendors.37b7208e.js
+- lib/mihari/web/public/static/js/chunk-vendors.37b7208e.js.map
 - mihari.gemspec
 - renovate.json
 - sig/lib/mihari.rbs
@@ -1248,7 +1243,6 @@ files:
 - sig/lib/mihari/mixins/hash.rbs
 - sig/lib/mihari/mixins/refang.rbs
 - sig/lib/mihari/mixins/retriable.rbs
-- sig/lib/mihari/mixins/rule.rbs
 - sig/lib/mihari/models/alert.rbs
 - sig/lib/mihari/models/artifact.rbs
 - sig/lib/mihari/models/autonomous_system.rbs
@@ -1262,8 +1256,8 @@ files:
 - sig/lib/mihari/models/tagging.rbs
 - sig/lib/mihari/models/whois.rbs
 - sig/lib/mihari/status.rbs
-- sig/lib/mihari/structs/alert.rbs
 - sig/lib/mihari/structs/censys.rbs
+- sig/lib/mihari/structs/filters.rbs
 - sig/lib/mihari/structs/google_public_dns.rbs
 - sig/lib/mihari/structs/greynoise.rbs
 - sig/lib/mihari/structs/ipinfo.rbs

data/lib/mihari/mixins/rule.rb

@@ -1,84 +0,0 @@
-# frozen_string_literal: true
-
-require "date"
-require "erb"
-require "pathname"
-
-module Mihari
-  module Mixins
-    module Rule
-      include Mixins::Database
-
-      def load_erb_yaml(yaml)
-        YAML.safe_load(ERB.new(yaml).result, permitted_classes: [Date], symbolize_names: true)
-      end
-
-      #
-      # Load rule into hash
-      #
-      # @param [String] path_or_id Path to YAML file or YAML string or ID of a rule in the database
-      #
-      # @return [Mihari::Structs::Rule::Rule]
-      #
-      def load_rule(path_or_id)
-        yaml = nil
-
-        yaml = load_yaml_from_file(path_or_id) if File.exist?(path_or_id)
-        yaml = load_yaml_from_db(path_or_id) if yaml.nil?
-
-        Structs::Rule::Rule.from_yaml yaml
-      end
-
-      def load_yaml_from_file(path)
-        return nil unless Pathname(path).exist?
-
-        File.read path
-      end
-
-      def load_yaml_from_db(id)
-        with_db_connection do
-          rule = Mihari::Rule.find(id)
-          rule.yaml || rule.symbolized_data.to_yaml
-        rescue ActiveRecord::RecordNotFound
-          raise ArgumentError, "ID:#{id} is not found in the database"
-        end
-      end
-
-      #
-      # Validate a rule
-      #
-      # @param [Mihari::Structs::Rule::Rule] rule
-      #
-      def validate_rule!(rule)
-        rule.validate!
-      rescue RuleValidationError => e
-        Mihari.logger.error "Failed to parse the input as a rule"
-        raise e
-      end
-
-      #
-      # Returns a template for rule
-      #
-      # @return [String] A template for rule
-      #
-      def rule_template
-        yaml = File.read(File.expand_path("../templates/rule.yml.erb", __dir__))
-        Structs::Rule::Rule.from_yaml yaml
-        yaml
-      end
-
-      #
-      # Create (blank) rule file
-      #
-      # @param [String] filename
-      # @param [Dry::Files] files
-      # @param [String] template
-      #
-      # @return [nil]
-      #
-      def initialize_rule_yaml(filename, files = Dry::Files.new, template: rule_template)
-        files.write(filename, template)
-      end
-    end
-  end
-end

data/lib/mihari/structs/alert.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-module Mihari
-  module Structs
-    module Alert
-      class SearchFilter < Dry::Struct
-        attribute? :artifact_data, Types::String.optional
-        attribute? :description, Types::String.optional
-        attribute? :source, Types::String.optional
-        attribute? :tag_name, Types::String.optional
-        attribute? :title, Types::String.optional
-        attribute? :from_at, Types::DateTime.optional
-        attribute? :to_at, Types::DateTime.optional
-        attribute? :asn, Types::Int.optional
-        attribute? :dns_record, Types::String.optional
-        attribute? :reverse_dns_name, Types::String.optional
-
-        def valid_artifact_filters?
-          !(artifact_data || asn || dns_record || reverse_dns_name).nil?
-        end
-      end
-
-      class SearchFilterWithPagination < SearchFilter
-        attribute? :page, Types::Int.default(1)
-        attribute? :limit, Types::Int.default(10)
-
-        def without_pagination
-          SearchFilter.new(
-            artifact_data: artifact_data,
-            description: description,
-            from_at: from_at,
-            source: source,
-            tag_name: tag_name,
-            title: title,
-            to_at: to_at,
-            asn: asn,
-            dns_record: dns_record,
-            reverse_dns_name: reverse_dns_name
-          )
-        end
-      end
-    end
-  end
-end