Commit Graph

1220 Commits (cdc591488c62bc7d56e7203edc5360f1ca63ae6b)

Author SHA1 Message Date
HD Moore 176e999f08 Merge patches from Ryan Linn. Fixes #438
git-svn-id: file:///home/svn/framework3/trunk@7413 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 00:33:40 +00:00
HD Moore 6885ffa48f Improvements to the SSL TCP Server mixin
git-svn-id: file:///home/svn/framework3/trunk@7409 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 00:13:25 +00:00
James Lee 1b7fb68f52 More useful error when given invalid register name, fix error message to be consistent with code when offset is too large
git-svn-id: file:///home/svn/framework3/trunk@7407 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-08 19:42:58 +00:00
HD Moore cae79f8b3b Add a comment describing the extension
git-svn-id: file:///home/svn/framework3/trunk@7394 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 21:00:13 +00:00
HD Moore 836624570b Disabling unfinished ESPIA commands
git-svn-id: file:///home/svn/framework3/trunk@7393 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:58:57 +00:00
HD Moore d82d687ea6 Fixes #478. Handles the screenshot command better, defaults to a random bmp
git-svn-id: file:///home/svn/framework3/trunk@7392 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:58:24 +00:00
HD Moore c5ace6ef28 Use the open_file API
git-svn-id: file:///home/svn/framework3/trunk@7391 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:47:45 +00:00
HD Moore 5d129bdb53 Add open_file() to work around url vs file handling issues on cygwin
git-svn-id: file:///home/svn/framework3/trunk@7390 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:43:00 +00:00
HD Moore 1dad276f58 ...and back again. Looks like cygwin / 1.9.1 DL is a little different
git-svn-id: file:///home/svn/framework3/trunk@7389 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:28:25 +00:00
HD Moore 1a280c3a0a Switch to shell open
git-svn-id: file:///home/svn/framework3/trunk@7388 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:26:05 +00:00
HD Moore 1bb29e2835 See #478. Handle cygwin better for open url
git-svn-id: file:///home/svn/framework3/trunk@7387 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 20:22:28 +00:00
HD Moore 0604fbfd71 Workaround broken cygpath behavior with the cygwin path contains 8.3 names
git-svn-id: file:///home/svn/framework3/trunk@7377 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 16:43:14 +00:00
HD Moore 34d76a72e0 Fixes #462. Handle proxy errors like regular socket errors. This can lead to missing results in tests, so we may need to add special proxy exception checks to the scanner mixin
git-svn-id: file:///home/svn/framework3/trunk@7352 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-04 16:36:06 +00:00
HD Moore 45391a9ba9 Fixes byte vs char handling on Ruby 1.9.1, partial solution for see #430.
git-svn-id: file:///home/svn/framework3/trunk@7349 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-04 05:31:54 +00:00
HD Moore 83fece42fe Handle HTTP failures more gracefully
git-svn-id: file:///home/svn/framework3/trunk@7335 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-03 18:10:09 +00:00
HD Moore 1b5cc24eab See #434. Some libraries used the wrong exception class
git-svn-id: file:///home/svn/framework3/trunk@7325 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-02 18:20:02 +00:00
HD Moore 075b8c5fa4 Fixes #434. Always use Timeout.timeout() -- on Ruby 1.9 this results in the Timeout::TimeoutError exception vs RuntimeError
git-svn-id: file:///home/svn/framework3/trunk@7323 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-02 18:14:57 +00:00
HD Moore 176996fe61 Fixes #452. Solves a number of crashes caused by Regexp.new() on 1.9 without an explicit language specified
git-svn-id: file:///home/svn/framework3/trunk@7320 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-02 17:09:13 +00:00
HD Moore e5e89906d0 Switch the meterpreter to SSLv3 and try to generate a slightly more realistic CN for the certificate. The goal is to work through a wider range of inline proxies.
git-svn-id: file:///home/svn/framework3/trunk@7311 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-31 20:44:23 +00:00
HD Moore 5234fe8ff8 Fixes 416. Adds the rm/del commands to meterpreter, fixes build problems triggered by the POSIX code merge
git-svn-id: file:///home/svn/framework3/trunk@7291 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-27 02:31:07 +00:00
HD Moore 6dcffd0373 Catch attempts to migrate to a name vs a pid
git-svn-id: file:///home/svn/framework3/trunk@7289 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-27 00:56:56 +00:00
HD Moore 8d8bc45dfd Adds a shortcut for getting a shell (execute -f cmd -c -i -H) is now just "shell"
git-svn-id: file:///home/svn/framework3/trunk@7288 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-27 00:47:00 +00:00
HD Moore 5e137e92fd Fixes #381. To scan for TLSv1 only services, set SSLVersion TLS1
git-svn-id: file:///home/svn/framework3/trunk@7282 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 19:48:15 +00:00
HD Moore 478a7ce8ab Fixes #410. Calls the real _close function, not the best solution, but will do until we fix the IO::Stream override.
git-svn-id: file:///home/svn/framework3/trunk@7281 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 19:06:50 +00:00
HD Moore f9f690b0e7 Updated prefetch script and creation of Rex::Script::Completed as a clean way to exit meterpreter scripts
git-svn-id: file:///home/svn/framework3/trunk@7257 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-25 20:50:07 +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
kris b75ef037c3 more tabs vs spaces, and fix a few mismatched indentation levels (def/end, etc)
git-svn-id: file:///home/svn/framework3/trunk@7211 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-20 17:24:33 +00:00
HD Moore a17d96a1ab Remove the last usage of ReadWriteLock in the Socket class. Fixes #383
git-svn-id: file:///home/svn/framework3/trunk@7182 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-18 09:24:36 +00:00
HD Moore 8d9356f40d Minor tweak allows the 'quit' command to work inside of a resource script
git-svn-id: file:///home/svn/framework3/trunk@7177 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-17 16:53:21 +00:00
kris efe44ba6b5 bleh.. a bit of tabs vs spaces
git-svn-id: file:///home/svn/framework3/trunk@7171 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-16 18:27:18 +00:00
kris a4679bc3fc sort meterp use -l output so exts like priv and priv.x64 are grouped together
git-svn-id: file:///home/svn/framework3/trunk@7141 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-11 18:24:38 +00:00
kris 4ba9438e56 Append newline to meterpreter use -l output (was running into prompt)
git-svn-id: file:///home/svn/framework3/trunk@7134 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-09 04:33:59 +00:00
kris 672fd9e977 Meterpreter ipconfig Ruby 1.9 fix. This fixes string indexing errors and
(after that was fixed) the fact that sprintf "%02X" now decides to bail when
given a nil instead of it giving zeros.


