mihari 5.4.6 → 5.4.8

data/frontend/package.json

@@ -17,9 +17,9 @@
     "@fortawesome/fontawesome-svg-core": "^6.4.2",
     "@fortawesome/free-solid-svg-icons": "^6.4.2",
     "@fortawesome/vue-fontawesome": "^3.0.3",
-    "@vueuse/core": "^10.4.1",
-    "@vueuse/router": "^10.4.1",
-    "ace-builds": "^1.28.0",
+    "@vueuse/core": "^10.5.0",
+    "@vueuse/router": "^10.5.0",
+    "ace-builds": "^1.29.0",
     "axios": "^1.5.1",
     "bulma": "^0.9.4",
     "bulma-helpers": "^0.4.3",
@@ -38,21 +38,21 @@
   },
   "devDependencies": {
     "@redocly/cli": "1.2.0",
-    "@rushstack/eslint-patch": "^1.5.0",
+    "@rushstack/eslint-patch": "^1.5.1",
     "@tsconfig/node20": "^20.1.2",
     "@types/jsdom": "^21.1.3",
-    "@types/node": "^20.7.2",
+    "@types/node": "^20.8.5",
     "@types/url-parse": "^1.4.9",
-    "@typescript-eslint/eslint-plugin": "^6.7.3",
-    "@typescript-eslint/parser": "^6.7.3",
-    "@vitejs/plugin-vue": "^4.3.4",
+    "@typescript-eslint/eslint-plugin": "^6.7.5",
+    "@typescript-eslint/parser": "^6.7.5",
+    "@vitejs/plugin-vue": "^4.4.0",
     "@vue/eslint-config-prettier": "^8.0.0",
     "@vue/eslint-config-typescript": "^12.0.0",
     "@vue/test-utils": "2.4.1",
     "@vue/tsconfig": "^0.4.0",
-    "eslint": "^8.50.0",
+    "eslint": "^8.51.0",
     "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-prettier": "^5.0.1",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "eslint-plugin-vue": "^9.17.0",
     "husky": "^8.0.3",
@@ -60,8 +60,8 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^3.0.3",
     "typescript": "~5.2.2",
-    "vite": "^4.4.9",
+    "vite": "^4.4.11",
     "vitest": "^0.34.6",
-    "vue-tsc": "^1.8.15"
+    "vue-tsc": "^1.8.19"
   }
 }

data/lib/mihari/analyzers/base.rb

@@ -61,6 +61,13 @@ module Mihari
         Mihari.config.ignore_error
       end
 
+      #
+      # @return [Integer, nil]
+      #
+      def timeout
+        options[:timeout]
+      end
+
       # @return [Array<String>, Array<Mihari::Artifact>]
       def artifacts
         raise NotImplementedError, "You must implement #{self.class}##{__method__}"
@@ -97,7 +104,7 @@ module Mihari
         self.class.to_s.split("::").last
       end
 
-      alias_method :source, :class_name
+      alias source class_name
 
       class << self
         #

data/lib/mihari/analyzers/binaryedge.rb

@@ -32,7 +32,7 @@ module Mihari
       # @return [Mihari::Clients::BinaryEdge]
       #
       def client
-        @client ||= Clients::BinaryEdge.new(api_key: api_key, interval: interval)
+        @client ||= Clients::BinaryEdge.new(api_key: api_key, interval: interval, timeout: timeout)
       end
     end
   end

data/lib/mihari/analyzers/censys.rb

@@ -52,7 +52,7 @@ module Mihari
       # @return [Mihari::Clients::Censys]
       #
       def client
-        @client ||= Clients::Censys.new(id: id, secret: secret, interval: interval)
+        @client ||= Clients::Censys.new(id: id, secret: secret, interval: interval, timeout: timeout)
       end
 
       #

data/lib/mihari/analyzers/feed.rb

@@ -59,6 +59,7 @@ module Mihari
           query,
           method: method,
           headers: headers,
+          timeout: timeout,
           params: params,
           json: json,
           data: data

data/lib/mihari/analyzers/greynoise.rb

@@ -31,7 +31,7 @@ module Mihari
       private
 
       def client
-        @client ||= Clients::GreyNoise.new(api_key: api_key, interval: interval)
+        @client ||= Clients::GreyNoise.new(api_key: api_key, interval: interval, timeout: timeout)
       end
     end
   end

data/lib/mihari/analyzers/hunterhow.rb

@@ -46,7 +46,7 @@ module Mihari
       private
 
       def client
-        @client ||= Clients::HunterHow.new(api_key: api_key, interval: interval)
+        @client ||= Clients::HunterHow.new(api_key: api_key, interval: interval, timeout: timeout)
       end
     end
   end

data/lib/mihari/analyzers/onyphe.rb

@@ -33,7 +33,7 @@ module Mihari
       private
 
       def client
-        @client ||= Clients::Onyphe.new(api_key: api_key, interval: interval)
+        @client ||= Clients::Onyphe.new(api_key: api_key, interval: interval, timeout: timeout)
       end
     end
   end

data/lib/mihari/analyzers/shodan.rb

@@ -34,7 +34,7 @@ module Mihari
       # @return [Clients::Shodan]
       #
       def client
-        @client ||= Clients::Shodan.new(api_key: api_key, interval: interval)
+        @client ||= Clients::Shodan.new(api_key: api_key, interval: interval, timeout: timeout)
       end
     end
   end

data/lib/mihari/analyzers/urlscan.rb

@@ -44,7 +44,7 @@ module Mihari
       private
 
       def client
-        @client ||= Clients::UrlScan.new(api_key: api_key, interval: interval)
+        @client ||= Clients::UrlScan.new(api_key: api_key, interval: interval, timeout: timeout)
       end
 
       #

data/lib/mihari/analyzers/virustotal_intelligence.rb

@@ -33,7 +33,7 @@ module Mihari
       # @return [::VirusTotal::API]
       #
       def client
-        @client = Clients::VirusTotal.new(api_key: api_key, interval: interval)
+        @client = Clients::VirusTotal.new(api_key: api_key, interval: interval, timeout: timeout)
       end
     end
   end

data/lib/mihari/analyzers/zoomeye.rb

@@ -53,7 +53,7 @@ module Mihari
       end
 
       def client
-        @client ||= Clients::ZoomEye.new(api_key: api_key, interval: interval)
+        @client ||= Clients::ZoomEye.new(api_key: api_key, interval: interval, timeout: timeout)
       end
 
       #

data/lib/mihari/clients/base.rb

@@ -12,14 +12,20 @@ module Mihari
       # @return [Integer, nil]
       attr_reader :interval
 
+      # @return [Integer, nil]
+      attr_reader :timeout
+
       #
       # @param [String] base_url
       # @param [Hash] headers
+      # @param [Integer, nil] interval
+      # @param [Integer, nil] timeout
       #
-      def initialize(base_url, headers: {}, interval: nil)
+      def initialize(base_url, headers: {}, interval: nil, timeout: nil)
         @base_url = base_url
         @headers = headers || {}
         @interval = interval
+        @timeout = timeout
       end
 
       private
@@ -28,6 +34,13 @@ module Mihari
         sleep(interval) if interval
       end
 
+      #
+      # @return [::HTTP::Client]
+      #
+      def http
+        HTTP::Factory.build headers: headers, timeout: timeout
+      end
+
       #
       # @param [String] path
       #
@@ -41,20 +54,20 @@ module Mihari
       # @param [String] path
       # @param [Hash, nil] params
       #
-      # @return [String] <description>
+      # @return [::HTTP::Response]
       #
       def get(path, params: nil)
-        HTTP.get(url_for(path), headers: headers, params: params)
+        http.get(url_for(path), params: params)
       end
 
       #
       # @param [String] path
       # @param [Hash, nil] json
       #
-      # @return [String] <description>
+      # @return [::HTTP::Response]
       #
       def post(path, json: {})
-        HTTP.post(url_for(path), headers: headers, json: json)
+        http.post(url_for(path), json: json)
       end
     end
   end

data/lib/mihari/clients/binaryedge.rb

@@ -7,14 +7,15 @@ module Mihari
       # @param [String] base_url
       # @param [String, nil] api_key
       # @param [Hash] headers
-      # @param [Integer.nil ] interval
+      # @param [Integer, nil] interval
+      # @param [Integer, nil] timeout
       #
