Commit Graph

1931 Commits (c45b1037f1f151eb97ff7db8de8fd53944668617)

Author SHA1 Message Date
Wei Chen 047b1b4ee2 RopCollect needs to use print_status too
git-svn-id: file:///home/svn/framework3/trunk@13701 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-06 23:08:58 +00:00
David Rude 7e0424e976 fixes some bugs with imports of rop gadgets
git-svn-id: file:///home/svn/framework3/trunk@13700 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-06 22:27:03 +00:00
David Rude 5e4a3f5beb Opps typo in the require
git-svn-id: file:///home/svn/framework3/trunk@13678 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-01 10:21:15 +00:00
David Rude 525af4325d Add the jsobfu require
git-svn-id: file:///home/svn/framework3/trunk@13677 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-01 09:11:23 +00:00
David Rude 1e37649a4d Add backwards compatability support for old obfuscation methods needed by older exploits
git-svn-id: file:///home/svn/framework3/trunk@13674 4d416f70-5f16-0410-b530-b9f4589650da
2011-09-01 08:58:18 +00:00
David Rude aa5ad30805 Alters heaplib so it no longer obfuscates using the old method
git-svn-id: file:///home/svn/framework3/trunk@13665 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-30 22:08:51 +00:00
Wei Chen ee961b69ad Add support for virtualalloc (see #5262)
git-svn-id: file:///home/svn/framework3/trunk@13659 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-30 06:52:56 +00:00
Matt Weeks 6853221762 Fixes #5313 by adding logging support to pivoted PXE attacks, and displaying results as the module runs.
git-svn-id: file:///home/svn/framework3/trunk@13646 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-27 15:46:49 +00:00
Matt Weeks 23b4f4ed98 Address #5313 for locally-launched PXE attacks.
git-svn-id: file:///home/svn/framework3/trunk@13639 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-25 22:48:33 +00:00
Matt Weeks 2b340439e0 Fixes #5312 - auto boot from disk on second PXE boot (after payload delivery).
git-svn-id: file:///home/svn/framework3/trunk@13629 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-24 21:28:31 +00:00
James Lee 3c7f25ff78 help help
git-svn-id: file:///home/svn/framework3/trunk@13579 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-18 20:29:49 +00:00
Matt Weeks 9e80c740b6 Also recognize PXE clients who do not set the PXE option in the DHCP request but do identify in client string.
git-svn-id: file:///home/svn/framework3/trunk@13577 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-18 00:18:43 +00:00
James Lee f99429138e clean up some rdoc comments. odd that rdoc doesn't appear to pick up ApiConstants at all...
git-svn-id: file:///home/svn/framework3/trunk@13576 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-17 23:00:28 +00:00
James Lee 0fc14a2164 whitespace
git-svn-id: file:///home/svn/framework3/trunk@13572 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-16 21:16:25 +00:00
James Lee 79b7fb7c43 actually store the new Util object. how did this ever work before? fixes #5265
git-svn-id: file:///home/svn/framework3/trunk@13571 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-16 18:01:21 +00:00
James Lee f16e593628 report udp protocol correctly, see #5260, r13569
git-svn-id: file:///home/svn/framework3/trunk@13570 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-15 22:39:41 +00:00
James Lee 4779c039f0 protocol != proto. fixes #5260
git-svn-id: file:///home/svn/framework3/trunk@13569 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-15 22:29:57 +00:00
Chao Mu c77dfcc48e fixes #5232 Add DLL definition for crypt32. I removed a custom add too
git-svn-id: file:///home/svn/framework3/trunk@13560 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-14 21:08:55 +00:00
Matt Weeks 4a7714e1b1 Fix #5244
git-svn-id: file:///home/svn/framework3/trunk@13551 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-12 20:26:03 +00:00
Joshua Drake 5966cf460e Fixes #5240: avoid crash when read fails
git-svn-id: file:///home/svn/framework3/trunk@13550 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-12 19:30:56 +00:00
Jonathan Cran 15a9036dd9 add in the Buffer input class
git-svn-id: file:///home/svn/framework3/trunk@13516 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-10 21:05:12 +00:00
Chao Mu 0bc44c4736 Expanding the range of mock dll/functions to allow for more thorough testing. Number of assertions when you run railgun tests are about to jump.
git-svn-id: file:///home/svn/framework3/trunk@13506 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-10 03:36:39 +00:00
James Lee a5b30b1964 sometimes windows raises EADDRNOTAVAIL which gets mapped to AddressInUse when using addresses it doesn't like, e.g. .0 and .255; make AddressInUse a ConnectionError so scanners handle it properly. makes scanners work on windows when an address range includes one of these. they won't be scanned (since windows is dumb) but at least it won't error out.
git-svn-id: file:///home/svn/framework3/trunk@13503 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-10 00:51:23 +00:00
Matt Weeks b2733c04db More PXE dust for extra magic!
git-svn-id: file:///home/svn/framework3/trunk@13493 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-05 17:10:27 +00:00
HD Moore 842bfdebe8 Lets just leave this here (insurance against my laptop melting down between now and tomorrow morning). Nothing to see here, move along ;)
git-svn-id: file:///home/svn/framework3/trunk@13483 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-03 22:58:55 +00:00
HD Moore d7e775b74c This speeds up shutdown for normal reverse_tcp meterpreters (avoids the penalization for http/https)
git-svn-id: file:///home/svn/framework3/trunk@13470 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-02 01:33:17 +00:00
HD Moore 7fa5795115 Cleanup session files. Wait a little longer for the session to receive the shutdown command
git-svn-id: file:///home/svn/framework3/trunk@13458 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-31 19:46:36 +00:00
James Lee f5862e87d0 guard against nil and false ranges
git-svn-id: file:///home/svn/framework3/trunk@13446 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-31 15:48:29 +00:00
Tod Beardsley 7667e5aa74 More of the same.
git-svn-id: file:///home/svn/framework3/trunk@13439 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-30 23:50:04 +00:00
Tod Beardsley 58f7618b78 Fixes #5144. Repro's with nexpose-raw.xml in sample data -- before the fix, DNS on port 53 would be marked as "Postfix" which is the same as the service prior, 25/tcp. After the fix, it is appropriately blank. (Same with 80/tcp and 443/tcp both being Apache -- technically probably correct but the service fingerprint isn't there for 443 in the import).
Checking other service importers for the same kind of problem, but it looks unique to nexpose-raw.