git-svn-id: file:///home/svn/framework3/trunk@7133 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-08 16:46:13 +00:00
HD Moore 087a248f16 Remove debugging line;
git-svn-id: file:///home/svn/framework3/trunk@7127 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-04 23:16:28 +00:00
HD Moore c628302e72 Define the full class name for the history variable;
git-svn-id: file:///home/svn/framework3/trunk@7118 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-02 16:17:27 +00:00
HD Moore 304ed6b0a6 During a recursive download, ensure that the local directories are created properly
git-svn-id: file:///home/svn/framework3/trunk@7117 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-02 14:57:25 +00:00
HD Moore 35fcf8c2b2 Swap around rbreadline - load it by default, but also allow the old readline with the -L (--real-readline) parameter to msfconsole. This also fixes absolute path handling for msfconsole command passthrough
git-svn-id: file:///home/svn/framework3/trunk@7115 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-02 14:17:03 +00:00
HD Moore 5f010aa4b9 Fix some remaining 1.9 compatibility issues
git-svn-id: file:///home/svn/framework3/trunk@7105 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-01 16:01:53 +00:00
James Lee 53e3f166f8 make x86/nonupper raise the right exception type, prettify some formatting
git-svn-id: file:///home/svn/framework3/trunk@7083 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-28 05:23:23 +00:00
HD Moore 714e887a60 Fixes #313. Makes some usage changes to ET's screenshot method, tested on XP SP3 with no problems
git-svn-id: file:///home/svn/framework3/trunk@7073 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-27 18:42:34 +00:00
Stephen Fewer 1a220d6dc5 add java payload jsp_shell_reverse_tcp.
git-svn-id: file:///home/svn/framework3/trunk@7071 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-27 18:35:07 +00:00
HD Moore 5be5a20ba7 fixes #285. Corrects SSL init to be after proxies, fixes issues with 1.9.1 compatibility and SOCKS support
git-svn-id: file:///home/svn/framework3/trunk@7070 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-27 15:36:30 +00:00
et a89914d448 Finally screenshot capture. BMP at this time
git-svn-id: file:///home/svn/framework3/trunk@7063 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-26 04:05:09 +00:00
HD Moore 479add54e1 Mostly fix file information in listings -- Ruby 1.8.x used the builtin FileStat, 1.9 now users our own, and the offsets were off from the stat structure
git-svn-id: file:///home/svn/framework3/trunk@7054 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-23 21:20:09 +00:00
HD Moore 5e37dfa040 Fixes #325. Dont pass nil to the FileStat constructor, be strict about class path
git-svn-id: file:///home/svn/framework3/trunk@7049 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-20 22:12:46 +00:00
HD Moore 602b1a2efd Adds the 'clearev' command, see #317
git-svn-id: file:///home/svn/framework3/trunk@7048 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-20 22:05:44 +00:00
Stephen Fewer 1937839e79 Patch meterpreter's sysinfo command to resolve the system language and architecture.
git-svn-id: file:///home/svn/framework3/trunk@7028 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-10 13:09:48 +00:00
HD Moore 09eb693a97 Fix cygwin check
git-svn-id: file:///home/svn/framework3/trunk@7003 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-04 15:11:28 +00:00
Stephen Fewer d584b4d314 Fixed migrate for x64 meterpreter (Tested on Win 7 and 2003).
git-svn-id: file:///home/svn/framework3/trunk@6999 4d416f70-5f16-0410-b530-b9f4589650da
2009-09-04 01:40:48 +00:00
et 04491c7fb1 Fix small bug when str nil
git-svn-id: file:///home/svn/framework3/trunk@6979 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-27 04:56:38 +00:00
HD Moore 97fed166a3 Fixes #312. Thanks for the patch!
git-svn-id: file:///home/svn/framework3/trunk@6978 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-27 01:28:48 +00:00
HD Moore ec61dca868 Patch to make table output on the console more readable by removing the last column's padding, submitted by jduck. Thanks!
git-svn-id: file:///home/svn/framework3/trunk@6974 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-25 09:50:14 +00:00
HD Moore cf10a62dcc Merge in the beginnings of x64 support from Stephen Fewer
git-svn-id: file:///home/svn/framework3/trunk@6972 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-23 23:47:33 +00:00
James Lee 4dc13a9e8c fix a bug in colorization where %c gets replaced before %cya; wouldn't have been a problem until colorization gets put back in
git-svn-id: file:///home/svn/framework3/trunk@6962 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-18 04:54:58 +00:00
James Lee bd2da7c12a revert overzealous commit
git-svn-id: file:///home/svn/framework3/trunk@6961 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-18 04:53:35 +00:00
James Lee 08d50e0a5b fix a bug in colorization where %c gets replaced before %cya; wouldn't have been a problem until colorization gets put back in
git-svn-id: file:///home/svn/framework3/trunk@6960 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-18 04:49:16 +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 1ceb752986 clean up opera detection code a bit, and add 9.62 platform detection
git-svn-id: file:///home/svn/framework3/trunk@6939 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-06 05:54:36 +00:00
HD Moore 02443b3721 One more cleanup, everything loads cleanly now
git-svn-id: file:///home/svn/framework3/trunk@6930 4d416f70-5f16-0410-b530-b9f4589650da
2009-08-01 04:08:25 +00:00
James Lee 89eb1c5cc9 differentiate between firefox and safari and use some more standards-friendly string idioms
git-svn-id: file:///home/svn/framework3/trunk@6910 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-28 03:55:47 +00:00
James Lee 8e32779329 remove redundant code
git-svn-id: file:///home/svn/framework3/trunk@6909 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-28 00:02:25 +00:00
James Lee ce4e63e209 more reliable os detection on firefox
git-svn-id: file:///home/svn/framework3/trunk@6908 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-27 17:54:55 +00:00
HD Moore 2902a47d6d Remove busted unicode from the javascript os detect, this caused errors on 1.9.1
git-svn-id: file:///home/svn/framework3/trunk@6894 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-25 03:46:08 +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 756b1ab020 Add the OpenSSL require to meterpreter
git-svn-id: file:///home/svn/framework3/trunk@6869 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-22 18:37:51 +00:00
HD Moore b3e36e5692 Reduce the size of the generated executables (works better with sqlmap and other tools that need small exes). Payloads are now capped at 2048 and the amount of random data appended to the exe has been reduced.
git-svn-id: file:///home/svn/framework3/trunk@6849 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-20 13:55:29 +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 f8c2a203fd OSVDB references updates from Steve Tornio
git-svn-id: file:///home/svn/framework3/trunk@6812 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-16 16:02:24 +00:00
kris 3f5ee3d34b Don't raise "Invalid codepage 1252, only 1252 supported" in Rex::Text.to_unicode
for uhwtfms-half.  It always failed if passed something other than an empty str


