mihari 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea3de689646f7be03616ac03315aeca9afb34ba16737ad0f706b508374bdd214
-  data.tar.gz: cbd5e02b4e8466c195e8311a4d50668763a3d8b40aefd0ab4a7478979b4725c0
+  metadata.gz: 388f48a9001d38fd83f4a6d527d7c5826a490be1d339596d174a9f619a78cb0c
+  data.tar.gz: 7e0a6e2fcbe9ad1792c21472b8be7706a86b09fbbce951edb1829a76493aaedc
 SHA512:
-  metadata.gz: 388d1f90bd35a7819418d230703b6d20fe9b8118d64cbd90fea3802b1c80d04337ee8507d26bc4de57e13867f51593be820416eedea52984392ef9e203783707
-  data.tar.gz: f3c48426a7bc6c4334870d9de1fc57085094f783e8e1c6aca3ac043b9f42ff738b79457bb9cf93edeecb8d6b9976c3fe4cd5e70a0bdb306c71f767fa20c333c8
+  metadata.gz: dfcde6c4fa80ae12c56606157c6800c7e321cef71ed3e4aa9250805ea51126c74a19b3f73040630d169966fb17d834d8c45b37cc6f7baa808d7eea3e7c585fb9
+  data.tar.gz: d477cdcc4b4075e7671263f32ed5e81daad42e499eded5dffcecfba2d7568b779e99010a64a271a652db3f928800506cb6a4c7cf4060816742d4bb8d5bbec86a

data/lib/mihari.rb

@@ -78,6 +78,7 @@ require "mihari/emitters/misp"
 require "mihari/emitters/slack"
 require "mihari/emitters/stdout"
 require "mihari/emitters/the_hive"
+require "mihari/emitters/webhook"
 
 require "mihari/status"
 

data/lib/mihari/config.rb

@@ -4,7 +4,7 @@ require "yaml"
 
 module Mihari
   class Config
-    attr_accessor :binaryedge_api_key, :censys_id, :censys_secret, :circl_passive_password, :circl_passive_username, :misp_api_endpoint, :misp_api_key, :onyphe_api_key, :otx_api_key, :passivetotal_api_key, :passivetotal_username, :pulsedive_api_key, :securitytrails_api_key, :shodan_api_key, :slack_channel, :slack_webhook_url, :spyse_api_key, :thehive_api_endpoint, :thehive_api_key, :urlscan_api_key, :virustotal_api_key, :zoomeye_api_key, :database
+    attr_accessor :binaryedge_api_key, :censys_id, :censys_secret, :circl_passive_password, :circl_passive_username, :misp_api_endpoint, :misp_api_key, :onyphe_api_key, :otx_api_key, :passivetotal_api_key, :passivetotal_username, :pulsedive_api_key, :securitytrails_api_key, :shodan_api_key, :slack_channel, :slack_webhook_url, :spyse_api_key, :thehive_api_endpoint, :thehive_api_key, :urlscan_api_key, :virustotal_api_key, :zoomeye_api_key, :webhook_url, :webhook_use_json_body, :database
 
     def initialize
       load_from_env
@@ -33,6 +33,8 @@ module Mihari
       @urlscan_api_key = ENV["URLSCAN_API_KEY"]
       @virustotal_api_key = ENV["VIRUSTOTAL_API_KEY"]
       @zoomeye_api_key = ENV["ZOOMEYE_API_KEY"]
+      @webhook_url = ENV["WEBHOOK_URL"]
+      @webhook_use_json_body = ENV["WEBHOOK_USE_JSON_BODY"]
 
       @database = ENV["DATABASE"] || "mihari.db"
     end

data/lib/mihari/emitters/slack.rb

@@ -2,9 +2,6 @@
 
 require "slack-notifier"
 require "digest/sha2"
-require "mem"
-
-require "mihari/slack_monkeypatch"
 
 module Mihari
   module Emitters

