Merge pull request #33 from hmoore-r7/feature/bapv2-tweaks

A number of small fixes for BAPv2

Author: wchen-r7

lib/msf/core/exploit/browser_autopwnv2.rb

@@ -140,10 +140,9 @@ def set_exploit_options(xploit)
       xploit.datastore['DisablePayloadHandler'] = true
       xploit.datastore['BrowserProfilePrefix']  = browser_profile_prefix
       xploit.datastore['URIPATH']               = "/#{assign_module_resource}"
-      xploit.datastore['WORKSPACE']             = self.workspace
 
-      # TODO: Add BAPv2 tracking information (?) - HD
-      # TODO: Change exploit output options?     - HD
+      # Register this module as a child and copy datastore options
+      xploit.register_parent(self)
     end
 
 
@@ -152,12 +151,13 @@ def set_exploit_options(xploit)
     # @param resource [String] The resource to check.
     # @return [TrueClass] Resource is taken.
     # @return [FalseClass] Resource is not taken.
-    # TODO: Prevent partial prefix match - HD
     def is_resource_taken?(resource)
       taken = false
 
       bap_exploits.each do |m|
-        return true if m.datastore['URIPATH'] == resource
+        # Prevent partial matching of one resource within another
+        return true if m.datastore['URIPATH'].index(resource)
+        return true if resource.index(m.datastore['URIPATH'])
       end
 
       taken
@@ -206,8 +206,10 @@ def sort_bap_exploits
     # @return [Hash] A hash with each module list sorted by disclosure date.
     def sort_date_in_group(bap_groups)
       bap_groups.each_pair do |ranking, module_list|
-        # TODO: Handle wonky dates in local modules better - HD
-        bap_groups[ranking] = module_list.sort_by {|m| Date.parse(m.disclosure_date.to_s)}.reverse
+        bap_groups[ranking] = module_list.sort_by {|m|
+          dstr = m.disclosure_date || "1970-01-01"
+          Date.parse(dstr) rescue Date.parse("1970-01-01")
+        }.reverse
       end
     end
 
@@ -337,8 +339,9 @@ def start_payload_listeners
         # Configurable only by BAP
         multi_handler.datastore['ExitOnSession'] = false
         multi_handler.datastore['EXITFUNC']      = 'thread'
-        multi_handler.datastore['WORKSPACE']     = self.workspace
 
+        # Register this module as a child and copy datastore options
+        multi_handler.register_parent(self)
 
         # Now we're ready to start the handler
         multi_handler.exploit_simple(