git-svn-id: file:///home/svn/framework3/trunk@6793 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-14 00:01:04 +00:00
kris df9283d1b2 strip Rex::ExtTime.sec_to_s return val to remove ever-present trailing space
git-svn-id: file:///home/svn/framework3/trunk@6790 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-13 23:32:35 +00:00
kris c7515f15d7 a few simple changes (e.g., pack('V') -> pack_dword() where applicable)
git-svn-id: file:///home/svn/framework3/trunk@6785 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-13 22:26:27 +00:00
HD Moore 5fb316b383 Integrates L4teral's JS encoder/encrypter
git-svn-id: file:///home/svn/framework3/trunk@6784 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-13 22:17:11 +00:00
HD Moore 303e4eab71 Enable broadcast support for all datagram sockets, remove the broadcast parameter entirely.
git-svn-id: file:///home/svn/framework3/trunk@6780 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-13 15:24:46 +00:00
HD Moore bab394fa8f Typo fix - thanks Robin Wood!
git-svn-id: file:///home/svn/framework3/trunk@6779 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-13 15:11:11 +00:00
HD Moore 9068b9a133 Adds the Broadcast parameter to the Rex::Socket class, allows udp/ip sockets to send to broadcast addresses
git-svn-id: file:///home/svn/framework3/trunk@6778 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-13 13:19:31 +00:00
HD Moore e8784d68fb Fixes up the sniffer to handle large packet captures better, fixes a regression in the sysinfo command.
git-svn-id: file:///home/svn/framework3/trunk@6768 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-12 13:17:37 +00:00
HD Moore 82cf85680c Adds the sniffer extension for testing
git-svn-id: file:///home/svn/framework3/trunk@6762 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-11 13:39:43 +00:00
HD Moore 608ca7aae8 This patch removes some of the meterpreter compiler warnings and fixes migration over SSL
git-svn-id: file:///home/svn/framework3/trunk@6761 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-09 22:44:33 +00:00
kris c83e84f2d1 fix Rex::Socket::SubnetWalker num_ips; off by one
git-svn-id: file:///home/svn/framework3/trunk@6760 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-09 22:39:30 +00:00
kris 913181b16a factor out some code
git-svn-id: file:///home/svn/framework3/trunk@6759 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-09 21:45:52 +00:00
HD Moore 7b516e06fe Transfer the migration payload over SSL, still working on a crash bug after migration completes
git-svn-id: file:///home/svn/framework3/trunk@6756 4d416f70-5f16-0410-b530-b9f4589650da
2009-07-09 03:22:10 +00:00
HD Moore a74d3a3f38 Switches meterpreter to SSL by default, using the PolarSSL library. To build this, just place polarssl.lib into an workspace/common/Release/
git-svn-id: file:///home/svn/framework3/trunk@6718 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-26 23:18:53 +00:00
HD Moore 45afe789af Test case update
git-svn-id: file:///home/svn/framework3/trunk@6717 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-26 03:01:11 +00:00
HD Moore e27691c543 Performance and debugging improvements from Yoann Guillot
git-svn-id: file:///home/svn/framework3/trunk@6712 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-25 17:59:51 +00:00
HD Moore 977447f56a Add support for section dumping
git-svn-id: file:///home/svn/framework3/trunk@6686 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-20 17:53:53 +00:00
HD Moore 2283e0ffe4 Update executable template and API
git-svn-id: file:///home/svn/framework3/trunk@6682 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-20 17:42:17 +00:00
HD Moore cd12fc0ca2 Ruby 1.9.1 fixes for incognito (thanks Carlos!)
git-svn-id: file:///home/svn/framework3/trunk@6681 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-20 16:55:40 +00:00
HD Moore d9792d4beb More ruby-1.9.1 compatibility fixes
git-svn-id: file:///home/svn/framework3/trunk@6679 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-20 14:26:22 +00:00
HD Moore 58fb65d4ef Another ruby 1.9.1 compatibility fix
git-svn-id: file:///home/svn/framework3/trunk@6674 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-20 02:42:00 +00:00
HD Moore e6e8a42090 Enforce maximum thread count on windows platforms
git-svn-id: file:///home/svn/framework3/trunk@6672 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-19 21:46:40 +00:00
James Lee 7cb96ed11f typo
git-svn-id: file:///home/svn/framework3/trunk@6665 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-17 01:34:33 +00:00
HD Moore f78482d3f5 Indicate lack of support for ruby 1.9.0, indicate experimental support for ruby 1.9.1
git-svn-id: file:///home/svn/framework3/trunk@6661 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-14 21:30:56 +00:00
HD Moore 5757685b59 Remove the mutex/cv from the meterp handler, use a boring timeout instead, prevents a race on ruby 1.9.1
git-svn-id: file:///home/svn/framework3/trunk@6660 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-14 21:20:30 +00:00
HD Moore 5646e02a8a Fix 1.9.1 compat for msfelfscan
git-svn-id: file:///home/svn/framework3/trunk@6659 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-14 20:18:38 +00:00
HD Moore c1cc193901 Quick update to allow address filtering (find unicode addresses,etc) via the -F [regex] parameter
git-svn-id: file:///home/svn/framework3/trunk@6630 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-08 15:59:38 +00:00
HD Moore 0e35efaea2 Force binary string encoding in ruby 1.9.1, fix up a bad index call in x86.rb
git-svn-id: file:///home/svn/framework3/trunk@6618 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 03:02:42 +00:00
HD Moore 2b4e0f440b Fix up the encoding xor to work with both old and new ruby
git-svn-id: file:///home/svn/framework3/trunk@6617 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 02:30:12 +00:00
HD Moore 51f0e8fc53 Another 1.9.1 compat change, this time for msfmachscan
git-svn-id: file:///home/svn/framework3/trunk@6616 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 01:43:48 +00:00
HD Moore 90af8f03db Fixes up msfpescan/msfelfscan to work with both 1.8.6 and 1.9.1
git-svn-id: file:///home/svn/framework3/trunk@6615 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 01:39:54 +00:00
HD Moore f7a7a528be Moer ruby 1.9.1 fixes for msfpescan
git-svn-id: file:///home/svn/framework3/trunk@6614 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-03 01:24:35 +00:00
HD Moore f81392f938 Dont crash if the PE has no resources
git-svn-id: file:///home/svn/framework3/trunk@6613 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-02 23:40:36 +00:00
HD Moore 147a292825 Minor fixes for ruby 1.9.1 compatibility, still quite a bit more to go
git-svn-id: file:///home/svn/framework3/trunk@6612 4d416f70-5f16-0410-b530-b9f4589650da
2009-06-02 23:36:58 +00:00
HD Moore 3bc44cc395 Consolidate exe generation into a single to_executable() function. Will reduce code in exploit modules dropping later today...
git-svn-id: file:///home/svn/framework3/trunk@6586 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-27 13:37:41 +00:00
HD Moore 6bb267f31d Add disasm method to -r
git-svn-id: file:///home/svn/framework3/trunk@6532 4d416f70-5f16-0410-b530-b9f4589650da
2009-05-08 20:22:25 +00:00
natron 6f8d309949 Passivex fixed. Reverting r6318 for rex/proto/http/packet. Works on IE8, tests on IE6/7 welcome.
git-svn-id: file:///home/svn/framework3/trunk@6514 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-30 20:38:57 +00:00
James Lee fa23424b46 add -l to use and don't list already-loaded extensions in tab completion
git-svn-id: file:///home/svn/framework3/trunk@6509 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-30 06:09:42 +00:00
et a8b64c56b5 Handle encoding of special chars
git-svn-id: file:///home/svn/framework3/trunk@6508 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-29 04:04:40 +00:00
et 03d8541b3f espia early stages
git-svn-id: file:///home/svn/framework3/trunk@6499 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-27 03:43:22 +00:00
James Lee 3a2b0929ab stupid typo
git-svn-id: file:///home/svn/framework3/trunk@6497 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-25 02:12:54 +00:00
HD Moore 3ede3a1d41 Patch from int_80
git-svn-id: file:///home/svn/framework3/trunk@6496 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-23 17:49:04 +00:00
Patrick Webster 0b14dac349 Added rand_text_highascii method.
git-svn-id: file:///home/svn/framework3/trunk@6487 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-16 03:02:41 +00:00
HD Moore 67ab1cca92 Fixed #280. Fix namespace lookup for "FileUtils", thanks grymoire
git-svn-id: file:///home/svn/framework3/trunk@6454 4d416f70-5f16-0410-b530-b9f4589650da
2009-04-02 18:58:36 +00:00
HD Moore 26b9903b0d Changes Auxiliary::Scanner to use a new module instance for each thread, updates associated mixins and modules to support this change.
git-svn-id: file:///home/svn/framework3/trunk@6401 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-28 05:49:33 +00:00
HD Moore 89ecdd9ac8 Mostly working setdesktop code, removed grabdesktop
git-svn-id: file:///home/svn/framework3/trunk@6393 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-25 23:14:14 +00:00
HD Moore 753c7aa7d5 Apply patch to fix SSL server support
git-svn-id: file:///home/svn/framework3/trunk@6391 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-25 16:41:10 +00:00
HD Moore dc68188c3b Patch may resolv slowdowns during local file reads
git-svn-id: file:///home/svn/framework3/trunk@6382 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-23 21:04:39 +00:00
HD Moore 5be1222a1c Adds the meterpreter client-side code for the keylogger
git-svn-id: file:///home/svn/framework3/trunk@6370 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-23 01:25:11 +00:00
HD Moore 7debb6d52b Make sure Rex::Compat is loaded (triggers on msfpescan -D)
git-svn-id: file:///home/svn/framework3/trunk@6352 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-17 21:48:17 +00:00
natron 5069038ecd Fixes meterpreter's migrate function to work on DEP-enabled boxes (ticket 275). Patch by Stephen Fewer (harmonysecurity.com).
git-svn-id: file:///home/svn/framework3/trunk@6347 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-16 21:10:58 +00:00
James Lee 934d08bde2 fix unit tests to reflect new output
git-svn-id: file:///home/svn/framework3/trunk@6325 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-09 05:19:26 +00:00
James Lee 6d9a70c6ad fix codepage_map_cache for unit tests
git-svn-id: file:///home/svn/framework3/trunk@6324 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-09 05:18:33 +00:00
James Lee 491fb6b683 fix double header line bug introduced by my last commit
git-svn-id: file:///home/svn/framework3/trunk@6321 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-08 19:55:47 +00:00
James Lee 96c8f6127c Replace += with << for Strings in a bunch of places.
git-svn-id: file:///home/svn/framework3/trunk@6318 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-08 07:55:47 +00:00
HD Moore 19749865b0 Performance patch from Yoann Guillot <john-metasploit[at]ofjj.net>
git-svn-id: file:///home/svn/framework3/trunk@6316 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-07 23:41:47 +00:00
HD Moore 95f6aa0d02 Revert last commit temporarily
git-svn-id: file:///home/svn/framework3/trunk@6313 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-07 23:00:17 +00:00
HD Moore aa4274a3bb Upgrading metasm...
git-svn-id: file:///home/svn/framework3/trunk@6312 4d416f70-5f16-0410-b530-b9f4589650da
2009-03-07 22:58:19 +00:00
James Lee 616d0fdd46 add background command to meterpreter
git-svn-id: file:///home/svn/framework3/trunk@6257 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-27 03:12:20 +00:00
kris 08745cc6fd several typos
git-svn-id: file:///home/svn/framework3/trunk@6240 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-21 19:22:06 +00:00
kris e05b74a00c Don't use old OpenSSL::Digest::Digest
git-svn-id: file:///home/svn/framework3/trunk@6239 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-21 17:48:36 +00:00
James Lee 08fbd064d1 make the help command a little more helpful
git-svn-id: file:///home/svn/framework3/trunk@6230 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-17 04:53:06 +00:00
kris 2c039a87d2 return host info if available in HostCommunicationError's addr_to_s
git-svn-id: file:///home/svn/framework3/trunk@6208 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-06 14:15:54 +00:00
kris 4e0bc60ce1 just use alias
git-svn-id: file:///home/svn/framework3/trunk@6207 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-05 21:49:50 +00:00
kris a49c339a9a Use CRLF in http proxy request for some stringent servers
git-svn-id: file:///home/svn/framework3/trunk@6206 4d416f70-5f16-0410-b530-b9f4589650da
2009-02-05 21:29:15 +00:00
kris c60077bb1c Revamp/fix-up http proxying by using Rex to parse the response (instead of
really strict matching)


git-svn-id: file:///home/svn/framework3/trunk@6182 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-24 14:48:18 +00:00
James Lee fd435b48d9 http proxy support patch from Frederik Braun
git-svn-id: file:///home/svn/framework3/trunk@6181 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-24 06:32:06 +00:00
James Lee 1d499a9756 fix empty body when Content-Length is not set
git-svn-id: file:///home/svn/framework3/trunk@6176 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-23 21:10:58 +00:00
kris 6777023871 Notify handlers of socket creation for bare raw IP and TCP server sockets
git-svn-id: file:///home/svn/framework3/trunk@6149 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-14 00:27:37 +00:00
kris 8c8370e9b9 Notify handlers of before and after socket creation events for raw IP
git-svn-id: file:///home/svn/framework3/trunk@6148 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-14 00:15:33 +00:00
HD Moore dc264cdcf3 Fix from Tom Hessman when the EDITOR environment variable is not set (relayed via Ed)
git-svn-id: file:///home/svn/framework3/trunk@6147 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-13 16:19:56 +00:00
HD Moore 4e2d29ec68 Fix from Ed Skoudis when EDITOR is not set
git-svn-id: file:///home/svn/framework3/trunk@6146 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-13 14:43:22 +00:00
HD Moore 331eaaa602 Add basic framework for the new TTY architecture
git-svn-id: file:///home/svn/framework3/trunk@6136 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-13 06:46:32 +00:00
James Lee 49cd8d7223 typo fix
git-svn-id: file:///home/svn/framework3/trunk@6114 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-11 04:48:06 +00:00
kris a61baaa1eb deleting broken/useless timed_read()
git-svn-id: file:///home/svn/framework3/trunk@6110 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-10 17:46:23 +00:00
kris 754c1c5711 Add 127.0.0.1 -> ::1 conversion for IPv4-addressed IPv6 sockets
git-svn-id: file:///home/svn/framework3/trunk@6072 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-04 18:42:55 +00:00
James Lee 0fa92221dd add tab completion for meterpreter use command
git-svn-id: file:///home/svn/framework3/trunk@6064 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-04 06:41:01 +00:00
James Lee f50672c7eb add opera detection for js_os_detect
git-svn-id: file:///home/svn/framework3/trunk@6061 4d416f70-5f16-0410-b530-b9f4589650da
2009-01-02 21:28:05 +00:00
kris a0aa29bb18 typos
git-svn-id: file:///home/svn/framework3/trunk@6054 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-29 07:47:37 +00:00
kris 2d1ae98917 Convert 'Retries' and 'Timeout' values to integers if given
git-svn-id: file:///home/svn/framework3/trunk@6053 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-29 05:04:49 +00:00
kris b012696f1f just use boolean @@support_ipv6 instead of "yes"/"no"
git-svn-id: file:///home/svn/framework3/trunk@6047 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-26 07:11:49 +00:00
kris b03360f5e0 use pack_word in push_word and pack_dword in push_dword
git-svn-id: file:///home/svn/framework3/trunk@6046 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-25 02:00:46 +00:00
kris cc233af814 add pack_word() method
git-svn-id: file:///home/svn/framework3/trunk@6045 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-25 01:55:05 +00:00
kris 0e8ce1cc46 Move my portspec parsing code from scanner/portscan/tcp to Rex as
Socket.portspec_crack and use it to also replace the incomplete
parsing code used for db_autopwn


git-svn-id: file:///home/svn/framework3/trunk@6033 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-20 20:34:05 +00:00
kris 90f906d8c5 Add assignment to to_ruby and to_perl output, and allow changing of variable
name in to_java output


git-svn-id: file:///home/svn/framework3/trunk@6032 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-20 07:40:27 +00:00
kris cdcf5cf1fd add a few key descriptions
git-svn-id: file:///home/svn/framework3/trunk@6024 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-19 09:33:16 +00:00
kris 84b6d9daf4 remove extra (server-only) setsockopt(SO_REUSEADDR)
git-svn-id: file:///home/svn/framework3/trunk@6023 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-19 08:02:53 +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
kris bfc23d2886 use self.peerhost (which could use 'PeerAddr') instead of 'PeerHost'
git-svn-id: file:///home/svn/framework3/trunk@6021 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-19 06:54:22 +00:00
kris 560f2df2dd fix PeerAddr
git-svn-id: file:///home/svn/framework3/trunk@6020 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-19 06:50:04 +00:00
HD Moore 5822ab75a7 Adds an exploit module (universal) for the new internet explorer xml bug. This module shows off the .NET memory techniques discovered by Alexander Sotirov and Mark Dowd. This code should bypass DEP, ASLR, and NX :-)
git-svn-id: file:///home/svn/framework3/trunk@6012 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-12 01:45:00 +00:00
HD Moore cb8230f817 Fixes #263. Correct the max read() size for DCERPC over SMB
git-svn-id: file:///home/svn/framework3/trunk@6007 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-11 03:50:30 +00:00
HD Moore 71c5175a85 This patch introduces a really basic RPC service. It is still a long way from its final version
git-svn-id: file:///home/svn/framework3/trunk@5991 4d416f70-5f16-0410-b530-b9f4589650da
2008-12-02 22:09:34 +00:00
James Lee 63e3e3a0e9 remove some verbosity and dead code from js osdetect
git-svn-id: file:///home/svn/framework3/trunk@5973 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-21 05:37:28 +00:00
HD Moore 7d2f0c1bc0 Log a backtrack on meterpreter command errors, make debugging easier
git-svn-id: file:///home/svn/framework3/trunk@5968 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-20 05:54:55 +00:00
HD Moore 77bc8d90a3 Apply patch to not exit the console on ^C
git-svn-id: file:///home/svn/framework3/trunk@5947 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-18 19:41:13 +00:00
HD Moore 652100cb54 Use a temporary file for the glade.xml
git-svn-id: file:///home/svn/framework3/trunk@5936 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-17 05:02:13 +00:00
kris a35a9b7bdb add x86 push_word method
git-svn-id: file:///home/svn/framework3/trunk@5932 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-16 22:54:03 +00:00
James Lee b3ecce5cf4 look for files in absolute paths. fixes #252
git-svn-id: file:///home/svn/framework3/trunk@5928 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-16 21:10:35 +00:00
HD Moore 5d0ebc18cf See #250. Adds a wait() wrapper to the HTTP service as well
git-svn-id: file:///home/svn/framework3/trunk@5927 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-16 21:00:44 +00:00
HD Moore a7595fce6c Fixes #250. Solves an old bug with background jobs not working right, fixes the 'background modules dont work' bug as well.
git-svn-id: file:///home/svn/framework3/trunk@5926 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-16 20:54:41 +00:00
kris 81be31d751 sort Meterpreter ps output by pid
git-svn-id: file:///home/svn/framework3/trunk@5921 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-15 06:20:34 +00:00
HD Moore cf3475644e Remove debugging code
git-svn-id: file:///home/svn/framework3/trunk@5917 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-13 18:28:15 +00:00
kris 19fa03649a Add lpwd/getlwd Meterpreter commands
git-svn-id: file:///home/svn/framework3/trunk@5916 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-13 17:30:24 +00:00
kris 360bd6d222 Fix Meterpreter lcd command
git-svn-id: file:///home/svn/framework3/trunk@5915 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-13 17:22:28 +00:00
Ramon de C Valle 73b02f1899 Updated lib/rex/constants.rb
git-svn-id: file:///home/svn/framework3/trunk@5898 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-13 01:55:25 +00:00
HD Moore b4a5cb455b Short variable names to fit more into memory
git-svn-id: file:///home/svn/framework3/trunk@5896 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-12 23:51:36 +00:00
HD Moore 616491a552 Play nice with ruby implementations without readline and openssl
git-svn-id: file:///home/svn/framework3/trunk@5895 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-12 22:47:21 +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 a70e982369 Adds utlities for creating VBA scripts from an EXE (or payload)
git-svn-id: file:///home/svn/framework3/trunk@5893 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-12 19:15:24 +00:00
HD Moore 71448fd876 Typo for hashes
git-svn-id: file:///home/svn/framework3/trunk@5891 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-11 22:57:18 +00:00
HD Moore 10266c8e51 Better short read detection from antoine.
git-svn-id: file:///home/svn/framework3/trunk@5889 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-11 17:53:13 +00:00
HD Moore 250848ac5c Handle windows error on broadcast addresses
git-svn-id: file:///home/svn/framework3/trunk@5886 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-11 07:41:07 +00:00
HD Moore 81347ba308 Fix ENONET for BSD
git-svn-id: file:///home/svn/framework3/trunk@5885 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-11 06:19:44 +00:00
HD Moore cca9c39eab Typo fix from Rhyss
git-svn-id: file:///home/svn/framework3/trunk@5881 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-11 05:39:23 +00:00
HD Moore e9b3919ace Normalize exceptions across socket libraries
git-svn-id: file:///home/svn/framework3/trunk@5879 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-11 05:11:40 +00:00
kris aba3f95026 an empty string is better than a nil type-error (found by playing around, not
from a faulty module or whathaveyou)