-      def initialize(base_url = "https://api.binaryedge.io/v2", api_key:, headers: {}, interval: nil)
+      def initialize(base_url = "https://api.binaryedge.io/v2", api_key:, headers: {}, interval: nil, timeout: nil)
         raise(ArgumentError, "'api_key' argument is required") unless api_key
 
         headers["x-key"] = api_key
 
-        super(base_url, headers: headers, interval: interval)
+        super(base_url, headers: headers, interval: interval, timeout: timeout)
       end
 
       #

data/lib/mihari/clients/censys.rb

@@ -11,14 +11,15 @@ module Mihari
       # @param [String, nil] secret
       # @param [Hash] headers
       # @param [Integer, nil] interval
+      # @param [Integer, nil] timeout
       #
-      def initialize(base_url = "https://search.censys.io", id:, secret:, headers: {}, interval: nil)
+      def initialize(base_url = "https://search.censys.io", id:, secret:, headers: {}, interval: nil, timeout: nil)
         raise(ArgumentError, "'id' argument is required") if id.nil?
         raise(ArgumentError, "'secret' argument is required") if secret.nil?
 
         headers["authorization"] = "Basic #{Base64.strict_encode64("#{id}:#{secret}")}"
 
-        super(base_url, headers: headers, interval: interval)
+        super(base_url, headers: headers, interval: interval, timeout: timeout)
       end
 
       #

data/lib/mihari/clients/greynoise.rb

@@ -10,12 +10,13 @@ module Mihari
       # @param [String, nil] api_key
       # @param [Hash] headers
       # @param [Integer, nil] interval
+      # @param [Integer, nil] timeout
       #
-      def initialize(base_url = "https://api.greynoise.io", api_key:, headers: {}, interval: nil)
+      def initialize(base_url = "https://api.greynoise.io", api_key:, headers: {}, interval: nil, timeout: nil)
         raise(ArgumentError, "'api_key' argument is required") unless api_key
 
         headers["key"] = api_key
-        super(base_url, headers: headers, interval: interval)
+        super(base_url, headers: headers, interval: interval, timeout: timeout)
       end
 
       #

data/lib/mihari/clients/hunterhow.rb

@@ -15,11 +15,12 @@ module Mihari
       # @param [String, nil] api_key
       # @param [Hash] headers
       # @param [Integer, nil] interval
+      # @param [Integer, nil] timeout
       #
-      def initialize(base_url = "https://api.hunter.how/", api_key:, headers: {}, interval: nil)
+      def initialize(base_url = "https://api.hunter.how/", api_key:, headers: {}, interval: nil, timeout: nil)
         raise(ArgumentError, "'api_key' argument is required") unless api_key
 
-        super(base_url, headers: headers, interval: interval)
+        super(base_url, headers: headers, interval: interval, timeout: timeout)
 
         @api_key = api_key
       end

data/lib/mihari/clients/onyphe.rb

@@ -12,11 +12,13 @@ module Mihari
       # @param [String] base_url
       # @param [String, nil] api_key
       # @param [Hash] headers
+      # @param [Integer, nil] interval
+      # @param [Integer, nil] timeout
       #
-      def initialize(base_url = "https://www.onyphe.io", api_key:, headers: {}, interval: nil)
+      def initialize(base_url = "https://www.onyphe.io", api_key:, headers: {}, interval: nil, timeout: nil)
         raise(ArgumentError, "'api_key' argument is required") if api_key.nil?
 
-        super(base_url, headers: headers, interval: interval)
+        super(base_url, headers: headers, interval: interval, timeout: timeout)
 
         @api_key = api_key
       end

data/lib/mihari/clients/shodan.rb

@@ -13,11 +13,12 @@ module Mihari
       # @param [String, nil] api_key
       # @param [Hash] headers
       # @param [Integer, nil] interval
+      # @param [Integer, nil] timeout
       #
-      def initialize(base_url = "https://api.shodan.io", api_key:, headers: {}, interval: nil)
+      def initialize(base_url = "https://api.shodan.io", api_key:, headers: {}, interval: nil, timeout: nil)
         raise(ArgumentError, "'api_key' argument is required") unless api_key
 
-        super(base_url, headers: headers, interval: interval)
+        super(base_url, headers: headers, interval: interval, timeout: timeout)
 
         @api_key = api_key
       end

data/lib/mihari/clients/urlscan.rb

