Commit Graph

453 Commits (9f9bbce034595414c1fe98c616ff650e4c467a05)

Author SHA1 Message Date
HD Moore ceb4888772 Fix up the boilerplate comment to use a better url 2012-02-20 19:40:50 -06:00
Tod Beardsley 8ad9beef75 Removing javascript_keylogger from master. 2012-02-06 09:37:16 -06:00
sinn3r b2ae8a24dc Fix go cow art (tabs are bad to align chars) 2012-02-05 02:20:31 -06:00
sinn3r 0dd3ad0efb Remove naughty trailing commas 2012-02-05 02:03:49 -06:00
sinn3r 26f89f65bd Fix the bug that causes store_loot() to run twice. Also, other minor format changes. 2012-02-05 02:00:03 -06:00
Marcus J. Carey c06b0f7e72 cleaning up an editor glitch. 2012-02-02 17:59:51 -06:00
Marcus J. Carey 1a278c55b5 a bit more cleanup 2012-02-02 16:19:21 -06:00
Marcus J. Carey 45b58bea06 got rid of bmp generation 2012-02-02 16:07:27 -06:00
Marcus J. Carey e96eceb145 Editing Javascript keylogger 2012-02-02 15:01:22 -06:00
Marcus J. Carey 7b3262958d Merge branch 'master' of github.com:threatagent/metasploit-framework
Conflicts:
	modules/auxiliary/server/capture/javascript_keylogger.rb
2012-02-02 14:58:23 -06:00
Marcus J. Carey 59a44f75ec Updated Javascript Keylogger 2012-02-02 14:42:13 -06:00
Marcus J. Carey f45528ec68 Update modules/auxiliary/server/capture/javascript_keylogger.rb 2012-02-02 10:33:33 -06:00
Marcus J. Carey 3bfb8b3c9d Adding Javascript Keylogger 2012-02-02 10:30:55 -06:00
Marcus J. Carey e70f9151e5 Merge remote-tracking branch 'upstream/master' 2012-02-02 07:13:03 -06:00
sinn3r 1dec4c0c45 These modules should use vprint_xxx() instead of print_xxx() ... if datastore['VERBOSE'] 2012-01-30 13:08:35 -06:00
Marcus J. Carey 35de6a593b Update modules/auxiliary/server/html_frame_payload.rb 2012-01-24 17:14:10 -06:00
Marcus J. Carey 2e2726c3c0 Update modules/auxiliary/server/html_frame_payload.rb 2012-01-24 17:06:49 -06:00
Marcus J. Carey 88b1cd6891 Update modules/auxiliary/server/html_frame_payload.rb 2012-01-24 17:03:33 -06:00
Marcus J. Carey 71648159a8 Update modules/auxiliary/server/html_frame_payload.rb 2012-01-24 17:00:47 -06:00
Marcus J. Carey a20bd78f75 Adding html_frame_payload.rb 2012-01-24 16:56:32 -06:00
HD Moore cd4d7d3c47 Handle IPv6 properly (host header parsing) 2011-12-10 13:24:58 -06:00
Tod Beardsley 8ccb68c9df Adding an add_socket() to dhcp and rftp as lauched with a survice
when succesful.