git-svn-id: file:///home/svn/framework3/trunk@5878 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-11 04:01:21 +00:00
HD Moore bbb53dd9ea Default max_read to 1M, solves intermittent issues
git-svn-id: file:///home/svn/framework3/trunk@5876 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-10 23:03:16 +00:00
HD Moore b11939759e Fix an ugly error when the response was too small
git-svn-id: file:///home/svn/framework3/trunk@5875 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-10 22:56:25 +00:00
HD Moore 8628a9d2c1 Fixes #193. Add a unicode-capable workaround for windows, patch code to go through the compat lib
git-svn-id: file:///home/svn/framework3/trunk@5873 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-10 21:44:58 +00:00
HD Moore 6dd840e4b3 Fixes #201. Better error processing of client sockets
git-svn-id: file:///home/svn/framework3/trunk@5872 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-10 21:30:35 +00:00
HD Moore e2a70dd615 Fixes #111. Merge in patch to fix memdump support, still not perfect, but usable
git-svn-id: file:///home/svn/framework3/trunk@5871 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-10 21:18:12 +00:00
kris 23274e6efc Fix Meterpreter route error message
git-svn-id: file:///home/svn/framework3/trunk@5868 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-10 04:17:31 +00:00
kris cce1166199 Fix Meterpreter's portfwd default "list" behavior
git-svn-id: file:///home/svn/framework3/trunk@5867 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-10 03:56:23 +00:00
kris 21c1eecfa7 Update Meterpreter upload and download commands so that passing one non-option
argument sets both the source and destination file/dir (and make it so that
these commands only expect at least one argument instead of two)



