Commit Graph

250 Commits

Author SHA1 Message Date
HD Moore 3e98ff9d9a Stop breaking tar on OS X, thanks
git-svn-id: file:///home/svn/framework3/trunk@7815 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 22:25:29 +00:00
Stephen Fewer be588716c5 Bug fix for meterpreter on NT4 (Tested on NT4.0 SP6). Add a function thread_open() in thread.c to wrap the use kernel32!OpenThread and ntdll!NtOpenThread for backwards compatibility.
git-svn-id: file:///home/svn/framework3/trunk@7806 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 18:12:51 +00:00
HD Moore 6da0fda5ed Updated meterpreter binaries with a slight change to the thread schedule (solves a looping problem when the socket is dead).
git-svn-id: file:///home/svn/framework3/trunk@7793 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 05:42:47 +00:00
HD Moore ff19b649f3 See #662. This should fix most of the meterpreter-side issues with sockets, there is still a second piece of this which is unflushed data on the local forwards from the ruby code.
git-svn-id: file:///home/svn/framework3/trunk@7761 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-08 22:08:06 +00:00
HD Moore 792724c3f3 Cleanups to the socket code, its still not perfect, but much more usable now
git-svn-id: file:///home/svn/framework3/trunk@7750 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-08 14:52:07 +00:00
Stephen Fewer 4f8cfc27d4 Replace the use of Critical Sections for locking with Mutex's (thread.c). This appears to resolve a deadlock issue with OpenSSL on some Windows systems. This commit resolves a bug in interactive processes where an interactive waiter thread will chew cpu due to a tight loop introduced by anonymous pipes not blocking (process.c). Dynamic lock creation for OpenSSL has been re-enabled should a future version of OpenSSL require it, AFAIK the current version used, v0.8.9, does not use dynamic lock creation (server_setup.c). Channels have been given locks to help synchronize concurrent access to a single channel.
git-svn-id: file:///home/svn/framework3/trunk@7732 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 13:04:41 +00:00
HD Moore dfa0d155fc See #607. Switch sniffer code to use mutexes
git-svn-id: file:///home/svn/framework3/trunk@7728 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 05:19:46 +00:00
Stephen Fewer a273c9f07c Initial commit of the multi-threaded meterpreter.
git-svn-id: file:///home/svn/framework3/trunk@7698 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 17:37:21 +00:00
HD Moore 8aef3d560c Fixes #579
git-svn-id: file:///home/svn/framework3/trunk@7694 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 11:35:24 +00:00
HD Moore cbb0fb10e7 Tweak for 3.3.1
git-svn-id: file:///home/svn/framework3/trunk@7649 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 20:14:55 +00:00
HD Moore 8ba8945f53 Fixes #579. Clean up the runtime environment for ruby, update the version
git-svn-id: file:///home/svn/framework3/trunk@7633 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-28 16:38:52 +00:00
HD Moore ffcd613450 Commit the rc2 installer
git-svn-id: file:///home/svn/framework3/trunk@7527 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 04:05:45 +00:00
HD Moore 5507d686da Remove rm of old touched file
git-svn-id: file:///home/svn/framework3/trunk@7480 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-12 07:15:13 +00:00
HD Moore d38ac81282 Hopefully the last round of tweaks for the windows installer
git-svn-id: file:///home/svn/framework3/trunk@7479 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-12 07:13:09 +00:00
HD Moore 1e7be6650a This method seems to work on Windows 7 - $stdin reads on a closed rxvt lead to the hung ruby procs.
git-svn-id: file:///home/svn/framework3/trunk@7478 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-12 07:02:40 +00:00
HD Moore ecc06247ab Still sorting out permission checks
git-svn-id: file:///home/svn/framework3/trunk@7477 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-12 06:38:03 +00:00
HD Moore ab33e5403d Fixes #490. Fixes #497. Fixes #479 (hopefully in all cases). Updates to the cygwin scripts and batch files
git-svn-id: file:///home/svn/framework3/trunk@7475 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-12 06:18:32 +00:00
HD Moore 63383842e5 Fixes #496. Adds a Cygwin Shell link (and a pdf icon)
git-svn-id: file:///home/svn/framework3/trunk@7474 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-12 05:59:46 +00:00
HD Moore 74eb0ed34c Add the used icons
git-svn-id: file:///home/svn/framework3/trunk@7472 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-12 05:41:47 +00:00
HD Moore 879f0b306b Check the cygwin scripts into SVN
git-svn-id: file:///home/svn/framework3/trunk@7471 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-12 05:30:58 +00:00
Stephen Fewer 8c48a9a3f5 Commit the PassiveX DLL updated to build with Visual Studio C++ 2008. Removed some compiler warnings. Use VirtualProtect to make second stage RWX. Use WSASocketA() over socket() for second stage compatibility. Seems to now work with the shell stage (Tested on XPSP2/IE7) but still not working with meterpreter.
git-svn-id: file:///home/svn/framework3/trunk@7461 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-11 00:39:38 +00:00
HD Moore 4321b992dc Improved the msfupdate script, retry on dirty svn directories, warn the user if automatic updates are disabled, and indicate the msfconsole is in the system path after the install
git-svn-id: file:///home/svn/framework3/trunk@7437 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 01:26:46 +00:00
pusscat 9e85a3bf0f Update binaries and readme file
git-svn-id: file:///home/svn/framework3/trunk@7433 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 20:16:05 +00:00
pusscat a8576a584f Initial import of David Weston's "smart file" loading that allows (among other things) importation of buffers annotated with 010's map files!
git-svn-id: file:///home/svn/framework3/trunk@7431 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 19:56:33 +00:00
HD Moore 1a094cec0d Update for 3.3
git-svn-id: file:///home/svn/framework3/trunk@7424 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 07:02:43 +00:00
HD Moore a87fc61a63 Updated banners
git-svn-id: file:///home/svn/framework3/trunk@7414 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 00:54:53 +00:00
HD Moore dbdf4df415 Minor tweaks to the Linux installers
git-svn-id: file:///home/svn/framework3/trunk@7410 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 00:14:18 +00:00
HD Moore 7b8d08a635 Fixes #466 and #467. Binaries and source to be stored outside the tree
git-svn-id: file:///home/svn/framework3/trunk@7372 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-06 02:55:18 +00:00
HD Moore df9a43ac61 See #376
git-svn-id: file:///home/svn/framework3/trunk@7344 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-04 03:21:14 +00:00
HD Moore ea54f3e013 Minor tweaks for formatting
git-svn-id: file:///home/svn/framework3/trunk@7343 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-04 01:18:37 +00:00
pusscat bcc8d5d8ca Update all binaries
git-svn-id: file:///home/svn/framework3/trunk@7341 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-03 21:52:00 +00:00
pusscat c7030e7705 Add tenketsu heap logging
git-svn-id: file:///home/svn/framework3/trunk@7340 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-03 21:49:24 +00:00
HD Moore 21e82d8b69 This patch implements a much more flexible executable creation scheme at the cost of exe size. This also adds the "-x" option to msfencode, allowing the user to specify their own executable template for generation.
git-svn-id: file:///home/svn/framework3/trunk@7315 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-01 04:11:43 +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 31276e1626 Fixes #427. Finally found a solution that works for 1.8 and 1.9, this allows lorcon modules to run in the background or foreground and handle interrupts from the console gracefully. Its still a hack
git-svn-id: file:///home/svn/framework3/trunk@7293 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-28 00:19:17 +00:00
HD Moore 7b22b2cc04 Mostly working codebase, still hanging on some instances, depends on latest svn of lorcon2. See #427
git-svn-id: file:///home/svn/framework3/trunk@7292 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-27 20:13:20 +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 276a3f8052 Use _WIN32 instead of __WIN32__ to be consistent
git-svn-id: file:///home/svn/framework3/trunk@7290 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-27 01:13:35 +00:00
HD Moore 3b99a513ec Fixes #352 and fixes #350. Can no longer reproduce memory corruption or packet loss with this code
git-svn-id: file:///home/svn/framework3/trunk@7287 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 22:49:43 +00:00
HD Moore b662d044a6 Fixes #412. Still an issue with lorcon not yielding back when there is no traffic, but this is a different bug
git-svn-id: file:///home/svn/framework3/trunk@7286 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 22:36:24 +00:00
HD Moore ddeb80e0da See #412. Fix compile warnings and errors on 1.9, still needs testing
git-svn-id: file:///home/svn/framework3/trunk@7285 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 21:09:40 +00:00
HD Moore 7d7c565a37 Merge in the POSIX stdapi extension, still some work left to finish
git-svn-id: file:///home/svn/framework3/trunk@7266 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-26 04:34:20 +00:00
HD Moore 9fda642939 Prevent the packet loop from blocking ruby
git-svn-id: file:///home/svn/framework3/trunk@7234 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-23 15:58:09 +00:00
HD Moore 070f85d6b5 Adds Lorcon::Device.write() for compatibility with Lorcon1
git-svn-id: file:///home/svn/framework3/trunk@7233 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-23 14:40:47 +00:00
HD Moore 1acf372dce Roll Lorcon2 into the metasploit tree, still testing the modules. See #378
git-svn-id: file:///home/svn/framework3/trunk@7228 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-23 04:32:26 +00:00
HD Moore 21de84f6ad Adds ruby-lorcon2 to the tree, (from lorcon2 trunk). Still some bugs to go, see #378
git-svn-id: file:///home/svn/framework3/trunk@7227 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-22 15:46:01 +00:00
HD Moore e07bce0101 Copyright updates reflecting the news
git-svn-id: file:///home/svn/framework3/trunk@7222 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-21 12:58:56 +00:00
HD Moore 00b2915554 Fixes #342. Set ReverseConnectRetries to a value between 1 and 255 (default is 5). On failure it will ExitProcess (still better than a cpu spin)
git-svn-id: file:///home/svn/framework3/trunk@7217 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-20 20:31:14 +00:00
HD Moore 62b06f5e16 Add Alexander Sotirov's metsvc to svn
git-svn-id: file:///home/svn/framework3/trunk@7213 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-20 18:42:47 +00:00
kris 93dd1f2901 Fix pcaprub compilation errors (not warnings) for Ruby 1.9
git-svn-id: file:///home/svn/framework3/trunk@7119 4d416f70-5f16-0410-b530-b9f4589650da
2009-10-03 02:45:15 +00:00