patch_finder 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3c8d250a7aa94b35b8f5aec0c944eac2c0a3935
-  data.tar.gz: 9c92cbd76ea88c27e15fcbecf668a88a645e53bf
+  metadata.gz: 1b6514503dbfbe97478245193cee9cb9ebd5ce8a
+  data.tar.gz: 0321ea95b7f6e67866884f5feda131fd286185c2
 SHA512:
-  metadata.gz: 2a55fda811184d47d0ae322d70a5b3431192f3fe9c93ad8588a48031ecd95af6a97f9499caa0d194b4f22812a4f6d6f5e908081d2db36e2c79ed08d95f28b32d
-  data.tar.gz: bb45dcb3fed06f018861ae979f0dc362e8a838c825d3bbe1866ef86003d4244e764f9ed01c238810052c3286478fa249acb85faab5d5dbce6f03a56544f0ebc0
+  metadata.gz: 730774a09da258d5bf5a63b858195211aced5366584677968220aab68c684ab3e4969c126deb607f8b72212d000f8b4b288d956181766c0d7d228d0d22b5aa16
+  data.tar.gz: 42c328ee3827716cac1d606ef1c7e4fe5b7c2b0fa3078b95fa32c1ce1faeb03cf91fa57e9c128cbb4ceb552011ef631239e291fc50f779592efcc8bc1114216b

data/bin/msu_finder

@@ -11,10 +11,10 @@
 lib = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-require 'core/helper'
-require 'core/config'
+require 'patch_finder/core/helper'
+require 'patch_finder/core/config'
+require 'patch_finder/msu'
 require 'optparse'
-require 'msu'
 
 class PatchFinderBin
 
@@ -109,7 +109,7 @@ class PatchFinderBin
   end
 
   def main
-    cli = PatchFinder::MSU.new
+    cli = PatchFinder::MSU.new(verbose: true)
     links = cli.find_msu_download_links(args)
     if args[:destdir]
       print_status("Download links found: #{links.length}")

data/lib/{core → patch_finder/core}/helper.rb

@@ -5,11 +5,17 @@ module PatchFinder
 
     class PatchFinderException < RuntimeError; end
 
-    # Prints a debug message.
+    attr_accessor :verbose
+
+    # Prints a message if verbose is set
     #
     # @return [void]
-    def print_debug(msg = '')
-      $stderr.puts "[DEBUG] #{msg}"
+    def print_verbose(msg = '')
+      $stderr.puts "[*] #{msg}" if self.verbose
+    end
+
+    def print_verbose_error(msg='')
+      print_error(msge) if self.verbose
     end
 
     # Prints a status message.

data/lib/{core → patch_finder/core}/thread_pool.rb

@@ -50,6 +50,14 @@ module PatchFinder
       @jobs.empty?
     end
 
+    # Terminates all threads
+    #
+    # @return [void]
+    def cleanup
+      @jobs.clear
+      @pool.map(&:kill)
+    end
+
   end
 end
 

data/lib/{engine → patch_finder/engine}/msu/google.rb

@@ -1,5 +1,5 @@
 require 'json'
-require 'core/helper'
+require 'patch_finder/core/helper'
 require_relative 'constants'
 
 module PatchFinder
@@ -64,7 +64,7 @@ module PatchFinder
               break if next_page.nil? || next_starting_index > 100
             end
           rescue GoogleClientException => e
-            print_error(e.message)
+            print_verbose_error(e.message)
             return msb_numbers.uniq
           end
 
@@ -97,7 +97,7 @@ module PatchFinder
           res = send_http_get_request(req_str)
           results = parse_results(res)
           if starting_index == 1
-            print_status("Number of search results: #{get_total_results(results)}")
+            print_verbose("Number of search results: #{get_total_results(results)}")
           end
 
           results

data/lib/{engine → patch_finder/engine}/msu/technet.rb

@@ -1,6 +1,6 @@
 require 'json'
 require 'nokogiri'
-require 'core/helper'
+require 'patch_finder/core/helper'
 require_relative 'constants'
 
 module PatchFinder
@@ -28,7 +28,7 @@ module PatchFinder
         def find_msb_numbers(keyword)
           product_list_matches = get_product_dropdown_list.select { |p| Regexp.new(keyword) === p[:option_text] }
           if product_list_matches.empty?
-            print_status('No match from the product list, attempting a generic search')
+            print_verbose('No match from the product list, attempting a generic search')
             search_by_keyword(keyword)
           else
             product_names = []
@@ -37,7 +37,7 @@ module PatchFinder
               ids << e[:option_value]
               product_names << e[:option_text]
             end
-            print_status("Matches from the product list (#{product_names.length}): #{ product_names * ', ' }")
+            print_verbose("Matches from the product list (#{product_names.length}): #{ product_names * ', ' }")
             search_by_product_ids(ids)
           end
         end

data/lib/{msu.rb → patch_finder/msu.rb}

@@ -1,8 +1,8 @@
 require 'nokogiri'
