ronin-support 0.4.1 → 0.5.2

data/lib/ronin/formatting/extensions/digest.rb

@@ -1,20 +1,20 @@
 #
-# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2021 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
-# This file is part of Ronin Support.
+# This file is part of ronin-support.
 #
-# Ronin Support is free software: you can redistribute it and/or modify
+# ronin-support is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published
 # by the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# Ronin Support is distributed in the hope that it will be useful,
+# ronin-support is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with Ronin Support.  If not, see <http://www.gnu.org/licenses/>.
+# along with ronin-support.  If not, see <https://www.gnu.org/licenses/>.
 #
 
 require 'ronin/formatting/extensions/digest/string'

data/lib/ronin/formatting/extensions/digest/file.rb

@@ -1,20 +1,20 @@
 #
-# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2021 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
-# This file is part of Ronin Support.
+# This file is part of ronin-support.
 #
-# Ronin Support is free software: you can redistribute it and/or modify
+# ronin-support is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published
 # by the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# Ronin Support is distributed in the hope that it will be useful,
+# ronin-support is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with Ronin Support.  If not, see <http://www.gnu.org/licenses/>.
+# along with ronin-support.  If not, see <https://www.gnu.org/licenses/>.
 #
 
 require 'digest/md5'

data/lib/ronin/formatting/extensions/digest/string.rb

@@ -1,20 +1,20 @@
 #
-# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2021 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
-# This file is part of Ronin Support.
+# This file is part of ronin-support.
 #
-# Ronin Support is free software: you can redistribute it and/or modify
+# ronin-support is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published
 # by the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# Ronin Support is distributed in the hope that it will be useful,
+# ronin-support is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with Ronin Support.  If not, see <http://www.gnu.org/licenses/>.
+# along with ronin-support.  If not, see <https://www.gnu.org/licenses/>.
 #
 
 require 'digest/md5'

data/lib/ronin/formatting/extensions/html.rb

@@ -1,20 +1,20 @@
 #
-# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2021 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
-# This file is part of Ronin Support.
+# This file is part of ronin-support.
 #
-# Ronin Support is free software: you can redistribute it and/or modify
+# ronin-support is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published
 # by the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# Ronin Support is distributed in the hope that it will be useful,
+# ronin-support is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with Ronin Support.  If not, see <http://www.gnu.org/licenses/>.
+# along with ronin-support.  If not, see <https://www.gnu.org/licenses/>.
 #
 
 require 'ronin/formatting/extensions/html/integer'

data/lib/ronin/formatting/extensions/html/integer.rb

@@ -1,20 +1,20 @@
 #
-# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2021 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
-# This file is part of Ronin Support.
+# This file is part of ronin-support.
 #
-# Ronin Support is free software: you can redistribute it and/or modify
+# ronin-support is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published
 # by the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# Ronin Support is distributed in the hope that it will be useful,
+# ronin-support is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with Ronin Support.  If not, see <http://www.gnu.org/licenses/>.
+# along with ronin-support.  If not, see <https://www.gnu.org/licenses/>.
 #
 
 require 'cgi'
@@ -114,10 +114,8 @@ class Integer
   # @api public
   #
   def js_escape
-    if self > 0xff
-      format_js
-    else
-      JS_ESCAPE_BYTES.fetch(self,chr)
+    if self > 0xff then format_js
+    else                JS_ESCAPE_BYTES.fetch(self,chr)
     end
   end
 
@@ -136,10 +134,8 @@ class Integer
   # @api public
   #
   def format_js
-    if self > 0xff
-      "\\u%.2X%.2X" % [(self & 0xff00) >> 8, (self & 0xff)]
-    else
-      "\\x%.2X" % self
+    if self > 0xff then "\\u%.4X" % self
+    else                "\\x%.2X" % self
     end
   end
 

data/lib/ronin/formatting/extensions/html/string.rb

@@ -1,20 +1,20 @@
 #
-# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2021 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
-# This file is part of Ronin Support.
+# This file is part of ronin-support.
 #
-# Ronin Support is free software: you can redistribute it and/or modify
+# ronin-support is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published
 # by the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# Ronin Support is distributed in the hope that it will be useful,
+# ronin-support is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with Ronin Support.  If not, see <http://www.gnu.org/licenses/>.
+# along with ronin-support.  If not, see <https://www.gnu.org/licenses/>.
 #
 
 require 'ronin/formatting/extensions/html/integer'
@@ -26,11 +26,11 @@ class String
 
   # JavaScript characters that must be back-slashed.
   JS_BACKSLASHED_CHARS = {
-    "\\b" => "\b",
-    "\\t" => "\t",
-    "\\n" => "\n",
-    "\\f" => "\f",
-    "\\r" => "\r",
+    "\\b"  => "\b",
+    "\\t"  => "\t",
+    "\\n"  => "\n",
+    "\\f"  => "\f",
+    "\\r"  => "\r",
     "\\\"" => "\"",
     "\\\\" => "\\"
   }
@@ -45,7 +45,7 @@ class String
   #   "one & two".html_escape
   #   # => "one &amp; two"
   #
-  # @see http://rubydoc.info/stdlib/cgi/1.9.2/CGI.escapeHTML
+  # @see https://rubydoc.info/stdlib/cgi/1.9.2/CGI.escapeHTML
   #
   # @since 0.2.0
   #
@@ -65,7 +65,7 @@ class String
   #   "&lt;p&gt;one &lt;span&gt;two&lt;/span&gt;&lt;/p&gt;".html_unescape
   #   # => "<p>one <span>two</span></p>"
   #
-  # @see http://rubydoc.info/stdlib/cgi/1.9.2/CGI.unescapeHTML
+  # @see https://rubydoc.info/stdlib/cgi/1.9.2/CGI.unescapeHTML
   #
   # @since 0.2.0
   #
@@ -95,11 +95,9 @@ class String
   # @api public
   #
   def format_html(options={})
-    formatter = if RUBY_VERSION < '1.9.'
-                  # String#ord was not backported to Ruby 1.8.7
-                  lambda { |c| c[0].format_html }
-                else
-                  lambda { |c| c.ord.format_html }
+    # String#ord was not backported to Ruby 1.8.7
+    formatter = if RUBY_VERSION < '1.9.' then lambda { |c| c[0].format_html  }
+                else                          lambda { |c| c.ord.format_html }
                 end
 
     format_chars(options,&formatter)
@@ -125,11 +123,9 @@ class String
   # @api public
   #
   def js_escape(options={})
-    formatter = if RUBY_VERSION < '1.9.'
-                  # String#ord was not backported to Rub 1.8.7
-                  lambda { |c| c[0].js_escape }
-                else
-                  lambda { |c| c.ord.js_escape }
+    # String#ord was not backported to Rub 1.8.7
+    formatter = if RUBY_VERSION < '1.9.' then lambda { |c| c[0].js_escape  }
+                else                          lambda { |c| c.ord.js_escape }
                 end
 
     format_chars(options,&formatter)
@@ -152,18 +148,16 @@ class String
   def js_unescape
     unescaped = ''
 
-    scan(/([\\%]u[0-9a-fA-F]{1,4}|[\\%][0-9a-fA-F]{1,2}|\\[btnfr"\\]|.)/).each do |match|
-      c = match[0]
-
-      unescaped << if JS_BACKSLASHED_CHARS.has_key?(c)
-                     JS_BACKSLASHED_CHARS[c]
-                   elsif (c.start_with?("\\u") || c.start_with?("%u"))
-                     c[2..-1].to_i(16)
-                   elsif (c.start_with?("\\") || c.start_with?("%"))
-                     c[1..-1].to_i(16)
-                   else
-                     c
-                   end
+    scan(/[\\%]u[0-9a-fA-F]{1,4}|[\\%][0-9a-fA-F]{1,2}|\\[btnfr"\\]|./) do |c|
+      unescaped << JS_BACKSLASHED_CHARS.fetch(c) do
+        if (c.start_with?("\\u") || c.start_with?("%u"))
+          c[2..-1].to_i(16)
+        elsif (c.start_with?("\\") || c.start_with?("%"))
+          c[1..-1].to_i(16)
+        else
+          c
+        end
+      end
     end
 
     return unescaped
@@ -189,11 +183,9 @@ class String
   # @api public
   #
   def format_js(options={})
-    formatter = if RUBY_VERSION < '1.9.'
-                  # String#ord was not backported to Rub 1.8.7
-                  lambda { |c| c[0].format_js }
-                else
-                  lambda { |c| c.ord.format_js }
+    # String#ord was not backported to Rub 1.8.7
+    formatter = if RUBY_VERSION < '1.9.' then lambda { |c| c[0].format_js  }
+                else                          lambda { |c| c.ord.format_js }
                 end
 
     format_chars(options,&formatter)

data/lib/ronin/formatting/extensions/http.rb

@@ -1,20 +1,20 @@
 #
-# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2021 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
-# This file is part of Ronin Support.
+# This file is part of ronin-support.
 #
-# Ronin Support is free software: you can redistribute it and/or modify
+# ronin-support is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published
 # by the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# Ronin Support is distributed in the hope that it will be useful,
+# ronin-support is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with Ronin Support.  If not, see <http://www.gnu.org/licenses/>.
+# along with ronin-support.  If not, see <https://www.gnu.org/licenses/>.
 #
 
 require 'ronin/formatting/extensions/http/integer'

data/lib/ronin/formatting/extensions/http/integer.rb

@@ -1,20 +1,20 @@
 #
-# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2021 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
-# This file is part of Ronin Support.
+# This file is part of ronin-support.
 #
-# Ronin Support is free software: you can redistribute it and/or modify
+# ronin-support is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published
 # by the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# Ronin Support is distributed in the hope that it will be useful,
+# ronin-support is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with Ronin Support.  If not, see <http://www.gnu.org/licenses/>.
+# along with ronin-support.  If not, see <https://www.gnu.org/licenses/>.
 #
 
 require 'uri/common'
@@ -31,7 +31,7 @@ class Integer
   # @api public
   #
   def uri_encode
-    URI.encode(chr)
+    URI::DEFAULT_PARSER.escape(chr)
   end
 
   #

data/lib/ronin/formatting/extensions/http/string.rb

@@ -1,20 +1,20 @@
 #
-# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2021 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
-# This file is part of Ronin Support.
+# This file is part of ronin-support.
 #
-# Ronin Support is free software: you can redistribute it and/or modify
+# ronin-support is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published
 # by the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# Ronin Support is distributed in the hope that it will be useful,
+# ronin-support is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with Ronin Support.  If not, see <http://www.gnu.org/licenses/>.
+# along with ronin-support.  If not, see <https://www.gnu.org/licenses/>.
 #
 
 require 'ronin/formatting/extensions/http/integer'
@@ -38,7 +38,7 @@ class String
   # @api public
   #
   def uri_encode
-    URI.encode(self)
+    URI::DEFAULT_PARSER.escape(self)
   end
 
   #
@@ -54,7 +54,7 @@ class String
   # @api public
   #
   def uri_decode
-    URI.decode(self)
+    URI::DEFAULT_PARSER.unescape(self)
   end
 
   #

data/lib/ronin/formatting/extensions/sql.rb

@@ -1,20 +1,20 @@
 #
-# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2021 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
-# This file is part of Ronin Support.
+# This file is part of ronin-support.
 #
-# Ronin Support is free software: you can redistribute it and/or modify
+# ronin-support is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published
 # by the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# Ronin Support is distributed in the hope that it will be useful,
+# ronin-support is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with Ronin Support.  If not, see <http://www.gnu.org/licenses/>.
+# along with ronin-support.  If not, see <https://www.gnu.org/licenses/>.
 #
 
 require 'ronin/formatting/extensions/sql/string'

data/lib/ronin/formatting/extensions/sql/string.rb

@@ -1,20 +1,20 @@
 #
-# Copyright (c) 2006-2012 Hal Brodigan (postmodern.mod3 at gmail.com)
+# Copyright (c) 2006-2021 Hal Brodigan (postmodern.mod3 at gmail.com)
 #
-# This file is part of Ronin Support.
+# This file is part of ronin-support.
 #
-# Ronin Support is free software: you can redistribute it and/or modify
+# ronin-support is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published
 # by the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# Ronin Support is distributed in the hope that it will be useful,
+# ronin-support is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with Ronin Support.  If not, see <http://www.gnu.org/licenses/>.
+# along with ronin-support.  If not, see <https://www.gnu.org/licenses/>.
 #
 
 class String
@@ -22,9 +22,8 @@ class String
   #
   # Escapes an String for SQL.
   #
-  # @param [Symbol] quotes (:single)
+  # @param [:single, :double, :tick] quotes (:single)
   #   Specifies whether to create a single or double quoted string.
-  #   May be either `:single` or `:double`.
   #
   # @return [String]
   #   The escaped String.
@@ -39,14 +38,15 @@ class String
   # @since 0.3.0
   #
   def sql_escape(quotes=:single)
-    case quotes
-    when :single
-      "'#{gsub(/'/,"''")}'"
-    when :double
-      "\"#{gsub(/"/,'""')}\""
-    else
-      raise(ArgumentError,"invalid quoting style #{quotes.inspect}")
-    end
+    char = case quotes
+           when :single then "'"
+           when :double then '"'
+           when :tick   then '`'
+           else
+             raise(ArgumentError,"invalid quoting style #{quotes.inspect}")
+           end
+
+    return char + gsub(char,char * 2) + char
   end
 
   #
@@ -80,16 +80,16 @@ class String
   #  # => "/etc/passwd"
   #
   def sql_decode
-    if ((self[0...2] == '0x') && (length % 2 == 0))
+    if (start_with?('0x') && (length % 2 == 0))
       raw = ''
 
-      self[2..-1].scan(/[0-9a-fA-F]{2}/).each do |hex_char|
-        raw << hex_char.hex.chr
+      self[2..-1].scan(/../) do |hex_char|
+        raw << hex_char.to_i(16).chr
       end
 
       return raw
-    elsif (self[0..0] == "'" && self[-1..-1] == "'")
-      self[1..-2].gsub("\\'","'").gsub("''","'")
+    elsif (start_with?("'") && end_with?("'"))
+      self[1..-2].gsub(/\\'|''/,"'")
     else
       return self
     end
@@ -119,10 +119,8 @@ class String
   #
   def sql_inject
     if (start_with?("'") || start_with?('"') || start_with?('`'))
-      if self[0,1] == self[-1,1]
-        self[1..-2]
-      else
-        "#{self[1..-1]}--"
+      if self[0,1] == self[-1,1] then self[1..-2]
+      else                            "#{self[1..-1]}--"
       end
     else
       self