Closing the related pull reuquest for this one.
2011-12-10 03:39:25 -06:00
HD Moore cf28713f9a Mark specific modules as incompatible due to use of quad-dot code 2011-12-05 13:07:36 -06:00
James Lee 67120d4263 msftidy on aux modules, see #5749 2011-11-20 13:12:07 +11:00
HD Moore 43fa2c3d1b Add a gitignore and delete the broken file_autopwn code. Fixes #4964 2011-11-10 20:11:53 -06:00
David Maloney aa4f6c1cae More cred sourcing fixes
git-svn-id: file:///home/svn/framework3/trunk@14193 4d416f70-5f16-0410-b530-b9f4589650da
2011-11-08 18:45:47 +00:00
Wei Chen d98ab06464 This fixes the nil problem with arg. See bug #5848
git-svn-id: file:///home/svn/framework3/trunk@14070 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-25 20:48:17 +00:00
Joshua Drake 62c8c6ea9f big msftidy pass, ping me if there are issues
git-svn-id: file:///home/svn/framework3/trunk@14034 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-23 11:56:13 +00:00
Wei Chen 973227933b Add CVE-2011-1290 as an aux module
git-svn-id: file:///home/svn/framework3/trunk@13994 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-18 16:30:28 +00:00
Wei Chen 975cc52bac Fix spelling errors
git-svn-id: file:///home/svn/framework3/trunk@13983 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-18 00:54:05 +00:00
Tod Beardsley 30ac88694f More msftidy fixes. Now I'm going to get a little more surgical to get this to move faster.
git-svn-id: file:///home/svn/framework3/trunk@13963 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-17 02:58:53 +00:00
Tod Beardsley e9461c766e Msftidy run against a bunch of whitespace violations, a few line too longs.
git-svn-id: file:///home/svn/framework3/trunk@13962 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-17 02:42:01 +00:00
HD Moore 3c73c3c2f8 Pile of small bug fixes for the FTP server and mixin
git-svn-id: file:///home/svn/framework3/trunk@13924 4d416f70-5f16-0410-b530-b9f4589650da
2011-10-14 23:07:09 +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 f9e651d382 Report to DB too.
git-svn-id: file:///home/svn/framework3/trunk@13640 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-25 22:56:22 +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
HD Moore 8b72de1af6 Cosmetic
git-svn-id: file:///home/svn/framework3/trunk@13557 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-13 16:51:49 +00:00
amaloteaux 377c987c1d report hashes captured by htp_ntlm server
git-svn-id: file:///home/svn/framework3/trunk@13496 4d416f70-5f16-0410-b530-b9f4589650da
2011-08-06 14:50:15 +00:00
amaloteaux 08322fc7ea smb capture: split creds.ptype from smb_net_hash to smb_netv1_hash and smb_netv2_hash
smb_netv1_hash correspond to netlmv1/netntlmv1 and netntlm2_session hash type
smb_netv2_hash correspond to netlmv2/netntlmv2 hash type
also removed the domain name from creds.user and added it to the pass column like this DOMAIN:NETLMHASH:NETNTLMHASH:CHALLENGE


git-svn-id: file:///home/svn/framework3/trunk@13372 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-27 17:53:09 +00:00
amaloteaux 95577d3b1b smb_net_hash instead of smb_hash
git-svn-id: file:///home/svn/framework3/trunk@13356 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-27 01:49:53 +00:00
amaloteaux 67a3f7bd75 same for http_ntlm capture
git-svn-id: file:///home/svn/framework3/trunk@13354 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-26 23:47:40 +00:00
amaloteaux 8809182f62 smb capture : correct some minor bug and allow ntlm2_session hashes to be dumped in john and cain format has they can easily crack them too
git-svn-id: file:///home/svn/framework3/trunk@13353 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-26 23:36:45 +00:00
Matt Weeks 0318379ca8 These are not necessary options; the DHCP server has reasonably intelligent defaults. Mark them as such.
git-svn-id: file:///home/svn/framework3/trunk@13164 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-14 02:32:28 +00:00
James Lee 44d7503cc1 prefix most browser autopwn output with the address of the associated client
git-svn-id: file:///home/svn/framework3/trunk@13086 4d416f70-5f16-0410-b530-b9f4589650da
2011-07-01 23:50:07 +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
HD Moore 55b4142ddf Minor cleanup
git-svn-id: file:///home/svn/framework3/trunk@12821 4d416f70-5f16-0410-b530-b9f4589650da
2011-06-02 20:56:55 +00:00
amaloteaux ee55e0cf76 http_ntlm & smb capture : correct john/cain output, Fixes #4565 and completly Fixes #4362 now
git-svn-id: file:///home/svn/framework3/trunk@12683 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-22 14:05:55 +00:00
HD Moore a8c474d7d6 Add the versioned (1.0) RPC backend
git-svn-id: file:///home/svn/framework3/trunk@12679 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-22 03:50:14 +00:00
James Lee 9a2e655c53 test for java explicitly when we have javascript, refactor several things, add a 'list' command, and make the info description more descriptive
git-svn-id: file:///home/svn/framework3/trunk@12670 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-20 09:11:43 +00:00
HD Moore cf3bcf2bcf Revert to old behavior for now
git-svn-id: file:///home/svn/framework3/trunk@12635 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-16 14:45:37 +00:00
HD Moore 9c93eda851 Disable Java attacks for IE (breaks the chaining)
git-svn-id: file:///home/svn/framework3/trunk@12632 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-16 04:21:58 +00:00
amaloteaux fd661770ed Fix #4362, thanks to Zack Fasel for report and initial patch
git-svn-id: file:///home/svn/framework3/trunk@12560 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-07 18:52:17 +00:00
Matt Weeks fea1459c50 Update description
git-svn-id: file:///home/svn/framework3/trunk@12559 4d416f70-5f16-0410-b530-b9f4589650da
2011-05-07 02:46:30 +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
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
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
amaloteaux 7e522d9979 http capture : add challenge as an option
git-svn-id: file:///home/svn/framework3/trunk@12231 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-03 23:31:14 +00:00
HD Moore 5ab60f2966 Fixes #3938 by correcting the path for the filename
git-svn-id: file:///home/svn/framework3/trunk@11946 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-13 15:04:16 +00:00
amaloteaux 544fb61aa2 server capture smb will check for empty pass and not display on screen
git-svn-id: file:///home/svn/framework3/trunk@11937 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-11 20:27:22 +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
Joshua Drake 8ef05017b8 style compliance fixes, naughty naughty
git-svn-id: file:///home/svn/framework3/trunk@11796 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-22 20:49:44 +00:00
Joshua Drake 7fb3094bb0 remove "File" from title
git-svn-id: file:///home/svn/framework3/trunk@11746 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-12 22:30:54 +00:00
HD Moore ac651fba6b Merge code from Alexandre Maloteaux, fixes #3615
git-svn-id: file:///home/svn/framework3/trunk@11678 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-30 19:26:35 +00:00
Joshua Drake a0a8ea8cbd re-order includes a bit
git-svn-id: file:///home/svn/framework3/trunk@11641 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-25 21:32:59 +00:00
HD Moore 3794ed35cc Apply patches from Matthew Weeks (scriptjunkie) to fix traversal flaws outlined in his Black Hat DC talk:
https://media.blackhat.com/bh-dc-11/Weeks/BlackHat_DC_2011_Weeks_Counterattack-wp.pdf
https://media.blackhat.com/bh-dc-11/Weeks/BlackHat_DC_2011_Weeks_Counterattack-Slides.pdf



