librex 0.0.6 → 0.0.7

data/lib/rex/ui/text/table.rb

@@ -57,7 +57,8 @@ class Table
 		self.header   = opts['Header']
 		self.headeri  = opts['HeaderIndent'] || 0
 		self.columns  = opts['Columns'] || []
-		self.rows     = opts['Rows']    || []
+		# updated below if we got a "Rows" option
+		self.rows     = []
 
 		self.width    = opts['Width']   || 80
 		self.indent   = opts['Indent']  || 0
@@ -72,6 +73,10 @@ class Table
 			self.colprops[idx]['MaxWidth'] = self.columns[idx].length
 		}
 
+		# ensure all our internal state gets updated with the given rows by
+		# using add_row instead of just adding them to self.rows.  See #3825.
+		opts['Rows'].each { |row| add_row(row) } if opts['Rows']
+
 		# Merge in options
 		if (opts['ColProps'])
 			opts['ColProps'].each_key { |col|
@@ -106,6 +111,21 @@ class Table
 
 		return str
 	end
+	
+	#
+	# Converts table contents to a csv
+	#
+	def to_csv
+		str = ''
+		str << ( columns.join(",") + "\n" )
+		rows.each { |row|
+			next if is_hr(row)
+			str << ( row.map{|x| 
+				x.gsub(/[\r\n]/, ' ').gsub(/\s+/, ' ').gsub('"', '""')
+			}.map{|x| "\"#{x}\"" }.join(",") + "\n" )
+		}
+		str
+	end
 
 	#
 	#

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: librex
 version: !ruby/object:Gem::Version 
-  hash: 19
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 6
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Metasploit Development Team
@@ -16,11 +11,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-04 00:00:00 -06:00
+date: 2011-03-10 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
-description: Rex provides a variety of classes useful for security testing and exploit development. Based on svn revision 11474
+description: Rex provides a variety of classes useful for security testing and exploit development. Based on svn revision 11930
 email: 
 - hdm@metasploit.com
 - jacob.hammack@hammackj.com
@@ -231,6 +226,7 @@ files:
 - lib/rex/post/meterpreter/extensions/stdapi/railgun/def/def_advapi32.rb
 - lib/rex/post/meterpreter/extensions/stdapi/railgun/def/def_iphlpapi.rb
 - lib/rex/post/meterpreter/extensions/stdapi/railgun/def/def_kernel32.rb
+- lib/rex/post/meterpreter/extensions/stdapi/railgun/def/def_netapi32.rb
 - lib/rex/post/meterpreter/extensions/stdapi/railgun/def/def_ntdll.rb
 - lib/rex/post/meterpreter/extensions/stdapi/railgun/def/def_shell32.rb
 - lib/rex/post/meterpreter/extensions/stdapi/railgun/def/def_user32.rb
@@ -239,6 +235,7 @@ files:
 - lib/rex/post/meterpreter/extensions/stdapi/railgun/multicall.rb
 - lib/rex/post/meterpreter/extensions/stdapi/railgun/railgun.rb
 - lib/rex/post/meterpreter/extensions/stdapi/railgun/tlv.rb
+- lib/rex/post/meterpreter/extensions/stdapi/railgun/util.rb
 - lib/rex/post/meterpreter/extensions/stdapi/stdapi.rb
 - lib/rex/post/meterpreter/extensions/stdapi/sys/config.rb
 - lib/rex/post/meterpreter/extensions/stdapi/sys/event_log.rb
@@ -332,6 +329,14 @@ files:
 - lib/rex/proto/http/server.rb.ut.rb
 - lib/rex/proto/http.rb
 - lib/rex/proto/http.rb.ts.rb
+- lib/rex/proto/ntlm/base.rb
+- lib/rex/proto/ntlm/constants.rb
+- lib/rex/proto/ntlm/crypt.rb
+- lib/rex/proto/ntlm/exceptions.rb
+- lib/rex/proto/ntlm/message.rb
+- lib/rex/proto/ntlm/utils.rb
+- lib/rex/proto/ntlm.rb
+- lib/rex/proto/ntlm.rb.ut.rb
 - lib/rex/proto/proxy/socks4a.rb
 - lib/rex/proto/rfb/cipher.rb
 - lib/rex/proto/rfb/client.rb
@@ -343,7 +348,6 @@ files:
 - lib/rex/proto/smb/constants.rb
 - lib/rex/proto/smb/constants.rb.ut.rb
 - lib/rex/proto/smb/crypt.rb
-- lib/rex/proto/smb/crypt.rb.ut.rb
 - lib/rex/proto/smb/evasions.rb
 - lib/rex/proto/smb/exceptions.rb
 - lib/rex/proto/smb/simpleclient.rb
@@ -448,7 +452,7 @@ files:
 - lib/rex/zip.rb
 - lib/rex.rb
 - lib/rex.rb.ts.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://www.metasploit.com/
 licenses: []
 
@@ -462,25 +466,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby Exploitation library

data/lib/rex/proto/smb/crypt.rb.ut.rb

@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift(File.join(File.dirname(__FILE__), '..', '..', '..'))
-
-require 'rex/test'
-require 'rex/proto/smb/crypt'
-
-class Rex::Proto::SMB::Crypt::UnitTest < Test::Unit::TestCase
-	
-	Klass = Rex::Proto::SMB::Crypt
-
-	def test_parse
-
-		pass = "XXXXXXX"
-		chal = "Z" * 8
-
-		assert_equal("\xc2\x48\xcf\x61\x65\xfe\x55\xef\xac\xa0\x30\x09\x66\xdc\x37\x96\x04\x6b\x9c\x0b\xb4\xa5\x2e\x27", Klass.lanman_des(pass, chal), 'lanman_des')
-		assert_equal("\x8d\x04\x18\x58\xf0\x78\xcc\xfa\x15\x60\xa4\x61\x76\x90\xe5\x51\x84\xfd\x70\xec\x7f\x23\xb7\xf9", Klass.ntlm_md4(pass, chal), 'ntlm_md4')
-	end
-end