metasploit-payloads 2.0.44 → 2.0.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ab4d6f7077681538f0be13a4655905a35908d0f797ff438175dcd134ece265b
-  data.tar.gz: 0e8ef069a3351beb5c9b29b5cbcf6e5f43f6dee67808ce9980d63bba24ee1eb9
+  metadata.gz: 5b4ebeff606061a918b56af763ae9805ab29e677ed65babebc048750b77e1e64
+  data.tar.gz: '038ad1767ddd11bcc6f28bde15ba5db94b69cce108ffd125c006849787b2cf02'
 SHA512:
-  metadata.gz: 5e19788faa20ca966576ff1145c42f15c8f1e2649ddb7cdd9aea1a99b9dda5e967e9dda0f64a0a20d146040291382afd12f65d847ff32b6ea7c26e6c3ea78dea
-  data.tar.gz: 5443da4c81d3848c4d00c3389322c8d07c9cb6d3b30beadb129292cd1e471735434c0508268441e52aa778fa87767f0ab5181e19a6dd7c772f5866d5f0542274
+  metadata.gz: 01147ee86c2d166c2747d956779ad48d56341b7e320f28929512c83def63388adf2a6afa218b3f854fc092b6d7d69261e1fc963b999f6536f151c11f13e0fcbe
+  data.tar.gz: 37bd7b524e2d7622e9b97dfa6d780aa3490d2dcb0f3ba7b3b40098db9e36664dccad08bd01a8c9908c8323f7c0acd1165185aca466975319495c174fd10c09a3

data/data/meterpreter/meterpreter.py

@@ -988,15 +988,6 @@ class HttpTransport(Transport):
         self._first_packet = None
         self._empty_cnt = 0
 
-    def _activate(self):
-        return True
-        self._first_packet = None
-        packet = self._get_packet()
-        if packet is None:
-            return False
-        self._first_packet = packet
-        return True
-
     def _get_packet(self):
         if self._first_packet:
             packet = self._first_packet
@@ -1004,31 +995,31 @@ class HttpTransport(Transport):
             return packet
         packet = None
         xor_key = None
+        url_h = None
         request = urllib.Request(self.url, None, self._http_request_headers)
         urlopen_kwargs = {}
         if sys.version_info > (2, 6):
             urlopen_kwargs['timeout'] = self.communication_timeout
         try:
             url_h = urllib.urlopen(request, **urlopen_kwargs)
-            packet = url_h.read()
-            for _ in range(1):
-                if packet == '':
-                    break
+            if url_h.code == 200:
+                packet = url_h.read()
                 if len(packet) < PACKET_HEADER_SIZE:
                     packet = None  # looks corrupt
-                    break
-                xor_key = struct.unpack('BBBB', packet[:PACKET_XOR_KEY_SIZE])
-                header = xor_bytes(xor_key, packet[:PACKET_HEADER_SIZE])
-                pkt_length = struct.unpack('>I', header[PACKET_LENGTH_OFF:PACKET_LENGTH_OFF+PACKET_LENGTH_SIZE])[0] - 8
-                if len(packet) != (pkt_length + PACKET_HEADER_SIZE):
-                    packet = None  # looks corrupt
+                else:
+                    xor_key = struct.unpack('BBBB', packet[:PACKET_XOR_KEY_SIZE])
+                    header = xor_bytes(xor_key, packet[:PACKET_HEADER_SIZE])
+                    pkt_length = struct.unpack('>I', header[PACKET_LENGTH_OFF:PACKET_LENGTH_OFF + PACKET_LENGTH_SIZE])[0] - 8
+                    if len(packet) != (pkt_length + PACKET_HEADER_SIZE):
+                        packet = None  # looks corrupt
         except:
-            debug_traceback('Failure to receive packet from ' + self.url)
+            debug_traceback('[-] failure to receive packet from ' + self.url)
 
         if not packet:
-            delay = 10 * self._empty_cnt
-            if self._empty_cnt >= 0:
-                delay *= 10
+            if url_h and url_h.code == 200:
+                # server has nothing for us but this is fine so update the communication time and wait
+                self.communication_last = time.time()
+            delay = 100 * self._empty_cnt
             self._empty_cnt += 1
             time.sleep(float(min(10000, delay)) / 1000)
             return packet

data/lib/metasploit-payloads.rb

@@ -69,30 +69,24 @@ module MetasploitPayloads
   end
 
   #
-  # List all the available extensions for the given suffix.
+  # List all the available extensions, optionally filtered by the given suffix.
   #
