ctf-party 2.3.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41082df14f844e9d331e06352e00af3ab29af0899ad4a54f911ee6cef946258b
-  data.tar.gz: ffb31de3ffd71d581c277f10ff0be95e9eaf2e75c161df8af1f9b8d415af64fc
+  metadata.gz: 1eb800f2b8374568f0f0caf62902e9851de280e60f136079486ddb1d80d597a3
+  data.tar.gz: 5202083c9dcfe5d3f917fd1a706d8bfc305d20e004f1857d406f7ef86c3a674f
 SHA512:
-  metadata.gz: e09eff292c815cb2a5de04f8ae901a9ccc83ac30f7cd8b3a634b2b0674b32e3cd568cecfca774641afe23953afc1a9987d810655d236bf6f4fede7a2d48c62e2
-  data.tar.gz: 425e78e522566abf5a67650de204e2feea57f800d81f85dd04c87a51c0cbfea1a8096344da8eea61ab9b0a857ef2c511eacb52f97f2e92fb333274897f05b8d9
+  metadata.gz: acfd29ec5d68b4904f60eb2331fd22773865aa80e549c366c285bc7ce3a0448a543729ac3ec8df00821942a70eec740d6ee20942939469463cd8cc15036e9793
+  data.tar.gz: b9cce70eaeaa54d167f2e657e5b120a776bb3510b9555916ea42739e1011bb335e493045ebf609a8cc2ca55041fbc93c40b30b930700f219193950f584fc10d4

data/bin/ctf-party

@@ -12,8 +12,10 @@ require 'docopt'
 cmd_whitelist = {
   # ctf-party commands
   alternatecase: 'Change one characte on two upcase and the other downcase',
+  bin2dec: 'Convert a binary string to decimal',
   bin2hex: 'Encode an binary string to a hexadecimal string',
   bin2str: 'Alias for from_bin',
+  dec2bin: 'Convert a decimal string to binary',
   dec2hex: 'Encode an decimal string to a hexadecimal string',
   dec2str: 'Alias for from_dec',
   defang_domain: 'Defang domain name',
@@ -24,7 +26,9 @@ cmd_whitelist = {
   from_bin: 'Decode a binary string',
   from_dec: 'Decode a decimal string (decimal to hexadecimal then hexadecimal to string)',
   from_hex: 'Decode a hexadecimal string',
-  from_hexip: 'Decode a hexadecimal IP string into a dotted decimal one',
+  from_hexip: 'Decode a hexadecimal IPv4 string into a dotted decimal one',
+  from_hexipv4: 'Decode a hexadecimal IPv4 string into a dotted decimal one',
+  from_hexipv6: 'Decode a hexadecimal IPv6 string into a the double-dotted hexadecimal format',
   hex2bin: 'Encode an hexadecimal string to a binary string',
   hex2dec: 'Encode an hexadecimal string to a decimal string',
   hex2str: 'Alias for from_hex',
@@ -52,34 +56,37 @@ cmd_whitelist = {
   to_bin: 'Encode a string into binary',
   to_dec: 'Encode a string into decimal (string to hexadecimal then hexadecimal to decimal)',
   to_hex: 'Encode a string into hexadecimal',
-  to_hexip: 'Encode a dotted decimal IP into a hexadecimal one',
-  urldecode: 'URL-decode the string',
-  urldecode_component: 'URL-decode the URL component string',
-  urlencode: 'URL-encode the string',
-  urlencode_component: 'URL-encode the URL component string',
+  to_hexip: 'Encode a dotted decimal IPv4 into a hexadecimal one',
+  to_hexipv4: 'Encode a dotted decimal IPv4 into a hexadecimal one',
+  urldecode: 'URL-decode the string (RFC 2396)',
+  urldecode_component: 'URL-decode the URL component string (RFC 3986)',
+  urldecode_data: 'URL-decode the form data (application/x-www-form-urlencoded) string',
+  urlencode: 'URL-encode the string (RFC 2396)',
+  urlencode_component: 'URL-encode the URL component string (RFC 3986)',
+  urlencode_data: 'URL-encode form data (application/x-www-form-urlencoded) 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'
+  bytesize: 'https://rubyapi.org/3.2/o/string#method-i-bytesize',
+  capitalize: 'https://rubyapi.org/3.2/o/string#method-i-capitalize',
+  chomp: 'https://rubyapi.org/3.2/o/string#method-i-chomp',
+  chop: 'https://rubyapi.org/3.2/o/string#method-i-chop',
+  downcase: 'https://rubyapi.org/3.2/o/string#method-i-downcase',
+  dump: 'https://rubyapi.org/3.2/o/string#method-i-dump',
+  hex: 'https://rubyapi.org/3.2/o/string#method-i-hex',
+  inspect: 'https://rubyapi.org/3.2/o/string#method-i-inspect',
+  length: 'https://rubyapi.org/3.2/o/string#method-i-length',
+  lstrip: 'https://rubyapi.org/3.2/o/string#method-i-lstrip',
+  reverse: 'https://rubyapi.org/3.2/o/string#method-i-reverse',
+  rstrip: 'https://rubyapi.org/3.2/o/string#method-i-rstrip',
+  scrub: 'https://rubyapi.org/3.2/o/string#method-i-scrub',
+  shellescape: 'https://rubyapi.org/3.2/o/string#method-i-shellescape',
+  size: 'https://rubyapi.org/3.2/o/string#method-i-size',
+  squeeze: 'https://rubyapi.org/3.2/o/string#method-i-squeeze',
+  strip: 'https://rubyapi.org/3.2/o/string#method-i-strip',
+  succ: 'https://rubyapi.org/3.2/o/string#method-i-succ',
+  swapcase: 'https://rubyapi.org/3.2/o/string#method-i-swapcase',
+  undump: 'https://rubyapi.org/3.2/o/string#method-i-undump',
+  unicode_normalize: 'https://rubyapi.org/3.2/o/string#method-i-unicode_normalize',
+  upcase: 'https://rubyapi.org/3.2/o/string#method-i-upcase'
 }
 
 doc = <<~DOCOPT
@@ -115,7 +122,7 @@ DOCOPT
 begin
   args = Docopt.docopt(doc, version: Version::VERSION)
   # use case 1, using the tool
-  pp args if args['--debug']
+  puts 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>'])

data/lib/ctf_party/base64.rb

@@ -6,16 +6,15 @@ 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`.
-  # @see https://ruby-doc.org/stdlib-2.6.5/libdoc/base64/rdoc/Base64.html
+  # @option opts [Symbol] :mode Default value: `:strict` (`:rfc4648`).
+  #   Other values are `:rfc2045` or `:urlsafe`.
+  # @see https://ruby-doc.org/3.2.2/stdlibs/base64/Base64.html
   # @return [String] the Base64 encoded string
   # @example
   #   'Super lib!'.to_b64 # => "U3VwZXIgbGliIQ=="
   def to_b64(opts = {})
     opts[:mode] ||= :strict
-    return Base64.strict_encode64(self) if opts[:mode] == :strict ||
-                                           opts[:mode] == :rfc4648
+    return Base64.strict_encode64(self) if %i[strict rfc4648].include?(opts[:mode])
     return Base64.encode64(self) if opts[:mode] == :rfc2045
     return Base64.urlsafe_encode64(self) if opts[:mode] == :urlsafe
   end
@@ -32,16 +31,15 @@ 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`.
-  # @see https://ruby-doc.org/stdlib-2.6.5/libdoc/base64/rdoc/Base64.html
+  # @option opts [Symbol] :mode Default value: `:strict` (`:rfc4648`).
+  #   Other values are `:rfc2045` or `:urlsafe`.
+  # @see https://ruby-doc.org/3.2.2/stdlibs/base64/Base64.html
   # @return [String] the Base64 decoded string
   # @example
   #   'UnVieQ=='.from_b64 # => "Ruby"
   def from_b64(opts = {})
     opts[:mode] ||= :strict
-    return Base64.strict_decode64(self) if opts[:mode] == :strict ||
-                                           opts[:mode] == :rfc4648
+    return Base64.strict_decode64(self) if %i[strict rfc4648].include?(opts[:mode])
     return Base64.decode64(self) if opts[:mode] == :rfc2045
     return Base64.urlsafe_decode64(self) if opts[:mode] == :urlsafe
   end
@@ -58,9 +56,9 @@ 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`.
-  # @see https://ruby-doc.org/stdlib-2.6.5/libdoc/base64/rdoc/Base64.html
+  # @option opts [Symbol] :mode Default value: `:strict` (`:rfc4648`).
+  #   Other values are `:rfc2045` or `:urlsafe`.
+  # @see https://ruby-doc.org/3.2.2/stdlibs/base64/Base64.html
   # @return [Boolean] `true` if the string is a valid base64 string, `false`
   #   else.
   # @example

data/lib/ctf_party/binary.rb

@@ -74,4 +74,32 @@ class String
   def bin2str!(opts = {})
     from_bin!(opts)
   end
+
+  # Convert a binary string to decimal (binary to hexadecimal then hexadecimal to decimal)
+  # @param opts [Hash] optional parameters (see {String#bin2hex} and {String#hex2dec})
+  # @return [String] the decimal encoded string
+  # @example
+  #   '011000100110100101101110011000010111001001111001'.bin2dec # => "108204962968185"
+  def bin2dec(opts = {})
+    bin2hex(opts).hex2dec(opts)
+  end
+
+  # Convert a binary string to decimal in place as described for {String#bin2dec}.
+  def bin2dec!(opts = {})
+    replace(bin2dec(opts))
+  end
+
+  # Convert a decimal string to binary (decimal to hexadecimal then hexadecimal to binary)
+  # @param opts [Hash] optional parameters (see {String#dec2hex} and {String#hex2bin})
+  # @return [String] the binary encoded string
+  # @example
+  #   '474316169578'.dec2bin # => "0110111001101111011100100110000101101010"
+  def dec2bin(opts = {})
+    dec2hex(opts).hex2bin(opts)
+  end
+
+  # Convert a decimal string to binary in place as described for {String#dec2bin}.
+  def dec2bin!(opts = {})
+    replace(dec2bin(opts))
+  end
 end

data/lib/ctf_party/cgi.rb

@@ -5,13 +5,13 @@ require 'cgi'
 require 'uri'
 
 class String
-  # URL-encode the URL string (RFC2396)
+  # URL-encode the URL string (RFC 2396)
   # @return [String] the URL-encoded string
   # @example
   #   '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"
+  #   "'Stop!' said Fred".urlencode # => "'Stop!'%20said%20Fred"
   def urlencode
-    URI::Parser.new.escape self
+    URI::RFC2396_PARSER.escape self
   end
 
   # URL-encode the string in place as described for {String#urlencode}.
@@ -19,21 +19,21 @@ class String
     replace(urlencode)
   end
 
-  # URL-encode the URL component string
-  # @return [String] the URL-encoded string
+  # URL-encode form data (`application/x-www-form-urlencoded`) string
+  # @return [String] the URL-encoded data
   # @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
+  #   "'Stop!' said Fred".urlencode_data # => "%27Stop%21%27+said+Fred"
+  #   'http://vulnerable.site/search.aspx?txt="><script>alert(/Rubyfu/.source)</script>'.urlencode_data # => "http%3A%2F%2Fvulnerable.site%2Fsearch.aspx%3Ftxt%3D%22%3E%3Cscript%3Ealert%28%2FRubyfu%2F.source%29%3C%2Fscript%3E"
+  def urlencode_data
     CGI.escape self
   end
 
-  # URL-encode the string in place as described for {String#urlencode_component}.
-  def urlencode_component!
-    replace(urlencode_component)
+  # URL-encode the data in place as described for {String#urlencode_data}.
+  def urlencode_data!
+    replace(urlencode_data)
   end
 
-  # URL-decode the URL string (RFC2396)
+  # URL-decode the URL string (RFC 2396)
   # @return [String] the URL-decoded string
   # @example
   #   '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>"
@@ -41,7 +41,7 @@ class String
   #   "'Stop!'%20said%20Fred".urldecode # => "'Stop!' said Fred"
   #   '%27Stop%21%27+said+Fred'.urldecode # => "'Stop!'+said+Fred"
   def urldecode
-    URI::Parser.new.unescape self
+    URI::RFC2396_PARSER.unescape self
   end
 
   # URL-decode the string in place as described for {String#urldecode}.
@@ -49,20 +49,20 @@ class String
     replace(urldecode)
   end
 
-  # URL-decode the URL component string
+  # URL-decode the form data (`application/x-www-form-urlencoded`) 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
+  #   'http://vulnerable.site/search.aspx?txt=%22%3E%3Cscript%3Ealert(/Rubyfu/.source)%3C/script%3E'.urldecode_data # => "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_data # => "http://vulnerable.site/search.aspx?txt=\"><script>alert(/Rubyfu/.source)</script>"
+  #   "'Stop!'%20said%20Fred".urldecode_data => "'Stop!' said Fred"
+  #   '%27Stop%21%27+said+Fred'.urldecode_data # => "'Stop!' said Fred"
+  def urldecode_data
     CGI.unescape self
   end
 
-  # URL-decode the string in place as described for {String#urldecode_component}.
-  def urldecode_component!
-    replace(urldecode_component)
+  # URL-decode the string in place as described for {String#urldecode_data}.
+  def urldecode_data!
+    replace(urldecode_data)
   end
 
   # HTML escape the string
@@ -90,4 +90,32 @@ class String
   def htmlunescape!
     replace(htmlunescape)
   end
+
+  # URL-encode the URL component string (RFC 3986)
+  # @return [String] URL-encoded component string
+  # @example
+  #   '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"
+  #   "'Stop!' said Fred".urlencode_component # => "%27Stop%21%27%20said%20Fred"
+  def urlencode_component
+    CGI.escapeURIComponent self
+  end
+
+  # URL-encode the URL component string (RFC 3986) as described for {String#urlencode_component}.
+  def urlencode_component!
+    replace(urlencode_component)
+  end
+
+  # URL-decode the URL component string (RFC 3986)
+  # @return [String] URL-decoded component string
+  # @example
+  #   '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>"
+  #   '%27Stop%21%27%20said%20Fred'.urldecode_component # => "'Stop!' said Fred"
+  def urldecode_component
+    CGI.unescapeURIComponent self
+  end
+
+  # URL-decode the URL component string (RFC 3986) as described for {String#urldecode_component}.
+  def urldecode_component!
+    replace(urldecode_component)
+  end
 end

data/lib/ctf_party/dec.rb

@@ -2,48 +2,50 @@
 
 class String
   # Encode a string into decimal (string to hexadecimal then hexadecimal to decimal)
+  # @param opts [Hash] optional parameters (see {String#to_hex} and {String#hex2dec})
   # @return [String] the decimal encoded string
   # @example
   #   'noraj'.to_dec # => "474316169578"
-  def to_dec
-    str2hex.hex2dec
+  def to_dec(opts = {})
+    to_hex(opts).hex2dec(opts)
   end
 
   # Encode a string into decimal in place as described for {String#to_dec}.
-  def to_dec!
-    replace(to_dec)
+  def to_dec!(opts = {})
+    replace(to_dec(opts))
   end
 
   # Decode a decimal string (decimal to hexadecimal then hexadecimal to string)
+  # @param opts [Hash] optional parameters (see {String#dec2hex} and {String#from_hex})
   # @return [String] the decimal decoded string
   # @example
   #   '1834615104613964215417'.from_dec # => "ctf-party"
-  def from_dec
-    dec2hex.hex2str
+  def from_dec(opts = {})
+    dec2hex(opts).from_hex(opts)
   end
 
   # Decode a decimal string in place as described for {String#from_dec}.
-  def from_dec!
-    replace(from_dec)
+  def from_dec!(opts = {})
+    replace(from_dec(opts))
   end
 
   # Alias for {String#to_dec}.
-  def str2dec
-    to_dec
+  def str2dec(opts = {})
+    to_dec(opts)
   end
 
   # Alias for {String#to_dec!}.
-  def str2dec!
-    replace(str2dec)
+  def str2dec!(opts = {})
+    replace(str2dec(opts))
   end
 
   # Alias for {String#from_dec}.
-  def dec2str
-    from_dec
+  def dec2str(opts = {})
+    from_dec(opts)
   end
 
   # Alias for {String#from_dec!}.
-  def dec2str!
-    replace(dec2str)
+  def dec2str!(opts = {})
+    replace(dec2str(opts))
   end
 end

data/lib/ctf_party/hex.rb

@@ -5,18 +5,25 @@ class 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`, `\\x`.
+  # @option opts [Symbol] :padding Minimum size of the decimal display
+  #   (number of characters) for the output. Default is no padding.
   # @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"
+  #   '41'.hex2dec(padding: 3) # => "065"
   def hex2dec(opts = {})
     opts[:prefix] ||= ''
+    opts[:padding] ||= 0
     # remove prefix
     out = gsub(opts[:prefix], '')
     # convert
-    return out.hex.to_s
+    out = out.hex.to_s
+    # padding
+    out = ('0' * (opts[:padding] - out.size)) + out if out.size < opts[:padding]
+    return out
   end
 
   # Encode an hexadecimal string to a decimal string in place as described
@@ -29,7 +36,7 @@ class String
     replace(hex2dec(opts))
   end
 
-  # Encode an decimal string to a hexadecimal string
+  # Encode a 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`.
@@ -59,14 +66,14 @@ class String
     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, complex conditional to avoid cropping when odd byte lenght
+    # adding prefix must be done after case change, complex conditional to avoid cropping when odd byte length
     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
 
-  # Encode an decimal string to a hexadecimal string in place as described
+  # Encode a decimal string to a hexadecimal string in place as described
   # for {String#dec2hex}.
   # @example
   #   a = '255'
@@ -181,6 +188,8 @@ class 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`, `\\x`.
+  # @option opts [Integer] :even Returns an even number of chars (pad with `0`). Default value is a 1.
+  #   `0` for false and `1` for true.
   # @return [String] the binary encoded string
   # @example
   #   'ab'.hex2bin # => "10101011"
@@ -188,10 +197,14 @@ class String
   #   '\\x6e\\x6f\\x72\\x61\\x6a'.hex2bin(prefix: '\\x') # => "110111001101111011100100110000101101010"
   def hex2bin(opts = {})
     opts[:prefix] ||= ''
+    opts[:even] ||= 1
     # remove prefix
     out = gsub(opts[:prefix], '')
     # convert
-    return out.to_i(16).to_s(2)
+    out = out.to_i(16).to_s(2)
+    # padding
+    out = "0#{out}" if out.size.odd? && opts[:even] == 1
+    return out
   end
 
   # Encode an hexadecimal string to a binary string in place as described
@@ -225,8 +238,10 @@ class String
     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
+    # adding prefix must be done after case change, complex conditional to avoid cropping when odd byte length
+    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
 
@@ -240,7 +255,7 @@ class String
     replace(bin2hex(opts))
   end
 
-  # Decode a hexadecimal IP string into a dotted decimal one
+  # Decode a hexadecimal IPv4 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`, '\\x'.
@@ -248,10 +263,10 @@ class String
   #   (`: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 = {})
+  #   '0100007F'.from_hexipv4(nibble: :low) # => "127.0.0.1"
+  #   '0x7f000001'.from_hexipv4(prefix: '0x') # => "127.0.0.1"
+  #   '\\x7f\\x00\\x00\\x01'.from_hexipv4(prefix: '\\x') # => "127.0.0.1"
+  def from_hexipv4(opts = {})
     opts[:prefix] ||= ''
     opts[:nibble] ||= :high
     # remove prefix
@@ -262,13 +277,44 @@ class String
     out.join('.')
   end
 
-  # Decode a hexadecimal IP string into a dotted decimal one in place as described
-  # for {String#from_hexip}.
-  def from_hexip!(opts = {})
-    replace(from_hexip(opts))
+  alias from_hexip from_hexipv4
+
+  # Decode a hexadecimal IPv4 string into a dotted decimal one in place as described
+  # for {String#from_hexipv4}.
+  def from_hexipv4!(opts = {})
+    replace(from_hexipv4(opts))
+  end
+
+  alias from_hexip! from_hexipv4!
+
+  # Decode a hexadecimal IPv6 string into a the double-dotted hexadecimal format
+  # @param opts [Hash] optional parameters
+  # @option opts [String] :prefix Prefix of the input. Default value is a void
+  #   string. Example of values: `0x`, `\x`, '\\x'.
+  # @return [String] the double-dotted hexadecimal format
+  # @example
+  #   '000080FE00000000FF005450B6AD1DFE'.from_hexipv6 # => "[fe80::5054:ff:fe1d:adb6]"
+  #   '0x000080FE00000000FF005450B6AD1DFE'.from_hexipv6(prefix: '0x') # => "[fe80::5054:ff:fe1d:adb6]"
+  #   '00000000000000000000000000000000'.from_hexipv6 # => "[::]"
+  def from_hexipv6(opts = {})
+    opts[:prefix] ||= ''
+    # remove prefix
+    out = gsub(opts[:prefix], '')
+    # convert
+    out = out.scan(/.{2}/).reverse.join
+    out = out.scan(/.{8}/).reverse.join
+    out = out.scan(/.{4}/).map { |x| x.sub(/^0+/, '') }.join(':')
+    out = out.sub(/:{3,}/, '::').downcase
+    "[#{out}]"
+  end
+
+  # Decode a hexadecimal IPv6 string into a the double-dotted hexadecimal format in place as described
+  # for {String#from_hexipv6}.
+  def from_hexipv6!(opts = {})
+    replace(from_hexipv6(opts))
   end
 
-  # Encode a dotted decimal IP into a hexadecimal one
+  # Encode a dotted decimal IPv4 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`.
@@ -280,10 +326,10 @@ class String
   #   (`: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 = {})
+  #   '127.0.0.1'.to_hexipv4 # => "7f000001"
+  #   '127.0.0.1'.to_hexipv4(nibble: :low) # => "0100007f"
+  #   '127.0.0.1'.to_hexipv4(prefixall: '\\x') # => "\\x7f\\x00\\x00\\x01"
+  def to_hexipv4(opts = {})
     opts[:prefix] ||= ''
     opts[:prefixall] ||= ''
     opts[:case] ||= :lower
@@ -299,9 +345,13 @@ class String
     return opts[:prefix] + out
   end
 
-  # Encode a dotted decimal IP into a hexadecimal one in place as described
-  # for {String#to_hexip}.
-  def to_hexip!(opts = {})
-    replace(to_hexip(opts))
+  alias to_hexip to_hexipv4
+
+  # Encode a dotted decimal IPv4 into a hexadecimal one in place as described
+  # for {String#to_hexipv4}.
+  def to_hexipv4!(opts = {})
+    replace(to_hexipv4(opts))
   end
+
+  alias to_hexip! to_hexipv4!
 end

data/lib/ctf_party/network.rb

@@ -35,22 +35,22 @@ class String
     ipv4? || ipv6?
   end
 
-  # Is the string a valid URI?
+  # Is the string a valid (RFC 2396) URI?
   # @param opts [Hash] optional parameters
   # @option opts [Symbol] :lax Default value: `false`.
   #   When `lax: false`, only URI matching common protocols (ftp http https ldap ldaps mailto ws wss) are recognized,
   #   but is still a bit lax (eg. `http://` is seen as valid).
   #   When `lax: true`, the parser will accept more types of URI (gopher magnet matrix), but will be very lax and accept
   #   nearly anything including `:`.
-  # @return [Boolean] `true` if the string is a valid URI, `false` else.
+  # @return [Boolean] `true` if the string is a valid (RFC 2396) URI, `false` else.
   # @example
   #   'ftp://ftp.ruby-lang.org/pub/ruby/3.2/ruby-3.2.0.tar.xz'.uri? # => true
   #   'a:'.uri? # => false
   #   'a:'.uri?(lax: true) # => true
   def uri?(opts = {})
     opts[:lax] ||= false
-    strict = URI::DEFAULT_PARSER.make_regexp(%w[ftp http https ldap ldaps mailto ws wss]).match?(self)
-    lax = URI::DEFAULT_PARSER.make_regexp.match?(self)
+    strict = URI::RFC2396_PARSER.make_regexp(%w[ftp http https ldap ldaps mailto ws wss]).match?(self)
+    lax = URI::RFC2396_PARSER.make_regexp.match?(self)
     if opts[:lax] == true
       strict || lax
     else

data/lib/ctf_party/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-module Version
-  VERSION = '2.3.0'
+module CTFParty
+  VERSION = '4.0.0'
 end

data/lib/ctf_party.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'ctf_party/version'
 # Project internal
 require 'ctf_party/base64'
 require 'ctf_party/binary'

metadata

@@ -1,15 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: ctf-party
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Alexandre ZANNI
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-21 00:00:00.000000000 Z
+date: 2025-03-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: docopt
   requirement: !ruby/object:Gem::Requirement
@@ -24,12 +37,32 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: uri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 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.
+  XOR, whitespace strip, IP/URI/domain/email defang/refang.
 email: alexandre.zanni@engineer.com
 executables:
 - ctf-party
@@ -66,8 +99,8 @@ 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/
+  funding_uri: https://github.com/sponsors/noraj
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -75,18 +108,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
   - - "<"
     - !ruby/object:Gem::Version
-      version: '3.3'
+      version: '4.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A CLI tool & library to enhance and speed up script/exploit writing with
   string conversion/manipulation