git-svn-id: file:///home/svn/framework3/trunk@5866 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-10 02:07:41 +00:00
HD Moore 4250d1e132 Handle socket errors more gracefully
git-svn-id: file:///home/svn/framework3/trunk@5864 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-09 23:02:18 +00:00
HD Moore 2d498ed3c5 Fixes #149. This doesnt address quite the bug, but solves a case where the DNS server does not reply and the Windows version of ruby acts stupid. The bug mentioned in this ticket is addressed by a newer ruby version.
git-svn-id: file:///home/svn/framework3/trunk@5863 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-09 22:59:21 +00:00
HD Moore 7367c2cbd4 Fixes #248. Catch empty returns from pgets
git-svn-id: file:///home/svn/framework3/trunk@5860 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-09 21:40:03 +00:00
HD Moore ecc853d453 Fixes #246. Revert to older readline behavior, the priority change should prevent the readline idle loop from consuming process time.
git-svn-id: file:///home/svn/framework3/trunk@5859 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-09 08:44:36 +00:00
kris 97fee9e16f Return "0 secs" instead of "" in Rex::ExtTime.sec_to_s()
git-svn-id: file:///home/svn/framework3/trunk@5855 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-08 22:35:37 +00:00
James Lee 75feaa6fab allow passing args to meterpreter scripts through AutoRunScript
git-svn-id: file:///home/svn/framework3/trunk@5853 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-08 19:39:06 +00:00
James Lee 0193cd5219 fix session vs client variable problems with meterpreter AutoRunScript and make usage actually reflect what the code does
git-svn-id: file:///home/svn/framework3/trunk@5834 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-04 06:40:12 +00:00
HD Moore b53695f7db The psexec module now uses a service-compatible exe, shellcode is spawned in a subprocess and the service cleans up properly
git-svn-id: file:///home/svn/framework3/trunk@5829 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-03 23:06:37 +00:00
HD Moore f1789fc1b2 Adds the check() method and scanner module to ms08-067, massively upgrades the smb/version scanner, with better SP detection and remote language pack detection.
git-svn-id: file:///home/svn/framework3/trunk@5823 4d416f70-5f16-0410-b530-b9f4589650da
2008-11-03 09:17:08 +00:00
HD Moore a4d53893ac Improvements to opty2 from vlad902:
1) Fixed a minor bug, sometimes Opty2 would generate C1 /6 instructions which most processors will execute but which are not technically valid (they would exist for SAL but SAL is an alias for SHL so it is defined as C1 /4).
 2) I changed the 0x90 nop instruction so that it is no longer considered that 0x90 changes the eax register.
3) Removed o16/0x66 prepend byte from 0x0f, this is currently unused anyways but might prevent some poor person from debugging it in the future.
 4) Previously short jumps would only make positive jumps, I added the capability for them to make a "-1" jump which would basically just start executing at the offset byte. For example it could generate something like EB FF XX YY ... where EB FF jumps to FF XX YY ...
 5) I added support for the instructions mov reg, segreg (8C), mov reg, imm8/imm32 (C6/C7), and lea reg, mem (8D). I implemented LEA so that it only allows memory references to be in ModR/M form and not be in SIB form (I don't think it's possible to allow SIB in the way Opty2 works at the moment).
 