-require 'core/thread_pool'
-require 'engine/msu/google'
-require 'engine/msu/technet'
-require 'engine/msu/constants'
+require 'patch_finder/core/thread_pool'
+require 'patch_finder/engine/msu/google'
+require 'patch_finder/engine/msu/technet'
+require 'patch_finder/engine/msu/constants'
 
 module PatchFinder
   class MSU
@@ -11,6 +11,10 @@ module PatchFinder
 
     MAX_THREADS = 10
 
+    def initialize(opts={})
+      self.verbose = opts[:verbose] || false
+    end
+
     # Returns the download links.
     #
     # @param args [Hash] Arguments created by the user.
@@ -19,27 +23,31 @@ module PatchFinder
       msb_numbers = collect_msbs(args)
 
       unless msb_numbers.empty?
-        print_status("Advisories found (#{msb_numbers.length}): #{msb_numbers * ', '}")
-        print_status('Please wait while the download links are being collected...')
+        print_verbose("Advisories found (#{msb_numbers.length}): #{msb_numbers * ', '}")
+        print_verbose('Please wait while the download links are being collected...')
       end
 
       download_links = []
 
-      print_status("Max number of active collecting clients: #{MAX_THREADS}")
+      print_verbose("Max number of active collecting clients: #{MAX_THREADS}")
       pool = PatchFinder::ThreadPool.new(MAX_THREADS)
 
-      msb_numbers.each do |msb|
-        pool.schedule do
-          links = collect_links_from_msb(msb, args[:regex])
-          pool.mutex.synchronize do
-            download_links.concat(links)
+      begin
+        msb_numbers.each do |msb|
+          pool.schedule do
+            links = collect_links_from_msb(msb, args[:regex])
+            pool.mutex.synchronize do
+              download_links.concat(links)
+            end
           end
         end
-      end
 
-      pool.shutdown
+        pool.shutdown
 
-      sleep(0.5) until pool.eop?
+        sleep(0.5) until pool.eop?
+      ensure
+        pool.cleanup
+      end
 
       download_links
     end
@@ -55,10 +63,10 @@ module PatchFinder
 
       case args[:search_engine]
       when :technet
-        print_status("Searching advisories that include #{args[:keyword]} via Technet")
+        print_verbose("Searching advisories that include #{args[:keyword]} via Technet")
         msb_numbers = technet_search(args[:keyword])
       when :google
-        print_status("Searching advisories that include #{args[:keyword]} via Google")
+        print_verbose("Searching advisories that include #{args[:keyword]} via Google")
         msb_numbers = google_search(args[:keyword], args[:google_api_key], args[:google_search_engine_id])
       end
 
@@ -72,24 +80,24 @@ module PatchFinder
     # @return [Array]
     def collect_links_from_msb(msb, regex = nil)
       unless is_valid_msb?(msb)
-        print_error "Not a valid MSB format: #{msb}"
-        print_error 'Example of a correct one: ms15-100'
+        print_verbose_error "Not a valid MSB format: #{msb}"
+        print_verbose_error 'Example of a correct one: ms15-100'
         return []
       end
 
       res = download_advisory(msb)
 
       if !has_advisory?(res)
-        print_error "The advisory cannot be found for #{msb}"
+        print_verbose_error "The advisory cannot be found for #{msb}"
         return []
       end
 
       links = get_details_aspx(res)
       if links.length == 0
-        print_error "Unable to find download.microsoft.com links for #{msb}."
+        print_verbose_error "Unable to find download.microsoft.com links for #{msb}."
         return []
       else
-        print_status("Found #{links.length} affected products for #{msb}.")
+        print_verbose("Found #{links.length} affected products for #{msb}.")
       end
 
       link_collector = []
@@ -169,7 +177,7 @@ module PatchFinder
           begin
             links << found_link
           rescue ::URI::InvalidURIError
-            print_error "Unable to parse URI: #{found_link}"
+            print_verbose_error "Unable to parse URI: #{found_link}"
           end
         end
       end

data/patch_finder.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'patch_finder'
-  spec.version       = '1.0.1'
+  spec.version       = '1.0.2'
   spec.authors       = ['wchen-r7']
   spec.email         = ['wei_chen@rapid7.com']
   spec.summary       = 'Patch Finder'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: patch_finder
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - wchen-r7
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,13 +65,13 @@ files:
 - Rakefile
 - bin/msu_finder
 - docs/bin/msu_finder.txt
-- lib/core/config.rb
-- lib/core/helper.rb
-- lib/core/thread_pool.rb
-- lib/engine/msu/constants.rb
-- lib/engine/msu/google.rb
-- lib/engine/msu/technet.rb
-- lib/msu.rb
+- lib/patch_finder/core/config.rb
+- lib/patch_finder/core/helper.rb
+- lib/patch_finder/core/thread_pool.rb
+- lib/patch_finder/engine/msu/constants.rb
+- lib/patch_finder/engine/msu/google.rb
+- lib/patch_finder/engine/msu/technet.rb
+- lib/patch_finder/msu.rb
 - patch_finder.gemspec
 - tools/extract_msu.bat
 - tools/list_dll.rb