Commit Graph

2329 Commits (ff83f1cd2f2d4bcd62dbbec093d37e5e7a390392)

Author SHA1 Message Date
James Lee 7cb96ed11f typo
git-svn-id: file:///home/svn/framework3/trunk@6665 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-17 01:34:33 +00:00
HD Moore 9f69267759 Switch all warnings to stderr
git-svn-id: file:///home/svn/framework3/trunk@6663 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-15 02:40:28 +00:00
HD Moore f9effa15c8 Indicate lack of JRuby support, pending completion of JRUBY-2739
git-svn-id: file:///home/svn/framework3/trunk@6662 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-14 21:37:02 +00:00
HD Moore f78482d3f5 Indicate lack of support for ruby 1.9.0, indicate experimental support for ruby 1.9.1
git-svn-id: file:///home/svn/framework3/trunk@6661 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-14 21:30:56 +00:00
HD Moore 5757685b59 Remove the mutex/cv from the meterp handler, use a boring timeout instead, prevents a race on ruby 1.9.1
git-svn-id: file:///home/svn/framework3/trunk@6660 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-14 21:20:30 +00:00
HD Moore 5646e02a8a Fix 1.9.1 compat for msfelfscan
git-svn-id: file:///home/svn/framework3/trunk@6659 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-14 20:18:38 +00:00
HD Moore e841228ea5 allow the SSL option to be overridden
git-svn-id: file:///home/svn/framework3/trunk@6635 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-09 21:12:15 +00:00
HD Moore 0f6b6f6169 Allow the equal sign to be used as part of an option value
git-svn-id: file:///home/svn/framework3/trunk@6634 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-09 20:43:42 +00:00
HD Moore c1cc193901 Quick update to allow address filtering (find unicode addresses,etc) via the -F [regex] parameter
git-svn-id: file:///home/svn/framework3/trunk@6630 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-08 15:59:38 +00:00
HD Moore 68888c469f Indicate why database support is not enabled
git-svn-id: file:///home/svn/framework3/trunk@6623 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 16:28:28 +00:00
HD Moore 1c11bbb12d Dont default to global, breaks in-module threading of send_request_cgi
git-svn-id: file:///home/svn/framework3/trunk@6620 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 05:05:29 +00:00
HD Moore 1e1d8124f0 Fix mips encoders
git-svn-id: file:///home/svn/framework3/trunk@6619 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 03:14:29 +00:00
HD Moore 0e35efaea2 Force binary string encoding in ruby 1.9.1, fix up a bad index call in x86.rb
git-svn-id: file:///home/svn/framework3/trunk@6618 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 03:02:42 +00:00
HD Moore 2b4e0f440b Fix up the encoding xor to work with both old and new ruby
git-svn-id: file:///home/svn/framework3/trunk@6617 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 02:30:12 +00:00
HD Moore 51f0e8fc53 Another 1.9.1 compat change, this time for msfmachscan
git-svn-id: file:///home/svn/framework3/trunk@6616 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 01:43:48 +00:00
HD Moore 90af8f03db Fixes up msfpescan/msfelfscan to work with both 1.8.6 and 1.9.1
git-svn-id: file:///home/svn/framework3/trunk@6615 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 01:39:54 +00:00
HD Moore f7a7a528be Moer ruby 1.9.1 fixes for msfpescan
git-svn-id: file:///home/svn/framework3/trunk@6614 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 01:24:35 +00:00
HD Moore f81392f938 Dont crash if the PE has no resources
git-svn-id: file:///home/svn/framework3/trunk@6613 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-02 23:40:36 +00:00
HD Moore 147a292825 Minor fixes for ruby 1.9.1 compatibility, still quite a bit more to go
git-svn-id: file:///home/svn/framework3/trunk@6612 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-02 23:36:58 +00:00
HD Moore 9fabd18c24 Ruby 1.9 compatibility changes
git-svn-id: file:///home/svn/framework3/trunk@6591 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-29 13:46:12 +00:00
HD Moore 6a76e5d0a2 One of potentially many threading issues with ruby 1.9
git-svn-id: file:///home/svn/framework3/trunk@6590 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-29 03:18:00 +00:00
et 7c16f5b5c9 Added wmap sql command to access db directly from wmap. XML reporting.
git-svn-id: file:///home/svn/framework3/trunk@6587 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-28 03:26:27 +00:00
HD Moore 3bc44cc395 Consolidate exe generation into a single to_executable() function. Will reduce code in exploit modules dropping later today...
git-svn-id: file:///home/svn/framework3/trunk@6586 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-27 13:37:41 +00:00
James Lee 99afc981d2 log a useful error message
git-svn-id: file:///home/svn/framework3/trunk@6573 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-21 23:37:07 +00:00
HD Moore 2a5060a934 Fix EOF seek and use a ghetto replacement for iconv to support older ruby versions
git-svn-id: file:///home/svn/framework3/trunk@6548 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-12 20:04:23 +00:00
Ramon de C Valle 6f2ff2d1d5 Do not handle Interrupt exception here.
git-svn-id: file:///home/svn/framework3/trunk@6545 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-11 18:16:54 +00:00
Ramon de C Valle a044ac4661 Do not print backtrace when handling Exception.
git-svn-id: file:///home/svn/framework3/trunk@6544 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-11 17:51:02 +00:00
HD Moore 5384f5685a Removing the lock to support joins, may introduce other bugs with concurrency, still testing
git-svn-id: file:///home/svn/framework3/trunk@6536 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-09 04:18:27 +00:00
Ramon de C Valle caffa9da9f Oops
git-svn-id: file:///home/svn/framework3/trunk@6534 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-08 20:27:40 +00:00
Ramon de C Valle 84f9f344cf Case no Rex UDP socket is passed to RexUDPTransport use Standard UDP socket
git-svn-id: file:///home/svn/framework3/trunk@6533 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-08 20:26:22 +00:00
HD Moore 6bb267f31d Add disasm method to -r
git-svn-id: file:///home/svn/framework3/trunk@6532 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-08 20:22:25 +00:00
Ramon de C Valle d62822a9fb Fixed SNMP Library
git-svn-id: file:///home/svn/framework3/trunk@6531 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-08 19:56:32 +00:00
HD Moore 8f63fc27e3 Adds the new SNMP mixin, still not working perfectly, but a good start
git-svn-id: file:///home/svn/framework3/trunk@6530 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-08 04:18:31 +00:00
HD Moore 6b5893f1f0 Import the ruby snmp library into the tree. Making a few adjustments to make it msf-friendly
git-svn-id: file:///home/svn/framework3/trunk@6529 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-08 03:35:59 +00:00
HD Moore a3263e9c4a Revert
git-svn-id: file:///home/svn/framework3/trunk@6525 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-05 21:37:01 +00:00
HD Moore 90ec694397 Dont log to a file
git-svn-id: file:///home/svn/framework3/trunk@6524 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-05 21:34:51 +00:00
HD Moore 2c5f13ca01 Fix up propids path
git-svn-id: file:///home/svn/framework3/trunk@6523 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-05 20:38:39 +00:00
HD Moore 43a03aa307 Big update from the ruby-ole trunk
git-svn-id: file:///home/svn/framework3/trunk@6522 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-05 20:31:41 +00:00
natron 6f8d309949 Passivex fixed. Reverting r6318 for rex/proto/http/packet. Works on IE8, tests on IE6/7 welcome.
git-svn-id: file:///home/svn/framework3/trunk@6514 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-30 20:38:57 +00:00
James Lee fa23424b46 add -l to use and don't list already-loaded extensions in tab completion
git-svn-id: file:///home/svn/framework3/trunk@6509 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-30 06:09:42 +00:00
et a8b64c56b5 Handle encoding of special chars
git-svn-id: file:///home/svn/framework3/trunk@6508 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-29 04:04:40 +00:00
et 03d8541b3f espia early stages
git-svn-id: file:///home/svn/framework3/trunk@6499 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-27 03:43:22 +00:00
HD Moore 304944d792 db_del_port from jabra
git-svn-id: file:///home/svn/framework3/trunk@6498 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-26 14:53:37 +00:00
James Lee 3a2b0929ab stupid typo
git-svn-id: file:///home/svn/framework3/trunk@6497 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-25 02:12:54 +00:00
HD Moore 3ede3a1d41 Patch from int_80
git-svn-id: file:///home/svn/framework3/trunk@6496 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-23 17:49:04 +00:00
Patrick Webster 0b14dac349 Added rand_text_highascii method.
git-svn-id: file:///home/svn/framework3/trunk@6487 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-16 03:02:41 +00:00
cg a2891e86de uhoh with personal stuff in exploit.rb
git-svn-id: file:///home/svn/framework3/trunk@6484 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-15 03:32:04 +00:00
cg cf1d255a55 SMTP Banner Grabber Aux module
git-svn-id: file:///home/svn/framework3/trunk@6483 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-15 03:26:22 +00:00
James Lee a8863ce330 possible fix to make postgres work again
git-svn-id: file:///home/svn/framework3/trunk@6478 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-12 07:09:03 +00:00
et 0c859dc35e Minor fixes regarding target_host handling
git-svn-id: file:///home/svn/framework3/trunk@6477 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-12 02:00:50 +00:00
kris 17ad98e8e3 Add 'Msf' to 'Context' in the connect command's socket for db_tracker
git-svn-id: file:///home/svn/framework3/trunk@6476 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-11 12:07:50 +00:00
kris 162a835212 Keep the back command from removing the database backend stuff since it's
been moved to metasploit core



git-svn-id: file:///home/svn/framework3/trunk@6474 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-10 23:56:28 +00:00
kris 9bcc3b3167 update aux scanner error message
git-svn-id: file:///home/svn/framework3/trunk@6473 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-10 04:05:05 +00:00
kris 0a67b8ec74 show license info for aux modules
git-svn-id: file:///home/svn/framework3/trunk@6471 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-08 20:53:04 +00:00
kris 1253e7a044 Catch ENOENT for db_destroy for sqlite3 so no backtrace is printed. I decided
to give a little error message for trying to destroy a nonexistent db still.


git-svn-id: file:///home/svn/framework3/trunk@6468 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-08 03:30:18 +00:00
kris b5a8c86241 use print_error
git-svn-id: file:///home/svn/framework3/trunk@6467 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-08 03:11:12 +00:00
kris 6b28b786ac watch out for RuntimeError in loadpath
git-svn-id: file:///home/svn/framework3/trunk@6466 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-08 03:04:29 +00:00
James Lee 8fd36fecf5 make plugin load failure a bit more graceful
git-svn-id: file:///home/svn/framework3/trunk@6460 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-07 05:59:38 +00:00
kris 1eb8c8dfc0 meh, what can I say? I like my name
git-svn-id: file:///home/svn/framework3/trunk@6459 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-03 15:05:35 +00:00
HD Moore 67ab1cca92 Fixed #280. Fix namespace lookup for "FileUtils", thanks grymoire
git-svn-id: file:///home/svn/framework3/trunk@6454 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-02 18:58:36 +00:00
et ce9e47c06b fixed error wmap modules crashing when vhost is nil
git-svn-id: file:///home/svn/framework3/trunk@6447 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-30 04:22:47 +00:00
HD Moore 1b205ee0ee slight fixes for ruby 1.9 compatibility (1.9 will stil not work)
git-svn-id: file:///home/svn/framework3/trunk@6445 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-30 02:57:10 +00:00
HD Moore 932bd89ac2 Mangle up METASM stubs to solve integration problems
git-svn-id: file:///home/svn/framework3/trunk@6430 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-29 07:49:51 +00:00
HD Moore 1894dc4f1a New metasm
git-svn-id: file:///home/svn/framework3/trunk@6429 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-29 07:30:54 +00:00
HD Moore da119f29e7 Swapping metasm...
git-svn-id: file:///home/svn/framework3/trunk@6428 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-29 07:30:31 +00:00
HD Moore 1073b04eb7 Remove sqlite2 support, force load sqlite3 gem
git-svn-id: file:///home/svn/framework3/trunk@6425 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-29 03:40:25 +00:00
HD Moore 2552633f9b Fix up batch mode aux scanners that dont use the tcp mixin. Minor changes to snmp_scan
git-svn-id: file:///home/svn/framework3/trunk@6422 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-29 03:11:56 +00:00
kris 62a1d3037d just a whitespace fix
git-svn-id: file:///home/svn/framework3/trunk@6419 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 23:04:28 +00:00
HD Moore 191289450e Meterpreter is now the default payload for windows autopwn targets
git-svn-id: file:///home/svn/framework3/trunk@6418 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 21:51:35 +00:00
HD Moore 709362ff53 This patch moves all database interaction into the metasploit core. Usage is about the same, except instead of loading a plugin, you call db_driver <driver_name>
git-svn-id: file:///home/svn/framework3/trunk@6417 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 21:42:30 +00:00
HD Moore 8b32f139d3 Skip svn directories for module searches, remove delay loading system (no longer used), enumerate available database drivers at load
git-svn-id: file:///home/svn/framework3/trunk@6416 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 20:45:46 +00:00
HD Moore 74d44235a2 Add the enumerable module as a standalone file
git-svn-id: file:///home/svn/framework3/trunk@6415 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 18:56:31 +00:00
HD Moore 3d6a0bab52 Fix up the version/options modules, make wmap_base_url display the vhost and use the host/port separator correctly
git-svn-id: file:///home/svn/framework3/trunk@6414 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 17:57:12 +00:00
HD Moore 89ad4df087 Fix WMAP modules to use the new scanner api; add wmap_base_url as a shorthand (extend in the future to do VHOST as well), general cosmetic cleanups
git-svn-id: file:///home/svn/framework3/trunk@6413 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 17:45:14 +00:00
HD Moore 26b9903b0d Changes Auxiliary::Scanner to use a new module instance for each thread, updates associated mixins and modules to support this change.
git-svn-id: file:///home/svn/framework3/trunk@6401 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 05:49:33 +00:00
HD Moore 89ecdd9ac8 Mostly working setdesktop code, removed grabdesktop
git-svn-id: file:///home/svn/framework3/trunk@6393 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-25 23:14:14 +00:00
HD Moore 753c7aa7d5 Apply patch to fix SSL server support
git-svn-id: file:///home/svn/framework3/trunk@6391 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-25 16:41:10 +00:00
HD Moore dc68188c3b Patch may resolv slowdowns during local file reads
git-svn-id: file:///home/svn/framework3/trunk@6382 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-23 21:04:39 +00:00
HD Moore d3d3a88d10 Patch to avoid weird race conditions with mutexes, might solve concurrency issue, may cause new ones
git-svn-id: file:///home/svn/framework3/trunk@6381 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-23 20:57:53 +00:00
HD Moore 5be1222a1c Adds the meterpreter client-side code for the keylogger
git-svn-id: file:///home/svn/framework3/trunk@6370 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-23 01:25:11 +00:00
HD Moore 13706d1bde Tons of new Mac OS X code from Dino Dai Zovi and Charlie Miller, more to follow
git-svn-id: file:///home/svn/framework3/trunk@6353 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-18 23:28:24 +00:00
HD Moore 7debb6d52b Make sure Rex::Compat is loaded (triggers on msfpescan -D)
git-svn-id: file:///home/svn/framework3/trunk@6352 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-17 21:48:17 +00:00
HD Moore 9ddc62fc40 Handle cases where RPORT is 139 and the user did not change SMBDirect to false
git-svn-id: file:///home/svn/framework3/trunk@6351 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-17 19:11:26 +00:00
HD Moore a2bc8d928c Removing the call to set evasions, looks like this was more broken that I realized
git-svn-id: file:///home/svn/framework3/trunk@6350 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-17 15:19:00 +00:00
HD Moore 2edc71ca05 Correct the http mixin to call the right evasion method
git-svn-id: file:///home/svn/framework3/trunk@6349 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-17 14:56:20 +00:00
natron 5069038ecd Fixes meterpreter's migrate function to work on DEP-enabled boxes (ticket 275). Patch by Stephen Fewer (harmonysecurity.com).
git-svn-id: file:///home/svn/framework3/trunk@6347 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-16 21:10:58 +00:00
kris ea1336d2f3 use more apt print methods for search messages
git-svn-id: file:///home/svn/framework3/trunk@6344 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-15 16:05:06 +00:00
HD Moore ccbf88f5a3 Fixes TCP socket evasion (max_send_size and send_delay)
git-svn-id: file:///home/svn/framework3/trunk@6340 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-14 05:06:13 +00:00
HD Moore f9eccd1a59 Fix up the fileformat mixin; some slightly wrong ruby and an extra \n at the end of the generated files
git-svn-id: file:///home/svn/framework3/trunk@6338 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-14 01:28:59 +00:00
kris d0c9404aee fix whitespace in error message
git-svn-id: file:///home/svn/framework3/trunk@6336 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-13 19:13:12 +00:00
kris b1edecb728 Fix "route remove" by guarding against constant NameError/backtrace
git-svn-id: file:///home/svn/framework3/trunk@6330 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-10 16:47:53 +00:00
kris b12a3d993e update version command description and comment
git-svn-id: file:///home/svn/framework3/trunk@6329 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-10 16:25:00 +00:00
HD Moore 3c924b245a Fix a metasm bug that causes a conflict with rails. Thanks h!
git-svn-id: file:///home/svn/framework3/trunk@6326 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-09 13:35:20 +00:00
James Lee 934d08bde2 fix unit tests to reflect new output
git-svn-id: file:///home/svn/framework3/trunk@6325 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-09 05:19:26 +00:00
James Lee 6d9a70c6ad fix codepage_map_cache for unit tests
git-svn-id: file:///home/svn/framework3/trunk@6324 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-09 05:18:33 +00:00
James Lee f3a7515a0a more whitespace cleanup
git-svn-id: file:///home/svn/framework3/trunk@6323 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-08 23:05:26 +00:00
James Lee 7384a7aed8 more accurate comments, whitespace cleanup
git-svn-id: file:///home/svn/framework3/trunk@6322 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-08 23:02:53 +00:00
James Lee 491fb6b683 fix double header line bug introduced by my last commit
git-svn-id: file:///home/svn/framework3/trunk@6321 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-08 19:55:47 +00:00
James Lee 96c8f6127c Replace += with << for Strings in a bunch of places.
git-svn-id: file:///home/svn/framework3/trunk@6318 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-08 07:55:47 +00:00
HD Moore 90c3586ac3 Fix error handling for the save command
git-svn-id: file:///home/svn/framework3/trunk@6317 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-08 07:41:28 +00:00
HD Moore 19749865b0 Performance patch from Yoann Guillot <john-metasploit[at]ofjj.net>
git-svn-id: file:///home/svn/framework3/trunk@6316 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-07 23:41:47 +00:00
HD Moore f341e79157 Add new metasm checkout
git-svn-id: file:///home/svn/framework3/trunk@6314 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-07 23:03:38 +00:00
HD Moore 95f6aa0d02 Revert last commit temporarily
git-svn-id: file:///home/svn/framework3/trunk@6313 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-07 23:00:17 +00:00
HD Moore aa4274a3bb Upgrading metasm...
git-svn-id: file:///home/svn/framework3/trunk@6312 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-07 22:58:19 +00:00
HD Moore 2b2c6b983e Switch to a future compatible method of when/case
git-svn-id: file:///home/svn/framework3/trunk@6311 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-07 18:18:38 +00:00
HD Moore 69c169bb2f Replace unicode with raw hex for future compatibility
git-svn-id: file:///home/svn/framework3/trunk@6310 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-07 18:17:08 +00:00
HD Moore 3beeedb98a Better error messages, complain about 1.9.9x
git-svn-id: file:///home/svn/framework3/trunk@6298 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-05 15:04:07 +00:00
kris e316610f5d remove unused vars
git-svn-id: file:///home/svn/framework3/trunk@6285 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-03 23:50:53 +00:00
natron 10f44dd364 Updated passivex to work with IE7/IE8. Launches multiple processes on IE8; will debug later.
git-svn-id: file:///home/svn/framework3/trunk@6261 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-27 23:13:53 +00:00
James Lee 616d0fdd46 add background command to meterpreter
git-svn-id: file:///home/svn/framework3/trunk@6257 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-27 03:12:20 +00:00
kris 08745cc6fd several typos
git-svn-id: file:///home/svn/framework3/trunk@6240 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-21 19:22:06 +00:00
kris e05b74a00c Don't use old OpenSSL::Digest::Digest
git-svn-id: file:///home/svn/framework3/trunk@6239 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-21 17:48:36 +00:00
kris 05b5cd695b add -z to connect command to just try the connection, then return (useful for
seeing if a host is reachable or not with certain settings)


git-svn-id: file:///home/svn/framework3/trunk@6236 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-19 14:24:07 +00:00
HD Moore 526012462e Fix IPv6 targets
git-svn-id: file:///home/svn/framework3/trunk@6233 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-17 21:10:02 +00:00
James Lee 08fbd064d1 make the help command a little more helpful
git-svn-id: file:///home/svn/framework3/trunk@6230 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-17 04:53:06 +00:00
James Lee 8039bf729c tab completion for loadpath
git-svn-id: file:///home/svn/framework3/trunk@6229 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-15 21:52:10 +00:00
kris aed112ff67 a few trivial whitespace things
git-svn-id: file:///home/svn/framework3/trunk@6228 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-15 19:27:53 +00:00
kris b9a8482302 delete old wx.rb
git-svn-id: file:///home/svn/framework3/trunk@6227 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-15 17:45:13 +00:00
James Lee fd962ca307 type fix (route -> sessions)
git-svn-id: file:///home/svn/framework3/trunk@6226 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-15 05:12:28 +00:00
kris cd9ad0f08d Don't join/split args on spaces in load command as that breaks things like
using quotes to have multi-word tokens; shellwords takes care of this stuff


git-svn-id: file:///home/svn/framework3/trunk@6222 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-15 02:48:25 +00:00
James Lee 9a6025aacc Add a plugin to capture packets
git-svn-id: file:///home/svn/framework3/trunk@6213 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-12 16:21:50 +00:00
kris 2c039a87d2 return host info if available in HostCommunicationError's addr_to_s
git-svn-id: file:///home/svn/framework3/trunk@6208 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-06 14:15:54 +00:00
kris 4e0bc60ce1 just use alias
git-svn-id: file:///home/svn/framework3/trunk@6207 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-05 21:49:50 +00:00
kris a49c339a9a Use CRLF in http proxy request for some stringent servers
git-svn-id: file:///home/svn/framework3/trunk@6206 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-05 21:29:15 +00:00
druid 7965a7de05 Wardialer
git-svn-id: file:///home/svn/framework3/trunk@6193 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-28 06:13:47 +00:00
kris 13cc54cbe5 Add -P source port option to connect
git-svn-id: file:///home/svn/framework3/trunk@6184 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-26 03:06:58 +00:00
kris c60077bb1c Revamp/fix-up http proxying by using Rex to parse the response (instead of
really strict matching)


git-svn-id: file:///home/svn/framework3/trunk@6182 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-24 14:48:18 +00:00
James Lee fd435b48d9 http proxy support patch from Frederik Braun
git-svn-id: file:///home/svn/framework3/trunk@6181 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-24 06:32:06 +00:00
James Lee 55daaf64bd remove dll option from reflectivemeterpreter, too
git-svn-id: file:///home/svn/framework3/trunk@6179 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-24 03:29:07 +00:00
James Lee 077c201f10 try any before specific LHOST
git-svn-id: file:///home/svn/framework3/trunk@6177 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-23 23:03:53 +00:00
James Lee 1d499a9756 fix empty body when Content-Length is not set
git-svn-id: file:///home/svn/framework3/trunk@6176 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-23 21:10:58 +00:00
kris 679fa424b1 add a colon to error message for clarity
git-svn-id: file:///home/svn/framework3/trunk@6175 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-23 18:37:48 +00:00
kris 32868c4b0f adding db_import_amap_mlog for reading in from a thc-amap machine-readable log
git-svn-id: file:///home/svn/framework3/trunk@6169 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-21 02:12:10 +00:00
kris 4a15116fe6 move a stray alias to underneath the original method
git-svn-id: file:///home/svn/framework3/trunk@6168 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-20 02:15:19 +00:00
kris a595def093 watch out for an already closed socket in connect (meterpreter session, etc)
git-svn-id: file:///home/svn/framework3/trunk@6161 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-18 01:21:42 +00:00
kris 17f4396d1d add args checking for connect
git-svn-id: file:///home/svn/framework3/trunk@6160 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-18 00:00:26 +00:00
kris d53ac9648c typo: correct name in "sessions" help/usage
git-svn-id: file:///home/svn/framework3/trunk@6153 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-14 21:31:24 +00:00
kris 2e4edcaa83 support [dot] conversion in authors' emails
git-svn-id: file:///home/svn/framework3/trunk@6151 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-14 15:17:03 +00:00
HD Moore cb327d40fc Fix up the dialup code
git-svn-id: file:///home/svn/framework3/trunk@6150 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-14 05:46:10 +00:00
kris 6777023871 Notify handlers of socket creation for bare raw IP and TCP server sockets
git-svn-id: file:///home/svn/framework3/trunk@6149 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-14 00:27:37 +00:00
kris 8c8370e9b9 Notify handlers of before and after socket creation events for raw IP
git-svn-id: file:///home/svn/framework3/trunk@6148 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-14 00:15:33 +00:00
HD Moore dc264cdcf3 Fix from Tom Hessman when the EDITOR environment variable is not set (relayed via Ed)
git-svn-id: file:///home/svn/framework3/trunk@6147 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-13 16:19:56 +00:00
HD Moore 4e2d29ec68 Fix from Ed Skoudis when EDITOR is not set
git-svn-id: file:///home/svn/framework3/trunk@6146 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-13 14:43:22 +00:00
HD Moore 463c67a322 Include the new TTY session type
git-svn-id: file:///home/svn/framework3/trunk@6143 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-13 07:13:55 +00:00
HD Moore 4678430946 Read the response from handler() and skip skipping the socket if active
git-svn-id: file:///home/svn/framework3/trunk@6142 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-13 07:08:40 +00:00
HD Moore 44caffbd87 Add a new TTY session type for customization
git-svn-id: file:///home/svn/framework3/trunk@6140 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-13 07:02:02 +00:00
HD Moore 5600b0b67d Try harder to verify the socket if its a modem connection
git-svn-id: file:///home/svn/framework3/trunk@6139 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-13 06:52:23 +00:00
HD Moore 331eaaa602 Add basic framework for the new TTY architecture
git-svn-id: file:///home/svn/framework3/trunk@6136 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-13 06:46:32 +00:00
James Lee 9c6d8b86fb patch from tebo; use standard printing methods
git-svn-id: file:///home/svn/framework3/trunk@6134 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-12 17:52:54 +00:00
James Lee e7aecca838 more awesomeness from tebo
git-svn-id: file:///home/svn/framework3/trunk@6133 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-12 05:18:05 +00:00
James Lee 0dbdc977a0 missed part of the patch for tebo's mssql login scanner module
git-svn-id: file:///home/svn/framework3/trunk@6131 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-12 00:26:05 +00:00
James Lee df2a28f2ce allow character sets in Exploit::pattern_create
git-svn-id: file:///home/svn/framework3/trunk@6130 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-12 00:10:48 +00:00
HD Moore beb276d1e6 Make the serialport/telephony require fail soft
git-svn-id: file:///home/svn/framework3/trunk@6129 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-11 17:30:26 +00:00
druid 4686367af2 Fixed some namespacing and method calling bugs
git-svn-id: file:///home/svn/framework3/trunk@6126 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-11 07:45:08 +00:00
druid 63401275bd Fixed syntax error (mybad)
git-svn-id: file:///home/svn/framework3/trunk@6125 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-11 07:26:05 +00:00
druid a9a7700121 Added code to support the FLOWCONTROL setting
git-svn-id: file:///home/svn/framework3/trunk@6124 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-11 07:23:43 +00:00
druid a11df5fbbf Added missing telephony.rb
git-svn-id: file:///home/svn/framework3/trunk@6123 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-11 07:17:57 +00:00
druid 8e4d9ad7b0 Updated to use generic method_missing def for pass-through methods to SerialPort
git-svn-id: file:///home/svn/framework3/trunk@6121 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-11 06:30:56 +00:00
druid 0d1ca42ed6 Adds support for exploitation over dialup via the new Telephony library.
git-svn-id: file:///home/svn/framework3/trunk@6120 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-11 06:09:02 +00:00
druid 4b3c8c3f33 The MSF Telephony Library. Initially provides the Modem Class
git-svn-id: file:///home/svn/framework3/trunk@6119 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-11 06:07:14 +00:00
James Lee 288075f7a0 add report_auth_info to some modules that authenticate. thanks, tebo
git-svn-id: file:///home/svn/framework3/trunk@6118 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-11 05:52:07 +00:00
James Lee 49cd8d7223 typo fix
git-svn-id: file:///home/svn/framework3/trunk@6114 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-11 04:48:06 +00:00
kris a1851b19db just typos/misspellings
git-svn-id: file:///home/svn/framework3/trunk@6113 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-11 03:17:21 +00:00
James Lee 51b0e84691 fix report_auth_info when db has not been initialized
git-svn-id: file:///home/svn/framework3/trunk@6112 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-11 01:45:57 +00:00
kris a61baaa1eb deleting broken/useless timed_read()
git-svn-id: file:///home/svn/framework3/trunk@6110 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-10 17:46:23 +00:00
James Lee 959191cb8c add heap spray function to HttpServer::HTML mixin
git-svn-id: file:///home/svn/framework3/trunk@6107 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-10 05:48:19 +00:00
kris 1c6715ff3b Run multiple resource files from single command (was getting ArgumentError)
git-svn-id: file:///home/svn/framework3/trunk@6102 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-09 20:29:50 +00:00
kris f6fd33a3eb add usage/help to resource command
git-svn-id: file:///home/svn/framework3/trunk@6101 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-09 20:16:08 +00:00
kris 4b34d5a8b1 use print() for search usage
git-svn-id: file:///home/svn/framework3/trunk@6100 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-09 19:58:22 +00:00
Patrick Webster 65bbf8c052 Alphabetically sort the tab completion module name output.
git-svn-id: file:///home/svn/framework3/trunk@6098 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-09 07:36:58 +00:00
Patrick Webster db2f420397 Some Aux modules have refs, but not printing the output.
git-svn-id: file:///home/svn/framework3/trunk@6097 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-09 07:02:03 +00:00
kris 8850ac2d87 comment updates
git-svn-id: file:///home/svn/framework3/trunk@6093 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-09 02:16:02 +00:00
cg c92e135cb4 update author.rb
git-svn-id: file:///home/svn/framework3/trunk@6086 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-07 23:23:56 +00:00
Mario Ceballos ee86b19834 added tns mixin to support oracle8i listener overflow and other tns
related stuff.


git-svn-id: file:///home/svn/framework3/trunk@6082 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-07 03:07:01 +00:00
kris 41fbd5500e shorten regexes
git-svn-id: file:///home/svn/framework3/trunk@6081 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-07 02:50:10 +00:00
kris f86ba09020 use print_status and print_error instead of print_line where applicable in
connect's output for [*] and [-]


git-svn-id: file:///home/svn/framework3/trunk@6077 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-06 06:12:58 +00:00
kris 754c1c5711 Add 127.0.0.1 -> ::1 conversion for IPv4-addressed IPv6 sockets
git-svn-id: file:///home/svn/framework3/trunk@6072 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-04 18:42:55 +00:00
James Lee 0fa92221dd add tab completion for meterpreter use command
git-svn-id: file:///home/svn/framework3/trunk@6064 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-04 06:41:01 +00:00
James Lee 23177cbb0d fix unload tabs
git-svn-id: file:///home/svn/framework3/trunk@6063 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-04 05:52:13 +00:00
James Lee f50672c7eb add opera detection for js_os_detect
git-svn-id: file:///home/svn/framework3/trunk@6061 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-02 21:28:05 +00:00
Mario Ceballos 6fff22ab9d updated with corrected address.
git-svn-id: file:///home/svn/framework3/trunk@6056 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-02 12:22:35 +00:00
HD Moore af1675bf19 This patch allows the framework to be created with only specific module types enabled, speeding up msfpayload and msfencode.
git-svn-id: file:///home/svn/framework3/trunk@6055 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-02 07:29:56 +00:00
kris a0aa29bb18 typos
git-svn-id: file:///home/svn/framework3/trunk@6054 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-29 07:47:37 +00:00
kris 2d1ae98917 Convert 'Retries' and 'Timeout' values to integers if given
git-svn-id: file:///home/svn/framework3/trunk@6053 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-29 05:04:49 +00:00
kris bba174bc61 Add -C to 'connect' command to try to use CRLF for the EOL sequence, which is
useful for talking to some stringent servers.  This currently just replaces
the final '[^\r]\n' from gets() with '\r\n', which works well while interacting


git-svn-id: file:///home/svn/framework3/trunk@6052 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-28 21:35:11 +00:00
kris ee9986a582 don't split connect's short usage info across lines
git-svn-id: file:///home/svn/framework3/trunk@6051 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-28 20:41:44 +00:00
kris 8bc6051787 Add -w to 'connect' command for specifying connect timeout
git-svn-id: file:///home/svn/framework3/trunk@6050 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-28 20:38:02 +00:00
kris 6b9ea78869 Add -S to 'connect' command for specifying source addr
git-svn-id: file:///home/svn/framework3/trunk@6049 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-28 20:02:17 +00:00
kris 658727ff27 whoops, reverse extra part of last commit
git-svn-id: file:///home/svn/framework3/trunk@6048 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-26 07:13:08 +00:00
kris b012696f1f just use boolean @@support_ipv6 instead of "yes"/"no"
git-svn-id: file:///home/svn/framework3/trunk@6047 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-26 07:11:49 +00:00
kris b03360f5e0 use pack_word in push_word and pack_dword in push_dword
git-svn-id: file:///home/svn/framework3/trunk@6046 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-25 02:00:46 +00:00
kris cc233af814 add pack_word() method
git-svn-id: file:///home/svn/framework3/trunk@6045 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-25 01:55:05 +00:00
kris 410d52626c Add -i option to 'connect' command to send contents of a file
git-svn-id: file:///home/svn/framework3/trunk@6044 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-25 01:13:29 +00:00
kris 5944cfc13c improve some usage info for connect command
git-svn-id: file:///home/svn/framework3/trunk@6040 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-23 17:47:05 +00:00
kris bbc9ad1f75 Adding netcat-like "connect" console command. It currently supports proxying,
comm selection and SSL options.


git-svn-id: file:///home/svn/framework3/trunk@6039 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-23 07:43:22 +00:00
kris ff92efa219 Add db_del_host command
git-svn-id: file:///home/svn/framework3/trunk@6038 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-22 03:19:39 +00:00
kris 3949663db1 fix version info with multiple components (e.g. was "5951 $, 5773")
git-svn-id: file:///home/svn/framework3/trunk@6035 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-21 04:18:17 +00:00
kris 704a92d43a add name to author list and switch some modules to use it
git-svn-id: file:///home/svn/framework3/trunk@6034 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-20 21:53:17 +00:00
kris 0e8ce1cc46 Move my portspec parsing code from scanner/portscan/tcp to Rex as
Socket.portspec_crack and use it to also replace the incomplete
parsing code used for db_autopwn


git-svn-id: file:///home/svn/framework3/trunk@6033 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-20 20:34:05 +00:00
kris 90f906d8c5 Add assignment to to_ruby and to_perl output, and allow changing of variable
name in to_java output


git-svn-id: file:///home/svn/framework3/trunk@6032 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-20 07:40:27 +00:00
kris cdcf5cf1fd add a few key descriptions
git-svn-id: file:///home/svn/framework3/trunk@6024 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-19 09:33:16 +00:00
kris 84b6d9daf4 remove extra (server-only) setsockopt(SO_REUSEADDR)
git-svn-id: file:///home/svn/framework3/trunk@6023 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-19 08:02:53 +00:00
kris 248f1e9fc3 Remove "#{xxx.to_s}" redundancies ('s/\(#{[^}]*\)\.to_s}/\1}/g')
git-svn-id: file:///home/svn/framework3/trunk@6022 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-19 07:11:08 +00:00
kris bfc23d2886 use self.peerhost (which could use 'PeerAddr') instead of 'PeerHost'
git-svn-id: file:///home/svn/framework3/trunk@6021 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-19 06:54:22 +00:00
kris 560f2df2dd fix PeerAddr
git-svn-id: file:///home/svn/framework3/trunk@6020 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-19 06:50:04 +00:00
James Lee 7f59e5ff15 make sessions behave like jobs when no options are given
git-svn-id: file:///home/svn/framework3/trunk@6013 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-15 06:05:11 +00:00
HD Moore 5822ab75a7 Adds an exploit module (universal) for the new internet explorer xml bug. This module shows off the .NET memory techniques discovered by Alexander Sotirov and Mark Dowd. This code should bypass DEP, ASLR, and NX :-)
git-svn-id: file:///home/svn/framework3/trunk@6012 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-12 01:45:00 +00:00
HD Moore cb8230f817 Fixes #263. Correct the max read() size for DCERPC over SMB
git-svn-id: file:///home/svn/framework3/trunk@6007 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-11 03:50:30 +00:00
et e00cf42f9d Minor update to wmap documentation with new features
git-svn-id: file:///home/svn/framework3/trunk@6005 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-08 04:44:46 +00:00
et 6f83ec2cf8 Added global variable WMAP_EXCLUDE_FILE with regular expresion to define what not to scan. By default images are not tested. Thanks Martin Muench for comments.
git-svn-id: file:///home/svn/framework3/trunk@6000 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-07 05:50:49 +00:00
et 6e2c61c97f Added wmap module methods to access requests and reports tables
git-svn-id: file:///home/svn/framework3/trunk@5997 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-04 03:42:43 +00:00
HD Moore a8c9397419 Patch frmo antoine
git-svn-id: file:///home/svn/framework3/trunk@5994 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-03 15:47:10 +00:00
Mario Ceballos e1e1f5d6a4 added fileformat mixin, fileformat exploit videolan_tivo.rb, and network based exploit videolan_tivo.rb
git-svn-id: file:///home/svn/framework3/trunk@5993 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-03 01:23:27 +00:00
HD Moore 71c5175a85 This patch introduces a really basic RPC service. It is still a long way from its final version
git-svn-id: file:///home/svn/framework3/trunk@5991 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-02 22:09:34 +00:00
kris 8eda1cccbf typo
git-svn-id: file:///home/svn/framework3/trunk@5990 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-02 02:03:22 +00:00
et 6f8a1ab13a Fixed minor help presentation issue
git-svn-id: file:///home/svn/framework3/trunk@5989 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-01 03:59:27 +00:00
et 8547688d7d Added wmap profiles capabilities to use as a method to run specific modules
git-svn-id: file:///home/svn/framework3/trunk@5988 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-01 03:48:23 +00:00
et 3e19245054 Fixed handling of root website directory. Minor presentation fixes in test modules
git-svn-id: file:///home/svn/framework3/trunk@5987 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-30 22:41:09 +00:00
et fb62ec351c Added wmap_targets -a add parameter as a quick way to create a new target
git-svn-id: file:///home/svn/framework3/trunk@5985 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-30 06:35:43 +00:00
kris 80cc5e3bb6 Don't save "unknown" service names from Nmap or Nessus
git-svn-id: file:///home/svn/framework3/trunk@5983 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-28 12:57:10 +00:00
kris 29919b1d84 Strip whitespace from saved service names from NBEs
git-svn-id: file:///home/svn/framework3/trunk@5982 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-28 12:51:35 +00:00
kris cba228e8bf close NBE after import
git-svn-id: file:///home/svn/framework3/trunk@5980 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-24 22:28:22 +00:00
James Lee 9bb814a9d1 fix typo in comment
git-svn-id: file:///home/svn/framework3/trunk@5974 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-21 23:44:45 +00:00
James Lee 63e3e3a0e9 remove some verbosity and dead code from js osdetect
git-svn-id: file:///home/svn/framework3/trunk@5973 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-21 05:37:28 +00:00
James Lee 4b082a77a8 un-break reverse handler for ipv6
git-svn-id: file:///home/svn/framework3/trunk@5972 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-21 05:34:39 +00:00
James Lee b76d3e1560 better handling of LHOST vs 0.0.0.0; fixes #262 again
git-svn-id: file:///home/svn/framework3/trunk@5971 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-21 05:12:31 +00:00
James Lee fec1533b50 revert r5969 which breaks behind nat
git-svn-id: file:///home/svn/framework3/trunk@5970 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-21 02:01:43 +00:00
James Lee f1e71237e4 bind to LHOST instead of 0.0.0.0, fixes #262
git-svn-id: file:///home/svn/framework3/trunk@5969 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-21 01:09:17 +00:00
HD Moore 7d2f0c1bc0 Log a backtrack on meterpreter command errors, make debugging easier
git-svn-id: file:///home/svn/framework3/trunk@5968 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-20 05:54:55 +00:00
HD Moore 73e933b269 Versioning updates
git-svn-id: file:///home/svn/framework3/trunk@5962 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-19 07:24:06 +00:00
HD Moore 412e4a27ef Fixes #261. Default the exploit arch to x86 so we dont match on the wrong payloads
git-svn-id: file:///home/svn/framework3/trunk@5959 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-19 07:09:09 +00:00
HD Moore 2f049269d6 Fix a crash bug in msfgui, thanks Donnie Werner
git-svn-id: file:///home/svn/framework3/trunk@5956 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-19 06:25:24 +00:00
HD Moore 6219b1873e Commit modified version of a patch from Marcell 'SkyOut' Dietl (Helith). This adds port inclusion, exclusion, and regex matching, as well as -q for 'quiet' mode (only status output, no module output)
git-svn-id: file:///home/svn/framework3/trunk@5952 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-18 22:01:15 +00:00
HD Moore 6c240e14b1 Disbale DoS modules from automation
git-svn-id: file:///home/svn/framework3/trunk@5948 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-18 19:56:03 +00:00
HD Moore 77bc8d90a3 Apply patch to not exit the console on ^C
git-svn-id: file:///home/svn/framework3/trunk@5947 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-18 19:41:13 +00:00
HD Moore 35e754c379 Remove the protected declaration before autofilter
git-svn-id: file:///home/svn/framework3/trunk@5945 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-18 15:13:27 +00:00
HD Moore 05088e59f9 Close before deleting
git-svn-id: file:///home/svn/framework3/trunk@5944 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-18 14:57:41 +00:00
HD Moore 2bc4ca41b3 Fix background exploit jobs
git-svn-id: file:///home/svn/framework3/trunk@5943 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-17 19:51:09 +00:00
HD Moore 63a6c7ec39 Officially hit beta release 2 (fixed international support)
git-svn-id: file:///home/svn/framework3/trunk@5940 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-17 06:31:14 +00:00
HD Moore 0188938b46 Make packetfu work with 1.8.5
git-svn-id: file:///home/svn/framework3/trunk@5937 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-17 05:12:06 +00:00
HD Moore 652100cb54 Use a temporary file for the glade.xml
git-svn-id: file:///home/svn/framework3/trunk@5936 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-17 05:02:13 +00:00
HD Moore d630d63e05 Handle binary mode on windows
git-svn-id: file:///home/svn/framework3/trunk@5935 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-17 04:37:36 +00:00
HD Moore 25a8621e72 This giant pile of bizzare image foo solves an issue with GLib not being able to parse international path names.
git-svn-id: file:///home/svn/framework3/trunk@5934 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-17 04:34:09 +00:00
HD Moore aac553feea Officially to Beta release 1.
git-svn-id: file:///home/svn/framework3/trunk@5933 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-17 01:10:29 +00:00
kris a35a9b7bdb add x86 push_word method
git-svn-id: file:///home/svn/framework3/trunk@5932 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-16 22:54:03 +00:00
HD Moore f6464e7116 Fixes #256. Jobify all auxiliary modules
git-svn-id: file:///home/svn/framework3/trunk@5931 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-16 21:28:51 +00:00
HD Moore 2cf715fd92 Fixes #249. Wrap the error when the view has been closed
git-svn-id: file:///home/svn/framework3/trunk@5930 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-16 21:21:13 +00:00
James Lee b3ecce5cf4 look for files in absolute paths. fixes #252
git-svn-id: file:///home/svn/framework3/trunk@5928 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-16 21:10:35 +00:00
HD Moore 5d0ebc18cf See #250. Adds a wait() wrapper to the HTTP service as well
git-svn-id: file:///home/svn/framework3/trunk@5927 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-16 21:00:44 +00:00
HD Moore a7595fce6c Fixes #250. Solves an old bug with background jobs not working right, fixes the 'background modules dont work' bug as well.
git-svn-id: file:///home/svn/framework3/trunk@5926 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-16 20:54:41 +00:00
HD Moore 42c80b5018 Fixes #255. Catch the case of an empty module cacche file
git-svn-id: file:///home/svn/framework3/trunk@5925 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-16 19:26:59 +00:00
kris 81be31d751 sort Meterpreter ps output by pid
git-svn-id: file:///home/svn/framework3/trunk@5921 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-15 06:20:34 +00:00
HD Moore cf3475644e Remove debugging code
git-svn-id: file:///home/svn/framework3/trunk@5917 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-13 18:28:15 +00:00
kris 19fa03649a Add lpwd/getlwd Meterpreter commands
git-svn-id: file:///home/svn/framework3/trunk@5916 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-13 17:30:24 +00:00
kris 360bd6d222 Fix Meterpreter lcd command
git-svn-id: file:///home/svn/framework3/trunk@5915 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-13 17:22:28 +00:00
et 0518511160 Fixed bug regarding website root directory
git-svn-id: file:///home/svn/framework3/trunk@5904 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-13 02:22:35 +00:00
Ramon de C Valle dfbf6b34a5 Added Linux Power/Cell Broadband Engine Architecture payload modules and advanced payload options
git-svn-id: file:///home/svn/framework3/trunk@5899 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-13 01:57:53 +00:00
Ramon de C Valle 73b02f1899 Updated lib/rex/constants.rb
git-svn-id: file:///home/svn/framework3/trunk@5898 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-13 01:55:25 +00:00
HD Moore b4a5cb455b Short variable names to fit more into memory
git-svn-id: file:///home/svn/framework3/trunk@5896 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-12 23:51:36 +00:00
HD Moore 616491a552 Play nice with ruby implementations without readline and openssl
git-svn-id: file:///home/svn/framework3/trunk@5895 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-12 22:47:21 +00:00
HD Moore f5374fe2d2 Syntax fixups
git-svn-id: file:///home/svn/framework3/trunk@5894 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-12 19:31:11 +00:00
HD Moore a70e982369 Adds utlities for creating VBA scripts from an EXE (or payload)
git-svn-id: file:///home/svn/framework3/trunk@5893 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-12 19:15:24 +00:00
HD Moore 71448fd876 Typo for hashes
git-svn-id: file:///home/svn/framework3/trunk@5891 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-11 22:57:18 +00:00
HD Moore 10266c8e51 Better short read detection from antoine.
git-svn-id: file:///home/svn/framework3/trunk@5889 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-11 17:53:13 +00:00
HD Moore 250848ac5c Handle windows error on broadcast addresses
git-svn-id: file:///home/svn/framework3/trunk@5886 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-11 07:41:07 +00:00
HD Moore 81347ba308 Fix ENONET for BSD
git-svn-id: file:///home/svn/framework3/trunk@5885 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-11 06:19:44 +00:00
kris 7b002d4288 remove unused exception variables
git-svn-id: file:///home/svn/framework3/trunk@5882 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-11 06:00:54 +00:00
HD Moore cca9c39eab Typo fix from Rhyss
git-svn-id: file:///home/svn/framework3/trunk@5881 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-11 05:39:23 +00:00
HD Moore e9b3919ace Normalize exceptions across socket libraries
git-svn-id: file:///home/svn/framework3/trunk@5879 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-11 05:11:40 +00:00
kris aba3f95026 an empty string is better than a nil type-error (found by playing around, not
from a faulty module or whathaveyou)


