metasploit-payloads 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6699dfd3baa43b3d87b1f201e6d5d859d82572d
-  data.tar.gz: 2b81c9eaa0d693288d59ab8633584cd5458ae6e4
+  metadata.gz: 1e0ef667259cb500ad14f6990fa77ef1fe5af5c9
+  data.tar.gz: 39aec139c0cf4eed41529cec436e6769850a76e2
 SHA512:
-  metadata.gz: 9adff287ce261753634c426a8173decba2dd5f23c1065f3457fdd7c76fb15a966a737533819c67f334920e401f04bef913eede53cd589da85c58377ce89d1172
-  data.tar.gz: d3a4f026e71514fbe3555c37aa001531bbc224ab749c3f4ac2d5bf1365666998bc235145a3a5a90bf50886b7e0bf73550847a59085db22068702722ec7f2564b
+  metadata.gz: 740a16fa2292e855c560d270383ffc98730c3bee76019e58691f401aae17b552975c43ce70f3e515bf261448c5d126cf64b873834f5c6bde7287b7d6362b69c3
+  data.tar.gz: 676dde7a59ac14f0fadebbe4f2e23747852f04b802a7fa21666fb2554683faff3b50c13be202b8e19a6e5322bc5d24e4198d696e37c661a745fd7db8c43696f6

data/lib/metasploit-payloads.rb

@@ -10,27 +10,29 @@ end
 module MetasploitPayloads
   EXTENSION_PREFIX      = 'ext_server_'
   METERPRETER_SUBFOLDER = 'meterpreter'
+  USER_DATA_SUBFOLDER   = 'payloads'
 
   #
   # Get the path to an extension based on its name (no prefix).
   #
   def self.meterpreter_ext_path(ext_name, binary_suffix)
-    path("#{EXTENSION_PREFIX}#{ext_name}", binary_suffix)
+    path(METERPRETER_SUBFOLDER, "#{EXTENSION_PREFIX}#{ext_name}.#{binary_suffix}")
   end
 
-  def self.readable_path(gem_path, msf_path)
+  def self.readable_path(gem_path, *extra_paths)
     # Try the MSF path first to see if the file exists, allowing the MSF data
     # folder to override what is in the gem. This is very helpful for
     # testing/development without having to move the binaries to the gem folder
     # each time. We only do this is MSF is installed.
-    if ::File.readable? msf_path
-      warn_local_path(msf_path) if ::File.readable? gem_path
-      return msf_path
-
-    elsif ::File.readable? gem_path
-      return gem_path
+    extra_paths.each do |extra_path|
+      if ::File.readable? extra_path
+        warn_local_path(extra_path) if ::File.readable? gem_path
+        return extra_path
+      end
     end
 
+    return gem_path if ::File.readable? gem_path
+
     nil
   end
 
@@ -38,12 +40,7 @@ module MetasploitPayloads
   # Get the path to a meterpreter binary by full name.
   #
   def self.meterpreter_path(name, binary_suffix)
-    file_name = "#{name}.#{binary_suffix}".downcase
-    gem_path = expand(local_meterpreter_dir, file_name)
-    if metasploit_installed?
-      msf_path = expand(msf_meterpreter_dir, file_name)
-    end
-    readable_path(gem_path, msf_path)
+    path(METERPRETER_SUBFOLDER, "#{name}.#{binary_suffix}".downcase)
   end
 
   #
@@ -52,9 +49,10 @@ module MetasploitPayloads
   def self.path(*path_parts)
     gem_path = expand(data_directory, ::File.join(path_parts))
     if metasploit_installed?
+      user_path = expand(Msf::Config.config_directory, ::File.join(USER_DATA_SUBFOLDER, path_parts))
       msf_path = expand(Msf::Config.data_directory, ::File.join(path_parts))
     end
-    readable_path(gem_path, msf_path)
+    readable_path(gem_path, user_path, msf_path)
   end
 
   #
@@ -80,7 +78,10 @@ module MetasploitPayloads
 
     # Find the valid extensions in the data folder first, if MSF
     # is installed.
-    root_dirs.unshift(msf_meterpreter_dir) if metasploit_installed?
+    if metasploit_installed?
+      root_dirs.unshift(msf_meterpreter_dir)
+      root_dirs.unshift(user_meterpreter_dir)
+    end
 
     root_dirs.each do |dir|
       # Merge in any that don't already exist in the collection.
@@ -106,6 +107,13 @@ module MetasploitPayloads
     ::File.join(Msf::Config.data_directory, METERPRETER_SUBFOLDER)
   end
 
+  #
+  # Full path to the user's MSF data folder which contains the meterpreter binaries.
+  #
+  def self.user_meterpreter_dir
+    ::File.join(Msf::Config.config_directory, USER_DATA_SUBFOLDER, METERPRETER_SUBFOLDER)
+  end
+
   #
   # Full path to the local gem folder which contains the meterpreter binaries.
   #
@@ -149,7 +157,7 @@ module MetasploitPayloads
     unless @local_paths.include?(path)
       STDERR.puts("WARNING: Local file #{path} is being used")
       if @local_paths.empty?
-        STDERR.puts('WARNING: Local files may be incompatible Metasploit framework')
+        STDERR.puts('WARNING: Local files may be incompatible with the Metasploit Framework')
       end
       @local_paths << path
     end

data/lib/metasploit-payloads/version.rb

@@ -1,6 +1,6 @@
 # -*- coding:binary -*-
 module MetasploitPayloads
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-payloads
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - OJ Reeves
@@ -88,7 +88,7 @@ cert_chain:
   2SpuQH+SWteq3NXkAmFEEqvLJQ4sbptZt8OP8ghL3pVAvZNFmww/YVszSkShSzcg
   QdihYCSEL2drS2cFd50jBeq71sxUtxbv82DUa2b+
   -----END CERTIFICATE-----
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler