Commit Graph

193 Commits (7989a2920324032bfa5d83567bc92d2428f1eb1f)

Author SHA1 Message Date
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
HD Moore cd4d7d3c47 Handle IPv6 properly (host header parsing) 2011-12-10 13:24:58 -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
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 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
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
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
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
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
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
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
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
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 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
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
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
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 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
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
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
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
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 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
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
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 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
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 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 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 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 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