@@ -8,13 +8,14 @@ module Mihari
       # @param [String, nil] api_key
       # @param [Hash] headers
       # @param [Interval, nil] interval
+      # @param [Interval, nil] timeout
       #
-      def initialize(base_url = "https://urlscan.io", api_key:, headers: {}, interval: nil)
+      def initialize(base_url = "https://urlscan.io", api_key:, headers: {}, interval: nil, timeout: nil)
         raise(ArgumentError, "'api_key' argument is required") if api_key.nil?
 
         headers["api-key"] = api_key
 
-        super(base_url, headers: headers, interval: interval)
+        super(base_url, headers: headers, interval: interval, timeout: timeout)
       end
 
       #

data/lib/mihari/clients/virustotal.rb

@@ -8,13 +8,14 @@ module Mihari
       # @param [String, nil] api_key
       # @param [Hash] headers
       # @param [Integer, nil] interval
+      # @param [Integer, nil] timeout
       #
-      def initialize(base_url = "https://www.virustotal.com", api_key:, headers: {}, interval: nil)
+      def initialize(base_url = "https://www.virustotal.com", api_key:, headers: {}, interval: nil, timeout: nil)
         raise(ArgumentError, "'api_key' argument is required") if api_key.nil?
 
         headers["x-apikey"] = api_key
 
-        super(base_url, headers: headers, interval: interval)
+        super(base_url, headers: headers, interval: interval, timeout: timeout)
       end
 
       #

data/lib/mihari/clients/zoomeye.rb

@@ -12,12 +12,13 @@ module Mihari
       # @param [String, nil] api_key
       # @param [Hash] headers
       # @param [Integer, nil] interval
+      # @param [Integer, nil] timeout
       #
-      def initialize(base_url = "https://api.zoomeye.org", api_key:, headers: {}, interval: nil)
+      def initialize(base_url = "https://api.zoomeye.org", api_key:, headers: {}, interval: nil, timeout: nil)
         raise(ArgumentError, "'api_key' argument is required") unless api_key
 
         headers["api-key"] = api_key
-        super(base_url, headers: headers, interval: interval)
+        super(base_url, headers: headers, interval: interval, timeout: timeout)
       end
 
       #

data/lib/mihari/config.rb

@@ -97,6 +97,10 @@ module Mihari
     attr_reader :ignore_error
 
     def initialize
+      load
+    end
+
+    def load
       @binaryedge_api_key = ENV.fetch("BINARYEDGE_API_KEY", nil)
 
       @censys_id = ENV.fetch("CENSYS_ID", nil)
@@ -153,5 +157,14 @@ module Mihari
 
       @ignore_error = ENV.fetch("IGNORE_ERROR", false)
     end
+
+    #
+    # @return [Array<String>]
+    #
+    def keys
+      instance_variables.map do |key|
+        key[1..].to_s.upcase
+      end
+    end
   end
 end

data/lib/mihari/database.rb

@@ -13,7 +13,7 @@ def development_env?
   env == "development"
 end
 
-class V5Schema < ActiveRecord::Migration[7.0]
+class V5Schema < ActiveRecord::Migration[7.1]
   def change
     create_table :rules, id: :string, if_not_exists: true do |t|
       t.string :title, null: false
@@ -162,7 +162,7 @@ module Mihari
       def close
         return unless ActiveRecord::Base.connected?
 
-        ActiveRecord::Base.clear_active_connections!
+        ActiveRecord::Base.connection_handler.clear_active_connections!
       end
 
       def with_db_connection

data/lib/mihari/emitters/webhook.rb

@@ -72,17 +72,13 @@ module Mihari
       def emit
         return if artifacts.empty?
 
-        client = Mihari::HTTP.new(url, headers: headers)
-
-        res = nil
+        # returns body to prevent Parallel issue (Parallel fails to handle HTTP:Response object)
         case method
         when "GET"
-          res = client.get
+          http.get(url).body.to_s
         when "POST"
-          res = client.post(json: payload)
+          http.post(url, json: json).body.to_s
         end
-
-        res
       end
 
       def valid?
@@ -93,12 +89,16 @@ module Mihari
 
       private
 
+      def http
+        HTTP::Factory.build headers: headers
+      end
+
       #
-      # Convert payload into string
+      # Render template
       #
       # @return [String]
       #