git-svn-id: file:///home/svn/framework3/trunk@5804 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-30 07:30:52 +00:00
HD Moore 1df0612f61 Adds a case-sensitivity permutation routine
git-svn-id: file:///home/svn/framework3/trunk@5780 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-22 22:43:13 +00:00
HD Moore 65419ad206 Adds routines/tools for cracking the NTLM hash from the plaintext case-insensive LANMAN password
git-svn-id: file:///home/svn/framework3/trunk@5779 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-22 22:42:52 +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 e016ff2d76 cleanup patch from antoine
git-svn-id: file:///home/svn/framework3/trunk@5748 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-13 14:22:38 +00:00
HD Moore a87cbe1c5e Add disassembly mode to msfpescan for -a
git-svn-id: file:///home/svn/framework3/trunk@5717 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-05 02:40:55 +00:00
HD Moore 0f03e872f1 Fixes ^C and ^Z session handling
git-svn-id: file:///home/svn/framework3/trunk@5706 4d416f70-5f16-0410-b530-b9f4589650da
2008-10-01 17:32:55 +00:00
James Lee 43886f3697 typo fix, thanks Kris Katterjohn
git-svn-id: file:///home/svn/framework3/trunk@5702 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-30 23:24:52 +00:00
HD Moore af9a8eba9a Swap back to 8192 until the exploits which use it are updated.
git-svn-id: file:///home/svn/framework3/trunk@5694 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-27 17:13:11 +00:00
HD Moore 14e8e75cb6 Another, smaller, win32 wrapper
git-svn-id: file:///home/svn/framework3/trunk@5693 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-27 05:02:36 +00:00
HD Moore 16d2825b83 Wrap the shellcode in SEH
git-svn-id: file:///home/svn/framework3/trunk@5692 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 23:35:47 +00:00
HD Moore b94d10f53c Switch the exe back to windows mode (vs console)
git-svn-id: file:///home/svn/framework3/trunk@5691 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 23:01:58 +00:00
HD Moore 4d47f49c1c Randomize the timedatestamp
git-svn-id: file:///home/svn/framework3/trunk@5690 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 22:37:41 +00:00
HD Moore 6d5ac7eead Switches the executable template to something a little nicer and adds exe output to msfencode
git-svn-id: file:///home/svn/framework3/trunk@5689 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 22:34:51 +00:00
HD Moore e341e46f6b Remove debugging comment
git-svn-id: file:///home/svn/framework3/trunk@5688 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 13:33:09 +00:00
HD Moore 37d9c3db1d Corrects an issue where a scope ID is passed to IPv4 addresses, cleans up the parsing.
git-svn-id: file:///home/svn/framework3/trunk@5687 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-26 05:39:06 +00:00
HD Moore 1310e0e94c Imported msfmachscan from Darren Kemp
git-svn-id: file:///home/svn/framework3/trunk@5682 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-24 22:14:33 +00:00
HD Moore b3c3b29ed1 Wrong fix, right bug.
git-svn-id: file:///home/svn/framework3/trunk@5681 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-24 20:47:01 +00:00
HD Moore 8491ef3ff9 Correct File namespace (thanks MJM)
git-svn-id: file:///home/svn/framework3/trunk@5680 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-24 20:39:28 +00:00
James Lee 36a06e7576 initial commit of php findsock. This patch makes all http connections global and removes the "close if (!pipelining)" checks, so beware of bugs.
git-svn-id: file:///home/svn/framework3/trunk@5678 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-24 04:41:51 +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
Ramon de C Valle bd753e8ece Fixed identation
git-svn-id: file:///home/svn/framework3/trunk@5664 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-17 02:01:15 +00:00
Ramon de C Valle 58cef5775e Added ARCH_POWER constant and fixed AIX payload modules
git-svn-id: file:///home/svn/framework3/trunk@5663 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-17 01:42:51 +00:00
HD Moore 6772685f3e Merge patch from Julien TINNES for MIPS support (LE/BE)
git-svn-id: file:///home/svn/framework3/trunk@5658 4d416f70-5f16-0410-b530-b9f4589650da
2008-09-15 18:50:34 +00:00
HD Moore 1fa95d6050 This patch adds support for IPv6 scope_ids to AddressRange parameters. Ranges consisting of a single address are not expanded
git-svn-id: file:///home/svn/framework3/trunk@5640 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-23 07:05:38 +00:00
HD Moore 947dad1f45 Expose the sslctx to the caller
git-svn-id: file:///home/svn/framework3/trunk@5639 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-23 05:12:43 +00:00
James Lee 1e3d89b467 fix a bug where firefox detection breaks with obfuscation of the js_osdetect code
git-svn-id: file:///home/svn/framework3/trunk@5632 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-15 20:11:42 +00:00
James Lee 36ce7136aa add a couple of javascript os detections
git-svn-id: file:///home/svn/framework3/trunk@5629 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-13 16:31:38 +00:00
HD Moore 9903e0bb1d Add the ror/rol ror13hash code to msf3
git-svn-id: file:///home/svn/framework3/trunk@5627 4d416f70-5f16-0410-b530-b9f4589650da
2008-08-13 01:44:37 +00:00
HD Moore bd7e616fe3 Need another red bull...
git-svn-id: file:///home/svn/framework3/trunk@5604 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-26 18:23:54 +00:00
HD Moore 09c1b1d0fc This fixes raw socket support for FreeBSD, NetBSD, BSDi, and Mac OS X. Thanks LibNET!
git-svn-id: file:///home/svn/framework3/trunk@5603 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-26 18:15:35 +00:00
HD Moore c6930f79f1 consistency fixes
git-svn-id: file:///home/svn/framework3/trunk@5596 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-25 06:04:51 +00:00
HD Moore bb1db8253a Raw socket mode that should work for 'everyone'
git-svn-id: file:///home/svn/framework3/trunk@5595 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-25 05:05:32 +00:00
HD Moore cef76df19c Raw socket support for BSD systems
git-svn-id: file:///home/svn/framework3/trunk@5594 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-25 04:59:11 +00:00
HD Moore a4af2d9d93 Fix socket, change requires in dns
git-svn-id: file:///home/svn/framework3/trunk@5575 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-23 17:39:02 +00:00
James Lee 0144e9ea6a add detection for IE6 on XPSP0
git-svn-id: file:///home/svn/framework3/trunk@5572 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-23 06:40:27 +00:00
HD Moore a52530f647 Raw IP socket support for Rex. Guess what this is for :-)
git-svn-id: file:///home/svn/framework3/trunk@5565 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-22 19:03:59 +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 4415d0370f Stop leaking file descriptors when source_address() is called
git-svn-id: file:///home/svn/framework3/trunk@5561 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-21 03:32:51 +00:00
James Lee a15e3c08e9 add string obfuscation
git-svn-id: file:///home/svn/framework3/trunk@5556 4d416f70-5f16-0410-b530-b9f4589650da
2008-07-14 18:57:13 +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 380aba15b0 Implements the readline workaround, tested with regular and meterpreter sessions
git-svn-id: file:///home/svn/framework3/trunk@5544 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-27 20:51:36 +00:00
HD Moore f056b9437f Revert this again, breaks meterpreter console
git-svn-id: file:///home/svn/framework3/trunk@5543 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-27 20:07:53 +00:00
HD Moore 596a13ae30 Correctly handle the readline threading issue, tested with sessions.
git-svn-id: file:///home/svn/framework3/trunk@5541 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-27 19:57:28 +00:00
HD Moore eb0134d8b6 Fix an annoying error
git-svn-id: file:///home/svn/framework3/trunk@5539 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-24 20:55:42 +00:00
James Lee 8a009c5b48 initial support for SOCKS5
git-svn-id: file:///home/svn/framework3/trunk@5537 4d416f70-5f16-0410-b530-b9f4589650da
2008-06-22 22:55:38 +00:00