git-svn-id: file:///home/svn/framework3/trunk@13438 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-30 23:35:13 +00:00
HD Moore 7f758e42e8 Fix up SSL behavior (correctly, this time). Update the msfrpc tools to support the new MessagePack code, fix various defaults in the plugin. Fixes #5116
git-svn-id: file:///home/svn/framework3/trunk@13416 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-29 23:58:05 +00:00
HD Moore 07df5f051f Woops. Get the right variable name
git-svn-id: file:///home/svn/framework3/trunk@13412 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-29 19:26:43 +00:00
HD Moore f57799943c Rework this patch to only enable non-blocking openssl on Windows, as this has also reproduced on BT5 with 1.9.2
git-svn-id: file:///home/svn/framework3/trunk@13411 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-29 19:10:20 +00:00
HD Moore ace9ca86a8 This commit abstracts the non-blocking SSL check so that it verifies existence of the non-blocking API and skips Mac OS X. This should fix some of the issues with meterpreter on MacOS X with Ruby 1.9.2
git-svn-id: file:///home/svn/framework3/trunk@13404 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-29 03:34:15 +00:00
James Lee d50577066f remove some silliness of registering UserAgent as an option since it's already an advanced option for HttpClient, make the default obvious
git-svn-id: file:///home/svn/framework3/trunk@13394 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-28 22:57:47 +00:00
HD Moore 9f8cbc4145 First pass at an import, still missing a few items to call this done
git-svn-id: file:///home/svn/framework3/trunk@13390 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-28 21:17:30 +00:00
HD Moore c7077f2551 Fix up the stop call
git-svn-id: file:///home/svn/framework3/trunk@13382 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-27 20:50:11 +00:00
James Lee aa2c025ce1 add a flush option to portfwd. thanks ipax for the patch!
git-svn-id: file:///home/svn/framework3/trunk@13359 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-27 04:59:06 +00:00
Joshua Drake f1473c4cb3 Fixes #5062 - Use .length instead of .count (1.8 compat)
git-svn-id: file:///home/svn/framework3/trunk@13352 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-26 23:36:30 +00:00
James Lee fa4dbf6783 move the client accessor back to the top so it's available when needed, use the session-specific separator, fixes #4892 again
git-svn-id: file:///home/svn/framework3/trunk@13350 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-26 22:37:41 +00:00
James Lee 2212afcf31 un-remove an important include...
git-svn-id: file:///home/svn/framework3/trunk@13348 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-26 20:58:23 +00:00
James Lee 0f95070f3f add a request type for grabbing the host's directory separator, fixes #4892
git-svn-id: file:///home/svn/framework3/trunk@13346 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-26 20:51:33 +00:00
David Rude 25bdbe6568 More prompt bug fixes, back and use commands should work properly now
git-svn-id: file:///home/svn/framework3/trunk@13326 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-24 18:41:23 +00:00
James Lee d3836badc6 add a fingerprint for ie6 on xp sp2 korean
git-svn-id: file:///home/svn/framework3/trunk@13321 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-23 17:42:56 +00:00
HD Moore d60524a3d4 Fixes #5009 by using the right client object
git-svn-id: file:///home/svn/framework3/trunk@13299 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-22 23:33:06 +00:00
David Rude a54b8c26c3 Fix prompt updates to show the last set prompt variable
git-svn-id: file:///home/svn/framework3/trunk@13291 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-22 01:49:29 +00:00
David Rude 59b9dfd9eb no need for the framework reference now
git-svn-id: file:///home/svn/framework3/trunk@13281 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 18:35:57 +00:00
David Rude 2776669a51 reworked how the custom prompts work with different input streams
git-svn-id: file:///home/svn/framework3/trunk@13279 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 18:19:43 +00:00
HD Moore 3046896204 This commit makes the new unicode string encoding optional, it can be disabled by setting EnableUnicodeEncoding to false or through the 'disable_unicode_encoding' console command in the Meterpreter shell. Fixes #4986
git-svn-id: file:///home/svn/framework3/trunk@13278 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 15:44:54 +00:00
HD Moore ce862cf999 Disable this until some bugs are sorted out
git-svn-id: file:///home/svn/framework3/trunk@13277 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 15:38:28 +00:00
HD Moore 8337c9e90a Add the framework accessor, unbreak trunk
git-svn-id: file:///home/svn/framework3/trunk@13276 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 15:35:28 +00:00
HD Moore 7dfb74be10 See #4986, make unicode encoding optional
git-svn-id: file:///home/svn/framework3/trunk@13275 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 15:26:15 +00:00
David Rude f6e3065a51 camel case the advanced options
git-svn-id: file:///home/svn/framework3/trunk@13274 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 14:35:02 +00:00
David Rude 1902b92878 Merge custom prompt code
git-svn-id: file:///home/svn/framework3/trunk@13272 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-21 06:14:25 +00:00
James Lee bffc8088c3 don't just ignore the prefix. see r13244
git-svn-id: file:///home/svn/framework3/trunk@13250 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 23:27:37 +00:00
Carlos Perez d4055e8697 to_s on table was appending to it self every time it was called
git-svn-id: file:///home/svn/framework3/trunk@13244 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 22:04:13 +00:00
James Lee 93839922dd fix method name in doc comment
git-svn-id: file:///home/svn/framework3/trunk@13235 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 19:52:52 +00:00
David Rude b877d3c639 Added memory_grep post module and updated the GetProcessHeaps definition in railgun
git-svn-id: file:///home/svn/framework3/trunk@13225 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 17:06:26 +00:00
HD Moore 628f29c551 Correctly throw a not-supported error on older ruby
git-svn-id: file:///home/svn/framework3/trunk@13223 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-19 14:49:34 +00:00
Chao Mu d23a5f6092 "The GetFileSecurityA and GetFileSecurityW functions have a "RequestedInformation" that is defined as a PBLOB and should be a DWORD." - Keith Faber. Thank you Keith! see #4364
git-svn-id: file:///home/svn/framework3/trunk@13201 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-17 17:48:09 +00:00
HD Moore cccbdf9fab This patch allows meterpreter to work with file paths and user names that are not of the US-ASCII character set.
git-svn-id: file:///home/svn/framework3/trunk@13200 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-17 17:32:52 +00:00
Chao Mu 1e1d7c534d "This is the first update to the Railgun Advapi32.dll Definitions. It adds some of the Windows CryptoAPI function calls." - David Maloney. see #4746
git-svn-id: file:///home/svn/framework3/trunk@13199 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-17 17:17:48 +00:00
Chao Mu 572a5a5b8b Added method "functions" to DLLWrapper that grabs the DLL's "functions" so that people can continue to test for function existence via .functions['blah'], evne though I hate this, I want to be backwards compatible. This will be deprecated eventually
git-svn-id: file:///home/svn/framework3/trunk@13198 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-17 15:15:26 +00:00
Chao Mu 59015b2cbf Closes Redmine issue 3073 (Railgun DLL cache/definition loader needs a rewrite). Major overhaul of how railgun handles DLLs and requests to them. def_*.rb files are now formed differently, this may break your code if you made changes to railgun/def/def_* or railgun.rb, see http://blog.minorcrash.com/2011/07/new-way-to-add-dlls-to-railgun.html
git-svn-id: file:///home/svn/framework3/trunk@13181 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-15 00:18:01 +00:00
Matt Weeks d1cfa7560f Update DHCP server for correctness, reliability, simplicity.
Actually keep track of which clients get which IP, only give PXE options to PXE clients, and provide more control over serving to PXE and/or normal clients.



git-svn-id: file:///home/svn/framework3/trunk@13165 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-14 02:34:25 +00:00
HD Moore 65702f64b6 Check to make sure we are running under Console2; all sorts of gremlins and threading bugs appear when running under a bare cmd.exe console, this should save us a few bug reports.
git-svn-id: file:///home/svn/framework3/trunk@13160 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-13 05:01:37 +00:00
Wei Chen 687aaf5c71 Apply egghunter patch (by corelanc0d3r) for DEP bypass size calculation improvement.
Please see #4909


git-svn-id: file:///home/svn/framework3/trunk@13153 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-12 01:06:15 +00:00
James Lee 7f743a5c1b make meterpreter's File.basename() honor both kinds of directory seperators, use the remote basename as the dest when dest is implicit
git-svn-id: file:///home/svn/framework3/trunk@13124 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-08 00:08:42 +00:00
James Lee 9c8605813e don't wait for the session to send back a response after telling it to die
git-svn-id: file:///home/svn/framework3/trunk@13083 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-01 23:29:00 +00:00
James Lee 56de119a0f add a few opera fingerprints gathered from http://www.giac.org/paper/gwapt/1353/client-fingerprinting-analysis-browser-scripting-environment/115300
git-svn-id: file:///home/svn/framework3/trunk@13082 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-01 23:20:31 +00:00
Tod Beardsley 0818a856b6 Some fixups for some new AuthBrute hotness.
git-svn-id: file:///home/svn/framework3/trunk@13075 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-30 06:52:52 +00:00
HD Moore 7d9f36d4b9 Adds support for the new regloadkey/regunloadkey operations.
git-svn-id: file:///home/svn/framework3/trunk@13072 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-30 05:35:18 +00:00
James Lee 5f5c024193 supress a useless exception (trying to close a closed stream)
git-svn-id: file:///home/svn/framework3/trunk@13071 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-30 05:12:07 +00:00
HD Moore 92bb531af5 New bins, new functions, more info soon
git-svn-id: file:///home/svn/framework3/trunk@13059 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-29 06:12:03 +00:00
HD Moore a98602ed8d Shut down properly through session.kill
git-svn-id: file:///home/svn/framework3/trunk@13055 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-28 21:38:24 +00:00
HD Moore 9220506ba2 Merge in recent meterpreter work. These are not the commits you are looking for (more info on what all this is later this week).
git-svn-id: file:///home/svn/framework3/trunk@13053 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-28 21:26:43 +00:00
HD Moore 5bbf27bf5b Woops, this may not have a prompt accessor, find another way
git-svn-id: file:///home/svn/framework3/trunk@13029 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-25 20:33:15 +00:00
HD Moore da7cc53c38 Add the spool command for redirecting output to both the console and a file
git-svn-id: file:///home/svn/framework3/trunk@13028 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-25 18:51:07 +00:00
HD Moore 40b9b2467b Remove the downgrade until we figure out the cause, getting different results for the same OS/SP/configuration
git-svn-id: file:///home/svn/framework3/trunk@12991 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-21 01:12:17 +00:00
HD Moore c42ea1f896 Re-enable the workaround for now, see #4785
git-svn-id: file:///home/svn/framework3/trunk@12989 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-20 23:38:30 +00:00
HD Moore ab615c1225 Reference the ticket in this comment: See #4785
git-svn-id: file:///home/svn/framework3/trunk@12987 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-20 23:32:29 +00:00
HD Moore 346018c321 Disable NTLMv2 Session for Windows 2000 servers
git-svn-id: file:///home/svn/framework3/trunk@12984 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-20 22:54:13 +00:00
HD Moore 092817d449 Finally merging Cachedump into the SVN tree. Thanks to everyone who helped and again for their patience
git-svn-id: file:///home/svn/framework3/trunk@12946 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-15 01:06:22 +00:00
Joshua Drake cb98e40725 Add support for ignoring non-executable Mach-O binary segments
git-svn-id: file:///home/svn/framework3/trunk@12940 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-14 15:23:32 +00:00
HD Moore db413592e9 This commit adds support for the -r (remote machine name) parameter to the reg command and extends the api to support a remote machine name. Closes #1894
git-svn-id: file:///home/svn/framework3/trunk@12924 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-12 00:01:29 +00:00
HD Moore 6dd65e56f2 All changes look good, merging
git-svn-id: file:///home/svn/framework3/trunk@12921 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-11 23:17:42 +00:00
HD Moore c3307c80be Fixes #1733 by merging in Danilo Nascimento's patch. Thanks!
git-svn-id: file:///home/svn/framework3/trunk@12919 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-11 23:01:11 +00:00
Joshua Drake a8d177ec35 Revert r12910, conflict-o oops-o
git-svn-id: file:///home/svn/framework3/trunk@12911 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-11 18:53:39 +00:00
Joshua Drake 3ac9854e88 Fixes #4703: Change an assignment in the loop to append instead
git-svn-id: file:///home/svn/framework3/trunk@12910 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-11 18:50:33 +00:00
David Rude 54f9ea7c0d code clean ups, fixes a bug in gadget collection, adds gadget grouping
git-svn-id: file:///home/svn/framework3/trunk@12909 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-11 18:38:02 +00:00
David Rude 8eaf46eca0 Add support to disable color
git-svn-id: file:///home/svn/framework3/trunk@12906 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-10 18:13:34 +00:00
David Rude a0c2321efc Add msfrop, a tool for collecting and ROP gadgets, features include export and import in CSV format, powerful regex searching
git-svn-id: file:///home/svn/framework3/trunk@12904 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-10 12:54:01 +00:00
James Lee 9d99b9de22 fix a logic error that results in sockets closing instead of resending data, really fixes #4642; also fixes a nil error when read() failed, makes logs actually useful
git-svn-id: file:///home/svn/framework3/trunk@12885 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-08 21:36:34 +00:00
James Lee 96b568d65b add a tool for list all modules by rank, fixes #4333, fixes #4334, thanks David Maloney!
git-svn-id: file:///home/svn/framework3/trunk@12876 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-06 22:47:55 +00:00
David Rude 62826d3ff8 fix a bug in msfpescan and msfbinscan when handling disassembly
git-svn-id: file:///home/svn/framework3/trunk@12863 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-05 21:50:29 +00:00
Tod Beardsley 7b4c7d44db Adds a Burp Session XML parser and importer. Also includes fix to Rex's HTTP header parser to ensure that it uses only unencoded regexes.
git-svn-id: file:///home/svn/framework3/trunk@12846 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-03 21:17:57 +00:00
James Lee 89a12add6f always break strings into at least two pieces when splitting. Add better docs.
git-svn-id: file:///home/svn/framework3/trunk@12843 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-03 17:52:34 +00:00
James Lee bee19278d7 add a new javascript obfuscation engine using rkelly for parsing. use it in browser_autopwn and ms10_018_ie_behaviors. see #1003
git-svn-id: file:///home/svn/framework3/trunk@12839 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-03 00:36:26 +00:00
Tod Beardsley 110f4df649 Adding a webapp vulnscanner parser for Appscan
git-svn-id: file:///home/svn/framework3/trunk@12826 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 22:16:08 +00:00
Tod Beardsley f03ffaf13d Fixing a stack trace when the imported site cannot be resolved.
git-svn-id: file:///home/svn/framework3/trunk@12825 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 22:12:50 +00:00
Tod Beardsley 0a7f6b8528 Adds support for importing Acunetix webvuln XML reports.
git-svn-id: file:///home/svn/framework3/trunk@12813 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 06:17:38 +00:00
David Rude 1a466da015 Handle PE dissassemly the proper way, fixes a bug when handling regex searches
git-svn-id: file:///home/svn/framework3/trunk@12802 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 19:53:08 +00:00
Tod Beardsley d3f19d8777 Moving the character and cdata readers to the nokogiri mixin. They've all been the same so far.
git-svn-id: file:///home/svn/framework3/trunk@12800 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 17:37:54 +00:00
Tod Beardsley 8600bc5bef Foundstone registers a fingerprint instead of directly setting os_name. Also updates the Windows version regex for mbsa. Also adds a fall-through fingerprint parser (which foundstone uses).
git-svn-id: file:///home/svn/framework3/trunk@12798 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 16:31:27 +00:00
Tod Beardsley 43b78a6b8f Adds an import note for MBSA and Foundstone.
git-svn-id: file:///home/svn/framework3/trunk@12792 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 02:21:10 +00:00
Mario Ceballos 2e0d399262 fixes some warnings.
git-svn-id: file:///home/svn/framework3/trunk@12791 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 01:14:47 +00:00
Tod Beardsley 23e3d4274d Adds a parser for MBSA XML files.
git-svn-id: file:///home/svn/framework3/trunk@12790 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-01 00:01:46 +00:00
Tod Beardsley c94577448e Cleans up service name normalization.
git-svn-id: file:///home/svn/framework3/trunk@12787 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-31 19:27:22 +00:00
Tod Beardsley 90bbacd75e Fixes #4620, attribute hashes are passed through a sanitizer now.
git-svn-id: file:///home/svn/framework3/trunk@12786 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-31 19:01:54 +00:00
Tod Beardsley f420b9c9e9 Adding an importer for Foundstone/Mcafee Network Inventory reports.
git-svn-id: file:///home/svn/framework3/trunk@12780 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-31 15:24:42 +00:00
Tod Beardsley e85a350257 Fixes #4605 -- only try to yield if we have a block to yield to.
git-svn-id: file:///home/svn/framework3/trunk@12762 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-29 03:00:13 +00:00
HD Moore 3a4b5a02fb Force strings to be binary in Meterpreter requests, wrap server-side errors with a client-side wrapper
git-svn-id: file:///home/svn/framework3/trunk@12758 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-28 05:55:51 +00:00
Tod Beardsley b6f79ec070 Updating nmap's nokogiri state tracker as well.
git-svn-id: file:///home/svn/framework3/trunk@12744 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-27 18:15:49 +00:00
Tod Beardsley 19f50d9b1d Updates the nokogiri streaming document state machine to something a little more grown up.
git-svn-id: file:///home/svn/framework3/trunk@12742 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-27 17:53:56 +00:00
David Rude f92819e754 removed nasm calls inplace of metasm, cleaned up some formatting as well
git-svn-id: file:///home/svn/framework3/trunk@12741 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-27 17:34:31 +00:00
Tod Beardsley a891d53be4 Adding a Nokogiri stream parser for Nexpose raw XML files.
git-svn-id: file:///home/svn/framework3/trunk@12740 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-27 17:30:11 +00:00
Tod Beardsley 3eabf41a67 Adds a Nokogiri parser for Nexpose vuln imports.
git-svn-id: file:///home/svn/framework3/trunk@12737 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-26 20:29:47 +00:00
James Lee 8acfef8770 add support for providing a list of CA certs for the signature
git-svn-id: file:///home/svn/framework3/trunk@12734 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-26 17:50:56 +00:00
Tod Beardsley 528e9e2b3a update from chlee
git-svn-id: file:///home/svn/framework3/trunk@12723 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-25 19:26:41 +00:00
Tod Beardsley 252830f3dd See #4471 - Moving off some common methods to a mixin.
git-svn-id: file:///home/svn/framework3/trunk@12720 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-25 18:48:23 +00:00
James Lee 11a1b5dcad fix the requires for java signing.
git-svn-id: file:///home/svn/framework3/trunk@12719 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-25 18:02:02 +00:00
James Lee 812bae9df9 add support for signing applets (or any other jar) with openssl. this removes the need for a dependency on RJB
git-svn-id: file:///home/svn/framework3/trunk@12718 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-25 16:45:20 +00:00
HD Moore ecaeac1f6e Only override the server header if the caller didn't already provide one.
git-svn-id: file:///home/svn/framework3/trunk@12709 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-25 01:51:09 +00:00
Tod Beardsley e09d4fb771 Patch from chlee for the nexpose XML parser. Adds "potential" as a vulnerable marker (so imports them), adds import cases for description and solution as well.
git-svn-id: file:///home/svn/framework3/trunk@12707 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-25 00:24:20 +00:00
Tod Beardsley 38504b39a8 Warn the user if there's a truncated nmap file.
git-svn-id: file:///home/svn/framework3/trunk@12704 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-24 21:48:22 +00:00
Tod Beardsley 81e1b41840 Fixes #4578. If the user has Nokogiri of a reasonable version installed, use that to parse Nmap-created XML documents. Otherwise, fall back to the existing REXML parser.
git-svn-id: file:///home/svn/framework3/trunk@12702 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-24 19:40:50 +00:00
James Lee ad2880ce67 merge chao-mu's patches for railgun testing, fixes #4015, thanks!
git-svn-id: file:///home/svn/framework3/trunk@12697 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-23 22:20:45 +00:00
James Lee 9311f5b198 add a unit test for ring buffer. all these tests pass on 1.8.7-p299, 1.9.1-p378, and 1.9.2-p180
git-svn-id: file:///home/svn/framework3/trunk@12694 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-23 19:15:00 +00:00
James Lee d1e2f274f9 add ability to use arbitrary certs with SSL server sockets.
git-svn-id: file:///home/svn/framework3/trunk@12675 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-20 23:12:35 +00:00
James Lee 81eb15148f add a new fingerprint for unpatched ie7 on vista
git-svn-id: file:///home/svn/framework3/trunk@12660 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-19 00:57:30 +00:00
James Lee 0f9e7f640e add a new fingerprint for latest ie8 on win7
git-svn-id: file:///home/svn/framework3/trunk@12659 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-18 22:42:46 +00:00
Tod Beardsley 60dcac616e Renames some nessus-imported vulnerabilities to drop the NSS identifier and just stick with the plugin name (if available). Also drops junk NSS-0 vulnerabilities.
git-svn-id: file:///home/svn/framework3/trunk@12653 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-17 22:18:43 +00:00
James Lee e823a885bc avoid nil.downcase for old egghunter usage
git-svn-id: file:///home/svn/framework3/trunk@12652 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-17 21:55:48 +00:00
James Lee c5f79f1176 make parsing a little easier for obfuscation
git-svn-id: file:///home/svn/framework3/trunk@12650 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-17 20:35:18 +00:00
James Lee 7c2455b704 un-revert the last of r12600's overzealousness. see #4378 and r12569
git-svn-id: file:///home/svn/framework3/trunk@12649 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-17 17:40:48 +00:00
Tod Beardsley f542bdbb84 Fixes r12634, should be a regex not a not-equal. Using unless instead of if to avoid negative matching.
git-svn-id: file:///home/svn/framework3/trunk@12648 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-17 17:37:04 +00:00
James Lee ad12dffe29 move help_to_s down into CommandDispatcher so each dispatcher will know how to print its own help. see #564
git-svn-id: file:///home/svn/framework3/trunk@12640 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-16 23:03:31 +00:00
Wei Chen db1684395f Added VirtualProtect feature for egghunter
git-svn-id: file:///home/svn/framework3/trunk@12637 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-16 19:00:56 +00:00
Tod Beardsley 5f3e451e4d Fixes #4441. I believe this will solve the empty element problem for the nmap parser, but I'm having trouble reproducing it. Basically it wraps tag_start in a begin/rescue, and will ignore bad calls to nil objects (and nil objects only).
git-svn-id: file:///home/svn/framework3/trunk@12634 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-16 13:49:35 +00:00
HD Moore 9f2ac9ae9f Gracefully handle a failed socket write due to disconnect
git-svn-id: file:///home/svn/framework3/trunk@12626 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-16 02:00:47 +00:00
HD Moore aadee8460d Minor tweak helps syntax highlighters
git-svn-id: file:///home/svn/framework3/trunk@12620 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-15 18:23:40 +00:00
HD Moore c5c4c929b8 Clarify that partial is handled in HTTP
git-svn-id: file:///home/svn/framework3/trunk@12619 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-15 18:23:14 +00:00
HD Moore aa98667a77 Two performance fixes for HTTP Servers. The first reduces latency from 0.25s to near-zero for back-to-back connections by using the Queue class as a notify system. The second switches the slow socket.get for the much faster socket.read
git-svn-id: file:///home/svn/framework3/trunk@12615 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-14 18:34:06 +00:00
Tod Beardsley 7f21eb8406 Allows for nessus imports to grab the plugin name as well as the plugin ID.
git-svn-id: file:///home/svn/framework3/trunk@12609 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-13 16:29:07 +00:00
HD Moore 4500d09c2f Bubble up errors from socket.get_once() and trigger an EOFError when read() returns nil
git-svn-id: file:///home/svn/framework3/trunk@12607 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-13 06:37:15 +00:00
HD Moore 9ce47c01bd Reverting the autoload changes until we can upgrade to a new ActiveSupport library or find a workaround
git-svn-id: file:///home/svn/framework3/trunk@12600 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 20:03:55 +00:00
Joshua Drake 7600f9110e remove some more unecessary requires
git-svn-id: file:///home/svn/framework3/trunk@12595 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 18:33:49 +00:00
Joshua Drake 025c68244b See #4371, fix uninitialized constant Rex::Exploitation::Egghunter
git-svn-id: file:///home/svn/framework3/trunk@12592 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-12 15:03:20 +00:00
James Lee d0614a4be7 fix a few requires in rex in preparation of removing unneeded requires from msf
git-svn-id: file:///home/svn/framework3/trunk@12587 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-11 23:28:12 +00:00
James Lee 7837e64b85 remove cruft leftover from the dawn of time
git-svn-id: file:///home/svn/framework3/trunk@12586 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-11 22:55:25 +00:00
Joshua Drake af45f0166f re-unbreak omelet code
git-svn-id: file:///home/svn/framework3/trunk@12572 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-09 22:42:41 +00:00
David Rude 2de7f9eb30 fixes a stack trace in converting a char to hex in ruby 1.9.x
git-svn-id: file:///home/svn/framework3/trunk@12571 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-09 20:48:40 +00:00
James Lee 2e1d25dad7 store some state so we can associate scripts with the right port/host. fixes #4378
git-svn-id: file:///home/svn/framework3/trunk@12569 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-09 18:10:56 +00:00
Tod Beardsley ce90282884 See #4378 -- this should limit the nmap parser to script tags that are associated only with ports. egyp7 may have a better way with dealing with this though, so not calling it fixed yet.
git-svn-id: file:///home/svn/framework3/trunk@12568 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-09 17:24:43 +00:00
Joshua Drake 05f107f466 Fixes #4371, Converts many uses of require to autoload
git-svn-id: file:///home/svn/framework3/trunk@12554 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 18:47:10 +00:00
Joshua Drake 57b530ccf6 fix up test require path
git-svn-id: file:///home/svn/framework3/trunk@12553 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 18:41:38 +00:00
Joshua Drake d638586d1f fix up test require path
git-svn-id: file:///home/svn/framework3/trunk@12552 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 18:39:19 +00:00
Joshua Drake 3e59f77871 add require, get test running
git-svn-id: file:///home/svn/framework3/trunk@12551 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 18:17:41 +00:00
Joshua Drake 719576b7b9 fix a small bug in omelet hunter, test is now runnable
git-svn-id: file:///home/svn/framework3/trunk@12550 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 18:14:10 +00:00
Joshua Drake 849c2d682c remove crufty require
git-svn-id: file:///home/svn/framework3/trunk@12549 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 18:12:38 +00:00
James Lee c3d66f276f return the proper thing in add_route() and remove_route(), make sure each comm responds to :routes before trying to delete them. fixes several unit test failures.
git-svn-id: file:///home/svn/framework3/trunk@12548 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 17:30:25 +00:00
Joshua Drake 6e4049cb2c add some error messages to this test
git-svn-id: file:///home/svn/framework3/trunk@12547 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-06 17:22:09 +00:00
James Lee e621828cac check for a nil return value from write(), fixes #4329
git-svn-id: file:///home/svn/framework3/trunk@12528 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-03 06:55:15 +00:00
HD Moore 8d7e8620b2 Map write to syswrite for BufferSock
git-svn-id: file:///home/svn/framework3/trunk@12525 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-03 05:25:41 +00:00
HD Moore 1c86441f12 This removes the abortive_close code for stream sockets, it was leading to inconsistencies in how dead sessions were cleaned up
git-svn-id: file:///home/svn/framework3/trunk@12519 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-03 03:59:02 +00:00
HD Moore b93e134195 Use shell_write vs ring.put
git-svn-id: file:///home/svn/framework3/trunk@12516 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 23:07:02 +00:00
HD Moore d98f8dfd89 Make it clear that all Rex::IO::Stream implementations must accept a second parameter called opts for the read, write, and put methods
git-svn-id: file:///home/svn/framework3/trunk@12515 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 21:39:09 +00:00
HD Moore 366bc8979d Only try to report to the database if the database driver is active. Fixes #4306
git-svn-id: file:///home/svn/framework3/trunk@12512 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 20:29:01 +00:00
HD Moore c668534105 This normalizes openssl non-blocking support across both 1.8.x/1.9.1 and 1.9.2+
git-svn-id: file:///home/svn/framework3/trunk@12509 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 17:25:26 +00:00
HD Moore eb78aac8dd Only try to catch the non-blocking exceptions if they are defined
git-svn-id: file:///home/svn/framework3/trunk@12508 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 16:30:45 +00:00
HD Moore d402ebf6fb Fix #3498 by showing post module options in the info output
git-svn-id: file:///home/svn/framework3/trunk@12506 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 16:06:37 +00:00
Joshua Drake 1eee55b3cf remove a crufty require
git-svn-id: file:///home/svn/framework3/trunk@12502 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 03:42:26 +00:00
James Lee e30d2bbdd4 revert r12476, as it breaks interactive meterpreter channels. r12495 and r12494 should deal with what it was it was trying to solve in the first place. fixes #4293.
git-svn-id: file:///home/svn/framework3/trunk@12496 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-02 00:29:48 +00:00
James Lee a170d37c62 make it a little clearer what getprivs actually does
git-svn-id: file:///home/svn/framework3/trunk@12492 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-01 22:28:09 +00:00
HD Moore 39cab9b076 Correct use of select and expand the listen queue for TCP Servers
git-svn-id: file:///home/svn/framework3/trunk@12484 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 18:08:52 +00:00
Tod Beardsley 140a304032 Specify IO::select for sleep directly.
git-svn-id: file:///home/svn/framework3/trunk@12483 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 17:56:38 +00:00
HD Moore 22537ffbde A few more tweaks to non-blocking ssl mode
git-svn-id: file:///home/svn/framework3/trunk@12482 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 10:24:52 +00:00
HD Moore 96ac0fd51a Swap out exceptions
git-svn-id: file:///home/svn/framework3/trunk@12481 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 08:47:32 +00:00
HD Moore 5758f2ab46 Add support for non-blocking OpenSSL sockets when the Ruby version supports them (1.9.2+ or with openssl-nonblock gem).
git-svn-id: file:///home/svn/framework3/trunk@12480 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 07:59:33 +00:00
HD Moore 6bdf2a4e2b Proactively wrap each() in other Hash based classes to avoid situations that trigger modification during enumeration
git-svn-id: file:///home/svn/framework3/trunk@12479 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 04:59:27 +00:00
HD Moore 20c949d1fb Fix some bad copypasta from non-blocking write commit. This should make stream sessions happy again.
git-svn-id: file:///home/svn/framework3/trunk@12476 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 04:25:42 +00:00
Matt Weeks e99b5a4f35 Un-break DHCP server when not using served_over.
Variable must be initialized before use regardless of whether HOSTNAME is defined.