git-svn-id: file:///home/svn/framework3/trunk@11636 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-25 02:24:37 +00:00
Joshua Drake e821f7e757 Fixes #3567, apply patch to make ports/payloads configurable
git-svn-id: file:///home/svn/framework3/trunk@11611 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-20 20:32:18 +00:00
Tod Beardsley 1d7745d449 Add some tracking datastore objects (ParentUUID and AutopwnUUID) to browser_autopwn.rb's exploits and multi/handlers to make exploit tracking a little easier.
git-svn-id: file:///home/svn/framework3/trunk@11592 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 22:15:22 +00:00
James Lee f2661e68db don't respond with 404's for requests that don't match the URIPATH exactly. allows for more generic hash stealing and fixes 3442
git-svn-id: file:///home/svn/framework3/trunk@11576 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-13 20:57:33 +00:00
James Lee 1ecb293010 pass the listener bind address through to handlers
git-svn-id: file:///home/svn/framework3/trunk@11493 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-06 21:18:24 +00:00
James Lee 9c1f7b28e2 pass SSL opt on to submodules
git-svn-id: file:///home/svn/framework3/trunk@11346 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-15 23:02:04 +00:00
Joshua Drake b30270e742 fix version
git-svn-id: file:///home/svn/framework3/trunk@11310 4d416f70-5f16-0410-b530-b9f4589650da
2010-12-12 19:06:18 +00:00
HD Moore cf500fb294 Subtract the stupid
git-svn-id: file:///home/svn/framework3/trunk@10792 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-23 07:09:59 +00:00
Joshua Drake ae04e34cf7 fix some non-full-namespace includes
git-svn-id: file:///home/svn/framework3/trunk@10617 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-09 06:55:52 +00:00
Joshua Drake 840824e3e8 remove unexplained binary characters
git-svn-id: file:///home/svn/framework3/trunk@10588 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-07 16:22:16 +00:00
James Lee 3d26c54bd7 preserve some more datastore bits
git-svn-id: file:///home/svn/framework3/trunk@10518 4d416f70-5f16-0410-b530-b9f4589650da
2010-10-01 14:06:59 +00:00
James Lee 0001550e6d String#to_a was removed in 1.9.2, replace with [ str ] for compat
git-svn-id: file:///home/svn/framework3/trunk@10448 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-23 21:17:41 +00:00
James Lee aa1d8e403f make sure the list of handler jobs is initialized in case we hit cleanup before exploits have started
git-svn-id: file:///home/svn/framework3/trunk@10430 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 22:43:50 +00:00
HD Moore 3204b3ad83 Patch for the SMB timestamp parser which allows it to function in GMT+ zones
git-svn-id: file:///home/svn/framework3/trunk@10425 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 14:21:38 +00:00
HD Moore 76b14e5db7 Invert logic for consistency
git-svn-id: file:///home/svn/framework3/trunk@10403 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 00:06:18 +00:00
HD Moore 74e5c38fe8 Make the challenge configurable via patch from troulouliou
git-svn-id: file:///home/svn/framework3/trunk@10402 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-21 00:05:08 +00:00
Joshua Drake 4590844871 tons of indentation fixes, some other style tweaks
git-svn-id: file:///home/svn/framework3/trunk@10394 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 08:06:27 +00:00
Joshua Drake 78188beb6b change from capture to service
git-svn-id: file:///home/svn/framework3/trunk@10393 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-20 08:05:50 +00:00
James Lee 5f0cc946b1 document report_note a little better, and modify several modules to use it correctly. fixes #2568
git-svn-id: file:///home/svn/framework3/trunk@10377 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-19 22:25:56 +00:00
Stephen Fewer 5e2295a9a8 Add in an aux module to create a socks4 proxy server. If you add in a route via a meterpreter session to the framework routing table the proxy server will use that route where appropriate. (Also modified the servers opts hash to optionally take a 'Comm' param if you want to programmatically create a socks4 server which will always use a specific meterpreter session for all socket creation - by default this does not happen and it uses the rex socket switchboard as per normal rex socket creation).
git-svn-id: file:///home/svn/framework3/trunk@10337 4d416f70-5f16-0410-b530-b9f4589650da
2010-09-16 18:23:03 +00:00
James Lee 94aac0c517 dunno why i never thought of this before. clean up spawned exploits when stopping browser_autopwn
git-svn-id: file:///home/svn/framework3/trunk@10197 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-30 22:17:26 +00:00
James Lee 080f662595 make the LPORT_JAVA option actually visible
git-svn-id: file:///home/svn/framework3/trunk@10195 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-30 21:36:38 +00:00
Joshua Drake 6e48076249 fixes #2435, add BROADCAST option to DHCP server, use in cases where sending to 255.255.255.255 fails
git-svn-id: file:///home/svn/framework3/trunk@10159 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-26 19:34:53 +00:00
James Lee 56396a6d8b add java support to browser_autopwn
git-svn-id: file:///home/svn/framework3/trunk@10089 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-20 20:49:33 +00:00
Joshua Drake 621c0e9829 add args to call, fixes #2352
git-svn-id: file:///home/svn/framework3/trunk@10048 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 23:20:16 +00:00
Tod Beardsley 6d6a547b34 Fixes #2412. Adds a creds table, modifies the db_report_auth API, adds the db_creds and db_add_cred commands.
git-svn-id: file:///home/svn/framework3/trunk@10034 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-18 00:58:20 +00:00
Joshua Drake cb445588e0 fix problem with unclosed sockets
git-svn-id: file:///home/svn/framework3/trunk@10012 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-14 04:58:27 +00:00
Joshua Drake 939bf2a881 merge dhcp.diif from scriptjunkie, see #2329
git-svn-id: file:///home/svn/framework3/trunk@9990 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-13 03:11:30 +00:00
Joshua Drake d540818f01 split http exploit mixin into http/server and http/client
git-svn-id: file:///home/svn/framework3/trunk@9971 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-07 06:59:16 +00:00
Joshua Drake 7f8bbbc535 add dhcp/pxe stuff from scriptjunkie, see #2329
git-svn-id: file:///home/svn/framework3/trunk@9963 4d416f70-5f16-0410-b530-b9f4589650da
2010-08-06 17:37:28 +00:00
Joshua Drake f6033b9bd6 change some print_status to print_error, rename a few msft modules using msb convention
git-svn-id: file:///home/svn/framework3/trunk@9929 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-25 21:37:54 +00:00
James Lee 515edead31 make DOMAINBYPASS an OptString instead of OptAddress so it doesn't have to be a single domain and doesn't have to resolv at startup. fixes #2272
git-svn-id: file:///home/svn/framework3/trunk@9857 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-19 16:10:30 +00:00
Joshua Drake d07e613504 style compliance fixes
git-svn-id: file:///home/svn/framework3/trunk@9842 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-16 02:33:25 +00:00
James Lee b4643b6c4c add advanced options to mimic meterpreter payload options and pass them on appropriately. fixes #2186
git-svn-id: file:///home/svn/framework3/trunk@9790 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-12 05:19:38 +00:00
James Lee f80d08651f document.write breaks stuff. build a div and put stuff in it instead
git-svn-id: file:///home/svn/framework3/trunk@9786 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-12 00:45:37 +00:00
James Lee eab025103c include non-javascript exploits when javascript is on
git-svn-id: file:///home/svn/framework3/trunk@9785 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-11 23:53:47 +00:00
James Lee 212d9c3fd3 workaround the new module behaviour of copying for jobs by grabbing the copy out of the job context
git-svn-id: file:///home/svn/framework3/trunk@9761 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-09 23:57:54 +00:00
Joshua Drake ad9f0d91b9 add tftp server auxiliary
git-svn-id: file:///home/svn/framework3/trunk@9743 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-08 23:34:33 +00:00
Joshua Drake 310b548b67 indent-fu
git-svn-id: file:///home/svn/framework3/trunk@9656 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 23:48:55 +00:00
Joshua Drake 97b016cb70 missed one binary mode change
git-svn-id: file:///home/svn/framework3/trunk@9654 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 23:45:49 +00:00
Joshua Drake 0882838491 ensure binary mode when opening files, whitespace fixes
git-svn-id: file:///home/svn/framework3/trunk@9653 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 23:33:07 +00:00
HD Moore 771deac360 Adds domain bypass support from Rudy Ruiz
git-svn-id: file:///home/svn/framework3/trunk@9644 4d416f70-5f16-0410-b530-b9f4589650da
2010-07-01 19:57:03 +00:00
James Lee 96cd7bddae compatibility for 1.9. fixes #2143
git-svn-id: file:///home/svn/framework3/trunk@9622 4d416f70-5f16-0410-b530-b9f4589650da
2010-06-25 05:52:05 +00:00
Joshua Drake 0e72894e58 more cleanups
git-svn-id: file:///home/svn/framework3/trunk@9212 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-03 17:13:09 +00:00
Joshua Drake 0ea6eca4bc big module whitespace/formatting cleanup pass
git-svn-id: file:///home/svn/framework3/trunk@9179 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-30 08:40:19 +00:00
HD Moore b0425f10cd Cleanup some of the output
git-svn-id: file:///home/svn/framework3/trunk@8942 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-27 22:13:50 +00:00
James Lee a27c941714 targ_host -> target_host
git-svn-id: file:///home/svn/framework3/trunk@8909 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-25 01:09:04 +00:00
James Lee 24d93655bb print the report results even if the db is not available. see #737
git-svn-id: file:///home/svn/framework3/trunk@8898 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-24 16:28:04 +00:00
James Lee bf2a64b3ac use new argument list for get_host
git-svn-id: file:///home/svn/framework3/trunk@8711 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-04 07:59:55 +00:00
James Lee 4f08e6fd25 treat the database as write-only and use the (improved) target cache, fixes 986
git-svn-id: file:///home/svn/framework3/trunk@8708 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-04 07:37:58 +00:00
James Lee b70b17b42a don't use undefined variables.
git-svn-id: file:///home/svn/framework3/trunk@8701 4d416f70-5f16-0410-b530-b9f4589650da
2010-03-03 19:51:05 +00:00
et 26bb74ad6e file autopwn minor fixes
git-svn-id: file:///home/svn/framework3/trunk@8486 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-14 00:06:32 +00:00
et 11cc5b0a32 fix name
git-svn-id: file:///home/svn/framework3/trunk@8484 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-13 23:38:01 +00:00
et 24084024c0 Add file format exploits generator. Kind of a File autopwn. Next step add Emailer
git-svn-id: file:///home/svn/framework3/trunk@8483 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-13 23:32:33 +00:00
James Lee cc41516a79 don't wait for the client reporting
git-svn-id: file:///home/svn/framework3/trunk@8210 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-23 00:17:59 +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
James Lee a81d8d23bd revamp version tests and the way exploits are run. fixes 673
git-svn-id: file:///home/svn/framework3/trunk@7891 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-16 00:13:57 +00:00
HD Moore bcd7343803 Fixes #563. Make fakedns act like a normal passive aux module
git-svn-id: file:///home/svn/framework3/trunk@7640 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-29 15:27:37 +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
James Lee 777317d0ad make sure everybody is using the same SRVHOST. fixes #511
git-svn-id: file:///home/svn/framework3/trunk@7545 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 22:06:32 +00:00
James Lee 68959ece65 use the new DisablePayloadHandler option to reduce the number of open ports required; lports per OS can be modified via advanced options
git-svn-id: file:///home/svn/framework3/trunk@7469 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-11 21:38:30 +00:00
HD Moore e3f68f2639 Another large number of warnings fixed by Yoann Guillot
git-svn-id: file:///home/svn/framework3/trunk@7248 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-25 17:18:23 +00:00
HD Moore b38a74c961 Another mega-patch from Yoann Guillot: fixes warnings generated by method calls with a space betwee the method and the parans, corrects a problem with the alpha encoders that causes them to overwrite the allowed charset, hardcodes the metasm output size of some modules in order to reduce load time, more to come
git-svn-id: file:///home/svn/framework3/trunk@7246 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-25 16:40:19 +00:00
HD Moore b14a4ddf0b Lots of shiny new NTLM goodness from Ryan Linn
git-svn-id: file:///home/svn/framework3/trunk@6958 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-17 20:00:05 +00:00
James Lee 4070c5653b add defanged detection mode. hurray for demoing stuff i haven't committed yet
git-svn-id: file:///home/svn/framework3/trunk@6940 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-06 05:56:24 +00:00
James Lee 13e54d2924 print a useful error message and bail when no exploits are found
git-svn-id: file:///home/svn/framework3/trunk@6916 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-28 11:29:14 +00:00
HD Moore 021e4c7fe1 Dont spoof the apple status page, better off exploiting the browser popup
git-svn-id: file:///home/svn/framework3/trunk@6902 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-26 05:31:29 +00:00
HD Moore 861f35979e Allow for basic authentication and access control in the FTP server module
git-svn-id: file:///home/svn/framework3/trunk@6896 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-25 04:18:37 +00:00
James Lee b386afb4da get rid of debug printing
git-svn-id: file:///home/svn/framework3/trunk@6883 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-23 09:58:13 +00:00
James Lee a467fdded7 allow autopwn sploits to specify compatible os as an array; minor refactor
git-svn-id: file:///home/svn/framework3/trunk@6881 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-23 08:43:54 +00:00
James Lee 739207bf4a merge browser_autopwn back into trunk. This changes the database schema slightly, so make sure to db_destroy and db_create before using the database features.
git-svn-id: file:///home/svn/framework3/trunk@6873 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-22 20:14:35 +00:00
HD Moore ad3e559ff9 Adds a working FTP server module
git-svn-id: file:///home/svn/framework3/trunk@6871 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-22 19:10:45 +00:00
James Lee 529ded22ae reverting last commit; somebody didn't cross their fingers
git-svn-id: file:///home/svn/framework3/trunk@6847 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-19 20:48:47 +00:00
James Lee c3dc1ecb55 reintegrate browser_autopwn into trunk; cross your fingers and hope this works
git-svn-id: file:///home/svn/framework3/trunk@6846 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-19 17:27:36 +00:00
HD Moore 957d894336 Add support for the apple network status check
git-svn-id: file:///home/svn/framework3/trunk@6746 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-06 01:12:55 +00:00
kris 37c2e301ed replacing defunct framework URL in header comments in most modules and pcap_log
git-svn-id: file:///home/svn/framework3/trunk@6479 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-13 14:33:26 +00:00
kris 1eb8c8dfc0 meh, what can I say? I like my name
git-svn-id: file:///home/svn/framework3/trunk@6459 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-03 15:05:35 +00:00
HD Moore f755cc00c0 Adds support for Yahoo! IMAP cookies (thanks Mario De Tore!) fixes a cpu eating loop in the HTTP service.
git-svn-id: file:///home/svn/framework3/trunk@6402 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 05:51:18 +00:00
James Lee 6bd083c441 patch from Jason Wood, adds check for extended capabilities command
git-svn-id: file:///home/svn/framework3/trunk@6346 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-16 08:48:08 +00:00
HD Moore 799d70b59a Let the target know their email did not go very far
git-svn-id: file:///home/svn/framework3/trunk@6339 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-14 03:15:28 +00:00
kris 704a92d43a add name to author list and switch some modules to use it
git-svn-id: file:///home/svn/framework3/trunk@6034 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-20 21:53:17 +00:00
kris 248f1e9fc3 Remove "#{xxx.to_s}" redundancies ('s/\(#{[^}]*\)\.to_s}/\1}/g')
git-svn-id: file:///home/svn/framework3/trunk@6022 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-19 07:11:08 +00:00
James Lee d185cce177 make it easier to comment out specific exploits
git-svn-id: file:///home/svn/framework3/trunk@5981 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-25 08:51:17 +00:00
HD Moore f54d91c53d Add PWFILE for Cain&Abel compatibility (thanks grutz!)
git-svn-id: file:///home/svn/framework3/trunk@5966 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-19 20:42:17 +00:00
James Lee a585fca827 typo fix
git-svn-id: file:///home/svn/framework3/trunk@5958 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-19 06:58:01 +00:00
James Lee 1935ad3ef7 don't advertise to the victim that we're trying to exploit them.
git-svn-id: file:///home/svn/framework3/trunk@5955 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-19 06:01:25 +00:00
James Lee e02574e1fc add new object detection technique to browser_autopwn
git-svn-id: file:///home/svn/framework3/trunk@5941 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-17 07:53:44 +00:00
HD Moore f5374fe2d2 Syntax fixups
git-svn-id: file:///home/svn/framework3/trunk@5894 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-12 19:31:11 +00:00
HD Moore c0ffd16629 Patch from antoine, corrected description and pre-calculated hashes
git-svn-id: file:///home/svn/framework3/trunk@5791 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-27 17:58:56 +00:00
HD Moore ce58c15d6e Switch to cain&abel / halflm tables compatible challenge
git-svn-id: file:///home/svn/framework3/trunk@5788 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-26 21:53:36 +00:00
Ramon de C Valle c66d6c4e46 Set property 'svn:keywords'
git-svn-id: file:///home/svn/framework3/trunk@5783 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-23 02:43:21 +00:00
Ramon de C Valle f124597a56 Code cleanups
git-svn-id: file:///home/svn/framework3/trunk@5773 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-19 21:03:39 +00:00
HD Moore c1aa7babb7 Add the telnet capture module from Kris Katterjohn
git-svn-id: file:///home/svn/framework3/trunk@5711 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-02 22:43:20 +00:00
HD Moore fd256ec4a1 This massive commit changes the metasploit 3 module format. The new syntax allows for greater scalability and future improvements to the metasploit module loader. This change also makes it easier for users to add new modules, since the class name no longer needs to match the directory structure.
git-svn-id: file:///home/svn/framework3/trunk@5709 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-02 05:23:59 +00:00
Ramon de C Valle a4ee57c476 Applied patch from Kris Katterjohn to to correct the status message printed for logins.
git-svn-id: file:///home/svn/framework3/trunk@5697 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-30 01:50:08 +00:00
HD Moore b0225127cf Patch for Ruby 1.9 compat (not there yet)
git-svn-id: file:///home/svn/framework3/trunk@5674 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-22 15:52:18 +00:00
James Lee 8e97503333 fix bug where random URIPATHs sent 404 instead of exploits
git-svn-id: file:///home/svn/framework3/trunk@5657 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-13 04:07:28 +00:00
James Lee 49e0daf140 bug fix for firefox 1.0; minor code cleanup, better naming
git-svn-id: file:///home/svn/framework3/trunk@5648 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-01 05:19:28 +00:00
HD Moore eae5315ab7 Apply patch for disabling console logging of DNS requests
git-svn-id: file:///home/svn/framework3/trunk@5621 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-08 21:20:25 +00:00
HD Moore 83248c3d60 Better parsing in proxy mode, ignore checkbox values
git-svn-id: file:///home/svn/framework3/trunk@5620 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-08 06:38:59 +00:00
HD Moore cc8ae206b6 First batch of karmetasploit updates
git-svn-id: file:///home/svn/framework3/trunk@5618 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-08 06:00:30 +00:00
HD Moore bfa20906fb Fix a bug in fakedns when TARGETHOST is not an IP address
git-svn-id: file:///home/svn/framework3/trunk@5616 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-08 03:46:07 +00:00
HD Moore 3cf81f257e Ensure that the Content-Type is set to text/html by default.
git-svn-id: file:///home/svn/framework3/trunk@5615 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-08 02:37:54 +00:00
HD Moore 9b56053974 Add timestamps, researching something
git-svn-id: file:///home/svn/framework3/trunk@5601 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-26 03:16:25 +00:00
HD Moore afa0623e6e Better logging
git-svn-id: file:///home/svn/framework3/trunk@5600 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-26 02:59:56 +00:00
HD Moore 067d19051e Do not reply to non TXT records for now
git-svn-id: file:///home/svn/framework3/trunk@5599 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-26 02:53:49 +00:00
HD Moore 4f67ae9186 Log the name correctly and fix the whitespace issues
git-svn-id: file:///home/svn/framework3/trunk@5582 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-23 21:59:57 +00:00
HD Moore e0f773d14d Lower the ttl
git-svn-id: file:///home/svn/framework3/trunk@5576 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-23 17:46:07 +00:00
James Lee 5cfdffc395 add ie_createobject to browser_autpwn
git-svn-id: file:///home/svn/framework3/trunk@5573 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-23 08:26:42 +00:00
James Lee 10f57cedcd fix stupid missing quote bug, thanks MC
git-svn-id: file:///home/svn/framework3/trunk@5571 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-23 06:06:41 +00:00
HD Moore e5018eeec8 Adds a helper service for finding a DNS server's source port
git-svn-id: file:///home/svn/framework3/trunk@5564 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-22 15:51:01 +00:00
James Lee 2d344e64df browser_autopwn now works with mozilla_compareto, mozilla_navigatorjava, and firefox_queryinterface; increased reliability of OS and browser detection
git-svn-id: file:///home/svn/framework3/trunk@5563 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-22 07:28:05 +00:00
HD Moore 798ea895b8 Lots of little tweaks the fake HTTP service
git-svn-id: file:///home/svn/framework3/trunk@5553 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-14 05:36:21 +00:00
James Lee 8800372e46 initial commit of browser_autopwn;
revamp php payloads;
socks5 for IPv6 (untested)