git-svn-id: file:///home/svn/framework3/trunk@5878 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-11 04:01:21 +00:00
HD Moore bbb53dd9ea Default max_read to 1M, solves intermittent issues
git-svn-id: file:///home/svn/framework3/trunk@5876 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-10 23:03:16 +00:00
HD Moore b11939759e Fix an ugly error when the response was too small
git-svn-id: file:///home/svn/framework3/trunk@5875 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-10 22:56:25 +00:00
HD Moore 7af4772729 All bugs closed
git-svn-id: file:///home/svn/framework3/trunk@5874 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-10 22:15:23 +00:00
HD Moore 8628a9d2c1 Fixes #193. Add a unicode-capable workaround for windows, patch code to go through the compat lib
git-svn-id: file:///home/svn/framework3/trunk@5873 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-10 21:44:58 +00:00
HD Moore 6dd840e4b3 Fixes #201. Better error processing of client sockets
git-svn-id: file:///home/svn/framework3/trunk@5872 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-10 21:30:35 +00:00
HD Moore e2a70dd615 Fixes #111. Merge in patch to fix memdump support, still not perfect, but usable
git-svn-id: file:///home/svn/framework3/trunk@5871 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-10 21:18:12 +00:00
et b4cbe4ff8d Multiple bug fixes. Fixed query modules now resolved to correct function. Corrected in proxy and wmap code handling of RHOSTS as hostnames are not in use. Fixed reporting as target port was not handled properly and modules modified to reflect new wmap_target methods.
git-svn-id: file:///home/svn/framework3/trunk@5869 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-10 04:38:05 +00:00
kris 23274e6efc Fix Meterpreter route error message
git-svn-id: file:///home/svn/framework3/trunk@5868 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-10 04:17:31 +00:00
kris cce1166199 Fix Meterpreter's portfwd default "list" behavior
git-svn-id: file:///home/svn/framework3/trunk@5867 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-10 03:56:23 +00:00
kris 21c1eecfa7 Update Meterpreter upload and download commands so that passing one non-option
argument sets both the source and destination file/dir (and make it so that
these commands only expect at least one argument instead of two)



git-svn-id: file:///home/svn/framework3/trunk@5866 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-10 02:07:41 +00:00
HD Moore 4250d1e132 Handle socket errors more gracefully
git-svn-id: file:///home/svn/framework3/trunk@5864 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-09 23:02:18 +00:00
HD Moore 2d498ed3c5 Fixes #149. This doesnt address quite the bug, but solves a case where the DNS server does not reply and the Windows version of ruby acts stupid. The bug mentioned in this ticket is addressed by a newer ruby version.
git-svn-id: file:///home/svn/framework3/trunk@5863 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-09 22:59:21 +00:00
HD Moore 6e773891de Fixes #167. Remove the EncoderDontFallThrough option, make this the normal behavior if an encoder is specified
git-svn-id: file:///home/svn/framework3/trunk@5862 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-09 22:23:29 +00:00
HD Moore 3b79f24500 Fixes #242. Use the bundled copy of activerecord
git-svn-id: file:///home/svn/framework3/trunk@5861 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-09 21:54:04 +00:00
HD Moore 7367c2cbd4 Fixes #248. Catch empty returns from pgets
git-svn-id: file:///home/svn/framework3/trunk@5860 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-09 21:40:03 +00:00
HD Moore ecc853d453 Fixes #246. Revert to older readline behavior, the priority change should prevent the readline idle loop from consuming process time.
git-svn-id: file:///home/svn/framework3/trunk@5859 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-09 08:44:36 +00:00
HD Moore 94a7cdcc6b Fix duplicate options when payload/exploit have a shared optino value
git-svn-id: file:///home/svn/framework3/trunk@5856 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-08 23:06:04 +00:00
kris 97fee9e16f Return "0 secs" instead of "" in Rex::ExtTime.sec_to_s()
git-svn-id: file:///home/svn/framework3/trunk@5855 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-08 22:35:37 +00:00
James Lee 75feaa6fab allow passing args to meterpreter scripts through AutoRunScript
git-svn-id: file:///home/svn/framework3/trunk@5853 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-08 19:39:06 +00:00
HD Moore bc8e5669bd Fixes #238. Exposes the RHOST option to the payload and fixes the MSFGUI display of payload options
git-svn-id: file:///home/svn/framework3/trunk@5852 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-08 19:25:25 +00:00
HD Moore d1052fdaf1 Fixes #215. Reinitialize the input/output after a reload
git-svn-id: file:///home/svn/framework3/trunk@5851 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-08 17:48:21 +00:00
HD Moore 5af9abd81d Fixes #194. Add nicer call stacks to auxiliary modules
git-svn-id: file:///home/svn/framework3/trunk@5850 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-07 22:54:49 +00:00
HD Moore 7c03f14792 Add a better test for the ruby short-named constant bug
git-svn-id: file:///home/svn/framework3/trunk@5848 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-07 20:44:13 +00:00
HD Moore 0881649f14 The psexec and smb_relay module now automatically cleanup. The ms08-06 module now supports all languages of XP SP3.
git-svn-id: file:///home/svn/framework3/trunk@5841 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-04 22:27:59 +00:00
HD Moore 68b9a2a421 Adds a new submitted fingerprint for Czech
git-svn-id: file:///home/svn/framework3/trunk@5836 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-04 07:13:48 +00:00
James Lee 0193cd5219 fix session vs client variable problems with meterpreter AutoRunScript and make usage actually reflect what the code does
git-svn-id: file:///home/svn/framework3/trunk@5834 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-04 06:40:12 +00:00
HD Moore 8ee55fb53c Embed the revision of the smb mixin
git-svn-id: file:///home/svn/framework3/trunk@5832 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-04 04:24:11 +00:00
HD Moore b53695f7db The psexec module now uses a service-compatible exe, shellcode is spawned in a subprocess and the service cleans up properly
git-svn-id: file:///home/svn/framework3/trunk@5829 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-03 23:06:37 +00:00
HD Moore 133d7ce658 Adds an automatic default target to ms08-067, autodetects OS, SP, and language now.
git-svn-id: file:///home/svn/framework3/trunk@5827 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-03 20:37:51 +00:00
HD Moore f1789fc1b2 Adds the check() method and scanner module to ms08-067, massively upgrades the smb/version scanner, with better SP detection and remote language pack detection.
git-svn-id: file:///home/svn/framework3/trunk@5823 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-03 09:17:08 +00:00
kris c52f889082 Report hosts as alive through db_tracker and the db Nmap and Nessus commands
git-svn-id: file:///home/svn/framework3/trunk@5819 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-31 18:39:53 +00:00
HD Moore 56a413d803 Reflective DLL injection payloads from Stephen Fewer
git-svn-id: file:///home/svn/framework3/trunk@5806 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-30 22:17:32 +00:00
HD Moore a4d53893ac Improvements to opty2 from vlad902:
1) Fixed a minor bug, sometimes Opty2 would generate C1 /6 instructions which most processors will execute but which are not technically valid (they would exist for SAL but SAL is an alias for SHL so it is defined as C1 /4).
 2) I changed the 0x90 nop instruction so that it is no longer considered that 0x90 changes the eax register.
3) Removed o16/0x66 prepend byte from 0x0f, this is currently unused anyways but might prevent some poor person from debugging it in the future.
 4) Previously short jumps would only make positive jumps, I added the capability for them to make a "-1" jump which would basically just start executing at the offset byte. For example it could generate something like EB FF XX YY ... where EB FF jumps to FF XX YY ...
 5) I added support for the instructions mov reg, segreg (8C), mov reg, imm8/imm32 (C6/C7), and lea reg, mem (8D). I implemented LEA so that it only allows memory references to be in ModR/M form and not be in SIB form (I don't think it's possible to allow SIB in the way Opty2 works at the moment).
 



git-svn-id: file:///home/svn/framework3/trunk@5804 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-30 07:30:52 +00:00
kris 025b7410a0 Remove spurious ] from db_services output for consistency with other db output
git-svn-id: file:///home/svn/framework3/trunk@5799 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-29 13:10:22 +00:00
kris 3e8c5ecebc Fix db_add_host (undefined variable)
git-svn-id: file:///home/svn/framework3/trunk@5795 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-27 22:47:09 +00:00
druid a07a3af2d6 Adds a method hook for any primer code needed to execute immediately after server startup.
git-svn-id: file:///home/svn/framework3/trunk@5792 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-27 20:31:40 +00:00
et 75be2e33ad Added module reporting and wmap_reports command
git-svn-id: file:///home/svn/framework3/trunk@5789 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-27 02:22:30 +00:00
et 29e983567e removed reports_exist check
git-svn-id: file:///home/svn/framework3/trunk@5785 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-23 04:23:54 +00:00
HD Moore 1df0612f61 Adds a case-sensitivity permutation routine
git-svn-id: file:///home/svn/framework3/trunk@5780 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-22 22:43:13 +00:00
HD Moore 65419ad206 Adds routines/tools for cracking the NTLM hash from the plaintext case-insensive LANMAN password
git-svn-id: file:///home/svn/framework3/trunk@5779 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-22 22:42:52 +00:00
Ramon de C Valle f124597a56 Code cleanups
git-svn-id: file:///home/svn/framework3/trunk@5773 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-19 21:03:39 +00:00
Ramon de C Valle 4c847e0d44 Fixed typo
git-svn-id: file:///home/svn/framework3/trunk@5772 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-19 20:38:07 +00:00
et 7e73ed8c15 first attempt of reporting implementation.
git-svn-id: file:///home/svn/framework3/trunk@5771 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-19 20:32:14 +00:00
Ramon de C Valle c34bbae344 Added payload advanced packing types for 16/16 and 22/10 bits substitution
git-svn-id: file:///home/svn/framework3/trunk@5770 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-19 20:32:14 +00:00
HD Moore deea354fbb Wrap the modulation setting as well
git-svn-id: file:///home/svn/framework3/trunk@5768 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-17 18:31:09 +00:00
HD Moore 4a3b540685 Handle the txrate error better
git-svn-id: file:///home/svn/framework3/trunk@5767 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-17 17:46:05 +00:00
HD Moore 7d98de2fed Handle cases where lorcon cant change the txrate (zdw driver)
git-svn-id: file:///home/svn/framework3/trunk@5766 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-17 17:35:35 +00:00
HD Moore 4eac2506b8 Add TXRATE and TXMOD options
git-svn-id: file:///home/svn/framework3/trunk@5765 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-17 15:58:33 +00:00
HD Moore 2e297596b0 Make the 1.8.6 requirement a warning for now
git-svn-id: file:///home/svn/framework3/trunk@5762 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-16 19:56:10 +00:00
Ramon de C Valle 8d760ebc1e Added patch and module from Kris Katterjohn
git-svn-id: file:///home/svn/framework3/trunk@5751 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-14 14:22:34 +00:00
HD Moore e016ff2d76 cleanup patch from antoine
git-svn-id: file:///home/svn/framework3/trunk@5748 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-13 14:22:38 +00:00
et c153d1fea0 Wmap database merged, new wmap_generic module, fix website tree display and docs.
git-svn-id: file:///home/svn/framework3/trunk@5740 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-12 03:46:49 +00:00
HD Moore 0320809c18 Fix session interaction again
git-svn-id: file:///home/svn/framework3/trunk@5734 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-10 05:01:49 +00:00
HD Moore 6df3d7f54a Switch capture mixin from scruby to packetfu
git-svn-id: file:///home/svn/framework3/trunk@5729 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-10 02:27:25 +00:00
HD Moore 10619f3af0 Import the bindata and packetfu libraries (thanks Tod)
git-svn-id: file:///home/svn/framework3/trunk@5727 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-10 02:23:05 +00:00
HD Moore 050216a1e9 Bug fix from Kris Katterjohn
git-svn-id: file:///home/svn/framework3/trunk@5723 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-09 23:12:16 +00:00
Ramon de C Valle 35240108de Added patch and module from Kris Katterjohn
git-svn-id: file:///home/svn/framework3/trunk@5720 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-06 13:16:08 +00:00
HD Moore a9d8ab159a Two patches from antoine
git-svn-id: file:///home/svn/framework3/trunk@5719 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-06 10:50:57 +00:00
HD Moore 6ca97f33f4 Syncing with trunk
git-svn-id: file:///home/svn/framework3/trunk@5718 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-05 15:09:47 +00:00
HD Moore a87cbe1c5e Add disassembly mode to msfpescan for -a
git-svn-id: file:///home/svn/framework3/trunk@5717 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-05 02:40:55 +00:00
HD Moore 02780a1d88 Improvements to the FTP mixin and scanner, still needs multiline read support
git-svn-id: file:///home/svn/framework3/trunk@5715 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-04 21:42:37 +00:00
HD Moore 94802ede22 Change the support url to the correct location
git-svn-id: file:///home/svn/framework3/trunk@5713 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-04 18:56:16 +00:00
HD Moore fd256ec4a1 This massive commit changes the metasploit 3 module format. The new syntax allows for greater scalability and future improvements to the metasploit module loader. This change also makes it easier for users to add new modules, since the class name no longer needs to match the directory structure.
git-svn-id: file:///home/svn/framework3/trunk@5709 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-02 05:23:59 +00:00
HD Moore 0f03e872f1 Fixes ^C and ^Z session handling
git-svn-id: file:///home/svn/framework3/trunk@5706 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-01 17:32:55 +00:00
et fa3ce57fed Implemented Auxiliary::WMAPScanUniqueQuery.
git-svn-id: file:///home/svn/framework3/trunk@5704 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-01 03:57:57 +00:00
James Lee 43886f3697 typo fix, thanks Kris Katterjohn
git-svn-id: file:///home/svn/framework3/trunk@5702 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-30 23:24:52 +00:00
Ramon de C Valle 623fd50de5 Applied patch from patch from Kris Katterjohn to fix the time printed in the MsfGui log output.
git-svn-id: file:///home/svn/framework3/trunk@5698 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-30 04:18:28 +00:00
HD Moore af9a8eba9a Swap back to 8192 until the exploits which use it are updated.
git-svn-id: file:///home/svn/framework3/trunk@5694 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-27 17:13:11 +00:00
HD Moore 14e8e75cb6 Another, smaller, win32 wrapper
git-svn-id: file:///home/svn/framework3/trunk@5693 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-27 05:02:36 +00:00
HD Moore 16d2825b83 Wrap the shellcode in SEH
git-svn-id: file:///home/svn/framework3/trunk@5692 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 23:35:47 +00:00
HD Moore b94d10f53c Switch the exe back to windows mode (vs console)
git-svn-id: file:///home/svn/framework3/trunk@5691 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 23:01:58 +00:00
HD Moore 4d47f49c1c Randomize the timedatestamp
git-svn-id: file:///home/svn/framework3/trunk@5690 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 22:37:41 +00:00
HD Moore 6d5ac7eead Switches the executable template to something a little nicer and adds exe output to msfencode
git-svn-id: file:///home/svn/framework3/trunk@5689 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 22:34:51 +00:00
HD Moore e341e46f6b Remove debugging comment
git-svn-id: file:///home/svn/framework3/trunk@5688 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 13:33:09 +00:00
HD Moore 37d9c3db1d Corrects an issue where a scope ID is passed to IPv4 addresses, cleans up the parsing.
git-svn-id: file:///home/svn/framework3/trunk@5687 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 05:39:06 +00:00
HD Moore c9bb1bbcd0 Move th fd.unlink for the db_nmap command
git-svn-id: file:///home/svn/framework3/trunk@5686 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 05:01:18 +00:00
HD Moore e6254d42ce Cleaning up all the wordy stuff
git-svn-id: file:///home/svn/framework3/trunk@5685 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 04:25:44 +00:00
HD Moore f4a4b0bfbb Add a nasty error about ruby 1.8.7 for now
git-svn-id: file:///home/svn/framework3/trunk@5684 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-25 04:42:08 +00:00
HD Moore a75978a218 Patch from Stephen Fewer from Harmony Security, makes the midstager uses VirtualAlloc with RWX, solves a number of issues, specifically stack space starvation for large payloads.
git-svn-id: file:///home/svn/framework3/trunk@5683 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-24 22:54:30 +00:00
HD Moore 1310e0e94c Imported msfmachscan from Darren Kemp
git-svn-id: file:///home/svn/framework3/trunk@5682 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-24 22:14:33 +00:00
HD Moore b3c3b29ed1 Wrong fix, right bug.
git-svn-id: file:///home/svn/framework3/trunk@5681 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-24 20:47:01 +00:00
HD Moore 8491ef3ff9 Correct File namespace (thanks MJM)
git-svn-id: file:///home/svn/framework3/trunk@5680 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-24 20:39:28 +00:00
HD Moore df55d0107a Update from Julien fixes API calls on older OSs
git-svn-id: file:///home/svn/framework3/trunk@5679 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-24 20:01:22 +00:00
James Lee 36a06e7576 initial commit of php findsock. This patch makes all http connections global and removes the "close if (!pipelining)" checks, so beware of bugs.
git-svn-id: file:///home/svn/framework3/trunk@5678 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-24 04:41:51 +00:00
HD Moore ddc47955f2 Simplified module loader, update to the platform module to be more compat with ruby 1.9
git-svn-id: file:///home/svn/framework3/trunk@5677 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-24 04:15:10 +00:00
HD Moore fba4fb2889 Fix deprecated while/case syntax
git-svn-id: file:///home/svn/framework3/trunk@5676 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-23 15:41:13 +00:00
HD Moore b001e4684d Import first version of WMAP from ET LoWNOISE
git-svn-id: file:///home/svn/framework3/trunk@5675 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-22 22:32:20 +00:00
HD Moore b0225127cf Patch for Ruby 1.9 compat (not there yet)
git-svn-id: file:///home/svn/framework3/trunk@5674 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-22 15:52:18 +00:00
HD Moore c123a0e3ee Merged in from the latest HG pull
git-svn-id: file:///home/svn/framework3/trunk@5669 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-18 21:02:32 +00:00
HD Moore 97dc2065b6 Nuking this - replacing with the latest testing version.
git-svn-id: file:///home/svn/framework3/trunk@5668 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-18 21:01:48 +00:00
HD Moore 53e9dc5b92 Massive patch to enable Ruby 1.9 compatibility
git-svn-id: file:///home/svn/framework3/trunk@5666 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-17 18:17:58 +00:00
Ramon de C Valle bd753e8ece Fixed identation
git-svn-id: file:///home/svn/framework3/trunk@5664 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-17 02:01:15 +00:00
Ramon de C Valle 58cef5775e Added ARCH_POWER constant and fixed AIX payload modules
git-svn-id: file:///home/svn/framework3/trunk@5663 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-17 01:42:51 +00:00
HD Moore 6772685f3e Merge patch from Julien TINNES for MIPS support (LE/BE)
git-svn-id: file:///home/svn/framework3/trunk@5658 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-15 18:50:34 +00:00
Ramon de C Valle 117bae1e3e Added AIX POWER/PowerPC payload modules
git-svn-id: file:///home/svn/framework3/trunk@5654 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-10 20:13:36 +00:00
HD Moore 9b34f931d2 Fixes #240. Resets tab completion after irb
git-svn-id: file:///home/svn/framework3/trunk@5653 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-05 22:10:18 +00:00
HD Moore 0f25d98fb2 Fixes a typo with IPv4->IPv6 address translation
git-svn-id: file:///home/svn/framework3/trunk@5652 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-05 16:23:34 +00:00
James Lee 0c2f8537a1 re-enable randomization of basic blocks in php shells
git-svn-id: file:///home/svn/framework3/trunk@5647 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-01 04:43:07 +00:00
HD Moore ecf211a0d8 Pass the correct payload space value when specified via target or override
git-svn-id: file:///home/svn/framework3/trunk@5645 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-26 22:57:06 +00:00
HD Moore b6993ad46a Increase the address option fields, supports IPv6 and hostnames now.
git-svn-id: file:///home/svn/framework3/trunk@5641 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-24 15:34:24 +00:00
HD Moore 1fa95d6050 This patch adds support for IPv6 scope_ids to AddressRange parameters. Ranges consisting of a single address are not expanded
git-svn-id: file:///home/svn/framework3/trunk@5640 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-23 07:05:38 +00:00
HD Moore 947dad1f45 Expose the sslctx to the caller
git-svn-id: file:///home/svn/framework3/trunk@5639 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-23 05:12:43 +00:00
HD Moore fcaa218548 Fix IPv4 payloads, dont commit past midnight anymore.
git-svn-id: file:///home/svn/framework3/trunk@5638 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-22 22:06:14 +00:00
HD Moore d53dd66701 Adds initial support for IPv6, including two stager. Tested Meterpreter over IPv6 stages on XP and Vista. Using this is still tricky, I will add a wiki page tomorrow to explain the ScopeID stuff for link-local testing. This commit also includes the raw (oversized) assembler for the stagers as well as the entire old metasploit assembly set (useful for development).
git-svn-id: file:///home/svn/framework3/trunk@5635 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-22 06:34:57 +00:00
James Lee 1e3d89b467 fix a bug where firefox detection breaks with obfuscation of the js_osdetect code
git-svn-id: file:///home/svn/framework3/trunk@5632 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-15 20:11:42 +00:00
James Lee 36ce7136aa add a couple of javascript os detections
git-svn-id: file:///home/svn/framework3/trunk@5629 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-13 16:31:38 +00:00
HD Moore 9903e0bb1d Add the ror/rol ror13hash code to msf3
git-svn-id: file:///home/svn/framework3/trunk@5627 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-13 01:44:37 +00:00
HD Moore a9c74714bb Upgrading to a newer snapshot of metasm
git-svn-id: file:///home/svn/framework3/trunk@5623 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-11 19:46:33 +00:00
HD Moore 3cf81f257e Ensure that the Content-Type is set to text/html by default.
git-svn-id: file:///home/svn/framework3/trunk@5615 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-08 02:37:54 +00:00
James Lee f5fe1e0305 fix escaping bug in js_base64
git-svn-id: file:///home/svn/framework3/trunk@5611 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-30 02:56:21 +00:00
HD Moore bd7e616fe3 Need another red bull...
git-svn-id: file:///home/svn/framework3/trunk@5604 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-26 18:23:54 +00:00
HD Moore 09c1b1d0fc This fixes raw socket support for FreeBSD, NetBSD, BSDi, and Mac OS X. Thanks LibNET!
git-svn-id: file:///home/svn/framework3/trunk@5603 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-26 18:15:35 +00:00
HD Moore 30e29858a2 Fix the resolver on darwin
git-svn-id: file:///home/svn/framework3/trunk@5598 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-25 22:42:04 +00:00
HD Moore c6930f79f1 consistency fixes
git-svn-id: file:///home/svn/framework3/trunk@5596 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-25 06:04:51 +00:00
HD Moore bb1db8253a Raw socket mode that should work for 'everyone'
git-svn-id: file:///home/svn/framework3/trunk@5595 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-25 05:05:32 +00:00
HD Moore cef76df19c Raw socket support for BSD systems
git-svn-id: file:///home/svn/framework3/trunk@5594 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-25 04:59:11 +00:00
HD Moore 905366758a Add the US-CERT-VU reference type
git-svn-id: file:///home/svn/framework3/trunk@5578 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-23 20:56:36 +00:00
HD Moore f52f4d7b62 Add |)ruid's infos to author, fix an issue with auxiliary options checking.
git-svn-id: file:///home/svn/framework3/trunk@5577 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-23 20:14:47 +00:00
HD Moore a4af2d9d93 Fix socket, change requires in dns
git-svn-id: file:///home/svn/framework3/trunk@5575 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-23 17:39:02 +00:00
HD Moore b70ce0ae10 Import the Net-DNS library
git-svn-id: file:///home/svn/framework3/trunk@5574 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-23 17:32:05 +00:00
James Lee 0144e9ea6a add detection for IE6 on XPSP0
git-svn-id: file:///home/svn/framework3/trunk@5572 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-23 06:40:27 +00:00
HD Moore cd41d97232 Remove double aux error logging
git-svn-id: file:///home/svn/framework3/trunk@5568 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-22 21:03:59 +00:00
HD Moore 43f9501c52 Adds a new module that demonstrates IP spoofing.
git-svn-id: file:///home/svn/framework3/trunk@5567 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-22 19:37:05 +00:00
HD Moore ca7c8b0f68 Adds the Exploit::Remote::Ip mixin
git-svn-id: file:///home/svn/framework3/trunk@5566 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-22 19:12:05 +00:00
HD Moore a52530f647 Raw IP socket support for Rex. Guess what this is for :-)
git-svn-id: file:///home/svn/framework3/trunk@5565 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-22 19:03:59 +00:00
James Lee 2d344e64df browser_autopwn now works with mozilla_compareto, mozilla_navigatorjava, and firefox_queryinterface; increased reliability of OS and browser detection
git-svn-id: file:///home/svn/framework3/trunk@5563 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-22 07:28:05 +00:00
HD Moore 4415d0370f Stop leaking file descriptors when source_address() is called
git-svn-id: file:///home/svn/framework3/trunk@5561 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-21 03:32:51 +00:00
James Lee a15e3c08e9 add string obfuscation
git-svn-id: file:///home/svn/framework3/trunk@5556 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-14 18:57:13 +00:00
Patrick Webster 301b1514f3 Added pop2 mixin, aux module, typos.
git-svn-id: file:///home/svn/framework3/trunk@5550 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-08 14:21:48 +00:00
James Lee 8800372e46 initial commit of browser_autopwn;
revamp php payloads;
socks5 for IPv6 (untested)



git-svn-id: file:///home/svn/framework3/trunk@5546 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-01 01:44:56 +00:00
HD Moore 380aba15b0 Implements the readline workaround, tested with regular and meterpreter sessions
git-svn-id: file:///home/svn/framework3/trunk@5544 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-27 20:51:36 +00:00
HD Moore f056b9437f Revert this again, breaks meterpreter console
git-svn-id: file:///home/svn/framework3/trunk@5543 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-27 20:07:53 +00:00
HD Moore 596a13ae30 Correctly handle the readline threading issue, tested with sessions.
git-svn-id: file:///home/svn/framework3/trunk@5541 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-27 19:57:28 +00:00
HD Moore eb0134d8b6 Fix an annoying error
git-svn-id: file:///home/svn/framework3/trunk@5539 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-24 20:55:42 +00:00
James Lee 8a009c5b48 initial support for SOCKS5
git-svn-id: file:///home/svn/framework3/trunk@5537 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-22 22:55:38 +00:00
James Lee 487d7d0bec spaces -> tabs. =(
git-svn-id: file:///home/svn/framework3/trunk@5536 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-22 20:01:41 +00:00
James Lee 4733e56c5a add 'resource' command, no tab completion yet because i'm lazy
git-svn-id: file:///home/svn/framework3/trunk@5535 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-22 19:59:12 +00:00
James Lee 73dd9aa89f show the name of the module in the output of 'show options' and friends
git-svn-id: file:///home/svn/framework3/trunk@5532 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-18 08:30:26 +00:00
James Lee 44e16600d1 typo fix
git-svn-id: file:///home/svn/framework3/trunk@5530 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-16 05:39:36 +00:00
Matt Miller b2b7a05abb comment out stage encoding until I can troubleshoot it some more
git-svn-id: file:///home/svn/framework3/trunk@5522 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-05 07:03:10 +00:00
HD Moore 67b418475d Temporarily revert to the old readline behavior
git-svn-id: file:///home/svn/framework3/trunk@5521 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-05 00:15:40 +00:00
HD Moore e55a9d29a4 Temporarily disable the new readline mode
git-svn-id: file:///home/svn/framework3/trunk@5520 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-05 00:13:33 +00:00
HD Moore b844a31fcc Re-enable readline history
git-svn-id: file:///home/svn/framework3/trunk@5519 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-05 00:01:38 +00:00
HD Moore 14d8bc67fc This patch solves a slowness problem introduced by the ruby thread scheduler and the readline extension. For every time slice that the readline thread receives, it does a 100ms select(stdin), which severely impacts the performance of all other running threads. This patch pushes readline into a forked subprocess. Not the most elegant, but it will do until we have a real client-server model.
git-svn-id: file:///home/svn/framework3/trunk@5518 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-04 22:56:25 +00:00
Matt Miller 2be17ce819 patch from Kris Katterjohn
git-svn-id: file:///home/svn/framework3/trunk@5512 4d416f70-5f16-0410-b530-b9f4589650da
2008-05-26 08:42:17 +00:00
Matt Miller 30ae3af6fb experimental: stages encoded by default, set DisableStageEncoding 1 to disable
git-svn-id: file:///home/svn/framework3/trunk@5511 4d416f70-5f16-0410-b530-b9f4589650da
2008-05-26 07:59:03 +00:00
Matt Miller d94bfaf373 better support for nx with dllinject payloads/meterp
git-svn-id: file:///home/svn/framework3/trunk@5510 4d416f70-5f16-0410-b530-b9f4589650da
2008-05-26 06:34:12 +00:00
James Lee e1a25c1383 payload generate now honors ENCODER instead of requiring -e
git-svn-id: file:///home/svn/framework3/trunk@5508 4d416f70-5f16-0410-b530-b9f4589650da
2008-05-19 23:56:17 +00:00
James Lee c0b39cc234 "set foo" prints the value of foo if it exists; really, that's it this time
git-svn-id: file:///home/svn/framework3/trunk@5507 4d416f70-5f16-0410-b530-b9f4589650da
2008-05-17 06:27:03 +00:00
James Lee 2db9dd6ab2 Reversing over greedy commit. =(
git-svn-id: file:///home/svn/framework3/trunk@5506 4d416f70-5f16-0410-b530-b9f4589650da
2008-05-17 06:17:41 +00:00
James Lee 93199c5610 "set foo" prints the value of foo if it exists
git-svn-id: file:///home/svn/framework3/trunk@5505 4d416f70-5f16-0410-b530-b9f4589650da
2008-05-17 05:29:32 +00:00
HD Moore 5ec3509103 egypt found a bug, regenerate payload was overwriting datastore entries and not setting them back
git-svn-id: file:///home/svn/framework3/trunk@5504 4d416f70-5f16-0410-b530-b9f4589650da
2008-05-16 21:20:43 +00:00
Patrick Webster 0adab629ba Added ntp module, linux egghunter
git-svn-id: file:///home/svn/framework3/trunk@5502 4d416f70-5f16-0410-b530-b9f4589650da
2008-05-12 14:49:45 +00:00
Matt Miller e63a121341 merge incognito updates from Luke Jennings
git-svn-id: file:///home/svn/framework3/trunk@5499 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-28 16:57:49 +00:00
James Lee 8116b32e14 allow comments in resource files.
git-svn-id: file:///home/svn/framework3/trunk@5498 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-26 18:28:41 +00:00
James Lee af4ac919fe add whitespace randomization to Rex::Text. Will update modules to use this instead of copy-paste
git-svn-id: file:///home/svn/framework3/trunk@5494 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-23 06:54:00 +00:00
HD Moore 16170bd716 Let the GUI handle -r, change default window size to fit smaller screens, updated HTTP capture code, added keywords to payload
git-svn-id: file:///home/svn/framework3/trunk@5491 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-22 23:20:35 +00:00
HD Moore 84d921633b Fun with saved passwords
git-svn-id: file:///home/svn/framework3/trunk@5490 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-22 18:48:21 +00:00
HD Moore c5a910525c Adding the BPS reference type, URLs are not public yet, will be soon.
git-svn-id: file:///home/svn/framework3/trunk@5481 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-21 05:21:28 +00:00
HD Moore 57131f98c3 Adding I)ruids's yp exploit. Fixing a streamserver bug thats been causing problems for a while. Updating the HTTP capture module to do better fingerprinting
git-svn-id: file:///home/svn/framework3/trunk@5477 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-18 01:33:09 +00:00
HD Moore 0ad43aad70 Fix an exception that is encountered when not enough of the DCERPC packet has been read
git-svn-id: file:///home/svn/framework3/trunk@5468 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-04 22:12:59 +00:00
HD Moore 06e47726ba Handle DCERPC reads over SMB pipes in a more efficient fashion. Rename the sadmind exploit, since Solaris is redundant
git-svn-id: file:///home/svn/framework3/trunk@5467 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-04 21:15:55 +00:00
HD Moore 125d114526 Properly handle SMB::pipe_(read|write)_(min|max)
git-svn-id: file:///home/svn/framework3/trunk@5466 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-04 20:54:39 +00:00
HD Moore 74f7fb0cb9 Patch from I)ruid
git-svn-id: file:///home/svn/framework3/trunk@5464 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-02 19:03:42 +00:00
James Lee 6ede0b8827 Remove the dispatch ninja tease.
git-svn-id: file:///home/svn/framework3/trunk@5462 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-01 04:55:59 +00:00
HD Moore 9c7f5d7130 Simple fix for bad calls to negotiate, remove useless disconnect call in the relay daemon
git-svn-id: file:///home/svn/framework3/trunk@5460 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-26 22:36:42 +00:00
HD Moore 03276c9cc0 Add a find_layers method
git-svn-id: file:///home/svn/framework3/trunk@5456 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-22 19:55:23 +00:00
HD Moore 1ea29ba8f0 Fixes #218. Updates the http password capture module. Removes a bogus makefile from the tree
git-svn-id: file:///home/svn/framework3/trunk@5452 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-22 06:34:52 +00:00
HD Moore 06aa636126 Payload patch from toto
git-svn-id: file:///home/svn/framework3/trunk@5450 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-18 16:01:15 +00:00
HD Moore c3a4cda127 Merged all of the scruby patches, fixed Dot11 support with regards to RadioTap headers.
git-svn-id: file:///home/svn/framework3/trunk@5446 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-17 04:46:42 +00:00
HD Moore 4ee248bf3e Pass the IP address in the IPC$ tree connect (required by novell)
git-svn-id: file:///home/svn/framework3/trunk@5441 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-13 15:46:33 +00:00
HD Moore ba075599a9 Patches from Sandor Szucs
git-svn-id: file:///home/svn/framework3/trunk@5440 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-10 21:27:07 +00:00
James Lee 4acc181aa7 Reload extensions after migrate
git-svn-id: file:///home/svn/framework3/trunk@5436 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-10 16:14:11 +00:00
James Lee dfa0f6c0c4 More reliable reverse shell
git-svn-id: file:///home/svn/framework3/trunk@5429 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-04 07:34:26 +00:00
James Lee 77f431fea3 autoload meterpreter's priv extension if the exploit gave us admin
git-svn-id: file:///home/svn/framework3/trunk@5427 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-02 23:07:33 +00:00
HD Moore 509fc09382 Lots of updates related to <secret project X>.
git-svn-id: file:///home/svn/framework3/trunk@5424 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-02 04:46:13 +00:00
HD Moore 7349c32ec9 Ignore exceptions during shutdown()
git-svn-id: file:///home/svn/framework3/trunk@5419 4d416f70-5f16-0410-b530-b9f4589650da
2008-02-14 21:11:57 +00:00
Ramon de C Valle e39c053f76 Updated ELF stuff
git-svn-id: file:///home/svn/framework3/trunk@5413 4d416f70-5f16-0410-b530-b9f4589650da
2008-02-13 02:43:56 +00:00
HD Moore cd5d111296 Handle situations were ruby-gtk2 is available, but cairo is not. Fixes #191
git-svn-id: file:///home/svn/framework3/trunk@5407 4d416f70-5f16-0410-b530-b9f4589650da
2008-02-09 08:17:20 +00:00
HD Moore 3685b7a133 Fixes #190. Check for missing path and handle all exceptions.
git-svn-id: file:///home/svn/framework3/trunk@5403 4d416f70-5f16-0410-b530-b9f4589650da
2008-02-09 07:50:20 +00:00