git-svn-id: file:///home/svn/framework3/trunk@12471 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-29 22:58:55 +00:00
James Lee 0978047673 clean up help a little for several meterpreter file commands
git-svn-id: file:///home/svn/framework3/trunk@12451 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-27 00:38:15 +00:00
HD Moore 8ba356271f Fixes #4223 on Windows by catching the specific exception class
git-svn-id: file:///home/svn/framework3/trunk@12450 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-27 00:20:32 +00:00
Tod Beardsley 2031c0d288 Importing Nexpose reports should retain test keys (which are usually some kind of proof or expanded details about a vulnerability).
git-svn-id: file:///home/svn/framework3/trunk@12442 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-26 17:31:26 +00:00
HD Moore b24b787e0a Add the right class wrappers
git-svn-id: file:///home/svn/framework3/trunk@12426 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-24 19:35:25 +00:00
HD Moore 4426a1b7f2 Port of the python Manifest.mbdb parser
git-svn-id: file:///home/svn/framework3/trunk@12424 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-24 18:21:13 +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
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
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
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
Jonathan Cran 0437d20f9d Commit railgun tests from chao-mu: http://blog.minorcrash.com/2011/04/railgun-update-1st-milestone-almost.html
~/framework$ ruby lib/rex/post/meterpreter/extensions/stdapi/railgun.rb.ts.rb 
Loaded suite lib/rex/post/meterpreter/extensions/stdapi/railgun.rb.ts
Started
.............
Finished in 8.804126009 seconds.
13 tests, 30 assertions, 0 failures, 0 errors






git-svn-id: file:///home/svn/framework3/trunk@12366 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-19 14:15:45 +00:00
HD Moore f1f15ba448 Allow socks4a to relay through meterpreter
git-svn-id: file:///home/svn/framework3/trunk@12353 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-18 18:17:49 +00:00
HD Moore 1b63d36c85 Fix typo reported by mubix
git-svn-id: file:///home/svn/framework3/trunk@12346 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-18 04:40:06 +00:00
Mario Ceballos 1d0d6195bd fixes a load error
git-svn-id: file:///home/svn/framework3/trunk@12344 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-17 02:08:42 +00:00
James Lee 03fdd9a0d0 add support method used in previous commit (r12341)
git-svn-id: file:///home/svn/framework3/trunk@12342 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-17 00:35:32 +00:00
James Lee c14580adf3 add help for several meterp commands and allow the channel command to do everything the associated with channels (list, interact, read, write, close)
git-svn-id: file:///home/svn/framework3/trunk@12341 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-17 00:34:45 +00:00
James Lee 827bec98d6 ljust the option names so we don't have funky alignment for multi-char option names
git-svn-id: file:///home/svn/framework3/trunk@12335 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-16 15:57:52 +00:00
James Lee 9c1b4ddca5 add a load command. this will later deprecate the use command under meterpreter for 3.7 release
git-svn-id: file:///home/svn/framework3/trunk@12334 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-16 13:59:57 +00:00
James Lee d294f511b6 add logging for interactive meterpreter channels
git-svn-id: file:///home/svn/framework3/trunk@12328 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-15 21:10:15 +00:00
HD Moore 50155919ea Add File.exists? as a wrapper to File.stat
git-svn-id: file:///home/svn/framework3/trunk@12324 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-15 15:29:57 +00:00
Carlos Perez 904e7af88b added API call for extracting keystrokes from client.ui.keyscan_dump
git-svn-id: file:///home/svn/framework3/trunk@12323 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-15 02:21:40 +00:00
James Lee f43fe6e31b clarify the help for getprivs
git-svn-id: file:///home/svn/framework3/trunk@12309 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-13 16:01:40 +00:00
James Lee 05e47166a3 push the check for msf up to the main meterpreter command dispatcher and fire events for file upload/download.
git-svn-id: file:///home/svn/framework3/trunk@12307 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-12 20:39:46 +00:00
James Lee 857b5c786b don't store less accurate nmap fingerprints, see #4099
git-svn-id: file:///home/svn/framework3/trunk@12302 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-11 23:05:07 +00:00
James Lee 36367f8a67 save os version info (usually windows service packs) and close the names tag, so we don't store every xml tag's text as a hostname
git-svn-id: file:///home/svn/framework3/trunk@12298 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-11 22:16:25 +00:00
Mike Smith d5d9d56081 Create a dedicated db table to track sessions & session events.
* Add new db tables for session & session_events
* Migrate existing session data from events db table
* Modify session report methods to log to the new tables


git-svn-id: file:///home/svn/framework3/trunk@12273 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-07 21:59:32 +00:00
James Lee 485211288f doc formatting
git-svn-id: file:///home/svn/framework3/trunk@12237 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-04 18:06:41 +00:00
James Lee cd8866d22f add doc for initialize
git-svn-id: file:///home/svn/framework3/trunk@12235 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-04 17:32:17 +00:00
James Lee dcefdc5f28 whitespace and rdoc fixes
git-svn-id: file:///home/svn/framework3/trunk@12234 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-04 17:27:12 +00:00
James Lee 7444436750 fix directives for rdoc
git-svn-id: file:///home/svn/framework3/trunk@12233 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-04 17:06:59 +00:00
amaloteaux 3e0982a792 enable ntlmv2 by default for smb, mssql and http
git-svn-id: file:///home/svn/framework3/trunk@12227 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-03 21:06:50 +00:00
amaloteaux f9680c854b reworj http ntlm authentificaion and correct some bug
git-svn-id: file:///home/svn/framework3/trunk@12225 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-03 20:38:27 +00:00
amaloteaux b38a187631 mssql login : enable ntlmv2 authentification
git-svn-id: file:///home/svn/framework3/trunk@12223 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-03 17:02:23 +00:00
amaloteaux c5e137d7d3 correct a bug on ntlm signing
git-svn-id: file:///home/svn/framework3/trunk@12211 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-01 20:58:11 +00:00
James Lee b823ea9876 fix undefined method error by using the correct class
git-svn-id: file:///home/svn/framework3/trunk@12169 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-28 18:42:22 +00:00
amaloteaux 19a4a2d88a move some code from lib/rex/proto/smb/client to lib/rex/proto/ntlm/util and add a mini mixin for ntlm
git-svn-id: file:///home/svn/framework3/trunk@12162 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-27 20:14:56 +00:00
Jonathan Cran 3c6b33bd80 continuation of tests / fixes from chao.
git-svn-id: file:///home/svn/framework3/trunk@12155 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-27 00:37:54 +00:00
amaloteaux 08df8179cc mssql login : enable windows authentification and add an encrypion check through tds prelogin mechanism
see issue #402 for some comment on the implementation and the todo's