data/lib/mihari/emitters/webhook.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require "json"
+require "net/http"
+require "uri"
+
+module Mihari
+  module Emitters
+    class Webhook < Base
+      # @return [true, false]
+      def valid?
+        webhook_url?
+      end
+
+      def emit(title:, description:, artifacts:, source:, tags:)
+        return if artifacts.empty?
+
+        uri = URI(Mihari.config.webhook_url)
+        data = {
+          title: title,
+          description: description,
+          artifacts: artifacts.map(&:data),
+          source: source,
+          tags: tags
+        }
+
+        if use_json_body
+          Net::HTTP.post(uri, data.to_json, "Content-Type" => "application/json")
+        else
+          Net::HTTP.post_form(uri, data)
+        end
+      end
+
+      private
+
+      def config_keys
+        %w[webhook_url]
+      end
+
+      def webhook_url
+        @webhook_url ||= Mihari.config.webhook_url
+      end
+
+      def webhook_url?
+        !webhook_url.nil?
+      end
+
+      def use_json_body
+        @use_json_body ||= truthy?(Mihari.config.webhook_use_json_body || 'false')
+      end
+
+      def truthy?(value)
+        return true if value == "true"
+        return true if value == true
+
+        false
+      end
+    end
+  end
+end

data/lib/mihari/notifiers/slack.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "slack-notifier"
-require "mihari/slack_monkeypatch"
 
 module Mihari
   module Notifiers

data/lib/mihari/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mihari
-  VERSION = "2.3.1"
+  VERSION = "2.4.0"
 end

data/mihari.gemspec

@@ -25,14 +25,14 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 2.2"
   spec.add_development_dependency "coveralls", "~> 0.8"
-  spec.add_development_dependency "execjs", "~> 2.7"
+  spec.add_development_dependency "execjs", "~> 2.8"
   spec.add_development_dependency "fakefs", "~> 1.3"
   spec.add_development_dependency "mysql2", "~> 0.5"
   spec.add_development_dependency "pg", "~> 1.2"
   spec.add_development_dependency "rack-test", "~> 1.1"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.10"
-  spec.add_development_dependency "standard", "~> 1.0"
+  spec.add_development_dependency "standard", "~> 1.1"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "vcr", "~> 6.0"
   spec.add_development_dependency "webmock", "~> 3.12"
@@ -62,7 +62,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "passivetotalx", "~> 0.1"
   spec.add_dependency "public_suffix", "~> 4.0"
   spec.add_dependency "pulsedive", "~> 0.1"
-  spec.add_dependency "puma", "~> 5.2"
+  spec.add_dependency "puma", "~> 5.3"
   spec.add_dependency "rack", "~> 2.2"
   spec.add_dependency "rack-contrib", "~> 2.3"
   spec.add_dependency "safe_shell", "~> 1.1"
@@ -71,7 +71,7 @@ Gem::Specification.new do |spec|
   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.3"
+  spec.add_dependency "slack-notifier", "~> 2.4"
   spec.add_dependency "spysex", "~> 0.1"
   spec.add_dependency "sqlite3", "~> 1.4"
   spec.add_dependency "thor", "~> 1.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mihari
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Manabu Niseki
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-04 00:00:00.000000000 Z
+date: 2021-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -548,14 +548,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -674,14 +674,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: spysex
   requirement: !ruby/object:Gem::Requirement
@@ -876,6 +876,7 @@ files:
 - lib/mihari/emitters/slack.rb
 - lib/mihari/emitters/stdout.rb
 - lib/mihari/emitters/the_hive.rb
+- lib/mihari/emitters/webhook.rb
 - lib/mihari/errors.rb
 - lib/mihari/html.rb
 - lib/mihari/models/alert.rb
@@ -889,7 +890,6 @@ files:
 - lib/mihari/serializers/alert.rb
 - lib/mihari/serializers/artifact.rb
 - lib/mihari/serializers/tag.rb
-- lib/mihari/slack_monkeypatch.rb
 - lib/mihari/status.rb
 - lib/mihari/type_checker.rb
 - lib/mihari/version.rb

data/lib/mihari/slack_monkeypatch.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Slack
-  class Notifier
-    module Util
-      class LinkFormatter
-        class << self
-          def format(string, opts = {})
-            # Resolve warning in Ruby 2.7
-            LinkFormatter.new(string, **opts).formatted
-          end
-        end
-      end
-    end
-  end
-end