miteru 0.11.2 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a839c5a380dbc9678c0c56cf9e3e5b08c3fe6bde787be8564a6e011c75e98e7
-  data.tar.gz: 9ceba3911baeaf65d77e9ecf4cb442a8082ae7529b6996ec26b03350d87ae853
+  metadata.gz: 1c0d220bd3b7a0ea6ca5b394e27f2bf86ad2f11f4c7ea524226c843f430d5c4e
+  data.tar.gz: 9c295c3913fb784eb66a17341d14c89955befbb7daed8d443996f27205e1a4a2
 SHA512:
-  metadata.gz: 27239dd2ae663db07b0f21e5cf91eafd9afacaf98efa19303a56b1f2fa03d5b2a7ee25e13df356152eca8ae309508f81347db05aec0792e27377ff27915d29df
-  data.tar.gz: 64866a271d0db4832f4b40b3d8797905204d626808ce44c39c1130dd364cba389f17cceb4207e9eb5ebd10c0ca6a2cdd4129a7f969cd89252f262d44062c033a
+  metadata.gz: aa2a4d9344b6e46da84e052d09335fa20637da4bcca905bc40b23ae8422fb7d420ffff25bed3e103e4e672eba1eb6456e34eba303be883f6abeda2dcd5366c79
+  data.tar.gz: e4dc6c7bbc95ba5a7185c44f9ecc7f8ded173278e756544a1c2c4232b31b3725a12a12b73b8b1e8e74e4842943334402aab36bb8a4b13b0d41a98393c5aee92a

data/.travis.yml

@@ -3,4 +3,7 @@ language: ruby
 cache: bundler
 rvm:
   - 2.5.1
-before_install: gem install bundler -v 1.17.1
+  - 2.6.1
+before_install:
+  - gem update --system
+  - gem install bundler

data/Gemfile

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in miteru.gemspec
 gemspec

data/Rakefile

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "bundler/setup"
 require "miteru"

data/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.5
+FROM ruby:2.6
 
 RUN gem install miteru
 

data/lib/miteru.rb

@@ -7,6 +7,7 @@ require "miteru/http_client"
 require "miteru/website"
 require "miteru/downloader"
 require "miteru/feeds"
+require "miteru/notifier"
 require "miteru/crawler"
 require "miteru/cli"
 

data/lib/miteru/crawler.rb

@@ -18,12 +18,12 @@ module Miteru
       @auto_download = auto_download
       @directory_traveling = directory_traveling
       @downloader = Downloader.new(download_to)
-      @post_to_slack = post_to_slack
       @size = size
       @threads = threads
       @verbose = verbose
 
       @feeds = Feeds.new(size, directory_traveling: directory_traveling)
+      @notifier = Notifier.new(post_to_slack)
     end
 
     def execute
@@ -32,13 +32,13 @@ module Miteru
       Parallel.each(feeds.suspicious_urls, in_threads: threads) do |url|
         website = Website.new(url)
         if website.has_kit?
-          message = "#{website.url}: it might contain phishing kit(s) (#{website.compressed_files.join(', ')})."
-          puts message.colorize(:light_red)
-          post_a_message_to_slack(message) if post_to_slack? && valid_slack_setting?
           downloader.download_compressed_files(website.url, website.compressed_files) if auto_download?
+          notify(website.url, website.compressed_files)
         else
-          puts "#{website.url}: it doesn't contain a phishing kit." if verbose
+          notify(website.url, website.compressed_files) if verbose
         end
+      rescue OpenSSL::SSL::SSLError, HTTP::Error, LL::ParserError => _
+        next
       end
     end
 
@@ -54,26 +54,12 @@ module Miteru
       ).execute
     end
 
-    def post_a_message_to_slack(message)
-      webhook_url = ENV["SLACK_WEBHOOK_URL"]
-      raise ArgumentError, "Please set the Slack webhook URL via SLACK_WEBHOOK_URL env" unless webhook_url
-
-      channel = ENV["SLACK_CHANNEL"] || "#general"
-
-      payload = { text: message, channel: channel }
-      HTTPClient.post(webhook_url, json: payload)
-    end
-
-    def post_to_slack?
-      @post_to_slack
+    def notify(url, message)
+      @notifier.notify(url, message)
     end
 
     def auto_download?
       @auto_download
     end
-
-    def valid_slack_setting?
-      ENV["SLACK_WEBHOOK_URL"] != nil
-    end
   end
 end

data/lib/miteru/notifier.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require "colorize"
+require "slack/incoming/webhooks"
+
+module Miteru
+  class Notifier
+    def initialize(post_to_slack = false)
+      @post_to_slack = post_to_slack
+    end
+
+    def notify(url, compressed_files)
+      message = compressed_files.empty? ? "it doesn't contain a phishing kit." : "it might contain phishing kit(s): (#{compressed_files.join(', ')})."
+
+      if post_to_slack? && !compressed_files.empty?
+        slack = Slack::Incoming::Webhooks.new(slack_webhook_url, channel: slack_channel)
+        slack.post url, attachments: [{ text: message }]
+      end
+
+      message = message.colorize(:light_red) unless compressed_files.empty?
+      puts "#{url}: #{message}"
+    end
+
+    def post_to_slack?
+      @post_to_slack && slack_webhook_url?
+    end
+
+    def slack_webhook_url
+      ENV.fetch "SLACK_WEBHOOK_URL"
+    end
+
+    def slack_channel
+      ENV.fetch "SLACK_CHANNEL", "#general"
+    end
+
+    def slack_webhook_url?
+      ENV.key? "SLACK_WEBHOOK_URL"
+    end
+  end
+end

data/lib/miteru/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Miteru
-  VERSION = "0.11.2"
+  VERSION = "0.11.3"
 end

data/miteru.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.17"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "coveralls", "~> 0.8"
   spec.add_development_dependency "glint", "~> 0.1"
   spec.add_development_dependency "rake", "~> 12.3"
@@ -37,5 +37,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "http", "~> 4.0"
   spec.add_dependency "oga", "~> 2.15"
   spec.add_dependency "parallel", "~> 1.12"
+  spec.add_dependency "slack-incoming-webhooks", "~> 0.2"
   spec.add_dependency "thor", "~> 0.19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miteru
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
 platform: ruby
 authors:
 - Manabu Niseki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-07 00:00:00.000000000 Z
+date: 2019-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +178,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: slack-incoming-webhooks
+  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: thor
   requirement: !ruby/object:Gem::Requirement
@@ -221,6 +235,7 @@ files:
 - lib/miteru/feeds/feed.rb
 - lib/miteru/feeds/urlscan.rb
 - lib/miteru/http_client.rb
+- lib/miteru/notifier.rb
 - lib/miteru/version.rb
 - lib/miteru/website.rb
 - miteru.gemspec