git-svn-id: file:///home/svn/framework3/trunk@12154 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-27 00:24:19 +00:00
Jonathan Cran d18f14de4e add a test suite for railgun
git-svn-id: file:///home/svn/framework3/trunk@12152 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-26 19:49:08 +00:00
Jonathan Cran 35c33020ca merge in test updates from chao-mu
git-svn-id: file:///home/svn/framework3/trunk@12150 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-26 19:29:59 +00:00
Jonathan Cran 4892a67fa1 small tweaks, remove model - no longer necessary
git-svn-id: file:///home/svn/framework3/trunk@12143 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-26 00:46:55 +00:00
James Lee cf3fbdad71 unneeded require in comments
git-svn-id: file:///home/svn/framework3/trunk@12142 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-26 00:45:52 +00:00
Jonathan Cran 50d573f282 doh! commit the rest of chao's railgun work
git-svn-id: file:///home/svn/framework3/trunk@12141 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-26 00:33:05 +00:00
Jonathan Cran 29061c5799 merge in chao-mu's changes. all tests passing :)
git-svn-id: file:///home/svn/framework3/trunk@12138 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-25 21:16:41 +00:00
James Lee c09be5561d this should have been a raise all along, see r9752
git-svn-id: file:///home/svn/framework3/trunk@12119 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-23 23:15:11 +00:00
James Lee 3527aa2472 correct width calculation for sysinfo
git-svn-id: file:///home/svn/framework3/trunk@12057 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-21 16:58:24 +00:00
Joshua Drake 12ea375d25 See #3183: Pad the plain text before trying DES on it.
git-svn-id: file:///home/svn/framework3/trunk@12033 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-20 08:55:12 +00:00
Matt Weeks a31eadc554 Change IPs before offer instead of between offer and ack. Fixes #3973.
git-svn-id: file:///home/svn/framework3/trunk@12030 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-20 00:33:02 +00:00
Carlos Perez b5bd7599fd Updated usage message to reflect that more than one resource file can be used
git-svn-id: file:///home/svn/framework3/trunk@12017 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-18 02:47:58 +00:00
Carlos Perez 3416862f13 Resource command for Meterpreter Sessions
git-svn-id: file:///home/svn/framework3/trunk@12016 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-18 02:44:15 +00:00
amaloteaux a7d2a34fe2 move comment
git-svn-id: file:///home/svn/framework3/trunk@11972 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-16 00:27:44 +00:00
amaloteaux b7a0a305ee allow psexec to success when SPN validation level is required on windows seven / 2008r2 servers
git-svn-id: file:///home/svn/framework3/trunk@11971 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-16 00:12:07 +00:00
Tod Beardsley b68396351a See #3941. This is a first attempt at supporting driving nmap via a metasploit module. It's a somewhat hefty checkin that includes the Nmap auxiliary mixin as well as an oracle login bruteforce module that uses it.
This definitely needs to be tested on Win32 before it can be called f i x e d, due to the differences between the nmap binaries and the way files are created and used.

