rex-bin_tools 0.1.13 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a00458801cfc7194ebfbbd76eea9c275ebf05a024366eccf3501f2de4b6cc80
-  data.tar.gz: e15ee4b3499407d8ab9567d2ac0741a13976695173de794527c904238eea1012
+  metadata.gz: 36f49cbee203b1c0d9b4c0d3bc94a1c25c2fb709ef8a542486391607784b578c
+  data.tar.gz: dd06eb800e062eb7165da6d9e548959f24f055482fe5a3fdee8e36726b4c5cd4
 SHA512:
-  metadata.gz: 4d1c25e07486cbe60112204add101f4c9266cdc505b3d000b82329e61ae5bf2bd048b5012a73a5e7880d6ef60074f4d0386df624c085c1e64561dd668ca5c1a3
-  data.tar.gz: f407afa35613d09973d41c1e08ef329a8f7b65640f2ea9d5efbd34b5fb41afe207ffdb0026fcc5cd3d4721faa41597b2eac7f6b885c308db37cd97557123acb3
+  metadata.gz: 68258b64360223c3860f4ce25be8852fa5e76f0ba205d0fca34c70d6bf92b7e23ceae5a322bf2d74e69485435c35aaed4bc51012569ab7000f020d23b3f3b539
+  data.tar.gz: 4398b9c1f3d8950d1026346971661cff0bffe0bec1ed83f74243898065cff910f40242029b37ace02da22c45d6ab1e924a4beeb17796da37e07312fb7c10ef10

data/.github/workflows/verify.yml

@@ -0,0 +1,29 @@
+name: Verify
+
+# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions
+permissions:
+  actions: none
+  checks: none
+  contents: none
+  deployments: none
+  id-token: none
+  issues: none
+  discussions: none
+  packages: none
+  pages: none
+  pull-requests: none
+  repository-projects: none
+  security-events: none
+  statuses: none
+
+on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    branches:
+      - '*'
+
+jobs:
+  build:
+    uses: rapid7/metasploit-framework/.github/workflows/shared_gem_verify.yml@master

data/lib/rex/bin_tools/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module BinTools
-    VERSION = "0.1.13"
+    VERSION = "0.1.15"
   end
 end

data/lib/rex/elfscan/scanner.rb

@@ -75,18 +75,9 @@ class JmpRegScanner < Generic
       regexstr += "\xff[#{calls}]|"
     end
 
-    # Adapting to Regexp.new's New Signature in Ruby 3.3+
     regexstr += "\xff[#{jmps}]|([#{pushs1}]|\xff[#{pushs2}])(\xc3|\xc2..))"
-    # Choose initialization method based on Ruby version
-    major, minor, _patch = RUBY_VERSION.split('.').map(&:to_i)
-    self.regex = if (major > 3) || (major == 3 && minor >= 3)
-      # For Ruby 3.3+: explicitly mark as binary pattern and use NOENCODING
-      binary_pattern = regexstr.b
-      Regexp.new(binary_pattern, Regexp::NOENCODING)
-    else
-      # For Ruby <= 3.2: use legacy three-argument syntax
-      Regexp.new(regexstr, nil, 'n')
-    end
+
+    self.regex = Regexp.new(regexstr, Regexp::NOENCODING)
   end
 
   # build a list for regex of the possible bytes, based on a base
@@ -165,18 +156,7 @@ class PopPopRetScanner < JmpRegScanner
 
   def config(param)
     pops = _build_byte_list(0x58, (0 .. 7).to_a - [4]) # we don't want pop esp's...
-    # Adapting to Regexp.new's New Signature in Ruby 3.3+
-    pattern = "[#{pops}][#{pops}](\xc3|\xc2..)"
-    # Choose initialization method based on Ruby version
-    major, minor, _patch = RUBY_VERSION.split('.').map(&:to_i)
-    self.regex = if (major > 3) || (major == 3 && minor >= 3)
-      # For Ruby 3.3+: explicitly mark as binary pattern and use NOENCODING
-      binary_pattern = pattern.b
-      Regexp.new(binary_pattern, Regexp::NOENCODING)
-    else
-      # For Ruby <= 3.2: use legacy three-argument syntax
-      Regexp.new(pattern, nil, 'n')
-    end
+    self.regex = Regexp.new("[#{pops}][#{pops}](\xc3|\xc2..)", Regexp::NOENCODING)
   end
 
   def scan_segment(program_header, param={})
@@ -211,18 +191,7 @@ end
 class RegexScanner < JmpRegScanner
 
   def config(param)
-    # Adapting to Regexp.new's New Signature in Ruby 3.3+
-    pattern = param['args']
-    # Choose initialization method based on Ruby version
-    major, minor, _patch = RUBY_VERSION.split('.').map(&:to_i)
-    self.regex = if (major > 3) || (major == 3 && minor >= 3)
-      # For Ruby 3.3+: explicitly mark as binary pattern and use NOENCODING
-      binary_pattern = pattern.b
-      Regexp.new(binary_pattern, Regexp::NOENCODING)
-    else
-      # For Ruby <= 3.2: use legacy three-argument syntax
-      Regexp.new(pattern, nil, 'n')
-    end
+    self.regex = Regexp.new(param['args'], Regexp::NOENCODING)
   end
 
   def scan_segment(program_header, param={})

data/lib/rex/machscan/scanner.rb

@@ -64,18 +64,9 @@ class JmpRegScanner < Generic
         regexstr += "\xff[#{calls}]|"
     end
 
-    # Adapting to Regexp.new's New Signature in Ruby 3.3+
     regexstr += "\xff[#{jmps}]|([#{pushs1}]|\xff[#{pushs2}])(\xc3|\xc2..))"
-    # Choose initialization method based on Ruby version
-    major, minor, _patch = RUBY_VERSION.split('.').map(&:to_i)
-    self.regex = if (major > 3) || (major == 3 && minor >= 3)
-      # For Ruby 3.3+: explicitly mark as binary pattern and use NOENCODING
-      binary_pattern = regexstr.b
-      Regexp.new(binary_pattern, Regexp::NOENCODING)
-    else
-      # For Ruby <= 3.2: use legacy three-argument syntax
-      Regexp.new(regexstr, nil, 'n')
-    end
+
+    self.regex = Regexp.new(regexstr, Regexp::NOENCODING)
   end
 
   # build a list for regex of the possible bytes, based on a base
@@ -154,18 +145,7 @@ class PopPopRetScanner < JmpRegScanner
 
   def config(param)
     pops = _build_byte_list(0x58, (0 .. 7).to_a - [4]) # we don't want pop esp's...
-    # Adapting to Regexp.new's New Signature in Ruby 3.3+
-    pattern = "[#{pops}][#{pops}](\xc3|\xc2..)"
-    # Choose initialization method based on Ruby version
-    major, minor, _patch = RUBY_VERSION.split('.').map(&:to_i)
-    self.regex = if (major > 3) || (major == 3 && minor >= 3)
-      # For Ruby 3.3+: explicitly mark as binary pattern and use NOENCODING
-      binary_pattern = pattern.b
-      Regexp.new(binary_pattern, Regexp::NOENCODING)
-    else
-      # For Ruby <= 3.2: use legacy three-argument syntax
-      Regexp.new(pattern, nil, 'n')
-    end
+    self.regex = Regexp.new("[#{pops}][#{pops}](\xc3|\xc2..)", Regexp::NOENCODING)
   end
 
   def scan_segment(segment, param={})
@@ -201,18 +181,7 @@ end
 class RegexScanner < JmpRegScanner
 
   def config(param)
-    # Adapting to Regexp.new's New Signature in Ruby 3.3+
-    pattern = param['args']
-    # Choose initialization method based on Ruby version
-    major, minor, _patch = RUBY_VERSION.split('.').map(&:to_i)
-    self.regex = if (major > 3) || (major == 3 && minor >= 3)
-      # For Ruby 3.3+: explicitly mark as binary pattern and use NOENCODING
-      binary_pattern = pattern.b
-      Regexp.new(binary_pattern, Regexp::NOENCODING)
-    else
-      # For Ruby <= 3.2: use legacy three-argument syntax
-      Regexp.new(pattern, nil, 'n')
-    end
+    self.regex = Regexp.new(param['args'], Regexp::NOENCODING)
   end
 
   def scan_segment(segment, param={})

data/lib/rex/pescan/analyze.rb

