miteru 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4133dc72d0d07c5719999c526b8534a2dd7b5db5fe74172042b747c5cc557d4a
-  data.tar.gz: d2f59be0a18bdaee1b74633a58b8ed59a396862defd4b80dff4ae8ae9d8199f4
+  metadata.gz: 7428f741cd791e37e5f201c978f4ee6b5f6fe239d350b69d3377a6af4604305d
+  data.tar.gz: 0057c9ee7ebe6dd5ee039939b30ff897d3298605c3843c980f2b30081ad8bc2d
 SHA512:
-  metadata.gz: 4a311f7ffa407ed11951f8f3b7ce696510ba31f8888dff459d3a04e4a19ec892f6f7e5651b7616e70a4482cf07d92f657dc4765ef17b6f42e66a3b526c7e1e26
-  data.tar.gz: 70b43504f29dc3646a343a87029e5c7a785d777099352717a4d2c2f26801879d2541d90ec5568f04d56c6635a35067397c4042e64a3177b6375cb74e51b5eae3
+  metadata.gz: b4f69cf18c8db256f035466f669835810e53329f7af7df5fd3d58689002c2e7175abb9456b31e21c0b23369e31a1559040c82f92c662202661c50cc8cc702334
+  data.tar.gz: d7188fe6bc2372560031fb964254f5ea6df56672edd0f112a6ebe7b41d5ad7efa2a52e6c1deb666891573990f0cf75e8b4ea768f5240cd5d25127a544e06e26c

data/.rubocop.yml

@@ -0,0 +1,2 @@
+Style/StringLiterals:
+  EnforcedStyle: double_quotes

data/README.md

@@ -1,7 +1,7 @@
 # Miteru
 
 [![Gem Version](https://badge.fury.io/rb/miteru.svg)](https://badge.fury.io/rb/miteru)
-[![Ruby CI](https://github.com/ninoseki/miteru/actions/workflows/test.yml/badge.svg)](https://github.com/ninoseki/miteru/actions/workflows/test.yml)
+[![Ruby CI](https://github.com/ninoseki/miteru/actions/workflows/ruby.yml/badge.svg)](https://github.com/ninoseki/miteru/actions/workflows/ruby.yml)
 [![CodeFactor](https://www.codefactor.io/repository/github/ninoseki/miteru/badge)](https://www.codefactor.io/repository/github/ninoseki/miteru)
 [![Coverage Status](https://coveralls.io/repos/github/ninoseki/miteru/badge.svg?branch=master)](https://coveralls.io/github/ninoseki/miteru?branch=master)
 
@@ -14,12 +14,12 @@ I take no responsibility and/or liability for how you choose to use this tool.
 
 ## How It Works
 
-- It collects phishy URLs from the following feeds:
-  - urlscan.io's automatic submissions. (`task.method:automatic`)
+- Collect phishy URLs from the following feeds:
+  - urlscan.io's automatic submissions. (`task.method:automatic AND NOT task.source:urlscan-observe`)
   - urlscan.io phish feed. (available for Pro users)
   - [mitchellkrogza/Phishing.Database](https://github.com/mitchellkrogza/Phishing.Database)'s `phishing-links-ACTIVE-NOW.txt`.
   - [ninoseki/ayashige](https://github.com/ninoseki/ayashige) feed.
-- It checks each phishy URL whether it enables directory listing and contains phishing kits (compressed files) or not.
+- Check each phishy URL whether it enables directory listing and contains phishing kits (compressed files) or not.
   - Note: Supported compressed files are: `*.zip`, `*.rar`, `*.7z`, `*.tar` and `*.gz`.
 
 ## Docs

data/lib/miteru/config.rb

@@ -27,7 +27,8 @@ module Miteru
       threads: Parallel.processor_count,
       urlscan_api_key: nil,
       urlscan_submit_visibility: "public",
-      urlscan_date_condition: ">now-1h",
+      urlscan_date_condition: "date:>now-1h",
+      urlscan_base_condition: "task.method:automatic AND NOT task.source:urlscan-observe",
       verbose: false
     )
 
@@ -91,6 +92,9 @@ module Miteru
     # @!attribute [r] urlscan_date_condition
     #   @return [String]
 
+    # @!attribute [r] urlscan_base_condition
+    #   @return [String]
+
     def database_url=(val)
       super(URI(val.to_s))
     end

data/lib/miteru/feeds/urlscan.rb

@@ -31,7 +31,7 @@ module Miteru
       end
 
       def q
-        "task.method:automatic AND date:#{Miteru.config.urlscan_date_condition}"
+        "#{base_condition} AND #{date_condition}"
       end
 
       #
@@ -59,6 +59,14 @@ module Miteru
           end
         end
       end
+
+      def base_condition
+        Miteru.config.urlscan_base_condition
+      end
+
+      def date_condition
+        Miteru.config.urlscan_date_condition
+      end
     end
   end
 end

data/lib/miteru/feeds/urlscan_pro.rb

@@ -23,7 +23,7 @@ module Miteru
       end
 
       def q
-        "date:#{Miteru.config.urlscan_date_condition}"
+        Miteru.config.urlscan_date_condition
       end
 
       def format

data/lib/miteru/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: miteru
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Manabu Niseki
@@ -554,6 +554,7 @@ files:
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - Gemfile
 - LICENSE
 - README.md