miteru 0.12.10 → 0.12.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c03dbd0645b9e1caac2f4cfd73df781c43efc1a19aa0f057856572a7ae76d7d
-  data.tar.gz: bd43177680ca857b77627cfbfd7feb0e03d80a1f39ac12d6eb2cb4fd859c26da
+  metadata.gz: 80ce8c8350165a57da77e2f4c7e86acd36e48b921a114fc8299ac7925847b696
+  data.tar.gz: 5c1efd6135cef875a7d425ee5f22c65553b05564afcff2b6ccc8234990db0fc2
 SHA512:
-  metadata.gz: 15b3980e86a77668edc3b6752efae2b8dc200eb374cc586774c499bbba3979d2dc479c5395b1f1ab1c1b6797d37ab2016a0ef9813982bdc4808187b71a6cb944
-  data.tar.gz: 2d31cba9f757afc300fccc0e86d9845d3b2ef99894bec11fd5214864d8f852b09b5a762894b81364f2c827f93277ece09aa09a19837990cebb55d6764528bc00
+  metadata.gz: 7bcf546a3dedf9cc4e9b1bc5aeb52806846fba4828279fc75afcf6c113c9ddf87646ecd2c737f8078c77ef391e13d56aafea00eba00073884cd2ada0acfd11b2
+  data.tar.gz: 220a3b82b01ec336d98217edb2a8940bab3ba46ab786aa5ed34aec93a23d55fadd9fb4a1668ca96f90f0c2f1679b8048d3b418970f2d79ee4819df779f49607d

data/README.md

@@ -71,12 +71,9 @@ https://dummy4.com: it might contain a phishing kit (dummy.zip).
 ## Using Docker (alternative if you don't install Ruby)
 
 ```bash
-$ git clone https://github.com/ninoseki/miteru.git
-$ cd miteru/docker
-$ docker build -t miteru .
-$ docker run miteru
+$ docker pull ninoseki/miteru
 # ex. auto-download detected phishing kit(s) into host machines's /tmp directory
-$ docker run -v /tmp:/tmp miteru execute --auto-download
+$ docker run --rm -v /tmp:/tmp ninoseki/miteru execute --auto-download
 ```
 
 ## Configuration

data/docker/Dockerfile

@@ -1,6 +1,12 @@
-FROM ruby:2.6
-
-RUN gem install miteru
+FROM ruby:2.6-alpine3.10
+RUN apk --no-cache add git build-base ruby-dev \
+  && cd /tmp/ \
+  && git clone https://github.com/ninoseki/miteru.git \
+  && cd miteru \
+  && gem build miteru.gemspec -o miteru.gem \
+  && gem install miteru.gem \
+  && rm -rf /tmp/miteru \
+  && apk del --purge git build-base ruby-dev
 
 ENTRYPOINT ["miteru"]
 

data/lib/miteru/configuration.rb

@@ -60,20 +60,20 @@ module Miteru
     end
   end
 
-  # @return [Miteru::Configuration] Miteru's current configuration
-  def self.configuration
-    @configuration ||= Configuration.new
-  end
+  class << self
+    # @return [Miteru::Configuration] Miteru's current configuration
+    def configuration
+      @configuration ||= Configuration.new
+    end
 
-  # Set Miteru's configuration
-  # @param config [Miteru::Configuration]
-  def self.configuration=(config)
-    @configuration = config
-  end
+    # Set Miteru's configuration
+    # @param config [Miteru::Configuration]
+    attr_writer :configuration
 
-  # Modify Miteru's current configuration
-  # @yieldparam [Miteru::Configuration] config current Miteru config
-  def self.configure
-    yield configuration
+    # Modify Miteru's current configuration
+    # @yieldparam [Miteru::Configuration] config current Miteru config
+    def configure
+      yield configuration
+    end
   end
 end

data/lib/miteru/downloader.rb

@@ -7,9 +7,11 @@ require "uri"
 module Miteru
   class Downloader
     attr_reader :base_dir
+    attr_reader :memo
 
     def initialize(base_dir = "/tmp")
       @base_dir = base_dir
+      @memo = {}
       raise ArgumentError, "#{base_dir} is not exist." unless Dir.exist?(base_dir)
     end
 
@@ -24,8 +26,9 @@ module Miteru
       destination = filepath_to_download(filename)
       begin
         downloaded_filepath = HTTPClient.download(kit.url, destination)
