metasploit_payloads-mettle 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92b49e4c7ad73c5e8fa455a769418519e32cbfc75cd81476a0e1172652edb45d
-  data.tar.gz: b48b79f9b44d011e7c51bbf94165c0b98b32dda4df1a088c1c0d0d146e0849e4
+  metadata.gz: 95fac8c3005517c4bfa1dbbb9fe597bce6cfeb527c9c9e8bc1a3607551ed70c4
+  data.tar.gz: d58711dc9d1f27f4ea5c955a4723e36d9f0313d40d69ce85bcbe05c76750fdc9
 SHA512:
-  metadata.gz: 16afd0ac19dcd817870d5af6fbaa1d2a22707cc4e91713e76a0451d717625504499792271b3ff05f8bab75a19905ab73032256b38f9fc6e8da53d3259ab2a7ee
-  data.tar.gz: 9ba129969e6d4b022591c571596e107777c1a2f36e2b5a87c54ea2adb0f64b7541dea4b79efbae09e4503bac742ddfd0a5b60356b5355488f51731c7c1b931f5
+  metadata.gz: dc7b08a671f8bbe96575681eb6571c7141d123e042a07f0d27aa0875be9f562deca562c815c29c98cf3285880ae249021b77387f4ab25ab756376c09f1fb295f
+  data.tar.gz: 87d657130aaaa56dadac6d58d183ebcdbf7d92b0984cd72c967207fe65694a3564da33368230dcdfbc11d385f944072c0f4c56ff64a9fb16c97631cd63f30373

data/lib/metasploit_payloads/mettle.rb

@@ -81,12 +81,12 @@ module MetasploitPayloads
       end
     end
 
-    def self.readable_path(gem_path, msf_path)
+    def self.readable_path(gem_path, msf_path=nil)
       # 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
+      if !msf_path.nil? && ::File.readable?(msf_path)
         warn_local_path(msf_path) if ::File.readable? gem_path
         msf_path
       elsif ::File.readable? gem_path
@@ -125,7 +125,7 @@ module MetasploitPayloads
     #
     def self.path(*path_parts)
       gem_path = expand(data_directory, ::File.join(path_parts))
-      msf_path = 'thisisnotthefileyouarelookingfor'
+      msf_path = nil
       if metasploit_installed?
         msf_path = expand(Msf::Config.data_directory, ::File.join('mettle', path_parts))
       end
@@ -176,8 +176,20 @@ module MetasploitPayloads
       end
 
       extensions = ::Dir.entries(dir_path)
+      extensions.select! { |extension| !extension.end_with?('.bin') }
+      # The stdapi extension is baked in
+      extensions << 'stdapi'
       # Only return extensions!
-      extensions - [ '.', '..', 'mettle', 'mettle.bin' ]
+      extensions - [ '.', '..', 'mettle' ]
+    end
+
+    #
+    # List platforms on which the specified extension is available for loading
+    #
+    def self.available_platforms(extension)
+      ::Dir.entries(path).select do |platform|
+        !(platform_path = path(platform, 'bin')).nil? && ::File.readable?(platform_path) && available_extensions(platform).include?(extension)
+      end
     end
 
     #

data/lib/metasploit_payloads/mettle/version.rb

@@ -1,7 +1,7 @@
 # -*- coding:binary -*-
 module MetasploitPayloads
   class Mettle
-    VERSION = '1.0.9'
+    VERSION = '1.0.10'
 
     def self.version
       VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_payloads-mettle
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Adam Cammack
@@ -94,7 +94,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2021-04-08 00:00:00.000000000 Z
+date: 2021-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler