ronin 0.1.3 → 0.1.4

data/History.txt

@@ -1,4 +1,22 @@
-=== 0.1.3 / 2008-01-08
+=== 0.1.4 / 2009-01-22
+
+* Moved Ronin::Web and Ronin::Sessions::Web into the ronin-web library.
+* Removed dependencies to hpricot, mechanize, spidr and rack.
+* Moved Hexdump into the Ronin::UI namespace.
+* Require parameters >= 0.1.3:
+  * Parameters 0.1.3 adds support for using lambdas as the default values
+    of parameters.
+* Temporarily added Ronin::Model.first_or_new:
+  * Will be removed once dkubb's version of first_or_new is merged into
+    dm-core.
+* Added the File.write method.
+* Added specs for String#format_http and String#format_html.
+* Fixed a formatting bug in String#format_chars and String#format_bytes.
+* Fixed typos.
+* Automatically load 'ronin/ui/hexdump' when starting the
+  Ronin::UI::Console.
+
+=== 0.1.3 / 2009-01-08
 
 * Moved Context into the Contextify library.
 * Require dm-core >= 0.9.9.

data/Manifest.txt

@@ -15,6 +15,7 @@ lib/ronin/extensions/uri.rb
 lib/ronin/extensions/uri/query_params.rb
 lib/ronin/extensions/uri/http.rb
 lib/ronin/extensions/string.rb
+lib/ronin/extensions/file.rb
 lib/ronin/formatting.rb
 lib/ronin/formatting/digest.rb
 lib/ronin/formatting/binary.rb
@@ -33,14 +34,10 @@ lib/ronin/formatting/extensions/html.rb
 lib/ronin/formatting/extensions/html/string.rb
 lib/ronin/formatting/extensions/http.rb
 lib/ronin/formatting/extensions/http/string.rb
-lib/ronin/hexdump.rb
-lib/ronin/hexdump/hexdump.rb
-lib/ronin/hexdump/extensions.rb
-lib/ronin/hexdump/extensions/file.rb
-lib/ronin/hexdump/extensions/kernel.rb
 lib/ronin/chars.rb
 lib/ronin/chars/char_set.rb
 lib/ronin/chars/chars.rb
+lib/ronin/translators.rb
 lib/ronin/translators/translator.rb
 lib/ronin/path.rb
 lib/ronin/network.rb
@@ -88,16 +85,6 @@ lib/ronin/rpc/client.rb
 lib/ronin/rpc/service.rb
 lib/ronin/rpc/console.rb
 lib/ronin/rpc/shell.rb
-lib/ronin/web.rb
-lib/ronin/web/extensions.rb
-lib/ronin/web/extensions/hpricot.rb
-lib/ronin/web/extensions/hpricot/tag.rb
-lib/ronin/web/extensions/hpricot/text.rb
-lib/ronin/web/extensions/hpricot/comment.rb
-lib/ronin/web/extensions/hpricot/elem.rb
-lib/ronin/web/extensions/hpricot/container.rb
-lib/ronin/web/extensions/hpricot/doc.rb
-lib/ronin/web/web.rb
 lib/ronin/sessions.rb
 lib/ronin/sessions/session.rb
 lib/ronin/sessions/tcp.rb
@@ -108,7 +95,6 @@ lib/ronin/sessions/pop3.rb
 lib/ronin/sessions/imap.rb
 lib/ronin/sessions/telnet.rb
 lib/ronin/sessions/http.rb
-lib/ronin/sessions/web.rb
 lib/ronin/database.rb
 lib/ronin/database/exceptions.rb
 lib/ronin/database/exceptions/invalid_config.rb
@@ -140,6 +126,12 @@ lib/ronin/cache/extension_cache.rb
 lib/ronin/cache/extension.rb
 lib/ronin/cache/cache.rb
 lib/ronin/cache/ronin.rb
+lib/ronin/ui.rb
+lib/ronin/ui/hexdump.rb
+lib/ronin/ui/hexdump/hexdump.rb
+lib/ronin/ui/hexdump/extensions.rb
+lib/ronin/ui/hexdump/extensions/file.rb
+lib/ronin/ui/hexdump/extensions/kernel.rb
 lib/ronin/ui/console.rb
 lib/ronin/ui/shell.rb
 lib/ronin/ui/command_line.rb
@@ -183,7 +175,6 @@ spec/formatting/http_spec.rb
 spec/formatting/text_spec.rb
 spec/code/reference_spec.rb
 spec/code/symbol_table_spec.rb
-spec/web/extensions/hpricot_spec.rb
 spec/license_spec.rb
 spec/path_spec.rb
 spec/platform_spec.rb

data/README.txt

@@ -61,7 +61,6 @@ of Ronin.
     * Imap
     * Telnet
     * HTTP
-  * Web access (utilizing Mechanize and Hpricot).
 * Provides an IRB styled console with:
   * Tab-completion enabled.
   * Auto-indentation enabled.
@@ -69,9 +68,6 @@ of Ronin.
 
 == REQUIREMENTS:
 
