ctf-party 1.5.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de422839915f8e5fe2e71975678b8966aecf94edc75d4a29e7337ba80c728537
-  data.tar.gz: 1ae611ce6ed8a42cb088c5ce27d75979f589a69413713f2165b109305a85d9c1
+  metadata.gz: b19410e0b443bc237d10f61d2f85caff731309e95142c66d5d74897b3b296319
+  data.tar.gz: b446182ee4883bddcabb9cfa108d62712d74ab004fe9b1f4180db7ae42e4dcd9
 SHA512:
-  metadata.gz: d941c1d060a2ecec96d396b6ff0c7f692bd138b7962956dfd98b8a092c534755f965cb77e3a72fa2cfad770c71a73783c791d01dfdca835b7ef7abd42d1ef552
-  data.tar.gz: c65a093261672e00c56eadb7d5dce1bae86a7ac41b6755a0c72e13b48ffdd967256e50dadbc74b41533d616799d1972ee737ce4fe7f0ecd2eda0227c86692aaf
+  metadata.gz: e38e7605cd1bf2bd7d9bcef501c93d6c5e1789a8488a6a150380e364822f24c981f265e319654527e0e804f6bcb7f3c6e2337d39abc54d081c602de43aca6056
+  data.tar.gz: 4cb5c641ec6cbdc40e35387068c8befc1b658d586bae0a52a8c13cdf5cd93068c05e250d48274810e2f276bb61681bf7be0b862da0699d672b857f47a66c50cc

data/bin/ctf-party

@@ -3,6 +3,7 @@
 
 # Ruby internal
 require 'pp'
+require 'shellwords' # for shellescape cmd
 # Project internal
 require 'ctf_party'
 require 'ctf_party/version'
