metasploit_payloads-mettle 1.0.24 → 1.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 884ef1471029d0bdc747e1749175291934e99bc0486f268507436958d9bbee61
-  data.tar.gz: 80346672374227d690ecae85368b9f3456f8224c4f50b3444d92087c9ab04697
+  metadata.gz: ef07cdf4a810417d24d4e2742d707b0d0ddf51815c8de1cf0f00e6ccc76117a4
+  data.tar.gz: 282a0090e10990321001020c44208207222691a0968e0dd83d1702aa05333dee
 SHA512:
-  metadata.gz: a3b38d4b613833aa82aead587696524732bc41ff7b456143b83d9ae8e86cb1dba661284b2feb0419454e490f3ca008691fd86ef608629b63c0ca7e772efe2f02
-  data.tar.gz: '057066916e68606cb4eb70599a0046e6aeb0f4685613527eee5e06c0f17cfdb4045a63c0a2965790f76632ff5be9094597753fa42c1a361657e328d4010be0ca'
+  metadata.gz: 48444df855f91ef2776426b7bef89063a367243526f84689a6e142f31d1d1aba4d08b30baf1d3cc4c92bcae1123a24fd72c181f5ee38417c907380e11aaa40c4
+  data.tar.gz: 5a1b307e6efc8a478a446672c27662ef8565a495eee4c509afb06fd1b17d6f115fc208a1d342f2baebd387c328e54304d83df2361c604a62839caa005a5d5261

data/lib/metasploit_payloads/mettle/error.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module MetasploitPayloads
+  class Mettle
+    class Error < StandardError
+    end
+
+    class NotFoundError < Error
+    end
+  end
+end

data/lib/metasploit_payloads/mettle/version.rb

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

data/lib/metasploit_payloads/mettle.rb

@@ -4,6 +4,10 @@ unless defined? MetasploitPayloads::Mettle::VERSION
   require 'metasploit_payloads/mettle/version'
 end
 
+unless defined? MetasploitPayloads::Mettle::Error
+  require 'metasploit_payloads/mettle/error'
+end
+
 #
 # This module dispenses Mettle payload binary files
 #
@@ -46,7 +50,7 @@ module MetasploitPayloads
         cmd_line << "-#{short_opt(opt)} \"#{val}\" "
       end
       if cmd_line.length > CMDLINE_MAX
-        fail RuntimeError, 'mettle argument list too big', caller
+        raise Mettle::Error, 'mettle argument list too big', caller
       end
 
       cmd_line + "\x00" * (CMDLINE_MAX - cmd_line.length)
@@ -69,7 +73,7 @@ module MetasploitPayloads
       when :session_guid
         'G'
       else
-        fail RuntimeError, "unknown mettle option #{opt}", caller
+        raise Mettle::Error, "unknown mettle option #{opt}", caller
       end
     end
 
@@ -109,12 +113,12 @@ module MetasploitPayloads
           when :exec
             "#{filename}"
           else
-            fail RuntimeError, "unknown format #{format} for #{filename}", caller
+            raise Mettle::NotFoundError, "unknown format #{format} for #{filename}", caller
           end
       file_path = path("#{triple}", 'bin', file)
       if file_path.nil?
         full_path = ::File.join([triple, file])
-        fail RuntimeError, "#{full_path} not found", caller
+        raise Mettle::NotFoundError, "#{full_path} not found", caller
       end
 
       ::File.binread(file_path)
@@ -172,7 +176,7 @@ module MetasploitPayloads
       dir_path = path("#{platform}", 'bin')
       if dir_path.nil?
         full_path = ::File.join([platform, 'bin'])
-        fail RuntimeError, "#{full_path} not found", caller
+        raise Mettle::NotFoundError, "#{full_path} not found", caller
       end
 
       extensions = ::Dir.entries(dir_path)
@@ -200,7 +204,7 @@ module MetasploitPayloads
         format = :process_image
       else
         format = :exec
-        name = [name,suffix].join('.') unless suffix.blank?
+        name = [name,suffix].join('.') unless suffix&.strip&.empty?
       end
       self.read(platform, format, name)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_payloads-mettle
 version: !ruby/object:Gem::Version
-  version: 1.0.24
+  version: 1.0.26
 platform: ruby
 authors:
 - Adam Cammack
@@ -94,7 +94,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2023-03-06 00:00:00.000000000 Z
+date: 2023-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -209,6 +209,7 @@ files:
 - build/x86_64-linux-musl/bin/sniffer.bin
 - build/x86_64-w64-mingw32/bin/mettle.exe
 - lib/metasploit_payloads/mettle.rb
+- lib/metasploit_payloads/mettle/error.rb
 - lib/metasploit_payloads/mettle/version.rb
 homepage: http://www.metasploit.com
 licenses: