rex-text 0.2.45 → 0.2.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35b8656aec1d2bd88d707649036693d4421362967f7602e1d18de3aae6e3ea57
-  data.tar.gz: 974fe908dd1312fe9a0ccdaa3844b9a537e83e6f001afe5ae28dc153350e5261
+  metadata.gz: e6669fedd30c2456c0b6203cbe8dcfcdec690726fb1de674a601a4fea68166c7
+  data.tar.gz: a83499bb2a5e324dd71e58f7e62662a7ad937cbde461fd90d7ae4ce60995c1dc
 SHA512:
-  metadata.gz: 7c3599bb12273e92655678f398595257fc357e0875e8c52ef109e16cb8861c226da817a901a3d884437e0ce2c051796005e297f5c2e33127e48c288e8d72f253
-  data.tar.gz: 1cab334469f0ed24807b4d651c87b2c677ab9a9b46616822f3715326e8917bfd0716f157e92b6ae4169c9b98b5dfc89b57bab928834c7c34ebbe7f3495284073
+  metadata.gz: 37973a9f478fd2b849cf6af27cdeb979d9f8ad819f7971bc54b640f2c066ce6da42fb869724d85fb9f5f36391f835e1ce696871c5ec033d24bc983c32ed30e15
+  data.tar.gz: 3455a6a84bf2a28205c4a0647d86b264a1ad228f28ad2d7b04e2f295ac902b8554b28cae45c8666efbf0e5991cf2dce001fc1ef2f0b40a9892ac4435d05af55f

checksums.yaml.gz.sig