@@ -59,21 +59,9 @@ module Analyze
 
       @sigs.each_pair do |name, data|
         begin
-          # Adapting to Regexp.new's New Signature in Ruby 3.3+
-          pattern = '^' + data[0]
-          # Choose initialization method based on Ruby version
-          major, minor, _patch = RUBY_VERSION.split('.').map(&:to_i)
-          regex = if (major > 3) || (major == 3 && minor >= 3)
-            # For Ruby 3.3+: explicitly mark as binary pattern and use NOENCODING
-            binary_pattern = pattern.b
-            Regexp.new(binary_pattern, Regexp::NOENCODING)
-          else
-            # For Ruby <= 3.2: use legacy three-argument syntax
-            Regexp.new(pattern, nil, 'n')
-          end
-          if (buf.match(regex))
-            $stdout.puts param['file'] + ": " + name
-          end
+        if (buf.match(Regexp.new('^' + data[0], Regexp::NOENCODING)))
+          $stdout.puts param['file'] + ": " + name
+        end
         rescue RegexpError
           $stderr.puts "Invalid signature: #{name} #{data[0]}"
         end

data/lib/rex/pescan/scanner.rb

@@ -80,18 +80,9 @@ module Scanner
         regexstr += "\xff[#{calls}]|"
       end
 
-      # Adapting to Regexp.new's New Signature in Ruby 3.3+
       regexstr += "\xff[#{jmps}]|([#{pushs1}]|\xff[#{pushs2}])(\xc3|\xc2..))"
-      # Choose initialization method based on Ruby version
-      major, minor, _patch = RUBY_VERSION.split('.').map(&:to_i)
-      self.regex = if (major > 3) || (major == 3 && minor >= 3)
-        # For Ruby 3.3+: explicitly mark as binary pattern and use NOENCODING
-        binary_pattern = regexstr.b
-        Regexp.new(binary_pattern, Regexp::NOENCODING)
-      else
-        # For Ruby <= 3.2: use legacy three-argument syntax
-        Regexp.new(regexstr, nil, 'n')
-      end
+
+      self.regex = Regexp.new(regexstr, Regexp::NOENCODING)
     end
 
     # build a list for regex of the possible bytes, based on a base
@@ -170,18 +161,7 @@ module Scanner
 
     def config(param)
       pops = _build_byte_list(0x58, (0 .. 7).to_a - [4]) # we don't want pop esp's...
-      # Adapting to Regexp.new's New Signature in Ruby 3.3+
-      pattern = "[#{pops}][#{pops}](\xc3|\xc2..)"
-      # Choose initialization method based on Ruby version
-      major, minor, _patch = RUBY_VERSION.split('.').map(&:to_i)
-      self.regex = if (major > 3) || (major == 3 && minor >= 3)
-        # For Ruby 3.3+: explicitly mark as binary pattern and use NOENCODING
-        binary_pattern = pattern.b
-        Regexp.new(binary_pattern, Regexp::NOENCODING)
-      else
-        # For Ruby <= 3.2: use legacy three-argument syntax
-        Regexp.new(pattern, nil, 'n')
-      end
+      self.regex = Regexp.new("[#{pops}][#{pops}](\xc3|\xc2..)", Regexp::NOENCODING)
     end
 
     def scan_section(section, param={})
@@ -215,18 +195,7 @@ module Scanner
   class RegexScanner < Generic
 
     def config(param)
-      # Adapting to Regexp.new's New Signature in Ruby 3.3+
-      pattern = param['args']
-      # Choose initialization method based on Ruby version
-      major, minor, _patch = RUBY_VERSION.split('.').map(&:to_i)
-      self.regex = if (major > 3) || (major == 3 && minor >= 3)
-        # For Ruby 3.3+: explicitly mark as binary pattern and use NOENCODING
-        binary_pattern = pattern.b
-        Regexp.new(binary_pattern, Regexp::NOENCODING)
-      else
-        # For Ruby <= 3.2: use legacy three-argument syntax
-        Regexp.new(pattern, nil, 'n')
-      end
+      self.regex = Regexp.new(param['args'], Regexp::NOENCODING)
     end
 
     def scan_section(section, param={})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-bin_tools
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.15
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -120,6 +120,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/verify.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"