-      def payload_as_string
+      def rendered_template
         [].tap do |out|
           options = {}
           options[:template] = File.read(template) unless template.nil?
@@ -115,8 +115,8 @@ module Mihari
       #
       # @return [Hash]
       #
-      def payload
-        JSON.parse payload_as_string
+      def json
+        JSON.parse rendered_template
       end
     end
   end

data/lib/mihari/enrichers/google_public_dns.rb

@@ -37,7 +37,7 @@ module Mihari
         def query_by_type(name, resource_type)
           url = "https://dns.google/resolve"
           params = { name: name, type: resource_type }
-          res = HTTP.get(url, params: params)
+          res = http.get(url, params: params)
 
           data = JSON.parse(res.body.to_s)
 
@@ -45,6 +45,12 @@ module Mihari
         rescue HTTPError
           nil
         end
+
+        private
+
+        def http
+          HTTP::Factory.build
+        end
       end
     end
   end

data/lib/mihari/enrichers/ipinfo.rb

@@ -28,18 +28,25 @@ module Mihari
         # @return [Mihari::Structs::IPInfo::Response, nil]
         #
         def query(ip)
-          headers = {}
-
-          token = Mihari.config.ipinfo_api_key
-          headers[:authorization] = "Bearer #{token}" unless token.nil?
-
           url = "https://ipinfo.io/#{ip}/json"
-          res = HTTP.get(url, headers: headers)
+          res = http.get(url)
           data = JSON.parse(res.body.to_s)
 
           Structs::IPInfo::Response.from_dynamic! data
         end
         memoize :query
+
+        private
+
+        def headers
+          token = Mihari.config.ipinfo_api_key
+          authorization = token.nil? ? nil : "Bearer #{token}"
+          { authorization: authorization }.compact
+        end
+
+        def http
+          HTTP::Factory.build headers: headers
+        end
       end
     end
   end

data/lib/mihari/enrichers/shodan.rb

@@ -23,12 +23,18 @@ module Mihari
         #
         def query(ip)
           url = "https://internetdb.shodan.io/#{ip}"
-          res = HTTP.get(url)
+          res = http.get(url)
           data = JSON.parse(res.body.to_s)
 
           Structs::Shodan::InternetDBResponse.from_dynamic! data
         end
         memoize :query
+
+        private
+
+        def http
+          HTTP::Factory.build
+        end
       end
     end
   end

data/lib/mihari/errors.rb

@@ -20,8 +20,6 @@ module Mihari
 
   class TimeoutError < HTTPError; end
 
-  class SSLError < HTTPError; end
-
   class StatusCodeError < HTTPError
     # @return [Integer]
     attr_reader :status_code

data/lib/mihari/feed/reader.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "csv"
-require "insensitive_hash"
 
 module Mihari
   module Feed
@@ -24,16 +23,18 @@ module Mihari
       # @return [String]
       attr_reader :method
 
-      def initialize(url, headers: {}, method: "GET", params: nil, json: nil, data: nil)
+      # @return [Integer, nil]
+      attr_reader :timeout
+
+      def initialize(url, headers: {}, method: "GET", params: nil, json: nil, data: nil, timeout: nil)
         @url = Addressable::URI.parse(url)
-        @headers = headers.insensitive
+        @headers = headers
         @method = method
+        @timeout = timeout
 
         @params = params
         @json = json
         @data = data
-
-        headers["content-type"] = "application/json" unless json.nil?
       end
 
       #
@@ -43,14 +44,12 @@ module Mihari
         return read_file(url.path) if url.scheme == "file"
 
         res = nil
-        client = HTTP.new(url, headers: headers)
-
-        res = client.get(params: params) if method == "GET"
-        res = client.post(params: params, json: json, data: data) if method == "POST"
+        res = http.get(url, params: params) if method == "GET"
+        res = http.post(url, params: params, json: json, form: data) if method == "POST"
 
         return [] if res.nil?
 
-        body = res.body
+        body = res.body.to_s
         content_type = res["Content-Type"].to_s
         return convert_as_json(body) if content_type.include?("application/json")
 
@@ -98,6 +97,12 @@ module Mihari
 
         convert_as_csv text
       end
+
+      private
+
+      def http
+        HTTP::Factory.build headers: headers, timeout: timeout
+      end
     end
   end
 end