@@ -1,2 +1,3 @@
-T�3�vM��r�)��T�C������S���?�f��B-�/�5���13��	,���oܚ���<[���9BaM��ϐ	n�5E�B@�H�o6EH�m���1[V�_*+������Z��q�"�M��Y
-'=�j��"����#�C��C�6�Ԙ��3B~ߔ�4�I�T�K�{�,�	�q�`��{یO���%N�8_��ԎJ��֯G>�����ာ�kU	J�����ϱW�S�vP��|�R��[�_�%N
+Ya�����M�C�e
+͠`p�@�L��=E�[�����U���J���_�5M���s���"E��蟊���SR'Ƥ���z"��5�M�y����ԓZ�)�1��[eR�P�8�
d��+�l�Ty������b[�M��͞J�
+~�#�k[
r��|�/��yq�ݓ�ߛ�N�

data/lib/rex/text/hex.rb

@@ -127,22 +127,13 @@ module Rex
     # Converts a string to a hex version with wrapping support
     #
     def self.hexify(str, col = DefaultWrap, line_start = '', line_end = '', buf_start = '', buf_end = '')
-      if col < line_start.length + 4 + line_end.length
-        # raise an exception
-        raise ArgumentError.new('insufficient column width')
-      end
+      self.hexify_general(str, "\\x", col, line_start, line_end, buf_start, buf_end)
+    end
 
-      ret = buf_start.dup
-      ret << line_start if ret.end_with?("\n")
-      str.each_char do |char|
-        # "\x##".length is 4, check if we're going over the wrap boundary
-        if (ret.split("\n").last || '').length + 4 + line_end.length > col
-          ret << "#{line_end}\n#{line_start}"
-        end
-        ret << "\\x" << char.unpack('H*')[0]
-      end
-      ret << "\n" if ret.split("\n").last.length + buf_end.length > col
-      ret << "#{buf_end}\n"
+    #
+    # Converts a string to hex, with each character prefixed with 0x; with wrapping support
+    def self.numhexify(str, col = DefaultWrap, line_start = '', line_end = '', buf_start = '', buf_end = '', between = '')
+      self.hexify_general(str, "0x", col, line_start, line_end, buf_start, buf_end, between)
     end
 
     #
@@ -175,5 +166,35 @@ module Rex
       str.gsub!(regex) { |x| x[2,2].to_i(16).chr }
     end
 
+    private
+
+    #
+    # General-case method to handle both "\xAA\xBB\xCC" format and 0xAA,0xBB,0xCC format
+    #
+    def self.hexify_general(str, char_prefix, col = DefaultWrap, line_start = '', line_end = '', buf_start = '', buf_end = '', between='')
+      encoded_char_length = 2 + char_prefix.length + between.length
+      if col < line_start.length + encoded_char_length + line_end.length
+        # raise an exception
+        raise ArgumentError.new('insufficient column width')
+      end
+
+      ret = buf_start.dup
+      ret << line_start if ret.end_with?("\n")
+      last_newline = ret.rindex("\n") || -1
+      last_line_length = ret.length - last_newline - 1
+      str.each_char do |char|
+        # Check if we're going over the wrap boundary
+        if last_line_length + encoded_char_length + line_end.length > col
+          ret << "#{line_end}\n#{line_start}"
+          last_line_length = line_start.length
+        end
+        ret << char_prefix << char.unpack('H*')[0] << between
+        last_line_length += encoded_char_length
+      end
+      # Remove the last in-between characters, if required
+      ret = ret[0..ret.length - 1 - between.length] unless str.empty?
+      ret << "\n" if last_line_length + buf_end.length > col
+      ret << "#{buf_end}\n"
+    end
   end
 end

data/lib/rex/text/lang.rb

@@ -28,30 +28,14 @@ module Rex
     end
 
     def self.to_csharp(str, wrap = DefaultWrap, name = "buf")
-      ret = "byte[] #{name} = new byte[#{str.length}] {"
-      str.each_char do |char|
-        # "0x##,".length is 5, check if we're going over the wrap boundary
-        ret << "\n" if ret.split("\n").last.length + 5 > wrap
-        ret << "0x" << char.unpack('H*')[0] << ","
-      end
-      ret = ret[0..ret.length - 2] unless str.empty? # cut off last comma
-      ret << "\n" if ret.split("\n").last.length + 2 > wrap
-      ret << "};\n"
+      return numhexify(str, wrap, '', '',  "byte[] #{name} = new byte[#{str.length}] {", "};", ',')
     end
 
     #
     # Converts to a golang style array of bytes
     #
     def self.to_golang(str, wrap = DefaultWrap, name = "buf")
-      ret = "#{name} :=  []byte{"
-      str.each_char do |char|
-        # "0x##,".length is 5, check if we're going over the wrap boundary
-        ret << "\n" if ret.split("\n").last.length + 5 > wrap
-        ret << "0x" << char.unpack('H*')[0] << ","
-      end
-      ret = ret[0..ret.length - 2] unless str.empty? # cut off last comma
-      ret << "\n" if ret.split("\n").last.length + 2 > wrap
-      ret << "};\n"
+      return numhexify(str, wrap, '', '',  "#{name} :=  []byte{", "};", ',')
     end
 
     #
@@ -66,17 +50,7 @@ module Rex
     #
     def self.to_nim(str, wrap = DefaultWrap, name = "buf")
       raise ArgumentError.new('str can not be empty') if str.empty?
-
-      ret = "var #{name}: array[#{str.length}, byte] = [\n"
-      ret << "byte "
-      str.each_char do |char|
-        # "0x##,".length is 5, check if we're going over the wrap boundary
-        ret << "\n" if ret.split("\n").last.length + 5 > wrap
-        ret << "0x" << char.unpack('H*')[0] << ","
-      end
-      ret = ret[0..ret.length - 2] unless str.empty? # cut off last comma
-      ret << "\n" if ret.split("\n").last.length + 1 > wrap
-      ret << "]\n"
+      return numhexify(str, wrap, '', '',  "var #{name}: array[#{str.length}, byte] = [\nbyte ", "]", ',')
     end
 
     #
@@ -86,6 +60,20 @@ module Rex
       return "#[\n" + wordwrap(str, 0, wrap, '', '') + "]#\n"
     end
 
+    #
+    # Converts to a Rust style array of bytes
+    #
+    def self.to_rust(str, wrap = DefaultWrap, name = "buf")
+      return numhexify(str, wrap, '', '',  "let #{name}: [u8; #{str.length}] = [", "];", ',')
+    end
+    
+    #
+    # Creates a Rust style comment
+    #
+    def self.to_rust_comment(str, wrap = DefaultWrap)
+      return "/*\n" + wordwrap(str, 0, wrap, '', ' * ') + " */\n"
+    end
+
     #
     # Creates a c-style comment
     #

data/lib/rex/text/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Text
-    VERSION = "0.2.45"
+    VERSION = "0.2.47"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-text
 version: !ruby/object:Gem::Version
-  version: 0.2.45
+  version: 0.2.47
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2022-09-06 00:00:00.000000000 Z
+date: 2022-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -185,8 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.10
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Provides Text Manipulation Methods for Exploitation