-  def self.list_meterpreter_extensions(binary_suffix)
-    extensions = []
-
-    root_dirs = [local_meterpreter_dir]
-
-    # Find the valid extensions in the data folder first, if MSF
-    # is installed.
-    if metasploit_installed?
-      root_dirs.unshift(msf_meterpreter_dir)
-      root_dirs.unshift(user_meterpreter_dir)
-    end
-
-    root_dirs.each do |dir|
-      next unless ::File.directory?(dir)
-
-      # Merge in any that don't already exist in the collection.
-      meterpreter_enum_ext(dir, binary_suffix).each do |e|
-        extensions.push(e) unless extensions.include?(e)
-      end
-    end
+  # @param [String] binary_suffix An optional suffix to use for filtering results. If omitted, all extensions will be
+  #   returned.
+  # @return [Array<String>] Returns an array of extensions.
+  def self.list_meterpreter_extensions(binary_suffix=nil)
+    list_meterpreter_dirs { |dir| meterpreter_enum_ext(dir, binary_suffix) }
+  end
 
-    extensions
+  #
+  # List all the available suffixes, optionally filtered by the given extension name. This is mostly useful for
+  # determining support for a specific extension.
+  #
+  # @param [String] extension_name An optional extension name to use for filtering results. If omitted, all suffixes
+  #   will be returned.
+  # @return [Array<String>] Returns an array of binary suffixes.
+  def self.list_meterpreter_extension_suffixes(extension_name=nil)
+    list_meterpreter_dirs { |dir| meterpreter_enum_ext_suffixes(dir, extension_name) }
   end
 
   #
@@ -124,19 +118,43 @@ module MetasploitPayloads
   end
 
   #
-  # Enumerate extensions in the given root folder based on the suffix.
+  # Enumerate extensions in the given root folder based on an optional suffix.
   #
-  def self.meterpreter_enum_ext(root_dir, binary_suffix)
+  # @param [String] root_dir The path to the directory from which to enumerate extensions.
+  # @param [String] binary_suffix An optional suffix to use for filtering results. If omitted, all extensions will be
+  #   returned.
+  # @return [Array<String>] Returns an array of extensions.
+  def self.meterpreter_enum_ext(root_dir, binary_suffix=nil)
     exts = []
+    binary_suffix ||= '.*'
     ::Dir.entries(root_dir).each do |f|
       if ::File.readable?(::File.join(root_dir, f)) && \
-         f =~ /#{EXTENSION_PREFIX}(.*)\.#{binary_suffix}/
+         f =~ /#{EXTENSION_PREFIX}(\w+)\.#{binary_suffix}/
         exts.push($1)
       end
     end
     exts
   end
 
+  #
+  # Enumerate binary suffixes in the given root folder based on an optional extension name.
+  #
+  # @param [String] root_dir The path to the directory from which to enumerate extension suffixes.
+  # @param [String] extension_name An optional extension name to use for filtering results. If omitted, all suffixes will
+  #   be returned.
+  # @return [Array<String>] Returns an array of binary suffixes.
+  def self.meterpreter_enum_ext_suffixes(root_dir, extension_name=nil)
+    suffixes = []
+    extension_name ||= '\w+'
+    ::Dir.entries(root_dir).each do |f|
+      if ::File.readable?(::File.join(root_dir, f)) && \
+         f =~ /#{EXTENSION_PREFIX}#{extension_name}\.(\w+(\.\w+)*)/
+        suffixes.push($1)
+      end
+    end
+    suffixes
+  end
+
   private
 
   #
@@ -164,4 +182,30 @@ module MetasploitPayloads
       @local_paths << path
     end
   end
+
+  class << self
+    private
+    def list_meterpreter_dirs(&block)
+      things = [] # *things* is whatever is being enumerated (extension names, suffixes, etc.) as determined by the block
+      root_dirs = [local_meterpreter_dir]
+
+      # Find the valid extensions in the data folder first, if MSF
+      # is installed.
+      if metasploit_installed?
+        root_dirs.unshift(msf_meterpreter_dir)
+        root_dirs.unshift(user_meterpreter_dir)
+      end
+
+      root_dirs.each do |dir|
+        next unless ::File.directory?(dir)
+
+        # Merge in any that don't already exist in the collection.
+        (yield dir).each do |e|
+          things.push(e) unless things.include?(e)
+        end
+      end
+
+      things
+    end
+  end
 end

data/lib/metasploit-payloads/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-payloads
 version: !ruby/object:Gem::Version
-  version: 2.0.44
+  version: 2.0.48
 platform: ruby
 authors:
 - OJ Reeves
@@ -96,7 +96,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2021-04-28 00:00:00.000000000 Z
+date: 2021-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake