Commit Graph

9279 Commits (6bdf2a4e2bb25179f99c82bb72b1ef5a8300b069)

Author SHA1 Message Date
Raphael Mudge 350e1b6fe9 Armitage 04.24.11: added an MOTD option for collaboration mode, added a "Pass Session" option to send a session elsewhere, explicitly set ExitOnSession to false to prevent listeners from dieing
git-svn-id: file:///home/svn/framework3/trunk@12423 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-24 16:21:45 +00:00
Wei Chen 2772be9125 Small offset change for Win 7 target requested by sd
git-svn-id: file:///home/svn/framework3/trunk@12422 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-24 03:50:55 +00:00
HD Moore bfe3c58d8b Correct the logic around Host object parameters
git-svn-id: file:///home/svn/framework3/trunk@12421 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-24 02:41:29 +00:00
HD Moore eacf1d3c8c Lets not break the trunk after all
git-svn-id: file:///home/svn/framework3/trunk@12420 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-24 02:32:43 +00:00
HD Moore 4f8c166807 Merge typo fixes from Raphael Mudge
git-svn-id: file:///home/svn/framework3/trunk@12419 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-24 02:25:20 +00:00
HD Moore 25971ff2ac Pass a host object into the nse parser from a host object cache.
git-svn-id: file:///home/svn/framework3/trunk@12416 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-24 00:54:43 +00:00
HD Moore 5918e6c0ac Allow report_auth_info() to accept a Host object instead of an address like all the other methods.
git-svn-id: file:///home/svn/framework3/trunk@12415 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-24 00:48:05 +00:00
HD Moore 9d715a1492 Switch from readpartial to read_nonblock, which works around an OpenSSL deadlock. This also adds support for the openssl-nonblock gem's specific exceptions
git-svn-id: file:///home/svn/framework3/trunk@12414 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-23 20:45:49 +00:00
Jonathan Cran 56049012cb remove my code out of the tree, tests all passing. thanks chao-mu!
git-svn-id: file:///home/svn/framework3/trunk@12413 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-23 02:49:14 +00:00
Jonathan Cran c9ab8f248d commit the rest of chao's patch :/
git-svn-id: file:///home/svn/framework3/trunk@12412 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-23 01:10:49 +00:00
Tod Beardsley 3829d2606b Removing the un-used USER_AS_PASS option for ssh_login_pubkey.
git-svn-id: file:///home/svn/framework3/trunk@12411 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-22 21:05:27 +00:00
HD Moore d27457ad91 Convert binary fields from text to binary
git-svn-id: file:///home/svn/framework3/trunk@12410 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-22 20:44:13 +00:00
HD Moore b0d81f4385 This mega-patch solves a few outstanding issues:
1) The database queue is no longer used, all threads have their own connection. This officially breaks sqlite3 support, even though sqlite3 was pretty broken to being with.
2) The report_* calls prefer a Host object in the :host parameter instead of :address. This lets it skip a lookup on the host table
3) The importers now pass in the Host object, significantly speeding up large imports
4) The host record is no longer updated by every change to a child object, this was too much of a bottleneck.

TL;DR: Database stuff is faster



git-svn-id: file:///home/svn/framework3/trunk@12409 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-22 20:16:55 +00:00
James Lee 219b796e28 dup of enum_applications
git-svn-id: file:///home/svn/framework3/trunk@12408 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-22 20:13:43 +00:00
James Lee 53809926c1 the database *is* available at startup if there is a ~/.msf3/database.yml or if msfconsole was started with -y. There's a check for the db anyway, so this shouldn't ever bomb out
git-svn-id: file:///home/svn/framework3/trunk@12407 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-22 19:49:44 +00:00
HD Moore 4c0c282cf8 Fix a stack trace when one of these is nil
git-svn-id: file:///home/svn/framework3/trunk@12406 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-22 19:27:50 +00:00
HD Moore 5fc0f4eaf1 Fix typo
git-svn-id: file:///home/svn/framework3/trunk@12405 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-22 19:07:41 +00:00
James Lee 537e312c13 set RHOSTS directly when we have a short list
git-svn-id: file:///home/svn/framework3/trunk@12404 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-22 18:31:55 +00:00
amaloteaux 91bb4b0130 auxiliary: add a basic pcap replay module
git-svn-id: file:///home/svn/framework3/trunk@12403 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-22 18:25:19 +00:00
Tod Beardsley ea6b1bb626 Fixes #4190 by reseting self.ssh_socket after the connection is established.
git-svn-id: file:///home/svn/framework3/trunk@12402 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-22 15:32:00 +00:00
James Lee 96ee780967 merge the_listener's patch for adding ability to set RHOSTS from db_services. extends it by adding the same support in db_hosts and db_notes, see #308
git-svn-id: file:///home/svn/framework3/trunk@12401 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-22 05:08:08 +00:00
James Lee 1be4b0831b add support for dumping services as a csv file like hosts. merges partial patch from the_listener, thanks! fixes #3120
git-svn-id: file:///home/svn/framework3/trunk@12400 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-22 02:22:21 +00:00
James Lee 2a06f2b70c remove extraneous options, fixes #4146. note that INTERFACE is not extraneous (since the user needs to be able to specify which iface to inject on)
git-svn-id: file:///home/svn/framework3/trunk@12398 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-21 21:05:17 +00:00
Steve Tornio 319b4993a4 add osvdb ref
git-svn-id: file:///home/svn/framework3/trunk@12397 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-21 19:38:42 +00:00
Tod Beardsley 794dfc502f Avoid trying duplicate SNMP community strings against the same host.
git-svn-id: file:///home/svn/framework3/trunk@12396 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-21 19:25:50 +00:00
James Lee d9a80d713c pastographical error, thanks dookie for spotting it
git-svn-id: file:///home/svn/framework3/trunk@12395 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-21 18:14:51 +00:00
HD Moore a61e7290b0 Do not modify the string passed to write() operations
git-svn-id: file:///home/svn/framework3/trunk@12394 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-21 17:29:11 +00:00
HD Moore 8b920a8f95 Dont modify the data buffer passed to write
git-svn-id: file:///home/svn/framework3/trunk@12393 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-21 17:17:26 +00:00
David Rude 0f9a232025 Added Spreecommerce Remote Code Execution exploit module - thanks joernchen
git-svn-id: file:///home/svn/framework3/trunk@12392 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-21 16:57:17 +00:00
Wei Chen c5d51cf810 Disclosure date change
git-svn-id: file:///home/svn/framework3/trunk@12391 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-21 15:45:07 +00:00
Wei Chen 6d71990dfc Disclosure date change
git-svn-id: file:///home/svn/framework3/trunk@12390 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-21 15:40:59 +00:00
Wei Chen 7ef79e3ca5 Changed disclosure date
git-svn-id: file:///home/svn/framework3/trunk@12389 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-21 15:34:01 +00:00
Mario Ceballos 31f2afc033 fix date
git-svn-id: file:///home/svn/framework3/trunk@12388 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-21 11:12:34 +00:00
Wei Chen 03ac21e5be Updated disclosure date
git-svn-id: file:///home/svn/framework3/trunk@12387 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-21 04:34:31 +00:00
James Lee f4ca230d4b work when the session is on a non-default interface.
git-svn-id: file:///home/svn/framework3/trunk@12386 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-21 04:22:49 +00:00
Wei Chen 4662f88d43 Incorrect CVE reference removed
git-svn-id: file:///home/svn/framework3/trunk@12385 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-21 04:21:48 +00:00
Wei Chen cb491e35d2 Changed disclosure date
git-svn-id: file:///home/svn/framework3/trunk@12384 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-21 02:10:40 +00:00
Wei Chen 458d8cccb8 Modified heap spray routine. Added IE 8 target for XP SP3.
git-svn-id: file:///home/svn/framework3/trunk@12383 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-20 21:55:33 +00:00
HD Moore 1a4d4340bf Make Ruby 1.8.7 happy
git-svn-id: file:///home/svn/framework3/trunk@12382 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-20 20:06:45 +00:00
HD Moore 545025dbea Add a warning when the imported vulnerability data is missing the service protocol/port (looks like just one vendor today has this problem).
git-svn-id: file:///home/svn/framework3/trunk@12381 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-20 18:33:27 +00:00
Tod Beardsley 41cc038eca Undoing r12379 in anticipation of a different version.
git-svn-id: file:///home/svn/framework3/trunk@12380 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-20 18:29:04 +00:00
Tod Beardsley 93a07df541 Add a :warning handler for db_import.
git-svn-id: file:///home/svn/framework3/trunk@12379 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-20 18:22:18 +00:00
HD Moore 07fb337ad9 Fix the actual thread cap
git-svn-id: file:///home/svn/framework3/trunk@12378 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-20 17:56:38 +00:00
James Lee 86bca6438f add a routes table; delete each comm's routes when flushing
git-svn-id: file:///home/svn/framework3/trunk@12377 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-20 17:49:27 +00:00
amaloteaux a08bef0a47 allow the wireshark dect dissector exploit to be used remotly
git-svn-id: file:///home/svn/framework3/trunk@12376 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-20 16:36:48 +00:00
Joshua Drake 78d3998854 Fixes #4125, add hostname support to the Rex DHCP server & aux module
git-svn-id: file:///home/svn/framework3/trunk@12375 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-20 14:21:36 +00:00
Tod Beardsley b164ac6539 Actually store the title for Nexpose imports.
git-svn-id: file:///home/svn/framework3/trunk@12374 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-19 23:00:19 +00:00
James Lee 8c0773ba71 and the bin for r12372, see #3898
git-svn-id: file:///home/svn/framework3/trunk@12373 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-19 22:40:13 +00:00
James Lee 30bc742740 merge mihi's patch for adding ps and audio recording to java meterpreter, fixes #3898
git-svn-id: file:///home/svn/framework3/trunk@12372 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-19 22:39:25 +00:00
Wei Chen 488c6de9df Description change again
git-svn-id: file:///home/svn/framework3/trunk@12371 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-19 16:41:58 +00:00