@@ -10,6 +11,7 @@ require 'ctf_party/version'
 require 'docopt'
 
 cmd_whitelist = {
+  # ctf-party commands
   alternatecase: 'Change one characte on two upcase and the other downcase',
   bin2hex: 'Encode an binary string to a hexadecimal string',
   bin2str: 'Alias for from_bin',
@@ -45,27 +47,62 @@ cmd_whitelist = {
   to_hex: 'Encode a string into hexadecimal',
   to_hexip: 'Encode a dotted decimal IP into a hexadecimal one',
   urldecode: 'URL-decode the string',
-  urlencode: 'URL-encode the string'
+  urldecode_component: 'URL-decode the URL component string',
+  urlencode: 'URL-encode the string',
+  urlencode_component: 'URL-encode the URL component string',
+  # native string commands
+  bytesize: 'https://rubyapi.org/3.1/o/string#method-i-bytesize',
+  capitalize: 'https://rubyapi.org/3.1/o/string#method-i-capitalize',
+  chomp: 'https://rubyapi.org/3.1/o/string#method-i-chomp',
+  chop: 'https://rubyapi.org/3.1/o/string#method-i-chop',
+  downcase: 'https://rubyapi.org/3.1/o/string#method-i-downcase',
+  dump: 'https://rubyapi.org/3.1/o/string#method-i-dump',
+  hex: 'https://rubyapi.org/3.1/o/string#method-i-hex',
+  inspect: 'https://rubyapi.org/3.1/o/string#method-i-inspect',
+  length: 'https://rubyapi.org/3.1/o/string#method-i-length',
+  lstrip: 'https://rubyapi.org/3.1/o/string#method-i-lstrip',
+  reverse: 'https://rubyapi.org/3.1/o/string#method-i-reverse',
+  rstrip: 'https://rubyapi.org/3.1/o/string#method-i-rstrip',
+  scrub: 'https://rubyapi.org/3.1/o/string#method-i-scrub',
+  shellescape: 'https://rubyapi.org/3.1/o/string#method-i-shellescape',
+  size: 'https://rubyapi.org/3.1/o/string#method-i-size',
+  squeeze: 'https://rubyapi.org/3.1/o/string#method-i-squeeze',
+  strip: 'https://rubyapi.org/3.1/o/string#method-i-strip',
+  succ: 'https://rubyapi.org/3.1/o/string#method-i-succ',
+  swapcase: 'https://rubyapi.org/3.1/o/string#method-i-swapcase',
+  undump: 'https://rubyapi.org/3.1/o/string#method-i-undump',
+  unicode_normalize: 'https://rubyapi.org/3.1/o/string#method-i-unicode_normalize',
+  upcase: 'https://rubyapi.org/3.1/o/string#method-i-upcase'
 }
 
 doc = <<~DOCOPT
-  ctf-party by noraj
+  ctf-party v#{Version::VERSION} by noraj
 
   Usage:
-    ctf-party <string> <cmd>... [--debug]
+    ctf-party <string> <cmd>... [--row --file] [--debug]
     ctf-party --list-commands [--debug]
     ctf-party -h | --help
     ctf-party --version
 
+  Parameters:
+    <string>              The string to manipulate, read from STDIN if equal to "-"
+    <cmd>                 Command to apply to the string, cf. --list-commands
+
   Options:
     -l, --list-commands   List available commands (see https://noraj.github.io/ctf-party/yard/String.html)
+    -r, --row             Apply the transformation to each row
+    -f, --file            Interpret the string as a filename, if file doesn't exist it will still be treated as a string
     --debug               Display arguments
     -h, --help            Show this screen
     --version             Show version
 
   Examples:
     ctf-party 'security' to_hex
-    ctf-party 'NzQ2Zjc0NmY=' from_b64 hex2str str2bin
+    ctf-party 'NzQ2Zjc0NmY=' from_b64 hex2bin
+    curl -s https://example.org | ctf-party - htmlescape
+    seq 1 10 | ctf-party - dec2hex hex2bin --row
+    cut -d : -f 1 /etc/passwd | ctf-party - randomcase --row
+    ctf-party /etc/passwd str2hex --row --file
 DOCOPT
 
 begin
@@ -73,11 +110,24 @@ begin
   # use case 1, using the tool
   pp args if args['--debug']
   if args['<string>']
+    args['<string>'] = $stdin.read.chomp if args['<string>'] == '-'
+    args['<string>'] = File.read(args['<string>']) if args['--file'] && File.exist?(args['<string>'])
     wrong_cmd = args['<cmd>'] - cmd_whitelist.keys.map(&:to_s)
     if wrong_cmd.empty?
-      output = args['<string>']
-      args['<cmd>'].each do |cmd|
-        output = output.public_send(cmd)
+      if args['--row']
+        output = ''
+        args['<string>'].each_line(chomp: true) do |line|
+          output_line = line
+          args['<cmd>'].each do |cmd|
+            output_line = output_line.public_send(cmd)
+          end
+          output += "#{output_line}\n"
+        end
+      else
+        output = args['<string>']
+        args['<cmd>'].each do |cmd|
+          output = output.public_send(cmd)
+        end
       end
       puts output
     else
@@ -85,7 +135,7 @@ begin
     end
   elsif args['--list-commands']
     cmd_whitelist.each do |k, v|
-      puts "#{k.to_s.ljust(15)}#{v}"
+      puts "#{k.to_s.ljust(25)}#{v}"
     end
   end
   # use case 2, help: already handled by docopt

data/lib/ctf_party/base64.rb

@@ -6,8 +6,8 @@ require 'base64'
 class String
   # Encode the string into base64
   # @param opts [Hash] optional parameters
-  # @option opts [Symbol] :mode Default value: +:strict+.
-  #   Other values are +:strict+ (+:rfc4648+) or +:urlsafe+.
+  # @option opts [Symbol] :mode Default value: `:strict`.
+  #   Other values are `:strict` (`:rfc4648`) or `:urlsafe`.
   # @see https://ruby-doc.org/stdlib-2.6.5/libdoc/base64/rdoc/Base64.html
   # @return [String] the Base64 encoded string
   # @example
@@ -32,8 +32,8 @@ class String
 
   # Decode the string from base64
   # @param opts [Hash] optional parameters
-  # @option opts [Symbol] :mode Default value: +:strict+.
-  #   Other values are +:strict+ (+:rfc4648+) or +:urlsafe+.
+  # @option opts [Symbol] :mode Default value: `:strict`.
+  #   Other values are `:strict` (`:rfc4648`) or `:urlsafe`.
   # @see https://ruby-doc.org/stdlib-2.6.5/libdoc/base64/rdoc/Base64.html
   # @return [String] the Base64 decoded string
   # @example
@@ -58,10 +58,10 @@ class String
 
   # Is the string encoded in base64?
   # @param opts [Hash] optional parameters
-  # @option opts [Symbol] :mode Default value: +:strict+.
-  #   Other values are +:strict+ (+:rfc4648+) or +:urlsafe+.
+  # @option opts [Symbol] :mode Default value: `:strict`.
+  #   Other values are `:strict` (`:rfc4648`) or `:urlsafe`.
   # @see https://ruby-doc.org/stdlib-2.6.5/libdoc/base64/rdoc/Base64.html
-  # @return [Boolean] +true+ if the string is a valid base64 string, +false+
+  # @return [Boolean] `true` if the string is a valid base64 string, `false`
   #   else.
   # @example
   #   'SGVsbG8gd29ybGQh'.b64? # => true

data/lib/ctf_party/binary.rb

@@ -4,7 +4,7 @@ class String
   # Encode a string into binary
   # @param opts [Hash] optional parameters
   # @option opts [Symbol] :bitnumbering Display output with most significant bit
-  #   first (+:MSB+ default) or least significant bit first (+:LSB+).
+  #   first (`:MSB` default) or least significant bit first (`:LSB`).
   # @return [String] the binary encoded string
   # @example
   #   'binary'.to_bin # => "011000100110100101101110011000010111001001111001"
@@ -41,7 +41,7 @@ class String
   # Decode a binary string
   # @param opts [Hash] optional parameters
   # @option opts [Symbol] :bitnumbering Display input with most significant bit
-  #   first (+:MSB+ default) or least significant bit first (+:LSB+).
+  #   first (`:MSB` default) or least significant bit first (`:LSB`).
   # @return [String] the binary decoded string
   # @example
   #   '011000100110100101101110011000010111001001111001'.from_bin # => "binary"

data/lib/ctf_party/cgi.rb

@@ -2,14 +2,16 @@
 
 # Ruby standard library
 require 'cgi'
+require 'uri'
 
 class String
-  # URL-encode the string
+  # URL-encode the URL string (RFC2396)
   # @return [String] the URL-encoded string
   # @example
-  #   "'Stop!' said Fred".urlencode # => "%27Stop%21%27+said+Fred"
+  #   'http://vulnerable.site/search.aspx?txt="><script>alert(/Rubyfu/.source)</script>'.urlencode # => "http://vulnerable.site/search.aspx?txt=%22%3E%3Cscript%3Ealert(/Rubyfu/.source)%3C/script%3E"
+  #   "'Stop!' said Fred" # => "'Stop!'%20said%20Fred"
   def urlencode
-    CGI.escape self
+    URI::Parser.new.escape self
   end
 
   # URL-encode the string in place as described for {String#urlencode}.
@@ -17,12 +19,29 @@ class String
     replace(urlencode)
   end
 
-  # URL-decode the string
+  # URL-encode the URL component string
+  # @return [String] the URL-encoded string
+  # @example
+  #   "'Stop!' said Fred".urlencode_component # => "%27Stop%21%27+said+Fred"
+  #   'http://vulnerable.site/search.aspx?txt="><script>alert(/Rubyfu/.source)</script>'.urlencode_component # => "http%3A%2F%2Fvulnerable.site%2Fsearch.aspx%3Ftxt%3D%22%3E%3Cscript%3Ealert%28%2FRubyfu%2F.source%29%3C%2Fscript%3E"
+  def urlencode_component
+    CGI.escape self
+  end
+
+  # URL-encode the string in place as described for {String#urlencode_component}.
+  def urlencode_component!
+    replace(urlencode_component)
+  end
+
+  # URL-decode the URL string (RFC2396)
   # @return [String] the URL-decoded string
   # @example
-  #   "%27Stop%21%27+said+Fred".urldecode # => "'Stop!' said Fred"
+  #   'http://vulnerable.site/search.aspx?txt=%22%3E%3Cscript%3Ealert(/Rubyfu/.source)%3C/script%3E'.urldecode # => "http://vulnerable.site/search.aspx?txt=\"><script>alert(/Rubyfu/.source)</script>"
+  #   'http%3A%2F%2Fvulnerable.site%2Fsearch.aspx%3Ftxt%3D%22%3E%3Cscript%3Ealert%28%2FRubyfu%2F.source%29%3C%2Fscript%3E'.urldecode # => "http://vulnerable.site/search.aspx?txt=\"><script>alert(/Rubyfu/.source)</script>"
+  #   "'Stop!'%20said%20Fred".urldecode # => "'Stop!' said Fred"
+  #   '%27Stop%21%27+said+Fred'.urldecode # => "'Stop!'+said+Fred"
   def urldecode
-    CGI.unescape self
+    URI::Parser.new.unescape self
   end
 
   # URL-decode the string in place as described for {String#urldecode}.
@@ -30,6 +49,22 @@ class String
     replace(urldecode)
   end
 
+  # URL-decode the URL component string
+  # @return [String] the URL-decoded string
+  # @example
+  #   'http://vulnerable.site/search.aspx?txt=%22%3E%3Cscript%3Ealert(/Rubyfu/.source)%3C/script%3E'.urldecode_component # => "http://vulnerable.site/search.aspx?txt=\"><script>alert(/Rubyfu/.source)</script>"
+  #   'http%3A%2F%2Fvulnerable.site%2Fsearch.aspx%3Ftxt%3D%22%3E%3Cscript%3Ealert%28%2FRubyfu%2F.source%29%3C%2Fscript%3E'.urldecode_component # => "http://vulnerable.site/search.aspx?txt=\"><script>alert(/Rubyfu/.source)</script>"
+  #   "'Stop!'%20said%20Fred".urldecode_component => "'Stop!' said Fred"
+  #   '%27Stop%21%27+said+Fred'.urldecode_component # => "'Stop!' said Fred"
+  def urldecode_component
+    CGI.unescape self
+  end
+
+  # URL-decode the string in place as described for {String#urldecode_component}.
+  def urldecode_component!
+    replace(urldecode_component)
+  end
+
   # HTML escape the string
   # @return [String] the HTML escaped string
   # @example

data/lib/ctf_party/digest.rb

@@ -66,32 +66,32 @@ class String
     replace(sha2(opts))
   end
 
-  # Alias for {String#sha2} with default value ( +sha2(bitlen: 256)+ ).
+  # Alias for {String#sha2} with default value ( `sha2(bitlen: 256)` ).
   def sha2_256
     sha2
   end
 
-  # Alias for {String#sha2!} with default value ( +sha2!(bitlen: 256)+ ).
+  # Alias for {String#sha2!} with default value ( `sha2!(bitlen: 256)` ).
   def sha2_256!
     replace(sha2)
   end
 
-  # Alias for {String#sha2} with default value ( +sha2(bitlen: 384)+ ).
+  # Alias for {String#sha2} with default value ( `sha2(bitlen: 384)` ).
   def sha2_384
     sha2(bitlen: 384)
   end
 
-  # Alias for {String#sha2!} with default value ( +sha2!(bitlen: 384)+ ).
+  # Alias for {String#sha2!} with default value ( `sha2!(bitlen: 384)` ).
   def sha2_384!
     replace(sha2(bitlen: 384))
   end
 
-  # Alias for {String#sha2} with default value ( +sha2(bitlen: 512)+ ).
+  # Alias for {String#sha2} with default value ( `sha2(bitlen: 512)` ).
   def sha2_512
     sha2(bitlen: 512)
   end
 
-  # Alias for {String#sha2!} with default value ( +sha2!(bitlen: 512)+ ).
+  # Alias for {String#sha2!} with default value ( `sha2!(bitlen: 512)` ).
   def sha2_512!
     replace(sha2(bitlen: 512))
   end

data/lib/ctf_party/flag.rb

@@ -21,7 +21,7 @@ class String
   # @option hash [String] :prefix prefix of the flag. Default: none.
   # @option hash [String] :suffix suffix of the flag. Default: none.
   # @option hash [Array<String>] :enclosing the characters used to surround
-  #   the flag. Default are curly braces: +{+, +}+. The array must contain
+  #   the flag. Default are curly braces: `{`, `}`. The array must contain
   #   exactly 2 elements.
   # @option hash [String] :digest the hash algorithm to apply on the flag.
   #   Default: none. Allowed values: md5, sha1, sha2_256, sha2_384, sha2_512,

data/lib/ctf_party/hex.rb

@@ -4,15 +4,17 @@ class String
   # Encode an hexadecimal string to a decimal string
   # @param opts [Hash] optional parameters
   # @option opts [String] :prefix Prefix of the input. Default value is a void
-  #   string. Example of values: +0x+, +\x+.
+  #   string. Example of values: `0x`, `\x`, `\\x`.
   # @return [String] the decimal encoded string
   # @example
   #   'ff'.hex2dec # => "255"
   #   '\xf3'.hex2dec(prefix: '\x') # => "243"
+  #   '6e6f72616a'.hex2dec # => "474316169578"
+  #   '\\x6e\\x6f\\x72\\x61\\x6a'.hex2dec(prefix: '\\x') # => "474316169578"
   def hex2dec(opts = {})
     opts[:prefix] ||= ''
     # remove prefix
-    out = sub(opts[:prefix], '')
+    out = gsub(opts[:prefix], '')
     # convert
     return out.hex.to_s
   end
@@ -30,26 +32,37 @@ class String
   # Encode an decimal string to a hexadecimal string
   # @param opts [Hash] optional parameters
   # @option opts [String] :prefix Prefix of the output. Default value is a void
-  #   string. Example of values: +0x+, +\x+.
-  # @option opts [Symbol] :case Char case of the ouput. Default value +:lower+.
-  #   Other valid value +:upper+.
+  #   string. Example of values: `0x`, `\x`.
+  # @option opts [String] :prefixall Prefix each byte. Default value is a void
+  #   string. Example of value: `\\x`.
+  # @option opts [Symbol] :case Char case of the output. Default value `:lower`.
+  #   Other valid value `:upper`.
   # @option opts [Symbol] :padding Minimum size of the hexadecimal display
-  #   (number of characters). Eg. 10 -> 0xA or 0x0A
+  #   (number of characters). Must be even.
   # @return [String] the hexadecimal encoded string
   # @example
   #   '255'.dec2hex # => "ff"
   #   '255'.dec2hex({prefix: '0x', case: :upper}) # => "0xFF"
+  #   '10'.dec2hex(padding: 2) # => "0a"
+  #   '10'.dec2hex(padding: 8) # => "0000000a"
+  #   '474316169578'.dec2hex(prefixall: '\\x') # => "\\x6e\\x6f\\x72\\x61\\x6a"
   def dec2hex(opts = {})
     opts[:prefix] ||= ''
+    opts[:prefixall] ||= ''
     opts[:case] ||= :lower
-    opts[:padding] ||= 1
+    opts[:padding] ||= 2
+    raise(ArgumentError, 'Padding must be even') if opts[:padding].odd?
+
     # convert
     out = to_i.to_s(16)
     # padding
-    out = ('0' * (opts[:padding] - 1)) + out if out.size < opts[:padding]
+    out = ('0' * (opts[:padding] - out.size)) + out if out.size < opts[:padding]
     # char case management
     out = out.upcase if opts[:case] == :upper
-    # adding prefix must be done after case change
+    # adding prefix must be done after case change, complex conditional to avoid cropping when odd byte lenght
+    out = (out.size.odd? ? [out[0]] + out[1..].scan(/.{1,2}/) : out.scan(/.{2}/)).map do |x|
+      opts[:prefixall] + x
+    end.join
     return opts[:prefix] + out
   end
 
@@ -66,19 +79,23 @@ class String
   # Encode a string into hexadecimal
   # @param opts [Hash] optional parameters
   # @option opts [String] :prefix Prefix of the output. Default value is a void
-  #   string. Example of values: +0x+, +\x+.
-  # @option opts [Symbol] :case Char case of the ouput. Default value +:lower+.
-  #   Other valid value +:upper+.
+  #   string. Example of values: `0x`, `\x`.
+  # @option opts [String] :prefixall Prefix each byte. Default value is a void
+  #   string. Example of value: `\\x`.
+  # @option opts [Symbol] :case Char case of the output. Default value `:lower`.
+  #   Other valid value `:upper`.
   # @option opts [Symbol] :nibble Display output with high nibble first
-  #   (+:high+ default) or low nibble first (+:low+).
+  #   (`:high` default) or low nibble first (`:low`).
   # @return [String] the hexadecimal encoded string
   # @example
   #   'noraj'.to_hex # => "6e6f72616a"
   #   'noraj'.to_hex(prefix: '0x') # => "0x6e6f72616a"
   #   'noraj'.to_hex(case: :upper) # => "6E6F72616A"
   #   'noraj'.to_hex(nibble: :low) # => "e6f62716a6"
+  #   'noraj'.to_hex(prefixall: '\\x') # => "\\x6e\\x6f\\x72\\x61\\x6a"
   def to_hex(opts = {})
     opts[:prefix] ||= ''
+    opts[:prefixall] ||= ''
     opts[:case] ||= :lower
     opts[:nibble] ||= :high
     # convert
@@ -92,6 +109,7 @@ class String
     # char case management
     out = out.upcase if opts[:case] == :upper
     # adding prefix must be done after case change
+    out = out.scan(/.{2}/).map { |x| opts[:prefixall] + x }.join
     return opts[:prefix] + out
   end
 
@@ -118,19 +136,20 @@ class String
   # Decode a hexadecimal string
   # @param opts [Hash] optional parameters
   # @option opts [String] :prefix Prefix of the input. Default value is a void
-  #   string. Example of values: +0x+, +\x+.
+  #   string. Example of values: `0x`, `\x`, `\\x`.
   # @option opts [Symbol] :nibble Display input with high nibble first
-  #   (+:high+ default) or low nibble first (+:low+).
+  #   (`:high` default) or low nibble first (`:low`).
   # @return [String] the hexadecimal decoded string
   # @example
   #   "6e6f72616a".from_hex # => "noraj"
   #   "0x6e6f72616a".from_hex(prefix: '0x') # => "noraj"
   #   "e6f62716a6".from_hex(nibble: :low) # => "noraj"
+  #   '\\x6e\\x6f\\x72\\x61\\x6a'.from_hex(prefix: '\\x') # => "noraj"
   def from_hex(opts = {})
     opts[:prefix] ||= ''
     opts[:nibble] ||= :high
     # remove prefix
-    out = sub(opts[:prefix], '')
+    out = gsub(opts[:prefix], '')
     # convert
     return Array(out).pack('H*') if opts[:nibble] == :high
     return Array(out).pack('h*') if opts[:nibble] == :low
@@ -161,15 +180,16 @@ class String
   # Encode an hexadecimal string to a binary string
   # @param opts [Hash] optional parameters
   # @option opts [String] :prefix Prefix of the input. Default value is a void
-  #   string. Example of values: +0x+, +\x+.
+  #   string. Example of values: `0x`, `\x`, `\\x`.
   # @return [String] the binary encoded string
   # @example
   #   'ab'.hex2bin # => "10101011"
   #   '\xf3'.hex2bin(prefix: '\x') # => "11110011"
+  #   '\\x6e\\x6f\\x72\\x61\\x6a'.hex2bin(prefix: '\\x') # => "110111001101111011100100110000101101010"
   def hex2bin(opts = {})
     opts[:prefix] ||= ''
     # remove prefix
-    out = sub(opts[:prefix], '')
+    out = gsub(opts[:prefix], '')
     # convert
     return out.to_i(16).to_s(2)
   end
@@ -187,21 +207,26 @@ class String
   # Encode an binary string to a hexadecimal string
   # @param opts [Hash] optional parameters
   # @option opts [String] :prefix Prefix of the output. Default value is a void
-  #   string. Example of values: +0x+, +\x+.
-  # @option opts [Symbol] :case Char case of the ouput. Default value +:lower+.
-  #   Other valid value +:upper+.
+  #   string. Example of values: `0x`, `\x`.
+  # @option opts [String] :prefixall Prefix each byte. Default value is a void
+  #   string. Example of value: `\\x`.
+  # @option opts [Symbol] :case Char case of the output. Default value `:lower`.
+  #   Other valid value `:upper`.
   # @return [String] the hexadecimal encoded string
   # @example
   #   '11110011'.bin2hex # => "f3"
   #   '11110011'.bin2hex({prefix: '0x', case: :upper}) # => "0xF3"
+  #   '0110111001101111011100100110000101101010'.bin2hex(prefixall: '\\x') # => "\\x6e\\x6f\\x72\\x61\\x6a"
   def bin2hex(opts = {})
     opts[:prefix] ||= ''
+    opts[:prefixall] ||= ''
     opts[:case] ||= :lower
     # convert
     out = to_i(2).to_s(16)
     # char case management
     out = out.upcase if opts[:case] == :upper
     # adding prefix must be done after case change
+    out = out.scan(/.{2}/).map { |x| opts[:prefixall] + x }.join
     return opts[:prefix] + out
   end
 
@@ -218,18 +243,19 @@ class String
   # Decode a hexadecimal IP string into a dotted decimal one
   # @param opts [Hash] optional parameters
   # @option opts [String] :prefix Prefix of the input. Default value is a void
-  #   string. Example of values: +0x+, +\x+.
+  #   string. Example of values: `0x`, `\x`, '\\x'.
   # @option opts [Symbol] :nibble Display input with high nibble first
-  #   (+:high+ default) or low nibble first (+:low+, used on Unix +/proc/net/tcp+).
+  #   (`:high` default) or low nibble first (`:low`, used on Unix `/proc/net/tcp`).
   # @return [String] the dotted decimal IP
   # @example
   #   '0100007F'.from_hexip(nibble: :low) # => "127.0.0.1"
   #   '0x7f000001'.from_hexip(prefix: '0x') # => "127.0.0.1"
+  #   '\\x7f\\x00\\x00\\x01'.from_hexip(prefix: '\\x') # => "127.0.0.1"
   def from_hexip(opts = {})
     opts[:prefix] ||= ''
     opts[:nibble] ||= :high
     # remove prefix
-    out = sub(opts[:prefix], '')
+    out = gsub(opts[:prefix], '')
     # convert
     out = out.scan(/.{2}/).map(&:hex2dec)
     out = out.reverse if opts[:nibble] == :low
@@ -245,17 +271,21 @@ class String
   # Encode a dotted decimal IP into a hexadecimal one
   # @param opts [Hash] optional parameters
   # @option opts [String] :prefix Prefix of the output. Default value is a void
-  #   string. Example of values: +0x+, +\x+.
-  # @option opts [Symbol] :case Char case of the ouput. Default value +:lower+.
-  #   Other valid value +:upper+.
+  #   string. Example of values: `0x`, `\x`.
+  # @option opts [String] :prefixall Prefix each byte. Default value is a void
+  #   string. Example of value: `\\x`.
+  # @option opts [Symbol] :case Char case of the output. Default value `:lower`.
+  #   Other valid value `:upper`.
   # @option opts [Symbol] :nibble Display output with high nibble first
-  #   (+:high+ default) or low nibble first (+:low+, used on Unix +/proc/net/tcp+).
+  #   (`:high` default) or low nibble first (`:low`, used on Unix `/proc/net/tcp`).
   # @return [String] the hexadecimal encoded IP
   # @example
   #   '127.0.0.1'.to_hexip # => "7f000001"
   #   '127.0.0.1'.to_hexip(nibble: :low) # => "0100007f"
+  #   '127.0.0.1'.to_hexip(prefixall: '\\x') # => "\\x7f\\x00\\x00\\x01"
   def to_hexip(opts = {})
     opts[:prefix] ||= ''
+    opts[:prefixall] ||= ''
     opts[:case] ||= :lower
     opts[:nibble] ||= :high
     # convert
@@ -265,6 +295,7 @@ class String
     # char case management
     out = out.upcase if opts[:case] == :upper
     # adding prefix must be done after case change
+    out = out.scan(/.{2}/).map { |x| opts[:prefixall] + x }.join
     return opts[:prefix] + out
   end
 

data/lib/ctf_party/rot.rb

@@ -2,7 +2,7 @@
 
 class String
   # "Encrypt / Decrypt" the string with Caesar cipher. This will shift the
-  # alphabet letters by +n+, where +n+ is the integer key. The same function
+  # alphabet letters by `n`, where `n` is the integer key. The same function
   # is used for encryption / decryption.
   # @param opts [Hash] optional parameters
   # @option opts [Integer] :shift The shift key. Default value: 13.
@@ -35,12 +35,12 @@ class String
     replace(rot(opts))
   end
 
-  # Alias for {String#rot} with default value ( +rot(shift: 13)+ ).
+  # Alias for {String#rot} with default value ( `rot(shift: 13)` ).
   def rot13
     rot
   end
 
-  # Alias for {String#rot!} with default value ( +rot!(shift: 13)+ ).
+  # Alias for {String#rot!} with default value ( `rot!(shift: 13)` ).
   def rot13!
     rot!
   end

data/lib/ctf_party/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Version
-  VERSION = '1.5.0'
+  VERSION = '2.2.0'
 end

data/lib/ctf_party/xor.rb

@@ -11,8 +11,8 @@ class String
     b1 = unpack('U*')
     b2 = key.unpack('U*')
     longest = [b1.length, b2.length].max
-    b1 = [0] * (longest - b1.length) + b1
-    b2 = [0] * (longest - b2.length) + b2
+    b1 = ([0] * (longest - b1.length)) + b1
+    b2 = ([0] * (longest - b2.length)) + b2
     b1.zip(b2).map { |a, b| a ^ b }.pack('U*')
   end
 
@@ -36,8 +36,8 @@ class String
     b1 = b1.chars.map(&:ord)
     b2 = b2.chars.map(&:ord)
     longest = [b1.length, b2.length].max
-    b1 = [0] * (longest - b1.length) + b1
-    b2 = [0] * (longest - b2.length) + b2
+    b1 = ([0] * (longest - b1.length)) + b1
+    b2 = ([0] * (longest - b2.length)) + b2
     b1.zip(b2).map { |a, b| (a ^ b).chr }.join
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ctf-party
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Alexandre ZANNI
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2022-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -24,145 +24,22 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: commonmarker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.20'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.20'
-- !ruby/object:Gem::Dependency
-  name: github-markup
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: minitest-skip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-description: A CLI tool & library to enhance and speed up script/exploitwriting for
-  CTF players (or security researchers, bug bountyhunters, pentesters but mostly focused
-  on CTF) bypatching the String class to add a short syntax of usualcode patterns.
+description: A CLI tool & library to enhance and speed up script/exploit writing for
+  CTF players (or security researchers, bug bounty hunters, pentesters but mostly
+  focused on CTF) by patching the String class to add a short syntax of usual code
+  patterns. Methods for base64, digest (hash), flag, rot (Caesar), hexadecimal, case,
+  cgi (URL encoding/decoding, HTML escaping/unescaping), binary, leet (1337), decimal,
+  XOR, whitespace strip.
 email: alexandre.zanni@engineer.com
 executables:
 - ctf-party
-- ctf_party_console
+- ctf-party_console
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE.txt
 - bin/ctf-party
-- bin/ctf_party_console
+- bin/ctf-party_console
 - lib/ctf_party.rb
 - lib/ctf_party/base64.rb
 - lib/ctf_party/binary.rb
@@ -187,6 +64,7 @@ metadata:
   documentation_uri: https://noraj.github.io/ctf-party/
   homepage_uri: https://noraj.github.io/ctf-party/
   source_code_uri: https://github.com/noraj/ctf-party/
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -198,16 +76,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
   - - "<"
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
-summary: A CLI tool & library to enhance and speed up script/exploitwriting for CTF
-  players
+summary: A CLI tool & library to enhance and speed up script/exploit writing with
+  string conversion/manipulation
 test_files: []