rex-text 0.2.52 → 0.2.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9814b1ad404f9ec4aec0102caf30af10fa00639bcbc6d67d3c3947ffd848229
-  data.tar.gz: 44ee07b97ef06aac2bc3e17ba27e6cbb2e61e7b93628e4b942196c693ac39fd2
+  metadata.gz: c05ee609d7b945466cea4997460b0309d45768ab3d1baa1b7fedaf24fb4e94a0
+  data.tar.gz: 9c43e502375129ec13d9f11695ac1fa6409e1aa28abe33289008b46c1d4bd8cb
 SHA512:
-  metadata.gz: a734eebc8ab62ca00c662b815e3ba9d2ef189f35a4b02513fe2adb0ef4d01f9142b3f4c97d08fc60274e5ee1ea3c8817e6cc9ca191deacd0030f79323b1c0357
-  data.tar.gz: e17248ae8403a4f4c39c8a56e3f7b3173a111d2b121d5fe350da672cb4e5d91264ee2ed7f2831bde9c8fcdc50bf9a2fdad070a810ac9a6dcec8f5837d00722cd
+  metadata.gz: 061327edbe4d52cd8a374539b8e9bde0cc01c156c95235ab48f528f25c3f806726b194d679e81a52e230bbbd77ceb70ed33f9227356c85fea1c05251a4c3c584
+  data.tar.gz: 7a2d1a026f030fa69403dd167378da42cf51629b5b942de03899d3f0dda52ede8f55e5d258fcfc4dd42180dc1d1089fc86c32f3d79265d269a294959eb4b237d

data/cortex.yaml

@@ -0,0 +1,15 @@
+---
+info:
+  title: Rex Text
+  description: Rex library for text generation and manipulation
+  x-cortex-git:
+    github:
+      alias: r7org
+      repository: rapid7/rex-text
+  x-cortex-tag: rex-text
+  x-cortex-type: service
+  x-cortex-domain-parents:
+  - tag: metasploit
+openapi: 3.0.1
+servers:
+- url: "/"

data/lib/rex/text/hex.rb

@@ -171,8 +171,8 @@ module Rex
     #
     # 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
+    def self.hexify_general(str, char_prefix, col = DefaultWrap, line_start = '', line_end = '', buf_start = '', buf_end = '', between='', char_suffix: '')
+      encoded_char_length = 2 + char_prefix.length + char_suffix.length + between.length
       if col < line_start.length + encoded_char_length + line_end.length
         # raise an exception
         raise ArgumentError.new('insufficient column width')
@@ -188,7 +188,7 @@ module Rex
           ret << "#{line_end}\n#{line_start}"
           last_line_length = line_start.length
         end
-        ret << char_prefix << char.unpack('H*')[0] << between
+        ret << char_prefix << char.unpack('H*')[0] << char_suffix << between
         last_line_length += encoded_char_length
       end
       # Remove the last in-between characters, if required

data/lib/rex/text/lang.rb

@@ -48,17 +48,17 @@ module Rex
     #
     # Converts to a masm style array of bytes
     #
-    def self.to_masm(str, wrap = DefaultWrap, name = "")
-      raise ArgumentError.new('str can not be empty') if str.empty?
-      a = to_hex(str)
-      a.gsub!(/\\x/, '')
-      a.gsub!(/(.{2})/, '\1h,')
-      a.gsub!(/(.{32})/, '\1\n')
-      a.gsub!('\n', "\n")
-      a.gsub!(/^(.*),$/, 'DB \1')
-      a.gsub!(/([a-f].h)/, '0\1')
-      a.sub!(/^/, 'shellcode ')
-      return a
+    def self.to_masm(str, wrap = DefaultWrap, name = "buf")
+      result = hexify_general(str, "", wrap, "#{' ' * (name.length + 1)}DB ", '', "#{name} DB ", '', ',', char_suffix: 'h')
+      result.gsub!(",\n", "\n")
+      result
+    end
+
+    #
+    # Creates a masm style comment
+    #
+    def self.to_masm_comment(str, wrap = DefaultWrap)
+      return wordwrap(str, 0, wrap, '', '; ')
     end
 
     #
@@ -72,7 +72,6 @@ module Rex
     # Converts to a nim style array of bytes
     #
     def self.to_nim(str, wrap = DefaultWrap, name = "buf")
-      raise ArgumentError.new('str can not be empty') if str.empty?
       return numhexify(str, wrap, '', '',  "var #{name}: array[#{str.length}, byte] = [\nbyte ", "]", ',')
     end
 
@@ -89,7 +88,7 @@ module Rex
     def self.to_rust(str, wrap = DefaultWrap, name = "buf")
       return numhexify(str, wrap, '', '',  "let #{name}: [u8; #{str.length}] = [", "];", ',')
     end
-    
+
     #
     # Creates a Rust style comment
     #

data/lib/rex/text/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Text
-    VERSION = "0.2.52"
+    VERSION = "0.2.54"
   end
 end

data.tar.gz.sig

@@ -1,4 +1,2 @@
-}	��R�.*/
-�O�+���
lt/�\:S������c��ҩl�\�ԫ�
j�r��}p�#��-�w��J��s�\�ט��8�y	��nHR!
-CEZ;�NuC�����m�Ą0�fͿ����R��=W�οa2r
|��\�v׃l�s
-�Q�&�=��^y��sS�ȴ�b�o��e��4�~�ۢuxe6�W�����nw
+�))s��q�뿿���+�w�E�B��Q'A����WmP�m�}cZ180׈
+���0٬\$��Tw�u���ki#�MGQL���O��wH��ǥq

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-text
 version: !ruby/object:Gem::Version
-  version: 0.2.52
+  version: 0.2.54
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2023-06-14 00:00:00.000000000 Z
+date: 2023-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -141,6 +141,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- cortex.yaml
 - lib/rex/codepage.map
 - lib/rex/text.rb
 - lib/rex/text/badchars.rb