metasploit-payloads 0.0.9 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5847d5771527a93ff4a51e6d7ed58210b55c45ed
-  data.tar.gz: 2cdd046533026017f94950c506ac0ddca3bb368b
+  metadata.gz: 5aeb9d8ba70aa72a36da299fe1d658085e0dddec
+  data.tar.gz: 57b098cfe5fb611538d9cc3a944534fed31a4191
 SHA512:
-  metadata.gz: 84b3c53c004c26946e5acde214945acba450f24d501c9a31f842a33e2d03242ad8b0e82246faddcaa2424a7ae1db494a7d6185f4d2ab0a05b9199dfca15b8119
-  data.tar.gz: a8ddf4086bd8c0317c08c776b37b0be3ac7ffaa95557c5221cf4d0dce34c4f5c95b8b79d6cafa2ff02e077cdafa7bccdd77cb5377d7ecfc7394c92da3f0cbfee
+  metadata.gz: a28cfb11b5282103343ddf0d52e9d29ee7b96140f2295dfe7fdd661029151f52b53053ffca033bfa315e8641000544dc52b0f53b0c621952ec751645e22ab3b0
+  data.tar.gz: dad251c87dc4412f96011019507fd71790b57225623d4dc41b3df045beb7917cb62cbc2249d7333a390f142477fcd3286960fcbf670ed391cc0979a9611298a1

data.tar.gz.sig

@@ -1 +1 @@
-'��K'�ןK�&(.l-�L��#�cgm|
h����J����TQ⊸kݲl��~��\ZJrs�%�h�v��E��s��A�� ���2��n�s}bjdj#>̽����U�e��)�j�i��3��>&�eq_�%~=j'M��/��D�?'�B\?�>�yX:���j0dN3��b��`v{�<�z��?K>0�K�h@��� %z�-�:���xм����Qy���!�:'.�V��]��(Uݙ�X%�~��4�9�	ԝ�
�
+|$�3�<Qaa&e#Bn�hs��YʱvO�M媞P����u"k�)�d0g��A�o3��>�RޒZ�m75�G?��[���p�[1~��P-��^r��3��f&&C�hO��%���.���B~��Q

data/lib/metasploit-payloads.rb

@@ -1,9 +1,13 @@
 # -*- coding:binary -*-
 
-require 'metasploit-payloads/version' unless defined? MetasploitPayloads::VERSION
+unless defined? MetasploitPayloads::VERSION
+  require 'metasploit-payloads/version'
+end
 
+#
+# This module dispenses Metasploit payload binary files
+#
 module MetasploitPayloads
-
   EXTENSION_PREFIX      = 'ext_server_'
   METERPRETER_SUBFOLDER = 'meterpreter'
 
@@ -14,44 +18,43 @@ module MetasploitPayloads
     path("#{EXTENSION_PREFIX}#{ext_name}", binary_suffix)
   end
 
+  def self.readable_path(gem_path, msf_path)
+    # 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
+    end
+
+    nil
+  end
+
   #
   # Get the path to a meterpreter binary by full name.
   #
   def self.meterpreter_path(name, binary_suffix)
     file_name = "#{name}.#{binary_suffix}".downcase
-    root_dirs = [local_meterpreter_dir]
-
-    # Try the data folder first to see if the extension exists, as this
-    # allows for the MSF data/meterpreter 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.
-    root_dirs.unshift(msf_meterpreter_dir) if metasploit_installed?
-
-    until root_dirs.length.zero?
-      file_path = expand(root_dirs.shift, file_name)
-      return file_path if ::File.readable?(file_path)
+    gem_path = expand(local_meterpreter_dir, file_name)
+    if metasploit_installed?
+      msf_path = expand(msf_meterpreter_dir, file_name)
     end
-
-    nil
+    readable_path(gem_path, msf_path)
   end
 
   #
   # Get the full path to any file packaged in this gem by local path and name.
   #
   def self.path(*path_parts)
-    root_dirs = [data_directory]
-
-    # Same as above, we try the data folder first, the fall back to the local
-    # meterpreter folder
-    root_dirs.unshift(Msf::Config.data_directory) if metasploit_installed?
-
-    until root_dirs.length.zero?
-      file_path = expand(root_dirs.shift, ::File.join(path_parts))
-      return file_path if ::File.readable?(file_path)
+    gem_path = expand(data_directory, ::File.join(path_parts))
+    if metasploit_installed?
+      msf_path = expand(Msf::Config.data_directory, ::File.join(path_parts))
     end
-
-    nil
+    readable_path(gem_path, msf_path)
   end
 
   #
@@ -61,12 +64,10 @@ module MetasploitPayloads
     file_path = path(path_parts)
     if file_path.nil?
       full_path = ::File.join(path_parts)
-      raise RuntimeError, "#{full_path} not found", caller
+      fail RuntimeError, "#{full_path} not found", caller
     end
 
-    ::File.open(file_path, "rb" ) { |f|
-      f.read(f.stat.size)
-    }
+    ::File.binread(file_path)
   end
 
   #
@@ -76,13 +77,14 @@ module MetasploitPayloads
     extensions = []
 
     root_dirs = [local_meterpreter_dir]
+
     # Find the valid extensions in the data folder first, if MSF
     # is installed.
     root_dirs.unshift(msf_meterpreter_dir) if metasploit_installed?
 
-    until root_dirs.length.zero?
+    root_dirs.each do |dir|
       # Merge in any that don't already exist in the collection.
-      meterpreter_enum_ext(root_dirs.shift, binary_suffix).each do |e|
+      meterpreter_enum_ext(dir, binary_suffix).each do |e|
         extensions.push(e) unless extensions.include?(e)
       end
     end
@@ -94,7 +96,7 @@ module MetasploitPayloads
   # Full path to the local gem folder containing the base data
   #
   def self.data_directory
-    ::File.join(::File.dirname(__FILE__), '..', 'data')
+    ::File.realpath(::File.join(::File.dirname(__FILE__), '..', 'data'))
   end
 
   #
@@ -111,27 +113,21 @@ module MetasploitPayloads
     ::File.join(data_directory, METERPRETER_SUBFOLDER)
   end
 
-  #
-  # Full path to the MSF data folder which contains the binaries.
-  #
-  def self.msf_meterpreter_dir
-    ::File.join(Msf::Config.data_directory, METERPRETER_SUBFOLDER)
-  end
-
   #
   # Enumerate extensions in the given root folder based on the suffix.
   #
   def self.meterpreter_enum_ext(root_dir, binary_suffix)
     exts = []
     ::Dir.entries(root_dir).each do |f|
-      if (::File.readable?(::File.join(root_dir, f)) && f =~ /#{EXTENSION_PREFIX}(.*)\.#{binary_suffix}/)
+      if ::File.readable?(::File.join(root_dir, f)) && \
+         f =~ /#{EXTENSION_PREFIX}(.*)\.#{binary_suffix}/
         exts.push($1)
       end
     end
     exts
   end
 
-private
+  private
 
   #
   # Determine if MSF has been installed and is being used.
@@ -147,5 +143,15 @@ private
     ::File.expand_path(::File.join(root_dir, file_name))
   end
 
-end
+  @local_paths = []
 
+  def self.warn_local_path(path)
+    unless @local_paths.include?(path)
+      STDERR.puts("WARNING: Local file #{path} is being used")
+      if @local_paths.empty?
+        STDERR.puts('WARNING: If you are not a developer, remove this file')
+      end
+      @local_paths << path
+    end
+  end
+end

data/lib/metasploit-payloads/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-payloads
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 1.0.0
 platform: ruby
 authors:
 - OJ Reeves