Merge pull request #192 from ninoseki/v2.1.1

v2.1.1

lib/miteru/crawler.rb

@@ -1,13 +1,18 @@
 # frozen_string_literal: true
 
+require "colorize"
+
 module Miteru
   class Crawler < Service
     #
     # @param [Miteru::Website] website
     #
     def call(website)
       Try[OpenSSL::SSL::SSLError, ::HTTP::Error, Addressable::URI::InvalidURIError] do
-        Miteru.logger.info("Website:#{website.truncated_url} has #{website.kits.length} kit(s).")
+        info = "Website:#{website.info}."
+        info = info.colorize(:red) if website.kits?
+
+        Miteru.logger.info(info)
         return unless website.kits?
 
         notify website

lib/miteru/notifiers/slack.rb

@@ -5,6 +5,7 @@
 module Miteru
   module Notifiers
     class SlackAttachment
+      # @return [String]
       attr_reader :url
 
       def initialize(url)
@@ -14,7 +15,7 @@ def initialize(url)
       def to_a
         [
           {
-            text: defanged_url,
+            text:,
             fallback: "VT & urlscan.io links",
             actions:
           }
@@ -47,10 +48,6 @@ def urlscan_link
         }
       end
 
-      def defanged_url
-        @defanged_url ||= url.to_s.gsub(".", "[.]")
-      end
-
       def domain
         @domain ||= [].tap do |out|
           out << URI(url).hostname
@@ -59,6 +56,10 @@ def domain
         end.first
       end
 
+      def text
+        domain.to_s.gsub(".", "[.]")
+      end
+
       def _urlscan_link
         return nil unless domain
 
@@ -82,12 +83,11 @@ def call(website)
         return unless callable?
 
         attachment = SlackAttachment.new(website.url)
-        kits = website.kits.select(&:downloaded?)
-        notifier.post(text: website.message.capitalize, attachments: attachment.to_a) if kits.any?
+        notifier.post(text: website.info, attachments: attachment.to_a) if website.kits?
       end
 
       def callable?
-        !slack_webhook_url.nil?
+        !webhook_url.nil?
       end
 
       private

lib/miteru/notifiers/urlscan.rb

@@ -9,7 +9,7 @@ class UrlScan < Base
       def call(website)
         return unless callable?
 
-        website.kits.each { |kit| submit(kit.url) }
+        website.kits.each { |kit| submit(kit.url, source: website.source) }
       end
 
       def callable?
@@ -41,8 +41,12 @@ def visibility
         Miteru.config.urlscan_submit_visibility
       end
 
-      def submit(url)
-        http.post("https://urlscan.io/api/v1/scan/", json: {tags:, visibility:, url:})
+      #
+      # @param [String] url
+      # @param [String] source
+      #
+      def submit(url, source:)
+        http.post("https://urlscan.io/api/v1/scan/", json: {tags: tags + ["source:#{source}"], visibility:, url:})
       end
     end
   end

lib/miteru/version.rb

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

lib/miteru/website.rb

@@ -48,6 +48,14 @@ def truncated_url
       url.truncate(64)
     end
 
+    def defanged_truncated_url
+      truncated_url.to_s.gsub(".", "[.]")
+    end
+
+    def info
+      "#{defanged_truncated_url} has #{kits.length} kit(s) (Source: #{source})"
+    end
+
     private
 
     def timeout

spec/website_spec.rb

@@ -30,4 +30,10 @@
       expect(website.kits?).to be(true)
     end
   end
+
+  describe "#info" do
+    it do
+      expect(website.info).to be_a(String)
+    end
+  end
 end