Also, the oracle_login scanner could use another once-over for error handling -- don't rely on that yet.

Once this all works the way I expect, I'll document the procedure more thoroghly so people can take advantage.



git-svn-id: file:///home/svn/framework3/trunk@11948 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-13 22:52:50 +00:00
amaloteaux 468f500e31 add a function to detect if ntlm response comes from an empty pwd
git-svn-id: file:///home/svn/framework3/trunk@11936 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-11 20:24:49 +00:00
James Lee dbcb02b8de future-proof the sysinfo command by generically looping over the values returned by the server instead of hardcoding keys
git-svn-id: file:///home/svn/framework3/trunk@11925 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-10 17:23:47 +00:00
amaloteaux b5323c129c when ntlmssp is not used, better to disable signing then raising an error
git-svn-id: file:///home/svn/framework3/trunk@11918 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 21:51:11 +00:00
amaloteaux fea87fb82b enable pass-the-hash when signing is required
git-svn-id: file:///home/svn/framework3/trunk@11917 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 21:13:04 +00:00
amaloteaux 2fa2ca174c use the correct exception
git-svn-id: file:///home/svn/framework3/trunk@11916 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 17:31:53 +00:00
amaloteaux 7755cdd983 correct a bug on ntlmv2_response and comment style compliance
git-svn-id: file:///home/svn/framework3/trunk@11915 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 16:57:33 +00:00
HD Moore 612c2e6796 This commit fixes much of the NTLM crypt code to work properly again, fixing #3918 as well.
git-svn-id: file:///home/svn/framework3/trunk@11914 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 05:04:42 +00:00
HD Moore 046d75533a This patch adds a method for recognizing LM/NTLM hashes, disables signing when no user is specified and the server denies our NTLMSSP logon with an empty user, and cleans up the indents and formatting for some of the new code
git-svn-id: file:///home/svn/framework3/trunk@11912 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 03:35:25 +00:00
HD Moore 315a1cb4f2 Disable signing when we reach this corner case, required to setup null sessions to XP SP2/SP3 (no domain)
git-svn-id: file:///home/svn/framework3/trunk@11910 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 03:08:11 +00:00
amaloteaux b04ac2d446 enable pass-the-hash for ntlmv2 as well, signing is not yet suported
git-svn-id: file:///home/svn/framework3/trunk@11908 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 02:41:50 +00:00
amaloteaux 1f948c1e17 re-enable pass-the-hash for smb client when ntlmv1 or ntlm2_session is used ( ntlmv2 or signing not yet supported but coming soon)
git-svn-id: file:///home/svn/framework3/trunk@11906 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 01:56:09 +00:00
amaloteaux 5f6995e8d3 enable ntlmv2 and signing for smb client stack (pth implementation is coming), fixes #11678 and #152
git-svn-id: file:///home/svn/framework3/trunk@11893 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-07 19:57:53 +00:00
James Lee c775f07a82 this test works, re-enable. fix a 1.9 compat issue.
git-svn-id: file:///home/svn/framework3/trunk@11877 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-04 16:43:20 +00:00