-        if duplicated?(downloaded_filepath)
-          puts "Do not download #{kit.url} because there is a duplicate file in the directory (SHA256: #{sha256(downloaded_filepath)})."
+        hash = sha256(downloaded_filepath)
+        if duplicated?(hash)
+          puts "Do not download #{kit.url} because there is a duplicate file in the directory (SHA256: #{hash})."
           FileUtils.rm downloaded_filepath
         else
           puts "Download #{kit.url} as #{downloaded_filepath}"
@@ -46,14 +49,20 @@ module Miteru
     end
 
     def sha256(path)
+      return memo[path] if memo.key?(path)
+
       digest = Digest::SHA256.file(path)
-      digest.hexdigest
+      hash = digest.hexdigest
+      memo[path] = hash
+      hash
+    end
+
+    def sha256s
+      Dir.glob("#{base_dir}/*.{zip,rar,7z,tar,gz}").map { |path| sha256(path) }
     end
 
-    def duplicated?(file_path)
-      base = sha256(file_path)
-      sha256s = Dir.glob("#{base_dir}/*.{zip,rar,7z,tar,gz}").map { |path| sha256(path) }
-      sha256s.select { |sha256| sha256 == base }.length > 1
+    def duplicated?(hash)
+      sha256s.count(hash) > 1
     end
   end
 end

data/lib/miteru/feeds/ayashige.rb

@@ -20,7 +20,7 @@ module Miteru
             "http://#{domain}"
           ]
         end.flatten
-      rescue HTTPResponseError, JSON::ParserError => e
+      rescue HTTPResponseError, HTTP::Error, JSON::ParserError => e
         puts "Failed to load ayashige feed (#{e})"
         []
       end

data/lib/miteru/feeds/urlscan.rb

@@ -25,7 +25,7 @@ module Miteru
 
         res = JSON.parse(get(url))
         res["results"].map { |result| result.dig("task", "url") }
-      rescue HTTPResponseError, JSON::ParserError => e
+      rescue HTTPResponseError, HTTP::Error, JSON::ParserError => e
         puts "Failed to load urlscan.io feed (#{e})"
         []
       end

data/lib/miteru/http_client.rb

@@ -11,6 +11,7 @@ module Miteru
     URLSCAN_UA = "miteru/#{Miteru::VERSION}"
 
     attr_reader :ssl_context
+
     def initialize
       ctx = OpenSSL::SSL::SSLContext.new
       ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
@@ -23,10 +24,6 @@ module Miteru
       destination
     end
 
-    def self.download(url, base_dir = "/tmp")
-      new.download(url, base_dir)
-    end
-
     def get(url, options = {})
       options = options.merge default_options
 
@@ -36,16 +33,22 @@ module Miteru
           .get(url, options)
     end
 
-    def self.get(url, options = {})
-      new.get url, options
-    end
-
     def post(url, options = {})
       HTTP.post url, options
     end
 
-    def self.post(url, options = {})
-      new.post url, options
+    class << self
+      def download(url, base_dir = "/tmp")
+        new.download(url, base_dir)
+      end
+
+      def get(url, options = {})
+        new.get url, options
+      end
+
+      def post(url, options = {})
+        new.post url, options
+      end
     end
 
     private

data/lib/miteru/version.rb

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

data/miteru.gemspec

@@ -27,16 +27,16 @@ Gem::Specification.new do |spec|
   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"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.8"
   spec.add_development_dependency "vcr", "~> 5.0"
-  spec.add_development_dependency "webmock", "~> 3.6"
+  spec.add_development_dependency "webmock", "~> 3.7"
 
   spec.add_dependency "colorize", "~> 0.8"
-  spec.add_dependency "down", "~> 4.8"
+  spec.add_dependency "down", "~> 5.0"
   spec.add_dependency "http", "~> 4.1"
   spec.add_dependency "oga", "~> 2.15"
-  spec.add_dependency "parallel", "~> 1.17"
+  spec.add_dependency "parallel", "~> 1.18"
   spec.add_dependency "slack-notifier", "~> 2.3"
-  spec.add_dependency "thor", "~> 0.19"
+  spec.add_dependency "thor", "~> 0.20"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miteru
 version: !ruby/object:Gem::Version
-  version: 0.12.10
+  version: 0.12.11
 platform: ruby
 authors:
 - Manabu Niseki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-10 00:00:00.000000000 Z
+date: 2019-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '1.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '1.18'
 - !ruby/object:Gem::Dependency
   name: slack-notifier
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.20'
 description: An experimental phishing kit detector
 email:
 - manabu.niseki@gmail.com
@@ -262,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: An experimental phishing kit detector