Commit Graph

1358 Commits (6a06a95f2f8387ecb41cb591e41a88ca8887aae5)

Author SHA1 Message Date
HD Moore 303d99650a Store the workspace in the script object
git-svn-id: file:///home/svn/framework3/trunk@8668 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 19:50:33 +00:00
James Lee 3b0c82b131 args should be an array, fixes 981
git-svn-id: file:///home/svn/framework3/trunk@8666 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 19:26:34 +00:00
Stephen Fewer 88cc851a41 Commit the stager_sysenter_hook win32 kernel shellcode source and mixin patch, resolves #405.
git-svn-id: file:///home/svn/framework3/trunk@8655 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-26 13:41:16 +00:00
HD Moore c1609d0db1 Woops!
git-svn-id: file:///home/svn/framework3/trunk@8631 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 23:15:01 +00:00
HD Moore 2f195694f4 Switch shell to a base class, allow the base class to use a null sink for output when no user_output is set.
git-svn-id: file:///home/svn/framework3/trunk@8630 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 23:07:08 +00:00
James Lee 999feb879f setup the input/output handles correctly for meterpreter sessions so we can get the output from scripts
git-svn-id: file:///home/svn/framework3/trunk@8618 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 16:46:47 +00:00
Joshua Drake b391abd32d adds scripting for command shell sessions
1. InitialAutoRunScript and AutoRunScript vars work
2. scripts/shells was created to hold them
3. *_shell methods were renamed shell_*
4. added "shell_command" method to command shell sessions
5. converted all uses of *_shell to shell_*
6. all payloads that produce command shell sessions include Msf::Sessions::CommandShellOptions



git-svn-id: file:///home/svn/framework3/trunk@8615 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-24 01:19:59 +00:00
HD Moore a71e8d2af0 Fix up meterpreter script changes
git-svn-id: file:///home/svn/framework3/trunk@8611 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 20:16:45 +00:00
HD Moore 4220c33675 Stuff meterpreter scripts into a dedicated object
git-svn-id: file:///home/svn/framework3/trunk@8603 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 17:59:35 +00:00
James Lee 455434a9f2 typo fix, thanks SubINacls for catching it
git-svn-id: file:///home/svn/framework3/trunk@8597 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 06:25:19 +00:00
James Lee 4ad6c24a95 look for dead sesions with a reaper thread instead of on other session events, add Session#alive accessor for all session types; still need to figure out when a shell session is dead and set it accordingly. Add a reason argument to on_session_close to distinguish between killed sessions and dead sessions
git-svn-id: file:///home/svn/framework3/trunk@8596 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-23 05:59:30 +00:00
James Lee 06b369a79b add a class method for route_exists?
git-svn-id: file:///home/svn/framework3/trunk@8591 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-22 22:30:37 +00:00
James Lee a12670b311 check for existence before stat'ing. fixes #893
git-svn-id: file:///home/svn/framework3/trunk@8581 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-22 17:27:54 +00:00
Joshua Drake b5e1e56f44 fix slicing of compressed deflate data
git-svn-id: file:///home/svn/framework3/trunk@8572 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-21 01:37:04 +00:00
Joshua Drake 4800d6841c commit cmd stager stuff from bannedit
git-svn-id: file:///home/svn/framework3/trunk@8518 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-16 16:38:19 +00:00
Stephen Fewer 17de90a902 Modify the client core to use compression for the loading of extensions and migration for a speed boost.
git-svn-id: file:///home/svn/framework3/trunk@8517 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-16 15:01:06 +00:00
Stephen Fewer 4b4b2d62b1 Commit the Ruby side for channel/TLV compression.
git-svn-id: file:///home/svn/framework3/trunk@8516 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-16 14:58:23 +00:00
HD Moore 2539a6fc09 Updated nmap parsing, store notes for last boot and os matches
git-svn-id: file:///home/svn/framework3/trunk@8494 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-14 19:07:15 +00:00
HD Moore bfa3ae28cb Import OS and hostname information
git-svn-id: file:///home/svn/framework3/trunk@8491 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-14 18:32:37 +00:00
HD Moore 5dff9c4efc Fixes #807. Make the html encoded output standards compliant
git-svn-id: file:///home/svn/framework3/trunk@8462 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-12 05:08:16 +00:00
Joshua Drake d4d271eef3 add OLE library as Rex::OLE
git-svn-id: file:///home/svn/framework3/trunk@8457 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-11 18:36:38 +00:00
Joshua Drake 7285e7a2bb whitespace fixed, also see r8452 which fixes #805
git-svn-id: file:///home/svn/framework3/trunk@8453 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-11 07:48:56 +00:00
Joshua Drake a3bf0fd94f handle arch parameters passed as array
oops, these other two functions didn't benefit from the same level of checking as endian? did.

