mihari 0.17.3 → 0.17.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cb8eb51d1aeff148fce824719c4c6b7730a19cc4c69434318cef07c26cf6b81
-  data.tar.gz: 8442809cef20850e40f203ee1dd91a448846c372d3595fae0c35429b4209795a
+  metadata.gz: 6a2088860e89b6cfa7ead2c47b1589ee19d6cb388051e1f5f0325c3b8eab9184
+  data.tar.gz: de9a0261e8ede8ff2bd6f93f236fd1d2eee2f8dfa7d8125e9ff2ad2b0c2089ba
 SHA512:
-  metadata.gz: 5b772bace499921b8ddd53f09a9a908e143cfff6ac21604c31656f8313d850c2a5b588048e913ef8d51cb0c8efacc1a5babcca8b649f73b729a324565d2543a4
-  data.tar.gz: db0c6ef09b91a6fe15be0412f0b980246bbe049c58f19e2bc79ce17f8ed7956e027e6d072983db7fe49581083821a2728a27e5df1c42c723c69618bdc4ac0792
+  metadata.gz: 12d2823b24f99989e44a8001e50b20222a1cfea8905a2c375365ff27eb4603f0e7aaf36fcdb53aa350d30ca5774622b22f85e2c2aa049d219ea89ec154783753
+  data.tar.gz: 9fdc2753b2d480a453867e83d9c11bebf4f376aaaddfd55696569ab2c41af6386c55e2f4d08ad5976439787676fca32cd2dba13ce80c2dbc65ff0dbe693bf8a0

data/lib/mihari/analyzers/crtsh.rb

@@ -9,19 +9,23 @@ module Mihari
       attr_reader :description
       attr_reader :query
       attr_reader :tags
+      attr_reader :exclude_expired
 
-      def initialize(query, title: nil, description: nil, tags: [])
+      def initialize(query, title: nil, description: nil, tags: [], exclude_expired: nil)
         super()
 
         @query = query
         @title = title || "crt.sh lookup"
         @description = description || "query = #{query}"
         @tags = tags
+
+        @exclude_expired = exclude_expired.nil? ? true : exclude_expired
       end
 
       def artifacts
         results = search
-        results.map { |result| result.dig("name_value") }.compact.uniq
+        name_values = results.map { |result| result.dig("name_value") }.compact
+        name_values.map(&:lines).flatten.uniq.map(&:chomp)
       end
 
       private
@@ -31,7 +35,8 @@ module Mihari
       end
 
       def search
-        api.search(query)
+        exclude = exclude_expired ? "expired" : nil
+        api.search(query, exclude: exclude)
       rescue ::Crtsh::Error => _e
         []
       end

data/lib/mihari/cli.rb

@@ -86,6 +86,7 @@ module Mihari
     method_option :title, type: :string, desc: "title"
     method_option :description, type: :string, desc: "description"
     method_option :tags, type: :array, desc: "tags"
+    method_option :exclude_expired, type: :boolean, desc: "exclude expired certificates"
     def crtsh(query)
       with_error_handling do
         run_analyzer Analyzers::Crtsh, query: query, options: options

data/lib/mihari/version.rb

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

data/mihari.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "coveralls", "~> 0.8"
-  spec.add_development_dependency "fakefs", "~> 0.20"
+  spec.add_development_dependency "fakefs", "~> 1.0"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.9"
   spec.add_development_dependency "timecop", "~> 0.9"
@@ -36,11 +36,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency "addressable", "~> 2.7"
   spec.add_dependency "binaryedge", "~> 0.1"
   spec.add_dependency "censu", "~> 0.2"
-  spec.add_dependency "crtsh-rb", "~> 0.1"
+  spec.add_dependency "crtsh-rb", "~> 0.2"
   spec.add_dependency "dnpedia", "~> 0.1"
   spec.add_dependency "dnstwister", "~> 0.1"
   spec.add_dependency "email_address", "~> 0.1"
-  spec.add_dependency "hachi", "~> 0.2"
+  spec.add_dependency "hachi", "~> 0.3"
   spec.add_dependency "lightly", "~> 0.3"
   spec.add_dependency "mem", "~> 0.1"
   spec.add_dependency "misp", "~> 0.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mihari
 version: !ruby/object:Gem::Version
-  version: 0.17.3
+  version: 0.17.4
 platform: ruby
 authors:
 - Manabu Niseki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-01 00:00:00.000000000 Z
+date: 2020-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: dnpedia
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: lightly
   requirement: !ruby/object:Gem::Requirement