-* hpricot
-* mechanize
-* spidr >= 0.1.3
 * DataMapper:
   * dm-core >= 0.9.9
   * data_objects >= 0.9.9

data/Rakefile

@@ -9,21 +9,20 @@ Hoe.new('ronin', Ronin::VERSION) do |p|
   p.rubyforge_name = 'ronin'
   p.developer('Postmodern','postmodern.mod3@gmail.com')
   p.remote_rdoc_dir = 'docs/ronin'
-  p.extra_deps = ['hpricot',
-                  'mechanize',
-                  ['spidr', '>=0.1.3'],
-                  ['dm-core', '>=0.9.9'],
-                  ['data_objects', '>=0.9.9'],
-                  ['do_sqlite3', '>=0.9.9'],
-                  ['dm-types', '>=0.9.9'],
-                  ['dm-serializer', '>=0.9.9'],
-                  ['dm-aggregates', '>=0.9.9'],
-                  ['dm-validations', '>=0.9.9'],
-                  ['dm-predefined', '>=0.1.0'],
-                  ['parameters', '>=0.1.2'],
-                  ['contextify', '>=0.1.0'],
-                  ['reverse-require', '>=0.3.1'],
-                  ['repertoire', '>=0.1.2']]
+  p.extra_deps = [
+    ['dm-core', '>=0.9.9'],
+    ['data_objects', '>=0.9.9'],
+    ['do_sqlite3', '>=0.9.9'],
+    ['dm-types', '>=0.9.9'],
+    ['dm-serializer', '>=0.9.9'],
+    ['dm-aggregates', '>=0.9.9'],
+    ['dm-validations', '>=0.9.9'],
+    ['dm-predefined', '>=0.1.0'],
+    ['parameters', '>=0.1.3'],
+    ['contextify', '>=0.1.0'],
+    ['reverse-require', '>=0.3.1'],
+    ['repertoire', '>=0.1.2']
+  ]
 end
 
 # vim: syntax=Ruby

data/TODO.txt

@@ -1,12 +1,11 @@
 == TODO
 
-=== Ronin 0.1.3:
+=== Ronin 0.1.5:
 
 * Add diagonstic logging of this format:
   
     [*] Message
   
-
 === Ronin 0.2.0:
 
 * Create an IO proxy class and RPC Service for proxying io.

data/lib/ronin.rb

@@ -21,14 +21,14 @@
 #++
 #
 
-require 'ronin/extensions'
 require 'ronin/config'
+require 'ronin/extensions'
 require 'ronin/formatting'
 require 'ronin/chars'
 require 'ronin/path'
 require 'ronin/network'
-require 'ronin/web'
 require 'ronin/models'
+require 'ronin/ui'
 require 'ronin/ronin'
 require 'ronin/version'
 

data/lib/ronin/extensions.rb

@@ -25,3 +25,4 @@ require 'ronin/extensions/meta'
 require 'ronin/extensions/hash'
 require 'ronin/extensions/uri'
 require 'ronin/extensions/string'
+require 'ronin/extensions/file'

data/lib/ronin/extensions/file.rb

@@ -0,0 +1,33 @@
+#
+#--
+# Ronin - A Ruby platform designed for information security and data
+# exploration tasks.
+#
+# Copyright (c) 2006-2009 Hal Brodigan (postmodern.mod3 at gmail.com)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#++
+#
+
+class File
+
+  #
+  # Writes the specified _data_ to the specified _path_.
+  #
+  def File.write(path,data)
+    File.open(path,'w') { |file| file.write(data) }
+  end
+
+end

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

@@ -21,6 +21,8 @@
 #++
 #
 
+require 'ronin/formatting/extensions/text'
+
 require 'uri'
 require 'cgi'
 
@@ -66,4 +68,14 @@ class String
     CGI.unescape(self)
   end
 
+  #
+  # Returns the HTTP hexidecimal encoded form of the string.
+  #
+  #   "hello".format_http
+  #   # => "hello"
+  #
+  def format_http(options={})
+    format_bytes(options) { |c| sprintf("%%%x",c) }
+  end
+
 end

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

@@ -38,16 +38,16 @@ class String
     included = (options[:included] || Ronin::Chars.all)
     excluded = (options[:excluded] || [])
 
-    formatted = included - excluded
+    targeted = included - excluded
     formatted = ''
 
     self.each_byte do |b|
       c = b.chr
 
-      if formatted.include?(c)
-        formatted_chars << block.call(c)
+      if targeted.include_byte?(b)
+        formatted << block.call(c)
       else
-        formatted_chars << c
+        formatted << c
       end
     end
 

data/lib/ronin/model.rb

@@ -49,6 +49,14 @@ module Ronin
 
           # The class type property
           property :type, Discriminator
+
+          #
+          # Finds the first resource by conditions, or initializes a new
+          # resource with the attributes if none found.
+          #
+          def self.first_or_new(query,attributes={})
+            first(query) || new(query.merge(attributes))
+          end
         end
       end
     end

data/lib/ronin/objectify/exceptions/object_context_not_found.rb

@@ -22,6 +22,8 @@
 #
 
 module Ronin
-  class ObjectContextNotFound < RuntimeError
+  module Objectify
+    class ObjectContextNotFound < RuntimeError
+    end
   end
 end

data/lib/ronin/objectify/exceptions/unknown_object_context.rb

@@ -22,6 +22,8 @@
 #
 
 module Ronin
-  class UnknownObject < RuntimeError
+  module Objectify
+    class UnknownObjectContext < RuntimeError
+    end
   end
 end

data/lib/ronin/sessions/telnet.rb

@@ -31,8 +31,11 @@ module Ronin
 
       setup_session do
         parameter :host, :description => 'Telnet host'
-        parameter :port, :value => Network::Telnet.default_port,
-                         :description => 'Telnet port'
+        parameter :port,
+                  :default => lambda {
+                    Ronin::Network::Telnet.default_port
+                  },
+                  :description => 'Telnet port'
 
         parameter :telnet_user, :description => 'Telnet user'
         parameter :telnet_password, :description => 'Telnet password'

data/lib/ronin/{web.rb → translators.rb}

@@ -21,5 +21,4 @@
 #++
 #
 
-require 'ronin/web/extensions'
-require 'ronin/web/web'
+require 'ronin/translators/translator'

data/lib/ronin/{hexdump.rb → ui.rb}

@@ -21,5 +21,5 @@
 #++
 #
 
-require 'ronin/hexdump/hexdump'
-require 'ronin/hexdump/extensions'
+require 'ronin/ui/console'
+require 'ronin/ui/hexdump'

data/lib/ronin/{hexdump/extensions.rb → ui/hexdump.rb}

@@ -21,5 +21,5 @@
 #++
 #
 
-require 'ronin/hexdump/extensions/file'
-require 'ronin/hexdump/extensions/kernel'
+require 'ronin/ui/hexdump/hexdump'
+require 'ronin/ui/hexdump/extensions'

data/lib/ronin/ui/hexdump/extensions.rb

@@ -0,0 +1,25 @@
+#
+#--
+# Ronin - A Ruby platform designed for information security and data
+# exploration tasks.
+#
+# Copyright (c) 2006-2009 Hal Brodigan (postmodern.mod3 at gmail.com)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#++
+#
+
+require 'ronin/ui/hexdump/extensions/file'
+require 'ronin/ui/hexdump/extensions/kernel'

data/lib/ronin/{hexdump → ui/hexdump}/extensions/file.rb

@@ -21,7 +21,7 @@
 #++
 #
 
-require 'ronin/hexdump/hexdump'
+require 'ronin/ui/hexdump/hexdump'
 
 class File
 
@@ -30,7 +30,7 @@ class File
   # to the given _output_ stream.
   #
   def self.hexdump(path,output=STDOUT)
-    Ronin::Hexdump.dump(self.open(path),output)
+    Ronin::UI::Hexdump.dump(self.open(path),output)
   end
 
 end

data/lib/ronin/{hexdump → ui/hexdump}/extensions/kernel.rb

@@ -21,13 +21,13 @@
 #++
 #
 
-require 'ronin/hexdump/hexdump'
+require 'ronin/ui/hexdump/hexdump'
 
 module Kernel
   #
   # Hexdumps the specified _object_ to the given _output_ stream.
   #
   def hexdump(object,output=STDOUT)
-    Ronin::Hexdump.dump(object,output)
+    Ronin::UI::Hexdump.dump(object,output)
   end
 end

data/lib/ronin/ui/hexdump/hexdump.rb

@@ -0,0 +1,78 @@
+#
+#--
+# Ronin - A Ruby platform designed for information security and data
+# exploration tasks.
+#
+# Copyright (c) 2006-2009 Hal Brodigan (postmodern.mod3 at gmail.com)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#++
+#
+
+module Ronin
+  module UI
+    module Hexdump
+      #
+      # Hexdumps the specified _object_ to the given _output_ stream.
+      #
+      def Hexdump.dump(object,output=STDOUT)
+        index = 0
+        offset = 0
+        hex_segment = nil
+        print_segment = nil
+
+        segment = lambda {
+          output.printf(
+            "%.8x  %s  |%s|\n",
+            index,
+            hex_segment.join(' ').ljust(47).insert(23,' '),
+            print_segment
+        )
+        }
+
+        object.each_byte do |b|
+          if offset == 0
+            hex_segment = []
+            print_segment = []
+          end
+
+          hex_segment << ("%.2x" % b)
+
+          print_segment[offset] = case b
+                                  when (0x20..0x7e)
+                                    b.chr
+                                  else
+                                    '.'
+                                  end
+
+          offset += 1
+
+          if (offset >= 16)
+            segment.call
+
+            offset = 0
+            index += 16
+          end
+        end
+
+        unless offset == 0
+          segment.call
+        end
+
+        return nil
+      end
+    end
+  end
+end