git-svn-id: file:///home/svn/framework3/trunk@8452 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-11 07:42:26 +00:00
Joshua Drake 13f837c340 fix zip module samples
git-svn-id: file:///home/svn/framework3/trunk@8447 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-11 00:18:37 +00:00
Joshua Drake 2c100083bf add a zip implementation, Rex::Zip, see lib/rex/zip/samples for more info
git-svn-id: file:///home/svn/framework3/trunk@8439 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-10 17:27:40 +00:00
Stephen Fewer 6335fde3e1 Commit the Ruby side for the UDP socket pivoting. Change the TCP client channel so the respective StreamAbstraction is responsible for monitoring its own rsock.
git-svn-id: file:///home/svn/framework3/trunk@8431 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-09 16:45:46 +00:00
Joshua Drake 79d2ecc227 don't slice a nil buffer
git-svn-id: file:///home/svn/framework3/trunk@8403 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-08 01:42:11 +00:00
HD Moore c8af3431b6 Typo
git-svn-id: file:///home/svn/framework3/trunk@8401 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-08 01:02:46 +00:00
HD Moore 5f76353e8e Woops, add the missing support files
git-svn-id: file:///home/svn/framework3/trunk@8400 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-08 00:59:29 +00:00
Stephen Fewer e19633354b Bug fix for a rare edge case with channels. When creating a Rex::Post::Meterpreter::Stream instance we should initialize_abstraction() before super() as we can get a scenario where dio_write_handler() is called with data to write to the rsock but rsock has not yet been initialized. This happens if the channel is registered (client.add_channel(self) in Channel.initialize) to a session and a 'core_channel_write' request comes in before we have called self.initialize_abstraction()
git-svn-id: file:///home/svn/framework3/trunk@8386 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-06 20:12:52 +00:00
Stephen Fewer fd2469db24 Commit the Ruby end for TCP server channels, the modified TCP client channels and the support for pivoting a reverse_tcp meterpreter.
git-svn-id: file:///home/svn/framework3/trunk@8384 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-06 17:59:25 +00:00
HD Moore b3a588b8cc Adds a module for kcope's samba filesystem traversal
git-svn-id: file:///home/svn/framework3/trunk@8369 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-05 06:38:24 +00:00
Joshua Drake a052340703 a few fixes to sunrpc code
this fixes a couple of errors handling error messages
also, some whitespace/indenting adjustments



git-svn-id: file:///home/svn/framework3/trunk@8365 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-03 20:30:09 +00:00
Tod Beardsley 3fe8d0375b Adds a print_debug message handler -- mostly useful during development to easily inspect objects.
git-svn-id: file:///home/svn/framework3/trunk@8353 4d416f70-5f16-0410-b530-b9f4589650da
2010-02-02 21:03:07 +00:00
James Lee 55a82c1642 add simple detection for Chrome
git-svn-id: file:///home/svn/framework3/trunk@8330 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-30 21:09:38 +00:00
HD Moore 42b331b47f Fix #790. Initialize the client state to be alive, tweak a few things on the meterpreter side
git-svn-id: file:///home/svn/framework3/trunk@8327 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-29 18:52:44 +00:00
HD Moore 7d88f394b4 Use the impersonated token to spawn the shell by default
git-svn-id: file:///home/svn/framework3/trunk@8326 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-29 17:35:30 +00:00
Stephen Fewer 47b08fa6ef simple patch to get all privileges after a successful getsystem
git-svn-id: file:///home/svn/framework3/trunk@8321 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-29 11:04:24 +00:00
Stephen Fewer 77da632e61 update the ruby side.
git-svn-id: file:///home/svn/framework3/trunk@8319 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-29 01:13:28 +00:00
James Lee c396129d41 add a liveness test to meterpreter, fixes 698
git-svn-id: file:///home/svn/framework3/trunk@8314 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 23:53:15 +00:00
Tod Beardsley a76480d42c See #726. Cleaning up my gross whitespace.
git-svn-id: file:///home/svn/framework3/trunk@8311 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 23:08:39 +00:00
Tod Beardsley 9c1ceb1b8a Fixes #726. Adding in the test cases (and some slight fixes) closes this ticket.
git-svn-id: file:///home/svn/framework3/trunk@8310 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 23:01:32 +00:00
Stephen Fewer b36fe815f3 Add in the ruby side for the priv extensions getsystem command.
git-svn-id: file:///home/svn/framework3/trunk@8296 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-28 13:55:19 +00:00
Tod Beardsley 5087ae25f7 Fixed test_gzip. Both strings happen to work, but this gets rid of the assert_equal error.
git-svn-id: file:///home/svn/framework3/trunk@8235 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 02:50:10 +00:00
Tod Beardsley 1652c75b7f Fixed Rex::Text.badchar_index to conform with the test requirement.
git-svn-id: file:///home/svn/framework3/trunk@8234 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 02:39:43 +00:00
Tod Beardsley d817ac11b4 Adding a convenience method for generating random hexadecimal characters.
git-svn-id: file:///home/svn/framework3/trunk@8233 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 02:35:13 +00:00
James Lee cdaeb27933 spaces -> tabs
git-svn-id: file:///home/svn/framework3/trunk@8232 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-26 00:01:55 +00:00
Tod Beardsley 359e1ad53a See #726. Adds a DB2 scanner and brute forcer.
git-svn-id: file:///home/svn/framework3/trunk@8223 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-25 15:58:24 +00:00
HD Moore 12ef5437df 1.0.0.0/8 has been allocated, switch to 50.50.50.50
git-svn-id: file:///home/svn/framework3/trunk@8221 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-25 13:27:19 +00:00
Stephen Fewer b7fb95b302 fix for ps bug on OSX
git-svn-id: file:///home/svn/framework3/trunk@8220 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-25 10:49:51 +00:00
HD Moore acceb274da Integrate a sound plugin, based on Robin Wood's patch
git-svn-id: file:///home/svn/framework3/trunk@8215 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-24 18:33:32 +00:00
HD Moore f9049e0d50 Load win32api for cygwin as well
git-svn-id: file:///home/svn/framework3/trunk@8214 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-24 17:31:50 +00:00
HD Moore 1e2f421432 Remove references to DL, since it has a conflicting API between 1.8 and 1.9. Update all methods to use Win32API and add a play_sound() method
git-svn-id: file:///home/svn/framework3/trunk@8213 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-24 17:28:03 +00:00
Stephen Fewer 651fd5e834 fix for ps bug where the wrong arch was sometimes defaulted to if no arch was returned.
git-svn-id: file:///home/svn/framework3/trunk@8211 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-23 16:50:44 +00:00
James Lee ae673cccd7 add detections for newest IE8 on win7 and x64
git-svn-id: file:///home/svn/framework3/trunk@8206 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-22 23:47:50 +00:00
James Lee 7e5ad7bfa3 log more info about script failures
git-svn-id: file:///home/svn/framework3/trunk@8205 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-22 23:09:41 +00:00
Stephen Fewer 7b34b46b68 Commit the ruby side for the meterpreter migration overhaul.
git-svn-id: file:///home/svn/framework3/trunk@8199 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-22 19:47:36 +00:00
Joshua Drake 7d6607b517 add default compression level for zlib_deflate()
git-svn-id: file:///home/svn/framework3/trunk@8191 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-21 19:31:17 +00:00
James Lee 4d644ab895 add os_flavor detection for firefox
git-svn-id: file:///home/svn/framework3/trunk@8185 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-21 11:26:16 +00:00
Stephen Fewer 538d44aa8d commit the changes on the ruby side for new ps command. We now get the process architecture and parent pid (when possible) of each process.
git-svn-id: file:///home/svn/framework3/trunk@8157 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-19 10:47:01 +00:00
Joshua Drake c13841d902 base RegexScanner on Generic instead of JmpRegScanner
git-svn-id: file:///home/svn/framework3/trunk@8148 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-18 22:17:08 +00:00
HD Moore a753666073 Switch sysread back to get_once(). This reverts a previous change, but the sysread breaks SSL support
git-svn-id: file:///home/svn/framework3/trunk@8124 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 21:40:30 +00:00
James Lee 7be26761f5 merge bannedit's WAR payload patch
git-svn-id: file:///home/svn/framework3/trunk@8119 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-14 18:15:15 +00:00
HD Moore 540beed83e Prevent the dcerpc NDR string functions from modifying their argument directly
git-svn-id: file:///home/svn/framework3/trunk@8102 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-12 23:15:07 +00:00
James Lee a9b1462e9d add a callback for session commands. fixes 618
git-svn-id: file:///home/svn/framework3/trunk@8075 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-06 05:06:12 +00:00
James Lee d261b39206 actually save the result of the merge
git-svn-id: file:///home/svn/framework3/trunk@8072 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-05 18:18:49 +00:00
HD Moore 6e45d1e32f Sort by creation order vs pid
git-svn-id: file:///home/svn/framework3/trunk@8059 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-02 11:35:57 +00:00
HD Moore 1623b59a0c Decrease indents to save screen space
git-svn-id: file:///home/svn/framework3/trunk@8058 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-02 11:28:43 +00:00
HD Moore 42b3a5774d Adds the process username to the ps output (when possible).
git-svn-id: file:///home/svn/framework3/trunk@8056 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-02 03:41:21 +00:00
HD Moore 4d7aec7c2d Fixes #745. This commit changes how token manipulation works, adds the steal_token, drop_token, and getprivs commands. Tested on NT 4.0, 2000 SP4, XP SP3, 2003 SP2, Vista, and Windows 7
git-svn-id: file:///home/svn/framework3/trunk@8055 4d416f70-5f16-0410-b530-b9f4589650da
2010-01-02 00:35:10 +00:00
HD Moore 98f83bbab1 Adds reg queryclass
git-svn-id: file:///home/svn/framework3/trunk@8046 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-31 15:52:30 +00:00
Joshua Drake 2283e029db crossing fingers, big cr removal batch
git-svn-id: file:///home/svn/framework3/trunk@8038 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-30 22:24:22 +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
HD Moore 922cef26fa Store the domain name in the SMB client object, along with other fields provided by NTLMSSP responses. Show the domain name and netbios name in the version scanner. Update MS06-070 to remove the default target, use the domain name from the server response, and use a more reliable return address for 2000 SP4.
git-svn-id: file:///home/svn/framework3/trunk@8022 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-29 14:00:49 +00:00
HD Moore 4c6fd97b0e Handles some broken TCP stack implementations better (but not perfectly)
git-svn-id: file:///home/svn/framework3/trunk@7991 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-27 07:02:55 +00:00
James Lee 8f2138a464 and remove the empty xdr.rb
git-svn-id: file:///home/svn/framework3/trunk@7965 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-24 00:21:36 +00:00
HD Moore b13e185943 Giant update from tebo, fixing up SunRPC and the nsfmount module
git-svn-id: file:///home/svn/framework3/trunk@7961 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-23 13:44:53 +00:00
HD Moore 7935656355 Fixes #708. Enforces a timeout around SSL's connect()
git-svn-id: file:///home/svn/framework3/trunk@7938 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-21 22:48:40 +00:00
HD Moore 2d399f9b52 Handle the native win32 errno as well
git-svn-id: file:///home/svn/framework3/trunk@7923 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-19 15:08:37 +00:00
HD Moore 1eceebc950 Fixes #697. This prevents a closed socket from being passed to select() and handles the case where a race condition allowed this to happen anyways (one thread closes, one thread selects). This should prevent most 'invalid handle' exceptions on Cygwin and prevent Win32 native from crashing due to the native exception.
git-svn-id: file:///home/svn/framework3/trunk@7922 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-19 15:02:26 +00:00
Joshua Drake addcba5131 0x7f isn't printable!
git-svn-id: file:///home/svn/framework3/trunk@7915 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-18 20:40:08 +00:00
HD Moore 39d37065de See #485. This patch allows the very basics of metasploit to work under jRuby 1.4.0. Many, many things are still broken
git-svn-id: file:///home/svn/framework3/trunk@7906 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-17 08:02:11 +00:00
James Lee 06427b53c9 document the detection for 2k SP0
git-svn-id: file:///home/svn/framework3/trunk@7887 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-15 23:08:28 +00:00
HD Moore a16feb01bc Minor tweaks to http processing
git-svn-id: file:///home/svn/framework3/trunk@7805 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 18:12:38 +00:00
HD Moore 5ef9a1c040 Wipe the headers before reparsing
git-svn-id: file:///home/svn/framework3/trunk@7801 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 17:04:52 +00:00
HD Moore 006d5d51fc Fixes #674 by adding 100-continue support
git-svn-id: file:///home/svn/framework3/trunk@7799 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 16:54:27 +00:00
HD Moore d2694ce5b9 Ignore errors on shutdown for the relay
git-svn-id: file:///home/svn/framework3/trunk@7795 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 06:09:15 +00:00
HD Moore e731426666 Fixes #662. The socket pivoting is still not perfect, but this goes a long way
git-svn-id: file:///home/svn/framework3/trunk@7792 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-10 05:40:26 +00:00
James Lee e0bd6dd6ed don't bother checking for an address if our range is empty
git-svn-id: file:///home/svn/framework3/trunk@7779 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-09 21:28:44 +00:00
Joshua Drake 87c85b5176 removed executable generation routines from Rex::Text (use Msf::Util::EXE), Fixes #660
git-svn-id: file:///home/svn/framework3/trunk@7760 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-08 21:24:45 +00:00
HD Moore 54c10c0c3d Fixes #623 and fixes #622, implements a number of changes to the core channel dispatch code, sets timeouts on unmatched responses, and handles tcp relay writes with a threaded/timeout wrapper to avoid delays.
git-svn-id: file:///home/svn/framework3/trunk@7753 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-08 18:32:26 +00:00
James Lee 7427640fb0 don't wait for a message body that will never come. fixes 659
git-svn-id: file:///home/svn/framework3/trunk@7748 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-08 02:26:37 +00:00
Stephen Fewer 7d3ff93ec9 Fix a few bugs in the parsing of exception directories on PE64 binaries.
git-svn-id: file:///home/svn/framework3/trunk@7730 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 12:56:54 +00:00
Stephen Fewer 4fb212b54e Go back to using select instead of sleep for the waiters.
git-svn-id: file:///home/svn/framework3/trunk@7729 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-07 12:55:31 +00:00
James Lee 02a62967e4 register the 'rex' log source, see #577
git-svn-id: file:///home/svn/framework3/trunk@7727 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-06 18:09:27 +00:00
HD Moore 1f5a0be9ca Fixes #630 by correct the constant typo
git-svn-id: file:///home/svn/framework3/trunk@7726 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-06 14:51:15 +00:00
HD Moore 2c92856612 Fixes #604. This fixes a long-standing race condition with meterpreter channels that received data as soon as they were open (TCP).
git-svn-id: file:///home/svn/framework3/trunk@7708 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 21:08:34 +00:00
James Lee a96a23f95c add cidr parsing for ipv6
git-svn-id: file:///home/svn/framework3/trunk@7707 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 20:17:28 +00:00
James Lee 1e6b6b3d62 fix ipv6 handling for single addresses
git-svn-id: file:///home/svn/framework3/trunk@7706 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 19:55:58 +00:00
James Lee 5952e29040 modify address range specification (for e.g. RHOSTS) to use nmap notation, fixes #182
git-svn-id: file:///home/svn/framework3/trunk@7705 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 19:37:14 +00:00
HD Moore 9b2d5fcd24 Fixes #605 by re-raising the correct exception class
git-svn-id: file:///home/svn/framework3/trunk@7701 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 18:38:59 +00:00
Stephen Fewer a544d71f4e A few small changes to the ruby side of meterpreters packet dispatcher stuff. Allow for blocking a request indefinatly and add in a new command 'wait' to stdapi.sys.process.
git-svn-id: file:///home/svn/framework3/trunk@7697 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-04 17:32:56 +00:00
James Lee 5182d1c927 allow the Connection header to specify keep-alive in a less strict manner. this is more rfc2616 compliant and fixes #601
git-svn-id: file:///home/svn/framework3/trunk@7677 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 07:40:37 +00:00
HD Moore fc983ef7e3 Many bug fixes to db_autopwn, cross-referencing of OS-level vulnerabilities, small bug fixes to HTTP client API
git-svn-id: file:///home/svn/framework3/trunk@7676 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-03 01:36:17 +00:00
James Lee 7b4a942ed6 revert logging change from r7653 which broke meterpreter sessions
git-svn-id: file:///home/svn/framework3/trunk@7671 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-02 19:11:11 +00:00
James Lee 626d085dd4 expand ryan linn's idea of more verbose job info to include start time, see #586
git-svn-id: file:///home/svn/framework3/trunk@7668 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-02 03:32:48 +00:00
James Lee 0da80965d6 more info about a job, thanks Ryan Linn for the patch; fixes #586
git-svn-id: file:///home/svn/framework3/trunk@7665 4d416f70-5f16-0410-b530-b9f4589650da
2009-12-01 23:11:12 +00:00
James Lee 125f0aab0a map any attempt to log to an unknown logsink to the core logsink, fixes 577
git-svn-id: file:///home/svn/framework3/trunk@7653 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 22:03:53 +00:00
HD Moore ed7b7ac6f0 Fixes #491 and fixes #543 by updating the HTTP stack and validating configuration options
git-svn-id: file:///home/svn/framework3/trunk@7652 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 21:15:06 +00:00
HD Moore 1189ac1dcd Updates to the PE class to support TLS/Exceptions
git-svn-id: file:///home/svn/framework3/trunk@7651 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 20:18:37 +00:00
HD Moore b8804e48cd Add (incomplete) support for TLS callbacks
git-svn-id: file:///home/svn/framework3/trunk@7648 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-30 19:48:35 +00:00
HD Moore ff93072d1e Fixes #578. Only register a new meterpreter sink if one doesnt already exist
git-svn-id: file:///home/svn/framework3/trunk@7632 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-28 16:34:46 +00:00
James Lee 9d2ab30f9d create the history file if it doesn't exist
git-svn-id: file:///home/svn/framework3/trunk@7627 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-26 07:13:21 +00:00
James Lee d6a732d619 move histfile reading into rex
git-svn-id: file:///home/svn/framework3/trunk@7625 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-26 06:03:05 +00:00
James Lee 3412a38146 register a 'meterpreter' logsink
git-svn-id: file:///home/svn/framework3/trunk@7622 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-26 02:46:04 +00:00
James Lee fd61df4e9e add full support for persistent history, works in msfweb as well. fixes #523
git-svn-id: file:///home/svn/framework3/trunk@7621 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-26 02:18:02 +00:00
James Lee 723aa65df0 refuse to migrate into the current process. fixes #418
git-svn-id: file:///home/svn/framework3/trunk@7618 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-25 23:24:01 +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 f8d84a7dc9 prevent loading the same dispatcher multiple times. fixes #560
git-svn-id: file:///home/svn/framework3/trunk@7587 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-24 01:07:19 +00:00
James Lee 6e7c4a77a9 add detection for ie6 on xpsp2
git-svn-id: file:///home/svn/framework3/trunk@7572 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-20 06:08:09 +00:00
James Lee 3b6126bfd9 actually commit what i said i was committing. =(
git-svn-id: file:///home/svn/framework3/trunk@7567 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-18 06:35:44 +00:00
HD Moore a92fbb1ff4 Fixes #526. Correct socket name and call to super in the socket output io
git-svn-id: file:///home/svn/framework3/trunk@7548 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 23:35:34 +00:00
HD Moore 8cadfe66cf Mostly cosmetic
git-svn-id: file:///home/svn/framework3/trunk@7530 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-16 15:16:08 +00:00
James Lee e296ec92ea more uninitalized var warnings
git-svn-id: file:///home/svn/framework3/trunk@7513 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-14 06:21:22 +00:00
James Lee 8471baa62a fix another uninitialized class var warning
git-svn-id: file:///home/svn/framework3/trunk@7494 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-13 22:00:16 +00:00
James Lee 8c28c38da3 remove busted unit test
git-svn-id: file:///home/svn/framework3/trunk@7482 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-12 19:49:35 +00:00
James Lee 78c88c888f don't backtrace just because the client cancelled
git-svn-id: file:///home/svn/framework3/trunk@7453 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 19:38:18 +00:00
James Lee 3dfaf32bc8 trying out bold colors
git-svn-id: file:///home/svn/framework3/trunk@7450 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 16:49:26 +00:00
James Lee 2cbb32550c fix meterp sessions getting initialized improperly, fix msf> prompt in exploit context after color cmd
git-svn-id: file:///home/svn/framework3/trunk@7449 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 16:10:39 +00:00
HD Moore 2c3cace80c Fix up the classes needed by msfweb. Fixes #495
git-svn-id: file:///home/svn/framework3/trunk@7447 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 15:59:49 +00:00
James Lee 3628a3d3c6 fix sessions breaking right away when interacting. command dispatcher still appears to be hosed
git-svn-id: file:///home/svn/framework3/trunk@7446 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 15:55:42 +00:00
HD Moore 3db9bbfaae See #493. Initialize the prompt
git-svn-id: file:///home/svn/framework3/trunk@7445 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 15:33:14 +00:00
James Lee daf58b6deb get rid of the single-character escapes so we're less likely to see accidental color substitutions
git-svn-id: file:///home/svn/framework3/trunk@7443 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 07:12:56 +00:00
James Lee fd4e4154cd add a new 'color' command that lets the user force color on or off.
git-svn-id: file:///home/svn/framework3/trunk@7442 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 06:58:01 +00:00
James Lee a8d9da0d3d initial color support. will add ability to change colors from console soon. see #344
git-svn-id: file:///home/svn/framework3/trunk@7440 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-10 03:27:48 +00:00
James Lee e73d4ead7f handle a broken socket gracefully, fixes a backtrace in msfd
git-svn-id: file:///home/svn/framework3/trunk@7432 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 20:10:53 +00:00
pusscat 493f56be57 https://metasploit.com/redmine/issues/430
Change this line so that 0xf0 is now used as an xor base



git-svn-id: file:///home/svn/framework3/trunk@7428 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 18:47:46 +00:00
Joshua Drake 927fe6b6c2 update pattern_offset to show all ocurrences
git-svn-id: file:///home/svn/framework3/trunk@7425 4d416f70-5f16-0410-b530-b9f4589650da
2009-11-09 17:50:53 +00:00
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