Commit Graph

2857 Commits (bf7b84c7e2120fca99b44d39dfdd465a60c2bbaf)

Author SHA1 Message Date
Tod Beardsley d166c166b5 Fixes #794. I also couldn't reproduce -- whiten0ise's error makes is sound like he's running an old or broken version of pcaprub that's missing Pcap#lookupnet (present in at least 0.7-dev, just checked http://rubyforge.org/projects/pcaprub/
However, this should at least solve the split error, and give better hints on other errors. Implements check_pcaprub_loaded to ensure that Pcap is in fact available on lookupnet, openpcap, and inject, and implemented a begin/rescue around lookupnet to catch errors involving a bad interface.



git-svn-id: file:///home/svn/framework3/trunk@8340 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-01 15:11:35 +00:00
James Lee 55a82c1642 add simple detection for Chrome
git-svn-id: file:///home/svn/framework3/trunk@8330 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-30 21:09:38 +00:00
HD Moore 42b331b47f Fix #790. Initialize the client state to be alive, tweak a few things on the meterpreter side
git-svn-id: file:///home/svn/framework3/trunk@8327 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-29 18:52:44 +00:00
HD Moore 7d88f394b4 Use the impersonated token to spawn the shell by default
git-svn-id: file:///home/svn/framework3/trunk@8326 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-29 17:35:30 +00:00
Stephen Fewer 47b08fa6ef simple patch to get all privileges after a successful getsystem
git-svn-id: file:///home/svn/framework3/trunk@8321 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-29 11:04:24 +00:00
Stephen Fewer 77da632e61 update the ruby side.
git-svn-id: file:///home/svn/framework3/trunk@8319 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-29 01:13:28 +00:00
James Lee c396129d41 add a liveness test to meterpreter, fixes 698
git-svn-id: file:///home/svn/framework3/trunk@8314 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 23:53:15 +00:00
Tod Beardsley a76480d42c See #726. Cleaning up my gross whitespace.
git-svn-id: file:///home/svn/framework3/trunk@8311 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 23:08:39 +00:00
Tod Beardsley 9c1ceb1b8a Fixes #726. Adding in the test cases (and some slight fixes) closes this ticket.
git-svn-id: file:///home/svn/framework3/trunk@8310 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 23:01:32 +00:00
natron 69ad365b46 Added STDERR to pure java payload, cleaned up user's view.
git-svn-id: file:///home/svn/framework3/trunk@8308 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 22:53:36 +00:00
Stephen Fewer b36fe815f3 Add in the ruby side for the priv extensions getsystem command.
git-svn-id: file:///home/svn/framework3/trunk@8296 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 13:55:19 +00:00
Joshua Drake 9c0213e642 check for JAVA_HOME before using it
git-svn-id: file:///home/svn/framework3/trunk@8289 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 08:18:24 +00:00
Joshua Drake a28b727e3f oops! minor change fixes #785
git-svn-id: file:///home/svn/framework3/trunk@8288 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 07:48:12 +00:00
James Lee f8a09fdc06 fix infinite loop and typo
git-svn-id: file:///home/svn/framework3/trunk@8286 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 02:43:54 +00:00
James Lee c97798e11a unbreak cmd shell sessions
git-svn-id: file:///home/svn/framework3/trunk@8285 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 02:17:57 +00:00
James Lee b783052af3 get rid of the Object#id deprecation warning by making event reporting more robust
git-svn-id: file:///home/svn/framework3/trunk@8284 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 00:00:00 +00:00
HD Moore 214d624ddc Fix the report_host() code (broken by previous commit), add an advanced option to store db hosts from monlist
git-svn-id: file:///home/svn/framework3/trunk@8283 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 23:25:17 +00:00
Tod Beardsley 7c4d7c3d71 Fixes #782. Cleans up the various arp and inject methods so they're a little more sane to read, and streamlines the ARP process.
Still would like to a) experiment with keeping a persistent cache (with a cache timeout maybe, like a real arp cache), and b) see how caching negative replies will work out, but that's for another time.



git-svn-id: file:///home/svn/framework3/trunk@8280 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 22:46:41 +00:00
HD Moore c1bc6a617a Default host state is now Up
git-svn-id: file:///home/svn/framework3/trunk@8279 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 22:13:48 +00:00
Tod Beardsley 0711363b49 See #782. Added in a mechanism to determine if I should ARP. This brings synflood back up to speed.
git-svn-id: file:///home/svn/framework3/trunk@8278 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 21:19:23 +00:00
Tod Beardsley bedbc2c341 See #782. Deregistering filter and pcapfile (not needed for these), moving GATEWAY to advanced options.
git-svn-id: file:///home/svn/framework3/trunk@8277 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 20:58:45 +00:00
natron 3b85e44a7a Remove old comments; no longer relevant.
git-svn-id: file:///home/svn/framework3/trunk@8270 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 19:59:25 +00:00
natron cd5e5880d2 Initial commit of Msf::Exploit::Java mixin and multi/browser/java_signed_applet exploit.
git-svn-id: file:///home/svn/framework3/trunk@8267 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 19:46:39 +00:00
Tod Beardsley 2f76affadb See #782. Updating ldap exploit to use capture_sendto. Also updating capture.rb to include RHOST.
git-svn-id: file:///home/svn/framework3/trunk@8266 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 19:37:22 +00:00
Tod Beardsley 709c634bfa Renaming sendto to capture_sendto to give the user a hint as to where it came from.
git-svn-id: file:///home/svn/framework3/trunk@8260 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 18:21:33 +00:00
Tod Beardsley 3053bd702a See #782. Updated xmas.rb (again), now uses the nicer frontend function sendto. Diff against r8026 to get an idea of what's changed for module writers.
git-svn-id: file:///home/svn/framework3/trunk@8259 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 18:12:02 +00:00
Tod Beardsley 77771ca5be See #782. Completes integration of the secondary self.arp_capture object. Renames readreply to inject_reply to avoid collisions with existing modules. Implements a configurable "ARP_SECRET" cookie for the self.arp_capture filter.
git-svn-id: file:///home/svn/framework3/trunk@8258 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 17:51:16 +00:00
Tod Beardsley 5adb1aef7e See #782. Fixing GWHOST/GATEWAY, implementing a new capture option for ARP requests.
git-svn-id: file:///home/svn/framework3/trunk@8257 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 15:11:18 +00:00
James Lee 8be92ab010 default state to 'up'
git-svn-id: file:///home/svn/framework3/trunk@8253 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 04:48:27 +00:00
Tod Beardsley 7eafaab2b2 See #782. Moving the arp cache to a class variable of the capture object. Seems better than just making up my own datastore entry.
git-svn-id: file:///home/svn/framework3/trunk@8250 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-27 02:57:20 +00:00
Tod Beardsley 4bb6e650da See #782. Implemented a more sensible arp cache so as not to spam with UDP probes and arps. Also refactored xmas to use the new methods.
git-svn-id: file:///home/svn/framework3/trunk@8245 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 21:37:40 +00:00
Tod Beardsley c003a663d1 See #782. Extended the injection ARP query methods to handle local addresses more satisfactorially, fixed a couple errors, and added a bunch of inline documentation to explain how it all works together.
git-svn-id: file:///home/svn/framework3/trunk@8238 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 16:00:16 +00:00
Tod Beardsley cac3d6d56b See #782. This introduces some inject methods to the Capture mixin, and edits the ip_spoof module to take advantage of them.
git-svn-id: file:///home/svn/framework3/trunk@8237 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 06:38:41 +00:00
et 96d6e7bd9b In progress. crawling
git-svn-id: file:///home/svn/framework3/trunk@8236 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 04:21:07 +00:00
Tod Beardsley 5087ae25f7 Fixed test_gzip. Both strings happen to work, but this gets rid of the assert_equal error.
git-svn-id: file:///home/svn/framework3/trunk@8235 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 02:50:10 +00:00
Tod Beardsley 1652c75b7f Fixed Rex::Text.badchar_index to conform with the test requirement.
git-svn-id: file:///home/svn/framework3/trunk@8234 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 02:39:43 +00:00
Tod Beardsley d817ac11b4 Adding a convenience method for generating random hexadecimal characters.
git-svn-id: file:///home/svn/framework3/trunk@8233 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 02:35:13 +00:00
James Lee cdaeb27933 spaces -> tabs
git-svn-id: file:///home/svn/framework3/trunk@8232 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 00:01:55 +00:00
Tod Beardsley 0155deda99 Adding an explicit .ord to L3's checksum calculator for 1.9 compatability.
git-svn-id: file:///home/svn/framework3/trunk@8231 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-25 20:19:22 +00:00
Tod Beardsley 359e1ad53a See #726. Adds a DB2 scanner and brute forcer.
git-svn-id: file:///home/svn/framework3/trunk@8223 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-25 15:58:24 +00:00
HD Moore 12ef5437df 1.0.0.0/8 has been allocated, switch to 50.50.50.50
git-svn-id: file:///home/svn/framework3/trunk@8221 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-25 13:27:19 +00:00
Stephen Fewer b7fb95b302 fix for ps bug on OSX
git-svn-id: file:///home/svn/framework3/trunk@8220 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-25 10:49:51 +00:00
HD Moore acceb274da Integrate a sound plugin, based on Robin Wood's patch
git-svn-id: file:///home/svn/framework3/trunk@8215 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-24 18:33:32 +00:00
HD Moore f9049e0d50 Load win32api for cygwin as well
git-svn-id: file:///home/svn/framework3/trunk@8214 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-24 17:31:50 +00:00
HD Moore 1e2f421432 Remove references to DL, since it has a conflicting API between 1.8 and 1.9. Update all methods to use Win32API and add a play_sound() method
git-svn-id: file:///home/svn/framework3/trunk@8213 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-24 17:28:03 +00:00
Stephen Fewer 651fd5e834 fix for ps bug where the wrong arch was sometimes defaulted to if no arch was returned.
git-svn-id: file:///home/svn/framework3/trunk@8211 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-23 16:50:44 +00:00
James Lee 9b19755bf1 fix report_client
git-svn-id: file:///home/svn/framework3/trunk@8209 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-23 00:15:57 +00:00
James Lee ae673cccd7 add detections for newest IE8 on win7 and x64
git-svn-id: file:///home/svn/framework3/trunk@8206 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-22 23:47:50 +00:00
James Lee 7e5ad7bfa3 log more info about script failures
git-svn-id: file:///home/svn/framework3/trunk@8205 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-22 23:09:41 +00:00
Stephen Fewer 7b34b46b68 Commit the ruby side for the meterpreter migration overhaul.
git-svn-id: file:///home/svn/framework3/trunk@8199 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-22 19:47:36 +00:00
Joshua Drake c147575255 fix error message
git-svn-id: file:///home/svn/framework3/trunk@8196 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-22 17:39:51 +00:00
Joshua Drake 7d6607b517 add default compression level for zlib_deflate()
git-svn-id: file:///home/svn/framework3/trunk@8191 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-21 19:31:17 +00:00
James Lee 4d644ab895 add os_flavor detection for firefox
git-svn-id: file:///home/svn/framework3/trunk@8185 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-21 11:26:16 +00:00
James Lee 865a50594b add a telnet login scanner
git-svn-id: file:///home/svn/framework3/trunk@8179 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-20 03:25:34 +00:00
Joshua Drake 07a25af681 minor whitespace change
git-svn-id: file:///home/svn/framework3/trunk@8177 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-20 02:31:30 +00:00
James Lee e19f66ec1f use the new authbrute mixin
git-svn-id: file:///home/svn/framework3/trunk@8176 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-20 01:43:01 +00:00
James Lee fb025658f9 don't duplicate user/pass from datastore
git-svn-id: file:///home/svn/framework3/trunk@8174 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-20 01:35:16 +00:00
James Lee 29dd0d4fea don't bother saving the results of report_vuln
git-svn-id: file:///home/svn/framework3/trunk@8173 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-20 01:01:54 +00:00
James Lee 265d73b224 task.wait is expensive, so avoid find_or_create_* calls at the cost of a few extra queries; fixes 768
git-svn-id: file:///home/svn/framework3/trunk@8171 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-20 00:35:44 +00:00
Stephen Fewer 538d44aa8d commit the changes on the ruby side for new ps command. We now get the process architecture and parent pid (when possible) of each process.
git-svn-id: file:///home/svn/framework3/trunk@8157 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-19 10:47:01 +00:00
James Lee 08eb80f4a9 use the authbrute mixin
git-svn-id: file:///home/svn/framework3/trunk@8150 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-18 22:22:22 +00:00
James Lee d90ffdc015 use a username and password from the datastore if provided
git-svn-id: file:///home/svn/framework3/trunk@8149 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-18 22:21:39 +00:00
Joshua Drake c13841d902 base RegexScanner on Generic instead of JmpRegScanner
git-svn-id: file:///home/svn/framework3/trunk@8148 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-18 22:17:08 +00:00
James Lee 46b346239e don't always use the username as a password, let modules do that if they want it
git-svn-id: file:///home/svn/framework3/trunk@8147 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-18 22:03:02 +00:00
James Lee d8f7645094 : -> .
git-svn-id: file:///home/svn/framework3/trunk@8146 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-18 21:35:42 +00:00
HD Moore 0bafe814be Fix the RawL5 namspace after the Racket upgrade
git-svn-id: file:///home/svn/framework3/trunk@8144 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-18 04:36:31 +00:00
HD Moore b6b25b7f03 allow the default workspace to be purged and recreated
git-svn-id: file:///home/svn/framework3/trunk@8134 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-15 15:58:13 +00:00
HD Moore 2ba892aa69 Report host mac, name, and whether its a VM
git-svn-id: file:///home/svn/framework3/trunk@8133 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-15 15:49:13 +00:00
James Lee 61984579d5 don't report to the db if there isn't one
git-svn-id: file:///home/svn/framework3/trunk@8132 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-15 04:34:12 +00:00
James Lee 1e3662e3ad events need to be part of core, not base
git-svn-id: file:///home/svn/framework3/trunk@8128 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-15 01:29:54 +00:00
James Lee 26aa834600 base should not depend on ui
git-svn-id: file:///home/svn/framework3/trunk@8127 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-15 01:24:45 +00:00
James Lee 53662ed46e save events to the database. fixes 618
git-svn-id: file:///home/svn/framework3/trunk@8126 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-15 00:32:48 +00:00
HD Moore a753666073 Switch sysread back to get_once(). This reverts a previous change, but the sysread breaks SSL support
git-svn-id: file:///home/svn/framework3/trunk@8124 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 21:40:30 +00:00
HD Moore caa67aa3d5 Require the nmap XML parser
git-svn-id: file:///home/svn/framework3/trunk@8123 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 20:29:55 +00:00
James Lee 78808fe3c1 show the database driver in framework.inspect
git-svn-id: file:///home/svn/framework3/trunk@8122 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 18:57:54 +00:00
HD Moore a55dfa1bbc Adds scanner_progress for granular percentage
git-svn-id: file:///home/svn/framework3/trunk@8120 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 18:20:32 +00:00
James Lee 7be26761f5 merge bannedit's WAR payload patch
git-svn-id: file:///home/svn/framework3/trunk@8119 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 18:15:15 +00:00
HD Moore d84ca6d438 Replicants should receive the same module store as the original
git-svn-id: file:///home/svn/framework3/trunk@8118 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 18:14:44 +00:00
HD Moore 3823512ae9 This adds the ability to use the module as a hash
git-svn-id: file:///home/svn/framework3/trunk@8117 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 18:09:34 +00:00
James Lee 54095a585e update the auth bruteforcer, and use it in smb/login
git-svn-id: file:///home/svn/framework3/trunk@8116 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 16:58:43 +00:00
HD Moore bc9985d5da Minor fixes to the nessusv2 importer, allow the db_import command to work on it directly
git-svn-id: file:///home/svn/framework3/trunk@8115 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 15:26:20 +00:00
HD Moore 568770ae23 Fixes #690 by merging John Miller's patch to enable Nessus v2 support
git-svn-id: file:///home/svn/framework3/trunk@8114 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 12:57:26 +00:00
HD Moore b9e6c8eef7 Fixes #758 by setting the http content type
git-svn-id: file:///home/svn/framework3/trunk@8113 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 12:51:31 +00:00
HD Moore 9bb14e1c4e Add a telnet banner grabber
git-svn-id: file:///home/svn/framework3/trunk@8108 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-13 21:46:48 +00:00
James Lee 2890f3eeda missed this in the last commit
git-svn-id: file:///home/svn/framework3/trunk@8105 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-13 07:03:18 +00:00
James Lee fd89f4e6cd add an events table
git-svn-id: file:///home/svn/framework3/trunk@8104 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-13 06:40:34 +00:00
HD Moore 540beed83e Prevent the dcerpc NDR string functions from modifying their argument directly
git-svn-id: file:///home/svn/framework3/trunk@8102 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-12 23:15:07 +00:00
James Lee f6d0c4c353 add the beginnings of an authentication brute-force mixin
git-svn-id: file:///home/svn/framework3/trunk@8100 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-12 07:29:25 +00:00
HD Moore 01ddb5f41d Fix a loop when the client disconnects
git-svn-id: file:///home/svn/framework3/trunk@8097 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-11 19:47:33 +00:00
HD Moore de4add3a1f Whitespace cleanups
git-svn-id: file:///home/svn/framework3/trunk@8096 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-11 19:18:49 +00:00
James Lee 5fae88b0b8 take out stupid debug prints
git-svn-id: file:///home/svn/framework3/trunk@8094 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-11 01:30:53 +00:00
James Lee fd3373862b move lookups into the queue instead of just saves, fixes a race condition where multiple entities could be inserted with the same info
git-svn-id: file:///home/svn/framework3/trunk@8093 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-10 17:53:12 +00:00
James Lee e1ba7b9618 print a useful message instead of nothing when the given file doesn't exist
git-svn-id: file:///home/svn/framework3/trunk@8092 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-10 17:49:28 +00:00
James Lee f29402028e make the status a little more easily available
git-svn-id: file:///home/svn/framework3/trunk@8091 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-09 02:11:46 +00:00
James Lee 93a673fa1f allow multiple filename arguments to db_import and handle globs, see 750
git-svn-id: file:///home/svn/framework3/trunk@8089 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-07 21:51:18 +00:00
James Lee dd180a850b make errors less generic
git-svn-id: file:///home/svn/framework3/trunk@8088 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-07 21:30:14 +00:00
HD Moore 05a88c76ac Default port state to 'open'
git-svn-id: file:///home/svn/framework3/trunk@8087 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-07 20:28:58 +00:00
James Lee 30b897b6cd add a generic db_import command that auto-detects filetype, move import parsing into msf/core/db. fixes 750
git-svn-id: file:///home/svn/framework3/trunk@8085 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-07 19:06:29 +00:00
Carlos Perez 1bd6872c6f Applied fix provided by Amin for localhost socket connection fos testig and dev
git-svn-id: file:///home/svn/framework3/trunk@8084 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-07 17:54:21 +00:00
James Lee a9b1462e9d add a callback for session commands. fixes 618
git-svn-id: file:///home/svn/framework3/trunk@8075 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-06 05:06:12 +00:00
HD Moore 6a10d6b6ca Cleanup for tcp mixin, report smb version better, downcase service names
git-svn-id: file:///home/svn/framework3/trunk@8074 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-05 18:47:04 +00:00
James Lee b365a86aa1 save nmap version detections
git-svn-id: file:///home/svn/framework3/trunk@8073 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-05 18:23:28 +00:00
James Lee d261b39206 actually save the result of the merge
git-svn-id: file:///home/svn/framework3/trunk@8072 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-05 18:18:49 +00:00
James Lee 58cfcd99f8 record a vuln when opening a session. the format may need some more thought
git-svn-id: file:///home/svn/framework3/trunk@8066 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-04 21:54:32 +00:00
James Lee cb4ab4b0f6 sort the output for the show command
git-svn-id: file:///home/svn/framework3/trunk@8065 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-04 21:10:26 +00:00
Mike Smith 471b1e6ff8 Delete services one-by-one instead of calling 'delete_all', which doesn't exist. (fixes #748)
git-svn-id: file:///home/svn/framework3/trunk@8064 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-04 16:14:23 +00:00
HD Moore b35df262ba Fix db_del_port
git-svn-id: file:///home/svn/framework3/trunk@8060 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-02 23:14:37 +00:00
HD Moore 6e45d1e32f Sort by creation order vs pid
git-svn-id: file:///home/svn/framework3/trunk@8059 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-02 11:35:57 +00:00
HD Moore 1623b59a0c Decrease indents to save screen space
git-svn-id: file:///home/svn/framework3/trunk@8058 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-02 11:28:43 +00:00
HD Moore 42b3a5774d Adds the process username to the ps output (when possible).
git-svn-id: file:///home/svn/framework3/trunk@8056 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-02 03:41:21 +00:00
HD Moore 4d7aec7c2d Fixes #745. This commit changes how token manipulation works, adds the steal_token, drop_token, and getprivs commands. Tested on NT 4.0, 2000 SP4, XP SP3, 2003 SP2, Vista, and Windows 7
git-svn-id: file:///home/svn/framework3/trunk@8055 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-02 00:35:10 +00:00
HD Moore adc1c18f26 Fix the old warning url
git-svn-id: file:///home/svn/framework3/trunk@8052 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-01 15:17:02 +00:00
James Lee 5aaa7bb3de fix a latent bug where multiple hosts could be reported with the same info and make report_vuln() work
git-svn-id: file:///home/svn/framework3/trunk@8050 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-01 00:19:15 +00:00
HD Moore 98f83bbab1 Adds reg queryclass
git-svn-id: file:///home/svn/framework3/trunk@8046 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-31 15:52:30 +00:00
Mike Smith de55508a03 fix 'db_workspace -a'
git-svn-id: file:///home/svn/framework3/trunk@8043 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-31 01:51:12 +00:00
James Lee 90b2b4c77c fix the db_add* and db_del* commands, make note output readable on 1.8
git-svn-id: file:///home/svn/framework3/trunk@8042 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-31 01:27:04 +00:00
James Lee 3bc1f935fa fix amap mlog import
git-svn-id: file:///home/svn/framework3/trunk@8041 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-31 01:11:53 +00:00
James Lee 7fc5ada4c6 fix nessus nbe parsing
git-svn-id: file:///home/svn/framework3/trunk@8040 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-30 23:49:29 +00:00
James Lee 56c2b54369 remove a debug print
git-svn-id: file:///home/svn/framework3/trunk@8039 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-30 23:31:18 +00:00
Joshua Drake 2283e029db crossing fingers, big cr removal batch
git-svn-id: file:///home/svn/framework3/trunk@8038 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-30 22:24:22 +00:00
Joshua Drake ff515f5808 fixed exception when unable to connect, fixed formatting
git-svn-id: file:///home/svn/framework3/trunk@8037 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-30 22:15:12 +00:00
James Lee 653daac8e6 remove a debug print and default proto to 'tcp' if it wasn't given
git-svn-id: file:///home/svn/framework3/trunk@8034 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-30 17:43:47 +00:00
James Lee 02eb7ab80d massive changes to the database api. Auxiliary::Report is now just a bunch of stubs into the main DBManager, most aux modules should just work, but they haven't all been tested. introduces a get_auth_info method for pulling credentials out of the db. other db api methods should be more standardized now. cross your fingers
git-svn-id: file:///home/svn/framework3/trunk@8028 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-29 23:48:45 +00:00
HD Moore c3038d4027 Add the payload_data method back in
git-svn-id: file:///home/svn/framework3/trunk@8027 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-29 23:37:36 +00:00
Joshua Drake 036ac8fb90 show warning if -L was specified but readline failed to load
git-svn-id: file:///home/svn/framework3/trunk@8024 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-29 21:54:03 +00:00
HD Moore 922cef26fa Store the domain name in the SMB client object, along with other fields provided by NTLMSSP responses. Show the domain name and netbios name in the version scanner. Update MS06-070 to remove the default target, use the domain name from the server response, and use a more reliable return address for 2000 SP4.
git-svn-id: file:///home/svn/framework3/trunk@8022 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-29 14:00:49 +00:00
Mike Smith 488b0cba5d Fix "dbfile" deprecation warning when using SQLite.
Replaced the deprecated "dbfile" option with "database" so that Rails
2.3.5 will not print a warning message.


git-svn-id: file:///home/svn/framework3/trunk@8018 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-29 01:27:11 +00:00
HD Moore 1d1f94593c Add -t asp to msfencode :)
git-svn-id: file:///home/svn/framework3/trunk@8013 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 22:41:43 +00:00
Joshua Drake a247de77ec add the SingleStaticBit for the CVE-2008-4193 exploit - comments welcome
git-svn-id: file:///home/svn/framework3/trunk@8011 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 20:39:43 +00:00
James Lee 8aff26edb4 add a method for waiting on a task to finish
git-svn-id: file:///home/svn/framework3/trunk@8009 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 20:15:33 +00:00
HD Moore 3f59ea2f95 Handle a return() from a proc a bit more gracefully, add a test case
git-svn-id: file:///home/svn/framework3/trunk@8008 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 19:44:14 +00:00
HD Moore a414d5fc8f Fixes an issue identified by egypt when the task's proc returns. This also stores the return value in task.retval
git-svn-id: file:///home/svn/framework3/trunk@8007 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 19:37:14 +00:00
HD Moore bb84e76e40 Upgrade the bundled Racket to version 1.0.7
git-svn-id: file:///home/svn/framework3/trunk@8003 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 13:26:56 +00:00
HD Moore 5757216f9a This overhauls the database reporting code - all report_* functions now add their write operation to a queue that is processed sequentially in the background. This prevents concurrency issues around database writes, but prevents modules from immediately using the results of their report_* calls in the database. Still todo is a method for waiting on the write to have occurred
git-svn-id: file:///home/svn/framework3/trunk@7997 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-28 00:21:21 +00:00
HD Moore 4c6fd97b0e Handles some broken TCP stack implementations better (but not perfectly)
git-svn-id: file:///home/svn/framework3/trunk@7991 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-27 07:02:55 +00:00
HD Moore 308bdcccb2 Fixes #733 (using open vs ::Up, may need a revert and a change to the importers instead). Update the sweep_udp module to store host, mac, name info
git-svn-id: file:///home/svn/framework3/trunk@7990 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 22:08:49 +00:00
HD Moore 0bf2f7dd9e Clean up trailing whitespace
git-svn-id: file:///home/svn/framework3/trunk@7987 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 18:29:24 +00:00
HD Moore de7cabaed1 Handle dashes in the version strings and add generic catch-alls for windows
git-svn-id: file:///home/svn/framework3/trunk@7986 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 18:26:24 +00:00
HD Moore b80ebd45f1 Better parsing of Windows 2008 versions (should handle Hyper-V variants now)
git-svn-id: file:///home/svn/framework3/trunk@7985 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 18:17:35 +00:00
HD Moore c8e60da5ee Fix warning on 1.8
git-svn-id: file:///home/svn/framework3/trunk@7982 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 09:01:08 +00:00
HD Moore 4331c111f1 Add a mysql mixin that wraps ruby-mysql (tmtm.org)
git-svn-id: file:///home/svn/framework3/trunk@7977 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 05:21:21 +00:00
HD Moore ec9bc73e0f Allow an existing socket to be passed in
git-svn-id: file:///home/svn/framework3/trunk@7976 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 04:08:59 +00:00
HD Moore fd24634fcc Rename to rbmysql, fix main script as well
git-svn-id: file:///home/svn/framework3/trunk@7975 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 04:06:40 +00:00
HD Moore 81b3470ef5 Rename the main class to prevent conflicts:
git-svn-id: file:///home/svn/framework3/trunk@7974 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 04:04:15 +00:00
HD Moore 8f47140ddf Add the README file from upstream
git-svn-id: file:///home/svn/framework3/trunk@7973 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 03:58:34 +00:00
HD Moore c9777b993a Rename to prevent system level conflicts
git-svn-id: file:///home/svn/framework3/trunk@7972 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 03:57:49 +00:00
HD Moore a7f672c2cd Import the ruby-mysql library
git-svn-id: file:///home/svn/framework3/trunk@7971 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-26 03:57:05 +00:00
James Lee 8f2138a464 and remove the empty xdr.rb
git-svn-id: file:///home/svn/framework3/trunk@7965 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-24 00:21:36 +00:00
Mike Smith 744c4cd02f Store the current workspace's name instead of the whole Workspace object.
This ensures that the most up-to-date data is reloaded from the database
when you ask for it, instead of returning cached results.

git-svn-id: file:///home/svn/framework3/trunk@7963 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 20:37:30 +00:00
HD Moore a9ec7c8b21 Ignore proxy errors during scanning
git-svn-id: file:///home/svn/framework3/trunk@7962 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 15:29:22 +00:00
HD Moore b13e185943 Giant update from tebo, fixing up SunRPC and the nsfmount module
git-svn-id: file:///home/svn/framework3/trunk@7961 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 13:44:53 +00:00
HD Moore 556b28e6ca Switching focus to 3.3.4-dev
git-svn-id: file:///home/svn/framework3/trunk@7960 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 13:44:19 +00:00
HD Moore eb58e8801a Tagging this as 3.3.3-release
git-svn-id: file:///home/svn/framework3/trunk@7957 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 06:03:57 +00:00
HD Moore dde54bf99c Allow minrank to be specified via -R
git-svn-id: file:///home/svn/framework3/trunk@7952 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 03:53:16 +00:00
James Lee 86f1616d24 less verbose inspect method for modules
git-svn-id: file:///home/svn/framework3/trunk@7951 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 01:46:20 +00:00
James Lee 0708798598 more concise inspect output for Session objects
git-svn-id: file:///home/svn/framework3/trunk@7949 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 01:03:51 +00:00
James Lee 89695b40fe add ability to specify columns for db_{hosts,services} output
git-svn-id: file:///home/svn/framework3/trunk@7948 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-22 22:20:58 +00:00
James Lee 4f92d9f431 Revamp the event system and add some ui hooks. Sessions are still ghetto -- we get interact events (in a lame way) but no input or output events yet. see 619
git-svn-id: file:///home/svn/framework3/trunk@7947 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-22 18:52:48 +00:00
Mike Smith d3e8132532 Fix (ruby 1.8.7) issue where data appeared under the wrong column.
git-svn-id: file:///home/svn/framework3/trunk@7944 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-22 02:48:54 +00:00
HD Moore 7935656355 Fixes #708. Enforces a timeout around SSL's connect()
git-svn-id: file:///home/svn/framework3/trunk@7938 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-21 22:48:40 +00:00
HD Moore 655e864ee3 See #708. Sets a default timeout for http requests
git-svn-id: file:///home/svn/framework3/trunk@7937 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-21 22:42:21 +00:00
HD Moore 111d49135e Fixes #609. Revert back to ExitProcess(0) as default, this resolves a number of small bugs
git-svn-id: file:///home/svn/framework3/trunk@7935 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-21 20:44:44 +00:00
HD Moore 6147db8722 Fixes #696. Default direct to FALSE if port is 139
git-svn-id: file:///home/svn/framework3/trunk@7933 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-21 19:04:28 +00:00
Mike Smith 1f7b184fe5 Use SQL to filter/sort the hosts & services records, instead of ruby.
git-svn-id: file:///home/svn/framework3/trunk@7930 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-21 16:46:11 +00:00
HD Moore 2d399f9b52 Handle the native win32 errno as well
git-svn-id: file:///home/svn/framework3/trunk@7923 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-19 15:08:37 +00:00
HD Moore 1eceebc950 Fixes #697. This prevents a closed socket from being passed to select() and handles the case where a race condition allowed this to happen anyways (one thread closes, one thread selects). This should prevent most 'invalid handle' exceptions on Cygwin and prevent Win32 native from crashing due to the native exception.
git-svn-id: file:///home/svn/framework3/trunk@7922 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-19 15:02:26 +00:00
Joshua Drake addcba5131 0x7f isn't printable!
git-svn-id: file:///home/svn/framework3/trunk@7915 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-18 20:40:08 +00:00
James Lee fc1e0b88fb change db_hosts and db_services output to be more thorough, see 619
git-svn-id: file:///home/svn/framework3/trunk@7912 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-18 01:14:05 +00:00
HD Moore 39d37065de See #485. This patch allows the very basics of metasploit to work under jRuby 1.4.0. Many, many things are still broken
git-svn-id: file:///home/svn/framework3/trunk@7906 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-17 08:02:11 +00:00
James Lee c4c0fd2b55 deal with broken Date.parse in 1.8.6 and older by just not printing the last updated date. fixes 693
git-svn-id: file:///home/svn/framework3/trunk@7897 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-17 03:17:37 +00:00
James Lee 06427b53c9 document the detection for 2k SP0
git-svn-id: file:///home/svn/framework3/trunk@7887 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-15 23:08:28 +00:00
HD Moore f76a9a43e6 Switch compat payloads to normal vs ranked
git-svn-id: file:///home/svn/framework3/trunk@7877 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-15 13:14:01 +00:00
James Lee f1a5103b32 allow the browser_autopwn mixin access to exploit modules' Rank constants. see 628
git-svn-id: file:///home/svn/framework3/trunk@7876 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-15 07:21:17 +00:00
James Lee b6c497467e add a message about requiring libmysqlclient-dev, fixes 535
git-svn-id: file:///home/svn/framework3/trunk@7866 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-14 23:40:21 +00:00
Mike Smith f9ffc8b8bc Add db_workspace command & other db refactoring.
* Added "workspaces" table and associated ActiveRecord class.
 * Moved ActiveRecord models from db_objects.rb into separate files.
 * Do the DB migration check every time you connect (was previously done
   during db_create).
 * Use :dependent => :destroy associations so that we don't have to
   manually delete the dependent objects.

git-svn-id: file:///home/svn/framework3/trunk@7861 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-14 22:52:34 +00:00
HD Moore 4311c20ee1 Warn the user when nessusv2 is specified (only v1 supported). See #690
git-svn-id: file:///home/svn/framework3/trunk@7857 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-14 22:00:54 +00:00
James Lee a03e3bf823 adds support for regular shell sessions when running commands with 'sessions -c'. Commands are run sequentially, so will take forever on large numbers of sessions.
git-svn-id: file:///home/svn/framework3/trunk@7855 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-14 21:17:49 +00:00
HD Moore bce6355df1 Make sure we use a real module class instance when ranking
git-svn-id: file:///home/svn/framework3/trunk@7844 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 23:41:25 +00:00
HD Moore e2cc45e4d4 Use the not-so-explicit platform
git-svn-id: file:///home/svn/framework3/trunk@7843 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 19:46:44 +00:00
HD Moore 89da53d570 Updates to encode_shellcode_stub
git-svn-id: file:///home/svn/framework3/trunk@7842 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 19:43:17 +00:00
HD Moore 40fb409343 Adds encode_shellcode_stub() to the exploit class, this allows arbitrary shellecode bits to be easily encoded
git-svn-id: file:///home/svn/framework3/trunk@7841 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 19:31:17 +00:00
HD Moore 7e4d03be86 This adds support for the old exe format to msfencode using -t exe-small and allows encoder modules to change preferences based on the platform, which fully solves #430.
git-svn-id: file:///home/svn/framework3/trunk@7840 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 19:03:35 +00:00
HD Moore c287573213 A few more wmap cleanups
git-svn-id: file:///home/svn/framework3/trunk@7839 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 06:56:01 +00:00
HD Moore a1f71fa994 Fixes #683. This triggers when running on ruby 1.9 and is probably one of many like this and one of the reasons this interface is not maintained. However, since you wen to the effort of reporting it, the least we can do is fix it ;)
git-svn-id: file:///home/svn/framework3/trunk@7838 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 05:30:34 +00:00
HD Moore 1029ecd7f8 Cleanup wmap, add the missing database tables back, rename to have a wmap_prefix
git-svn-id: file:///home/svn/framework3/trunk@7837 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-13 05:24:48 +00:00
James Lee 23a63991b2 add -c option to sessions command to allow running a shell command on running meterpreter sesions; see #663
git-svn-id: file:///home/svn/framework3/trunk@7831 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-12 00:49:48 +00:00
Joshua Drake 004c2864f4 This adds an option to the sessions command (-s). Using it allows running a script for each open meterpreter session, see #663
git-svn-id: file:///home/svn/framework3/trunk@7830 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-11 23:19:19 +00:00
HD Moore eac301484c Forgot to update the timeout() wrapper class for refernces
git-svn-id: file:///home/svn/framework3/trunk@7829 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-11 21:46:44 +00:00
HD Moore 0bc4ba6211 Major overhaul to how db_autopwn works, should be substantially faster and less error prone
git-svn-id: file:///home/svn/framework3/trunk@7824 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-11 20:21:18 +00:00
HD Moore e2a5cb0ebe Pass the password argument in db_create
git-svn-id: file:///home/svn/framework3/trunk@7823 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-11 18:54:19 +00:00
HD Moore c94c2ee892 Resolved Mac OS X compatibility with the tar, switching back to 3.3.3-dev
git-svn-id: file:///home/svn/framework3/trunk@7817 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 22:32:36 +00:00
HD Moore f1bf7ec7cf Bumping back to 3.3.2 for a second to build a tarball for OS X (._main bug)
git-svn-id: file:///home/svn/framework3/trunk@7816 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 22:26:59 +00:00
HD Moore 8179472a35 Hurray 3.3.2 is out - back to work on 3.3.3
git-svn-id: file:///home/svn/framework3/trunk@7809 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 20:26:40 +00:00
HD Moore d976df897a 3.3.2 done
git-svn-id: file:///home/svn/framework3/trunk@7808 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 19:14:45 +00:00
HD Moore a16feb01bc Minor tweaks to http processing
git-svn-id: file:///home/svn/framework3/trunk@7805 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 18:12:38 +00:00
HD Moore 5ef9a1c040 Wipe the headers before reparsing
git-svn-id: file:///home/svn/framework3/trunk@7801 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 17:04:52 +00:00
HD Moore 1c98368351 Loop until a non-100 is found or the resp parser fails
git-svn-id: file:///home/svn/framework3/trunk@7800 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 16:57:21 +00:00
HD Moore 006d5d51fc Fixes #674 by adding 100-continue support
git-svn-id: file:///home/svn/framework3/trunk@7799 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 16:54:27 +00:00
HD Moore afa5b46674 Default the minrank for autopwn, otherwise this prevents usage from being shown when no args are present. Also breaks -t -p when no rank is specified
git-svn-id: file:///home/svn/framework3/trunk@7798 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 15:12:59 +00:00
HD Moore 75c90b8ef9 Handle Errno::EINTR gracefully
git-svn-id: file:///home/svn/framework3/trunk@7796 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 06:13:14 +00:00
HD Moore d2694ce5b9 Ignore errors on shutdown for the relay
git-svn-id: file:///home/svn/framework3/trunk@7795 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 06:09:15 +00:00
HD Moore 2a5a5207f5 Switch trunk to 3.3.2-testing until we cut this
git-svn-id: file:///home/svn/framework3/trunk@7794 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 05:48:12 +00:00
HD Moore e731426666 Fixes #662. The socket pivoting is still not perfect, but this goes a long way
git-svn-id: file:///home/svn/framework3/trunk@7792 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 05:40:26 +00:00
Joshua Drake 4cb050010b add exploitability detection (by trying %n)
git-svn-id: file:///home/svn/framework3/trunk@7791 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 23:53:26 +00:00
James Lee 8d25dc00bc bail if MinimumRank is invalid
git-svn-id: file:///home/svn/framework3/trunk@7787 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 23:07:58 +00:00
James Lee 084a10ded5 remove a debug print and deal with minrank being absent
git-svn-id: file:///home/svn/framework3/trunk@7786 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 22:42:06 +00:00
Joshua Drake 318750c68c oops, forgot to update fmtstr_count_printed
git-svn-id: file:///home/svn/framework3/trunk@7785 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 22:37:34 +00:00
Joshua Drake 4a363329cb fixed generating fmts from buffers with small value delta (eg \x02\x01\x03\x01)
git-svn-id: file:///home/svn/framework3/trunk@7781 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 21:50:17 +00:00
James Lee e0bd6dd6ed don't bother checking for an address if our range is empty
git-svn-id: file:///home/svn/framework3/trunk@7779 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 21:28:44 +00:00
HD Moore 898c8655ff Default rank to manual for the search command
git-svn-id: file:///home/svn/framework3/trunk@7773 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 13:57:46 +00:00
James Lee 961e70fc34 add -f flag to exploit command to force running despite a conflicting MinimumRank value. fixes 628
git-svn-id: file:///home/svn/framework3/trunk@7770 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 02:49:27 +00:00
Joshua Drake 061b4a36cf add stack reading and detection for dpa/fpu fmt specifiers
git-svn-id: file:///home/svn/framework3/trunk@7768 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 02:18:12 +00:00
James Lee 6989949720 adds a global option, MinimumRank, which db_autopwn now checks to prevent running exploits below a certain rank. fixes #625, see #628
git-svn-id: file:///home/svn/framework3/trunk@7767 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 01:54:20 +00:00
Joshua Drake f383949540 fix 1.9.1 compatability
git-svn-id: file:///home/svn/framework3/trunk@7764 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-08 23:50:29 +00:00
Joshua Drake 9abe0c0b03 added support for direct parameter access
git-svn-id: file:///home/svn/framework3/trunk@7763 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-08 23:50:02 +00:00
Joshua Drake 87c85b5176 removed executable generation routines from Rex::Text (use Msf::Util::EXE), Fixes #660
git-svn-id: file:///home/svn/framework3/trunk@7760 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-08 21:24:45 +00:00
HD Moore 54c10c0c3d Fixes #623 and fixes #622, implements a number of changes to the core channel dispatch code, sets timeouts on unmatched responses, and handles tcp relay writes with a threaded/timeout wrapper to avoid delays.
git-svn-id: file:///home/svn/framework3/trunk@7753 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-08 18:32:26 +00:00
James Lee 7427640fb0 don't wait for a message body that will never come. fixes 659
git-svn-id: file:///home/svn/framework3/trunk@7748 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-08 02:26:37 +00:00
James Lee 47fdec6ab3 add ability to search by minimum rank, fixes 627
git-svn-id: file:///home/svn/framework3/trunk@7747 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 23:15:13 +00:00
Mike Smith 61b556a0d1 Initialize the database schema using ActiveRecord migrations
git-svn-id: file:///home/svn/framework3/trunk@7739 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 17:03:27 +00:00
Mike Smith 05a4212e1d Minor db improvements
Use find_each for better scalability with large databases.
No need to call save immediately after create.

git-svn-id: file:///home/svn/framework3/trunk@7737 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 17:03:21 +00:00
James Lee 765a1d72eb replace old clear color code with the new one ('%clr'). fixes 610
git-svn-id: file:///home/svn/framework3/trunk@7736 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 17:00:05 +00:00
Stephen Fewer 0b8917a39e Add HD's optimization for faster DLL reading (ala the x86 counterpart).
git-svn-id: file:///home/svn/framework3/trunk@7731 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 12:58:28 +00:00
Stephen Fewer 7d3ff93ec9 Fix a few bugs in the parsing of exception directories on PE64 binaries.
git-svn-id: file:///home/svn/framework3/trunk@7730 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 12:56:54 +00:00
Stephen Fewer 4fb212b54e Go back to using select instead of sleep for the waiters.
git-svn-id: file:///home/svn/framework3/trunk@7729 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 12:55:31 +00:00
James Lee 02a62967e4 register the 'rex' log source, see #577
git-svn-id: file:///home/svn/framework3/trunk@7727 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-06 18:09:27 +00:00
HD Moore 1f5a0be9ca Fixes #630 by correct the constant typo
git-svn-id: file:///home/svn/framework3/trunk@7726 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-06 14:51:15 +00:00
HD Moore 8df719e7a8 See #624. Adds the module ranking to all text-base displays, this may be enough to close the ticket
git-svn-id: file:///home/svn/framework3/trunk@7725 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-06 14:35:16 +00:00
HD Moore 42e6486fb4 Module loading broken again by revision r7709.
git-svn-id: file:///home/svn/framework3/trunk@7711 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-05 11:10:46 +00:00
Mario Ceballos 43f65b2851 fix for the NLS_LANG issue. (rory)
git-svn-id: file:///home/svn/framework3/trunk@7709 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 23:01:54 +00:00
HD Moore 2c92856612 Fixes #604. This fixes a long-standing race condition with meterpreter channels that received data as soon as they were open (TCP).
git-svn-id: file:///home/svn/framework3/trunk@7708 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 21:08:34 +00:00
James Lee a96a23f95c add cidr parsing for ipv6
git-svn-id: file:///home/svn/framework3/trunk@7707 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 20:17:28 +00:00
James Lee 1e6b6b3d62 fix ipv6 handling for single addresses
git-svn-id: file:///home/svn/framework3/trunk@7706 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 19:55:58 +00:00
James Lee 5952e29040 modify address range specification (for e.g. RHOSTS) to use nmap notation, fixes #182
git-svn-id: file:///home/svn/framework3/trunk@7705 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 19:37:14 +00:00
Joshua Drake 0458622cb7 attempt to persist left over data across calls
git-svn-id: file:///home/svn/framework3/trunk@7704 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 19:20:14 +00:00
James Lee ee0c1d460a remove the lock that was causing segfaults on 1.9; fixes #513, see #514
git-svn-id: file:///home/svn/framework3/trunk@7703 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 19:16:28 +00:00
HD Moore 9b2d5fcd24 Fixes #605 by re-raising the correct exception class
git-svn-id: file:///home/svn/framework3/trunk@7701 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 18:38:59 +00:00
Stephen Fewer a544d71f4e A few small changes to the ruby side of meterpreters packet dispatcher stuff. Allow for blocking a request indefinatly and add in a new command 'wait' to stdapi.sys.process.
git-svn-id: file:///home/svn/framework3/trunk@7697 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 17:32:56 +00:00
HD Moore fda1083d13 Stop throwing an exception on module initialization, delay this until connect() to avoid breaking module enumeration tools. Clean up the tabs and indents. Delete the broken rescue clause with no begin
git-svn-id: file:///home/svn/framework3/trunk@7696 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 17:22:32 +00:00
Joshua Drake 821f515ff5 add PrependChrootBreak
git-svn-id: file:///home/svn/framework3/trunk@7692 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 07:49:05 +00:00
Joshua Drake 4ab9a59a39 now supporting sequential identical values!
git-svn-id: file:///home/svn/framework3/trunk@7691 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 07:45:08 +00:00
HD Moore facebbc791 allow module search to continue even if one module fails to load
git-svn-id: file:///home/svn/framework3/trunk@7689 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 01:00:48 +00:00
Mario Ceballos 93d02320cf updated oracle mixin and adjusted affected modules. now compatible with ruby 1.8 and 1.9
git-svn-id: file:///home/svn/framework3/trunk@7688 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 23:57:02 +00:00
Joshua Drake d4f1314025 fixed problem reading long lines
git-svn-id: file:///home/svn/framework3/trunk@7687 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 21:52:59 +00:00
Joshua Drake 1d143a6ccf fix silly bug, sorry
git-svn-id: file:///home/svn/framework3/trunk@7686 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 21:11:56 +00:00
Joshua Drake d31d7f869f split buffer to array conversion out
git-svn-id: file:///home/svn/framework3/trunk@7685 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 20:58:07 +00:00
Joshua Drake 7aeb7a08b3 first attempt at support for ftp continuations
git-svn-id: file:///home/svn/framework3/trunk@7684 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 20:56:08 +00:00
HD Moore b1b7ef0350 Improves the NeXpose plugin, adds the ability to do discovery outside of NeXpose and then scan the results using the database as input (-d).
git-svn-id: file:///home/svn/framework3/trunk@7681 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 15:26:30 +00:00
Patrick Webster a4fc468700 Handles exception where exec is a directory, or permission is denied.
git-svn-id: file:///home/svn/framework3/trunk@7678 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 08:17:14 +00:00
James Lee 5182d1c927 allow the Connection header to specify keep-alive in a less strict manner. this is more rfc2616 compliant and fixes #601
git-svn-id: file:///home/svn/framework3/trunk@7677 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 07:40:37 +00:00
HD Moore fc983ef7e3 Many bug fixes to db_autopwn, cross-referencing of OS-level vulnerabilities, small bug fixes to HTTP client API
git-svn-id: file:///home/svn/framework3/trunk@7676 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 01:36:17 +00:00
James Lee 7b4a942ed6 revert logging change from r7653 which broke meterpreter sessions
git-svn-id: file:///home/svn/framework3/trunk@7671 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-02 19:11:11 +00:00
James Lee 626d085dd4 expand ryan linn's idea of more verbose job info to include start time, see #586
git-svn-id: file:///home/svn/framework3/trunk@7668 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-02 03:32:48 +00:00
James Lee dfabd1e3fc fixes #587; add http xmlrpc support from Ryan Linn, invoke it with 'load xmlrpc ServerType=Web' or ./msfrpcd -t Web
git-svn-id: file:///home/svn/framework3/trunk@7667 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-02 00:00:11 +00:00
James Lee e427bd5f81 spaces to tabs
git-svn-id: file:///home/svn/framework3/trunk@7666 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 23:15:07 +00:00
James Lee 0da80965d6 more info about a job, thanks Ryan Linn for the patch; fixes #586
git-svn-id: file:///home/svn/framework3/trunk@7665 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 23:11:12 +00:00
James Lee b486654975 nothing actually uses the zip library, ripping it out. fixes 591
git-svn-id: file:///home/svn/framework3/trunk@7663 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 22:34:45 +00:00
James Lee c2fac74ae2 make irb more useful by eliding unnecessary stuff from framework.inspect
git-svn-id: file:///home/svn/framework3/trunk@7662 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 21:42:14 +00:00
James Lee e73842251e add a kill command and clean up tabbing for jobs
git-svn-id: file:///home/svn/framework3/trunk@7659 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 18:24:11 +00:00
HD Moore b7addee664 Release cut, back to 3.4-dev
git-svn-id: file:///home/svn/framework3/trunk@7656 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 03:57:09 +00:00
HD Moore cae9880c28 Tag this as 3.3.1-release
git-svn-id: file:///home/svn/framework3/trunk@7654 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 03:08:48 +00:00
James Lee 125f0aab0a map any attempt to log to an unknown logsink to the core logsink, fixes 577
git-svn-id: file:///home/svn/framework3/trunk@7653 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 22:03:53 +00:00
HD Moore ed7b7ac6f0 Fixes #491 and fixes #543 by updating the HTTP stack and validating configuration options
git-svn-id: file:///home/svn/framework3/trunk@7652 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 21:15:06 +00:00
HD Moore 1189ac1dcd Updates to the PE class to support TLS/Exceptions
git-svn-id: file:///home/svn/framework3/trunk@7651 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 20:18:37 +00:00
HD Moore c72ec65474 Tag this as 3.3.1-dev until we cut 3.3.1-release, then back to 3.4-dev
git-svn-id: file:///home/svn/framework3/trunk@7650 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 20:17:55 +00:00
HD Moore b8804e48cd Add (incomplete) support for TLS callbacks
git-svn-id: file:///home/svn/framework3/trunk@7648 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 19:48:35 +00:00
HD Moore 38c8714db1 Fixes #585. Klunky right now but well tested
git-svn-id: file:///home/svn/framework3/trunk@7647 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 19:24:47 +00:00
et 53e9907a7d remove reports record
git-svn-id: file:///home/svn/framework3/trunk@7644 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 03:23:38 +00:00
HD Moore 05733b9d8d Correct tab indention
git-svn-id: file:///home/svn/framework3/trunk@7642 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-29 23:36:40 +00:00
HD Moore bfe2cc0c53 Force stale connections to be freed, fixes #513.
git-svn-id: file:///home/svn/framework3/trunk@7641 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-29 17:17:24 +00:00
HD Moore b0c68d3fd2 Faster DLL reading (ruby will yield to background threads on 4k blocks otherwise)
git-svn-id: file:///home/svn/framework3/trunk@7639 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-29 04:23:33 +00:00
HD Moore 63b6cf1713 Remove unused libraries from the tree
git-svn-id: file:///home/svn/framework3/trunk@7637 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-28 22:56:40 +00:00
HD Moore 3ef0987aae Remove unused libraries (packetfu will be re-integrated when the next rev is done)
git-svn-id: file:///home/svn/framework3/trunk@7634 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-28 22:48:36 +00:00
HD Moore ff93072d1e Fixes #578. Only register a new meterpreter sink if one doesnt already exist
git-svn-id: file:///home/svn/framework3/trunk@7632 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-28 16:34:46 +00:00
James Lee 9d2ab30f9d create the history file if it doesn't exist
git-svn-id: file:///home/svn/framework3/trunk@7627 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-26 07:13:21 +00:00
James Lee d6a732d619 move histfile reading into rex
git-svn-id: file:///home/svn/framework3/trunk@7625 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-26 06:03:05 +00:00
James Lee 3412a38146 register a 'meterpreter' logsink
git-svn-id: file:///home/svn/framework3/trunk@7622 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-26 02:46:04 +00:00
James Lee fd61df4e9e add full support for persistent history, works in msfweb as well. fixes #523
git-svn-id: file:///home/svn/framework3/trunk@7621 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-26 02:18:02 +00:00
James Lee 1b4aa0380b read in a history file. beginnings of persistent history. see #523
git-svn-id: file:///home/svn/framework3/trunk@7620 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-26 01:01:27 +00:00
James Lee 723aa65df0 refuse to migrate into the current process. fixes #418
git-svn-id: file:///home/svn/framework3/trunk@7618 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 23:24:01 +00:00
HD Moore f3006f78c9 Fix up handling of service-less vulnerabilities
git-svn-id: file:///home/svn/framework3/trunk@7612 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 18:03:25 +00:00
James Lee 6bd2e7f5b4 dup http resource so modules don't inadvertantly modify it
git-svn-id: file:///home/svn/framework3/trunk@7608 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 06:45:14 +00:00
et 70d5e219e4 Additional reporting methods removed
git-svn-id: file:///home/svn/framework3/trunk@7607 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 06:20:21 +00:00
et 252cdcfb92 Removing unnecesary reporting methods
git-svn-id: file:///home/svn/framework3/trunk@7606 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 06:11:52 +00:00
et 5b81d85447 Replaced reporting to use notes
git-svn-id: file:///home/svn/framework3/trunk@7605 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 06:08:28 +00:00
HD Moore b460843929 Fixes #574. Uses compatible_payloads as the initial list for finding a match
git-svn-id: file:///home/svn/framework3/trunk@7604 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 02:24:41 +00:00
HD Moore 49b6111dbc Correctly print vulnerability references when there is no associated service
git-svn-id: file:///home/svn/framework3/trunk@7600 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 01:44:55 +00:00
James Lee d5e09a90e2 add minver and maxver options and prepare for universal module ranking
git-svn-id: file:///home/svn/framework3/trunk@7598 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-24 21:40:02 +00:00
HD Moore 3796cf3865 Fixes #567, hands the case where the svn directories were moved
git-svn-id: file:///home/svn/framework3/trunk@7593 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-24 12:47:05 +00:00
et e354c8dbcc Multiple headers handling bug fixes
git-svn-id: file:///home/svn/framework3/trunk@7588 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-24 05:27:11 +00:00
James Lee f8d84a7dc9 prevent loading the same dispatcher multiple times. fixes #560
git-svn-id: file:///home/svn/framework3/trunk@7587 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-24 01:07:19 +00:00
et a3d4e1c44a Added command to launch msfproxy from console
git-svn-id: file:///home/svn/framework3/trunk@7584 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-23 03:38:05 +00:00
James Lee 6e7c4a77a9 add detection for ie6 on xpsp2
git-svn-id: file:///home/svn/framework3/trunk@7572 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-20 06:08:09 +00:00
James Lee 3b6126bfd9 actually commit what i said i was committing. =(
git-svn-id: file:///home/svn/framework3/trunk@7567 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-18 06:35:44 +00:00
James Lee 14a0040b8a move nmap xml parsing into Rex::Parser; add a test to make sure it works
git-svn-id: file:///home/svn/framework3/trunk@7566 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-18 06:15:45 +00:00
HD Moore f327418804 Fixes #553. Adds a timeout for all FTP commands and removes the unbounded fd.get
git-svn-id: file:///home/svn/framework3/trunk@7564 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-18 03:04:25 +00:00
Joshua Drake 56f0ef00e6 fix pad handling
git-svn-id: file:///home/svn/framework3/trunk@7562 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-18 00:50:44 +00:00
Joshua Drake 0ebff0e5ea allow target override
git-svn-id: file:///home/svn/framework3/trunk@7559 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-17 23:30:17 +00:00
Joshua Drake dd62aa6a98 add format string exploit mixin
git-svn-id: file:///home/svn/framework3/trunk@7558 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-17 22:29:43 +00:00
Joshua Drake 98c60be1f1 rough cut at some format string support
git-svn-id: file:///home/svn/framework3/trunk@7556 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-17 22:14:44 +00:00
HD Moore 4b9a54a2f6 Fixes #529 by correcting the variable name
git-svn-id: file:///home/svn/framework3/trunk@7555 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-17 12:45:34 +00:00
HD Moore e88ef79af8 And here we go again...
git-svn-id: file:///home/svn/framework3/trunk@7554 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-17 04:01:10 +00:00
HD Moore c7712d45d6 Mark this as 3.3-release, hopefully this is the last commit before 3.4-dev starts
git-svn-id: file:///home/svn/framework3/trunk@7551 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-17 00:06:44 +00:00
HD Moore a92fbb1ff4 Fixes #526. Correct socket name and call to super in the socket output io
git-svn-id: file:///home/svn/framework3/trunk@7548 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 23:35:34 +00:00
HD Moore 9b1935eb2a Fixes #522. Allow RHOSTS to contain hostnames with dashes
git-svn-id: file:///home/svn/framework3/trunk@7547 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 23:20:59 +00:00
HD Moore dc0dc98771 Fixes #517. Disables meterpreter stages for passivex stagers
git-svn-id: file:///home/svn/framework3/trunk@7546 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 22:45:33 +00:00
Joshua Drake d8b9e030e3 really fixed, test case: "db_create/db_nmap -P"
git-svn-id: file:///home/svn/framework3/trunk@7543 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 19:13:33 +00:00
Joshua Drake 6d18c6dd53 bugfix for NMAP failure, test case: "db_nmap -P"
git-svn-id: file:///home/svn/framework3/trunk@7542 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 19:06:42 +00:00
James Lee 36921e6d4b fix a bug where a failed encoder would try to convert nil to Integer. see #519
git-svn-id: file:///home/svn/framework3/trunk@7540 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 18:57:04 +00:00
HD Moore 3f811a801e Fixes #509. Fix the last shadowed var issue, the rest dont seem significant
git-svn-id: file:///home/svn/framework3/trunk@7537 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 18:34:08 +00:00
HD Moore 0251f21dc9 See #509
git-svn-id: file:///home/svn/framework3/trunk@7536 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 18:30:07 +00:00
HD Moore 58711ec7ad See #509
git-svn-id: file:///home/svn/framework3/trunk@7535 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 18:28:45 +00:00
HD Moore 8cadfe66cf Mostly cosmetic
git-svn-id: file:///home/svn/framework3/trunk@7530 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 15:16:08 +00:00
HD Moore ba5da501bf Log the exploit name when the module raises an exception, helps track down bugs during automation
git-svn-id: file:///home/svn/framework3/trunk@7529 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 15:08:58 +00:00
HD Moore 5c39fd102a Tag this a rc1, one more big bug shakeout
git-svn-id: file:///home/svn/framework3/trunk@7526 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 03:30:16 +00:00
HD Moore d67cb3cdde Really fixes #464
git-svn-id: file:///home/svn/framework3/trunk@7525 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 02:52:23 +00:00
HD Moore ba9f7b41b3 Fix save() again
git-svn-id: file:///home/svn/framework3/trunk@7524 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 02:48:00 +00:00
HD Moore 1ad262a53e Fixes #464 by using the correct logic to only save user defined variables and to reset default options after a register_*_options call by a mixin
git-svn-id: file:///home/svn/framework3/trunk@7523 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 02:39:08 +00:00
HD Moore 18ba91cebc Adds the find/save wrapper back, it seems to help a little, but doesn't solve all cases. See #514
git-svn-id: file:///home/svn/framework3/trunk@7517 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-14 22:11:53 +00:00
HD Moore 291aad8cc1 Fixes #516 and fixes #515. This patch makes database support a little more user-friendly. The db commands now accept -h and --help, the db_drivers command will indicate how to install support for a given database, the db_create/db_destroy commands will indicate what tools are required to use them, and the postgres driver will now roperly handle sameuser authentication over a unix domain socket with postgres-pr
git-svn-id: file:///home/svn/framework3/trunk@7516 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-14 21:41:38 +00:00
James Lee e296ec92ea more uninitalized var warnings
git-svn-id: file:///home/svn/framework3/trunk@7513 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-14 06:21:22 +00:00
James Lee d3d406f405 more unitialized goodness
git-svn-id: file:///home/svn/framework3/trunk@7501 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 23:53:17 +00:00
HD Moore f011c7d580 rc1 -> testing
git-svn-id: file:///home/svn/framework3/trunk@7498 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 22:52:29 +00:00
HD Moore eabfff5aca Adds the last updated date to the output
git-svn-id: file:///home/svn/framework3/trunk@7497 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 22:50:12 +00:00
James Lee a3c020fef2 more uninitialized var warnings
git-svn-id: file:///home/svn/framework3/trunk@7495 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 22:11:52 +00:00
James Lee 8471baa62a fix another uninitialized class var warning
git-svn-id: file:///home/svn/framework3/trunk@7494 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 22:00:16 +00:00
James Lee 80ee6157ed fix a few warnings
git-svn-id: file:///home/svn/framework3/trunk@7492 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 20:28:36 +00:00
James Lee b762ca5ece fix '@initialized not initialized' warning
git-svn-id: file:///home/svn/framework3/trunk@7489 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 17:31:57 +00:00
James Lee 8c28c38da3 remove busted unit test
git-svn-id: file:///home/svn/framework3/trunk@7482 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-12 19:49:35 +00:00
HD Moore 500eb85a58 Fix a typo in ^L support
git-svn-id: file:///home/svn/framework3/trunk@7476 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-12 06:31:50 +00:00
HD Moore 8c65a0f48c Handle interrupts without showing a backtrace
git-svn-id: file:///home/svn/framework3/trunk@7473 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-12 05:56:52 +00:00
James Lee 62470e47a7 Skip closed/filtered ports when db_autopwning
git-svn-id: file:///home/svn/framework3/trunk@7462 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-11 00:58:08 +00:00
James Lee c7967e00d7 handle both 'open' and 'up' for port state in db_services
git-svn-id: file:///home/svn/framework3/trunk@7460 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-11 00:29:44 +00:00
James Lee 029d0bae47 save the port state regardless of whether we know the name
git-svn-id: file:///home/svn/framework3/trunk@7459 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-11 00:22:03 +00:00
James Lee 73a0ef8b64 actually save port state
git-svn-id: file:///home/svn/framework3/trunk@7458 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-11 00:16:52 +00:00
James Lee 78c88c888f don't backtrace just because the client cancelled
git-svn-id: file:///home/svn/framework3/trunk@7453 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 19:38:18 +00:00
James Lee 7e177962bf tell the user what port we're listening on
git-svn-id: file:///home/svn/framework3/trunk@7452 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 17:39:51 +00:00
James Lee b64d12c846 sort jobs numerically
git-svn-id: file:///home/svn/framework3/trunk@7451 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 17:16:49 +00:00
James Lee 3dfaf32bc8 trying out bold colors
git-svn-id: file:///home/svn/framework3/trunk@7450 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 16:49:26 +00:00
James Lee 2cbb32550c fix meterp sessions getting initialized improperly, fix msf> prompt in exploit context after color cmd
git-svn-id: file:///home/svn/framework3/trunk@7449 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 16:10:39 +00:00
HD Moore 2c3cace80c Fix up the classes needed by msfweb. Fixes #495
git-svn-id: file:///home/svn/framework3/trunk@7447 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 15:59:49 +00:00
James Lee 3628a3d3c6 fix sessions breaking right away when interacting. command dispatcher still appears to be hosed
git-svn-id: file:///home/svn/framework3/trunk@7446 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 15:55:42 +00:00
HD Moore 3db9bbfaae See #493. Initialize the prompt
git-svn-id: file:///home/svn/framework3/trunk@7445 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 15:33:14 +00:00
HD Moore 69dbb7b4b0 Address some of #493
git-svn-id: file:///home/svn/framework3/trunk@7444 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 15:26:40 +00:00
James Lee daf58b6deb get rid of the single-character escapes so we're less likely to see accidental color substitutions
git-svn-id: file:///home/svn/framework3/trunk@7443 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 07:12:56 +00:00
James Lee fd4e4154cd add a new 'color' command that lets the user force color on or off.
git-svn-id: file:///home/svn/framework3/trunk@7442 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 06:58:01 +00:00
James Lee a8d9da0d3d initial color support. will add ability to change colors from console soon. see #344
git-svn-id: file:///home/svn/framework3/trunk@7440 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 03:27:48 +00:00
HD Moore 2bec0701a7 Fixes a crash on startup when no svn directories are present
git-svn-id: file:///home/svn/framework3/trunk@7438 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 03:05:12 +00:00
HD Moore acea0f87fb Correct the formatting of the old age warning. Obviously nobody would have seen this for another 5 days :)
git-svn-id: file:///home/svn/framework3/trunk@7436 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 23:45:21 +00:00
James Lee e73d4ead7f handle a broken socket gracefully, fixes a backtrace in msfd
git-svn-id: file:///home/svn/framework3/trunk@7432 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 20:10:53 +00:00