git-svn-id: file:///home/svn/framework3/trunk@5546 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-01 01:44:56 +00:00
HD Moore 5221b25aba Check for an empty HTTP request before trying to process it
git-svn-id: file:///home/svn/framework3/trunk@5542 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-27 19:57:53 +00:00
HD Moore d700c51e1a Updated to not log DNS queries by default
git-svn-id: file:///home/svn/framework3/trunk@5540 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-25 23:04:19 +00:00
HD Moore 16170bd716 Let the GUI handle -r, change default window size to fit smaller screens, updated HTTP capture code, added keywords to payload
git-svn-id: file:///home/svn/framework3/trunk@5491 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-22 23:20:35 +00:00
HD Moore 84d921633b Fun with saved passwords
git-svn-id: file:///home/svn/framework3/trunk@5490 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-22 18:48:21 +00:00
HD Moore 70fde3052d Place the UNC url last
git-svn-id: file:///home/svn/framework3/trunk@5487 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-21 22:02:39 +00:00
HD Moore 2084024822 Small bugfixes to HTTP capture
git-svn-id: file:///home/svn/framework3/trunk@5486 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-21 21:49:10 +00:00
HD Moore 1b96107f3a Bugfix
git-svn-id: file:///home/svn/framework3/trunk@5485 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-21 21:37:40 +00:00
HD Moore 929888a714 Configurable HTTP capture service
git-svn-id: file:///home/svn/framework3/trunk@5484 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-21 21:04:11 +00:00
HD Moore 3cdb74e572 Add the CTS/RTS and DEAUTH modules. Improve HTTP capture module error handling
git-svn-id: file:///home/svn/framework3/trunk@5483 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-21 05:41:53 +00:00
HD Moore 82330fff7e Importing two new wireless DoS modules, setting svn:keywords flags where needed.
git-svn-id: file:///home/svn/framework3/trunk@5482 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-21 05:27:06 +00:00
HD Moore 57131f98c3 Adding I)ruids's yp exploit. Fixing a streamserver bug thats been causing problems for a while. Updating the HTTP capture module to do better fingerprinting
git-svn-id: file:///home/svn/framework3/trunk@5477 4d416f70-5f16-0410-b530-b9f4589650da
2008-04-18 01:33:09 +00:00
HD Moore 00c2355da4 Switch back to client.put
git-svn-id: file:///home/svn/framework3/trunk@5459 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-26 22:05:40 +00:00
HD Moore a018fdc49b Support a background image
git-svn-id: file:///home/svn/framework3/trunk@5458 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-26 22:00:23 +00:00
HD Moore 78f66dc33c Handle PTR records
git-svn-id: file:///home/svn/framework3/trunk@5457 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-24 13:37:41 +00:00
HD Moore 36376e10be Add sigs for iphone usage
git-svn-id: file:///home/svn/framework3/trunk@5455 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-22 07:13:47 +00:00
HD Moore 9b4c7faf6c Handle STAT and QUIT and RSET and LIST
git-svn-id: file:///home/svn/framework3/trunk@5454 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-22 06:52:11 +00:00
HD Moore 44dd367da2 Allow logins and print unhandled commands.
git-svn-id: file:///home/svn/framework3/trunk@5453 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-22 06:47:05 +00:00
HD Moore 1ea29ba8f0 Fixes #218. Updates the http password capture module. Removes a bogus makefile from the tree
git-svn-id: file:///home/svn/framework3/trunk@5452 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-22 06:34:52 +00:00
HD Moore 8138c2259f Busted constant
git-svn-id: file:///home/svn/framework3/trunk@5451 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-22 05:40:34 +00:00
HD Moore 09cee75408 Adds the start of a http responder, fixes for dns and smb
git-svn-id: file:///home/svn/framework3/trunk@5426 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-02 08:03:27 +00:00
HD Moore 25670d238c Fake DNS server, spawned from Dino's KARMA DnsService
git-svn-id: file:///home/svn/framework3/trunk@5425 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-02 07:24:05 +00:00
HD Moore 509fc09382 Lots of updates related to <secret project X>.
git-svn-id: file:///home/svn/framework3/trunk@5424 4d416f70-5f16-0410-b530-b9f4589650da
2008-03-02 04:46:13 +00:00
HD Moore 17ce70f24b change spaces to tabs
git-svn-id: file:///home/svn/framework3/trunk@5241 4d416f70-5f16-0410-b530-b9f4589650da
2007-12-31 03:03:08 +00:00
HD Moore 92e3b2eef5 Adding the fake socks server
git-svn-id: file:///home/svn/framework3/trunk@5069 4d416f70-5f16-0410-b530-b9f4589650da
2007-08-08 02:46:31 +00:00
HD Moore f11c160946 This commit adds the smb_sniffer module
git-svn-id: file:///home/svn/framework3/trunk@5021 4d416f70-5f16-0410-b530-b9f4589650da
2007-07-03 04:33:54 +00:00