infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
46,876 Commits
7 Branches
556 Tags
419 MiB
Commit Graph

421 Commits (7a31fc2d17ab4fd1f54af95dfec65a30fcdd561f)

Author SHA1 Message Date
James Lee a957a68d65 Rebuild meterpreter.jar after changes from #303 
Basically just to make sure I didn't hose it in my confusion with git's
conflict resolution.
 2012-04-16 13:16:38 -06:00
James Lee 15913dd92c Squashed commit of the following: 
commit 97755336f2227a7db668b61e548d2956dddaccb8
Author: Michael Schierl <schierlm@gmx.de>
Date:   Thu Apr 5 22:33:40 2012 +0200

    make sure PayloadTrustManager gets dropped when using Spawn > 0

commit 0d096043e23af5d46a20b7f2c30c5d926ff66f8d
Author: Michael Schierl <schierlm@gmx.de>
Date:   Wed Apr 4 22:15:23 2012 +0200

    Fix connection hangs when using java/meterpreter/reverse_https with recent Java versions

    Reason is that Java thinks the SSL certificate presented by Metasploit is untrusted;
    therefore add a hack similar to the one in the metasploit.Payload class to trust all
    certificates here.

[Closes #303]
 2012-04-16 13:15:33 -06:00
Michael Schierl eedd7be453 Squashed commit of the following: 
commit 9afece529a33739a088c9c4d10b76dd52f23b99e
Author: Michael Schierl <schierlm@gmx.de>
Date:   Thu Apr 12 17:58:12 2012 +0200

    fix cat ... command by making stdapi_fs_stat return a sensible result

[Closes #330]
 2012-04-16 12:24:54 -06:00
Michael Schierl 1d56ffe225 Update javapayload and java meterpreter 
* Add support for hashing commands (stdapi_fs_md5 and sha1)
* Replace MTU detection with the Proper Java Way

Squashed commit of the following:

commit 0207b6e2e0c0eb55c7c5f04bd3008f674f6239ad
Author: Michael Schierl <schierlm@gmx.de>
Date:   Sat Mar 24 22:02:15 2012 +0100

    add support for stdapi_fs_{md5|sha1} commands

commit a187e7bc79f8d89e66df8d3a3f892c6dce10307b
Author: Michael Schierl <schierlm@gmx.de>
Date:   Sat Mar 24 20:32:03 2012 +0100

    update binaries

commit 0fc553bdac76cc8997fc581141483a3efbdefdfc
Author: Michael Schierl <schierlm@gmx.de>
Date:   Sat Mar 24 20:29:48 2012 +0100

    Add support to Java Meterpreter for multiple addresses on same interface

    For more information, see https://dev.metasploit.com/redmine/issues/6476

    Tested with Java 1.4, 1.5, 1.6, 1.7.

commit fc6dba99fe0b13bf8837ed7a699c5dbad35100e6
Author: Michael Schierl <schierlm@gmx.de>
Date:   Sat Mar 24 16:55:15 2012 +0100

    Fix Eclipse warnings

commit 4168d025507c1ecfbc50164cfc7f25f3f222b0ab
Author: Michael Schierl <schierlm@gmx.de>
Date:   Sat Mar 24 16:29:37 2012 +0100

    Update pretty-printing of unsupported command TLVs

    This adds the TLVs added by commit fbc8e25aaa to the pretty-printer.

commit 4a9335abdabb1b8a7741c5ec67852d7c5d552d6b
Author: Michael Schierl <schierlm@gmx.de>
Date:   Sat Mar 24 16:17:25 2012 +0100

    Un-ghetto Java Meterpreter MTU determination

    This splits the change from commit 14dfcce63a into a 1.6-specific and a 1.4-specific implementation (the latter being empty).

    Tested with Java 1.4, 1.5, 1.6, 1.7.

commit 968edd210ed68ba4974f051e280d90f0151df222
Author: Michael Schierl <schierlm@gmx.de>
Date:   Sat Mar 24 15:52:46 2012 +0100

    update .gitignore to ignore IDE generated files in JavaPayload projects

commit 86111625bee318411cf43da7706d37ce5d7045c5
Author: Michael Schierl <schierlm@gmx.de>
Date:   Sat Mar 24 15:49:58 2012 +0100

    synchronize stages with upstream JavaPayload

commit 2360f2e6eb8703ae762868678ac952203be35d93
Author: Michael Schierl <schierlm@gmx.de>
Date:   Sat Mar 24 15:39:58 2012 +0100

    remove unused stages

[Closes #270]
 2012-04-04 09:56:07 -06:00
James Lee 4ed55dc958 Fall back to MIB method if we can't get netmasks 
Misses IPv6 addresses, but at least doesn't break everything.

[Fixes #6525]
 2012-03-16 11:30:25 -06:00
James Lee ba1ed93ee2 Check for a 0 prefix length 
If the OnLinkPrefixLength is 0, something is wrong, try the value in the
prefix linked list.  Appears to fix v4 addresses on XP but not 2k3.

[See #6525]
 2012-03-16 03:46:10 -06:00
James Lee 9aaf6af072 Return network prefixes when available 
Solves #6525 on Vista+.  Win2k still works using the old MIB method
(which doesn't support ipv6).  Win2k3 and XP are still busted for
unknown reasons.
 2012-03-16 01:50:26 -06:00
James Lee 6036691517 Adjust snaplen to grab the whole packet in case mtu > 1514 
Fixes an issue where pcap_dispatch would return -1 and pcap_geterror
said "corrupted frame on kernel ring mac"

[Fixes #6527]
 2012-03-14 12:36:36 -06:00
James Lee 43f5ffabf6 Add Linux bins for new sniffer_release command et al. 
[See #214]
 2012-03-14 11:07:31 -06:00
David Maloney 5a69c896fc Fixes #6465 
Properly imports vulnerability titles from Qualys Scan Reports
 2012-03-13 16:45:55 -05:00
James Lee 6a6dd06103 Merge branch 'feature/6476-list-all-ifaces' 
Conflicts:
	modules/auxiliary/scanner/afp/afp_server_info.rb
 2012-03-13 13:55:45 -06:00
James Lee 89e3fee5a8 Revert "Squashed commit of the following:" 
This reverts commit dd9ac8a6c0.
 2012-03-13 13:38:35 -06:00
James Lee dd9ac8a6c0 Squashed commit of the following: 
commit 8b4750d0dcbac0686f9403acdf5cab50c918212f
Author: James Lee <egypt@metasploit.com>
Date:   Tue Mar 13 13:14:43 2012 -0600

    Add bins for listing all addresses

    [Fixes #6476]

commit 213dd92ebc9b706a45725e6515c7939d2edace0e
Author: James Lee <egypt@metasploit.com>
Date:   Tue Mar 13 02:08:34 2012 -0600

    Accept multiple addresses and netmasks

    [See #6476]

commit 2e8bd3c3ecfb319bf9456485d2420bb5829b60cc
Author: James Lee <egypt@metasploit.com>
Date:   Tue Mar 13 01:55:57 2012 -0600

    Make inspecting meterpreter packets a little less painful

    Not sure why I originally thought there was no way to access extensions'
    constants before.  A simple `require` makes it all happy.

commit da367907cf579bd3aefaffbc84d2f96a41b85f00
Author: James Lee <egypt@metasploit.com>
Date:   Sun Mar 11 22:08:44 2012 -0600

    Fix up Linux after changes for Windows

commit ec9f04378b0155f69df95d4a94e62d33ce61977c
Author: James Lee <egypt@metasploit.com>
Date:   Sun Mar 11 21:56:11 2012 -0600

    Grab IPv6 addresses on Windows when possible

    Tries to GetProcAddress of GetAdaptersAddresses and falls back to the
    old GetIpAddrTable() function when it isn't available. This should work
    on XPSP1 and newer, albeit without netmasks on versions before Vista.
    Still trying to figure that one out.

commit 1052ebdcf86114fbc03d1a37ab5d4c6a78e82daa
Author: James Lee <egypt@metasploit.com>
Date:   Tue Mar 6 15:34:09 2012 -0700

    Wrap Windows-specifc headers in ifdef

commit f23f20587b3117c38a77e7e5a93d542411e9504f
Author: James Lee <egypt@metasploit.com>
Date:   Tue Mar 6 14:36:34 2012 -0700

    Handle multiple addrs on one iface on the ruby side

commit d7207d075ac6462875d9da531cf20c175629a416
Author: James Lee <egypt@metasploit.com>
Date:   Mon Mar 5 21:57:39 2012 -0700

    Adds IPv6 addrs to win32 get_interfaces response

commit 11ae7e8a45bd56d25841ea8724377e0fb6789d72
Author: James Lee <egypt@metasploit.com>
Date:   Mon Mar 5 09:07:28 2012 -0700

    Don't distinguish between 4 and 6.

    The client can figure it out from the length.

commit 2c7490bdf3e4079f30857ee323d2ce23ab1bd9a5
Author: James Lee <egypt@metasploit.com>
Date:   Sun Mar 4 04:25:26 2012 -0700

    Append to the list instead of assigning to it

    All addresses are being sent to the client now.  Just need a way to
    parse them out correctly on the other side and meterpreter will be able
    to list all addresses on all interfaces on Linux.  Next step is to
    allocate the proper number of TLVs to avoid good ol' stack smashes on
    systems with lots of addresses and then make sure we clean all the
    memory leaks.

    [See #6476]

commit 73bba037ad968b922341c02459017afcc8407a76
Author: James Lee <egypt@metasploit.com>
Date:   Sun Mar 4 03:12:28 2012 -0700

    Lay the groundwork for returning all addresses

    This commit only sends the last interface in the list, but it is looping
    through all of them as evidenced by the log, just need to make sure
    we're not overwriting as we go.

    [See #6476]
 2012-03-13 13:19:18 -06:00
James Lee d09a80594c Add bins for listing all addresses 
[Fixes #6476]
 2012-03-13 13:14:43 -06:00
HD Moore c8c73b076d Permisssions (ignore) 2012-03-08 16:16:13 -06:00
James Lee 9f05562a18 Don't distinguish between IPv4 and IPv6 routes 
It's easier to deal with one Array of all routes regardless of INET
family than having get_routes() return a two-element Array of Arrays.
Also fixes a bug in each_route() which was expecting get_routes() to
return a single Array of all routes. Thanks to valsmith for reporting.
 2012-03-02 18:26:57 -07:00
James Lee 368cb13728 And the updated bin 2012-03-02 13:19:00 -07:00
James Lee be65f421f7 New Java meterpreter bins for adding MTU 2012-02-29 20:31:56 -07:00
James Lee 624e19fd8b Merge session-host-rework branch back to master 
Squashed commit of the following:

commit 2f4e8df33c5b4baa8d6fd67b400778a3f93482aa
Author: James Lee <egypt@metasploit.com>
Date:   Tue Feb 28 16:31:03 2012 -0700

    Clean up some rdoc comments

    This adds categories for the various interfaces that meterpreter and
    shell sessions implement so they are grouped logically in the docs.

commit 9d31bc1b35845f7279148412f49bda56a39c9d9d
Author: James Lee <egypt@metasploit.com>
Date:   Tue Feb 28 13:00:25 2012 -0700

    Combine the docs into one output dir

    There's really no need to separate the API sections into their own
    directory.  Combining them makes it much easier to read.

commit eadd7fc136a9e7e4d9652d55dfb86e6f318332e0
Author: James Lee <egypt@metasploit.com>
Date:   Tue Feb 28 08:27:22 2012 -0700

    Keep the order of iface attributes the same accross rubies

    1.8 doesn't maintain insertion order for Hash keys like 1.9 does so we
    end up with ~random order for the display with the previous technique.
    Switch to an Array instead of a Hash so it's always the same.

commit 6f66dd40f39959711f9bacbda99717253a375d21
Author: James Lee <egypt@metasploit.com>
Date:   Tue Feb 28 08:23:35 2012 -0700

    Fix a few more compiler warnings

commit f39cb536a80c5000a5b9ca1fec5902300ae4b440
Author: James Lee <egypt@metasploit.com>
Date:   Tue Feb 28 08:17:39 2012 -0700

    Fix a type-safety warning

commit 1e52785f38146515409da3724f858b9603d19454
Author: James Lee <egypt@metasploit.com>
Date:   Mon Feb 27 15:21:36 2012 -0700

    LHOST should be OptAddress, not OptAddressRange

commit acef978aa4233c7bd0b00ef63646eb4da5457f67
Author: James Lee <egypt@metasploit.com>
Date:   Sun Feb 26 17:45:59 2012 -0700

    Fix a couple of warnings and a typo

commit 29d87f88790aa1b3e5db6df650ecfb3fb93c675b
Author: HD Moore <hdm@digitaloffense.net>
Date:   Mon Feb 27 11:54:29 2012 -0600

    Fix ctype vs content_type typo

commit 83b5400356c47dd1973e6be3aa343084dfd09c73
Author: Gregory Man <man.gregory@gmail.com>
Date:   Sun Feb 26 15:38:33 2012 +0200

    Fixed scripts/meterpreter/enum_firefox to work with firefox > 3.6.x

commit 49c2c80b347820d02348d694cc71f1b3028b4365
Author: Steve Tornio <swtornio@gmail.com>
Date:   Sun Feb 26 07:13:13 2012 -0600

    add osvdb ref

commit e18e1fe97b89c3a2b8c22bc6c18726853d2c2bee
Author: Matt Andreko <mandreko@gmail.com>
Date:   Sat Feb 25 18:02:56 2012 -0500

    Added aspx target to msfvenom.  This in turn added it to msfencode as well.
    Ref: https://github.com/rapid7/metasploit-framework/pull/188
    Tested on winxp with IIS in .net 1.1 and 2.0 modes

commit e6aa5072112d79bbf8a4d2289cf8d301db3932f5
Author: Joshua J. Drake <github.jdrake@qoop.org>
Date:   Sat Feb 25 13:00:48 2012 -0600

    Fixes #6308: Fall back to 127.0.0.1 when SocketError is raised from the resolver

commit b3371e8bfeea4d84f9d0cba100352b57d7e9e78b
Author: James Lee <egypt@metasploit.com>
Date:   Tue Feb 28 17:07:42 2012 -0700

    Simplify logic for whether an inner iface has the same address

commit 5417419f35a40d1c08ca11ca40744722692d3b0d
Author: James Lee <egypt@metasploit.com>
Date:   Tue Feb 28 16:58:16 2012 -0700

    Whitespace

commit 9036875c2918439ae23e11ee7b958e30ccc29545
Author: James Lee <egypt@metasploit.com>
Date:   Tue Feb 28 16:53:45 2012 -0700

    Set session info before worrying about address

    get_interfaces can take a while on Linux, grab uid and hostname earlier
    so we can give the user an idea of what they popped as soon as possible.

commit f34b51c6291031ab25b5bfb1ac6307a516ab0ee9
Author: James Lee <egypt@metasploit.com>
Date:   Tue Feb 28 16:48:42 2012 -0700

    Clean up rdoc

commit e61a0663454400ec66f59a80d18b0baff4cb8cd9
Author: HD Moore <hd_moore@rapid7.com>
Date:   Tue Feb 28 04:54:45 2012 -0600

    Ensure the architecture is only the first word (not the full WOW64
    message in some cases)

commit 4c701610976a92298c1182eecc9291a1b301e43b
Author: HD Moore <hd_moore@rapid7.com>
Date:   Tue Feb 28 04:49:17 2012 -0600

    More paranoia code, just in case RHOST is set to whitespace

commit c5ff89fe3dc9061e0fa9f761e6530f6571989d28
Author: HD Moore <hd_moore@rapid7.com>
Date:   Tue Feb 28 04:47:01 2012 -0600

    A few more small bug fixes to handle cases with an empty string target
    host resulting in a bad address

commit 462d0188a1298f29ac83b10349aec6737efc5b19
Author: HD Moore <hd_moore@rapid7.com>
Date:   Tue Feb 28 03:55:10 2012 -0600

    Fix up the logic (reversed by accident)

commit 2b2b0adaec2448423dbd3ec54d90a5721965e2df
Author: HD Moore <hd_moore@rapid7.com>
Date:   Mon Feb 27 23:29:52 2012 -0600

    Automatically parse system information and populate the db, identify and
    report NAT when detected, show the real session_host in the sessions -l
    listing

commit 547a4ab4c62dc3248f847dd5d305ad3b74157348
Author: HD Moore <hd_moore@rapid7.com>
Date:   Mon Feb 27 22:16:03 2012 -0600

    Fix typo introduced

commit 27a7b7961e61894bdecd55310a8f45d0917c5a5c
Author: HD Moore <hd_moore@rapid7.com>
Date:   Mon Feb 27 22:11:38 2012 -0600

    More session.session_host tweaks

commit e447302a1a9915795e89b5e29c89ff2ab9b6209b
Author: HD Moore <hd_moore@rapid7.com>
Date:   Mon Feb 27 22:08:20 2012 -0600

    Additional tunnel_peer changes

commit 93369fcffaf8c6b00d992526b4083acfce036bb3
Author: HD Moore <hd_moore@rapid7.com>
Date:   Mon Feb 27 22:06:21 2012 -0600

    Additional changes to session.session_host

commit c3552f66d158685909e2c8b51dfead7c240c4f40
Author: HD Moore <hd_moore@rapid7.com>
Date:   Mon Feb 27 22:00:19 2012 -0600

    Merge changes into the new branch
 2012-02-28 18:29:39 -07:00
James Lee eccd62717e Binaries for new netlink code 
Includes a Windows dll to add support for route metrics.
 2012-02-24 16:42:13 -07:00
HD Moore 0023b46009 permission tweak 2012-02-18 14:39:52 -06:00
James Lee e17937ab35 And a bin with less redundantly verbose verbosity 2012-02-13 18:41:51 -07:00
James Lee 555b981b26 Smaller, non-debug versions of all linux bins 
This is a significant size savings on the extensions, not so big a deal
on the main stage since that was already stripped.
 2012-02-10 15:57:01 -07:00
James Lee e045accfc3 Refactor interface listing 
[See #6328]
 2012-02-02 00:14:38 -07:00
James Lee a8e3d7b413 New bin after fix from #6322 
[See #6322]
 2012-01-31 17:33:32 -07:00
James Lee fae4f5d132 Move IPv6 handling into connect() 
This allows portfwd and friends to work through the session.
 2012-01-31 02:46:57 -07:00
HD Moore 3ed8643dbc Permission changes 2012-01-31 00:33:21 -06:00
James Lee e48da7b7db Merge branch 'stat-struct-fixes' 
Conflicts:
	data/meterpreter/ext_server_stdapi.lso
 2012-01-27 19:07:27 -07:00
James Lee 2182026352 Bin for stat fixes 2012-01-27 18:58:26 -07:00
James Lee 4fb3f1649c New bins, hopefully all the compile flags are happy 
See #6268
 2012-01-27 18:10:47 -07:00
James Lee bddeb9912b New (hopefully) i386-compat bins for linux meterp 
Another stab at getting compatibility for older processors

See #6268
 2012-01-25 17:59:32 -07:00
James Lee 54429ca5a7 Add stripped, non-debug versions of bins 
Makes for much smaller extensions, although the main stage is still pretty
hefty.
 2012-01-23 16:45:18 -07:00
James Lee 53eb850c51 Adds i386 bins for linux meterpreter 
See #6268
 2012-01-23 15:24:21 -07:00
HD Moore 96766edfd0 Permission changes (to sync) 2011-11-10 19:48:32 -06:00
HD Moore aecd022587 Roll back to an older version of the sniffer extension, remove the 64-bit extension until the linking problems are resolved 
git-svn-id: file:///home/svn/framework3/trunk@14194 4d416f70-5f16-0410-b530-b9f4589650da
 2011-11-08 21:17:20 +00:00
Matt Weeks a82adb14f9 Allow boolean options of true and True as well as 0 and 1. 
git-svn-id: file:///home/svn/framework3/trunk@13796 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-26 19:16:02 +00:00
Matt Weeks ab4026cfb5 And do the same for pivoted PXE attacks. 
git-svn-id: file:///home/svn/framework3/trunk@13780 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-23 16:16:47 +00:00
Matt Weeks 10bf0fbe84 Whoops. Reset would be reset, not stop. 
git-svn-id: file:///home/svn/framework3/trunk@13752 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-18 20:26:09 +00:00
Matt Weeks 6853221762 Fixes #5313 by adding logging support to pivoted PXE attacks, and displaying results as the module runs. 
git-svn-id: file:///home/svn/framework3/trunk@13646 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-27 15:46:49 +00:00
Matt Weeks 06c3dabe31 Fixes #5312 for pivoted PXE attacks. 
git-svn-id: file:///home/svn/framework3/trunk@13634 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-25 02:07:35 +00:00
Matt Weeks 53e43fa847 whoops. Use these, not the dhcpserv.cpp/h 
git-svn-id: file:///home/svn/framework3/trunk@13633 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-25 01:41:57 +00:00
HD Moore 25100584eb Related to r13582 (binaries) 
git-svn-id: file:///home/svn/framework3/trunk@13583 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-19 05:10:13 +00:00
Matt Weeks b2733c04db More PXE dust for extra magic! 
git-svn-id: file:///home/svn/framework3/trunk@13493 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-05 17:10:27 +00:00
James Lee b412dac37f sniffer works, see #2418 
git-svn-id: file:///home/svn/framework3/trunk@13360 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-27 06:29:49 +00:00
James Lee 3fe4c2524c add linux bins to go with r13346 
git-svn-id: file:///home/svn/framework3/trunk@13349 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-26 21:17:00 +00:00
HD Moore 0b331ac7b7 Commit new bins 
git-svn-id: file:///home/svn/framework3/trunk@13347 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-26 20:54:51 +00:00
James Lee 0f95070f3f add a request type for grabbing the host's directory separator, fixes #4892 
git-svn-id: file:///home/svn/framework3/trunk@13346 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-26 20:51:33 +00:00
James Lee 3c261c346f add support for java/meterpreter/reverse_http. assuming i didn't miss any files, fixes #4946, thanks mihi! 
git-svn-id: file:///home/svn/framework3/trunk@13213 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-18 23:15:06 +00:00
James Lee f8a307f873 use append mode for stderr when creating processes with proc_open in windows, see http://us2.php.net/manual/en/function.proc-open.php#97012 . also, if windows doesn't give us a valid path to cmd.exe from the COMSPEC env var, just use cmd.exe and hope it's in the path 
git-svn-id: file:///home/svn/framework3/trunk@13176 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-14 20:34:05 +00:00
James Lee f01d29e4a5 add support for absolute paths, fixes #4874 
git-svn-id: file:///home/svn/framework3/trunk@13108 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-06 21:35:51 +00:00
HD Moore ec6ef32002 Merge in the binaries 
git-svn-id: file:///home/svn/framework3/trunk@13090 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-02 04:04:22 +00:00
James Lee 9e4b36d7ac keep channels around until all their data has been read, fixes #4818, and see #4688 
git-svn-id: file:///home/svn/framework3/trunk@13077 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-30 10:28:04 +00:00
James Lee 68185cb48d fix a deadlock when trying to kill spawned processes 
git-svn-id: file:///home/svn/framework3/trunk@13073 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-30 05:44:27 +00:00
HD Moore b7a0ac7989 Posix style (bins) 
git-svn-id: file:///home/svn/framework3/trunk@13062 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-29 06:31:14 +00:00
HD Moore 92bb531af5 New bins, new functions, more info soon 
git-svn-id: file:///home/svn/framework3/trunk@13059 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-29 06:12:03 +00:00
HD Moore 9220506ba2 Merge in recent meterpreter work. These are not the commits you are looking for (more info on what all this is later this week). 
git-svn-id: file:///home/svn/framework3/trunk@13053 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-28 21:26:43 +00:00
HD Moore db413592e9 This commit adds support for the -r (remote machine name) parameter to the reg command and extends the api to support a remote machine name. Closes #1894 
git-svn-id: file:///home/svn/framework3/trunk@12924 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-12 00:01:29 +00:00
HD Moore 6dd65e56f2 All changes look good, merging 
git-svn-id: file:///home/svn/framework3/trunk@12921 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-11 23:17:42 +00:00
HD Moore 36d4de74f8 Fresh meterpreter binaries, including a 64-bit version of the sniffer extension 
git-svn-id: file:///home/svn/framework3/trunk@12915 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-11 22:41:08 +00:00
James Lee 98fb399825 remove logging again, silly debugging 
git-svn-id: file:///home/svn/framework3/trunk@12606 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-13 01:31:04 +00:00
James Lee 6e06b61e48 php doesn't reuse array indexes with [], so do some acrobatics to figure out a real channel id. fixes #4418 
git-svn-id: file:///home/svn/framework3/trunk@12605 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-13 01:22:53 +00:00
James Lee 8c0773ba71 and the bin for r12372, see #3898 
git-svn-id: file:///home/svn/framework3/trunk@12373 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-19 22:40:13 +00:00
amaloteaux 78396e94f9 move linux meterpreter bin to the correct place 
git-svn-id: file:///home/svn/framework3/trunk@11938 4d416f70-5f16-0410-b530-b9f4589650da
 2011-03-11 20:29:25 +00:00
James Lee 6eac24e940 handle dead resources more gracefully 
git-svn-id: file:///home/svn/framework3/trunk@11770 4d416f70-5f16-0410-b530-b9f4589650da
 2011-02-18 00:24:18 +00:00
James Lee 758da50090 use the correct length for copying arguments, fixes #3526, thanks mihi! 
git-svn-id: file:///home/svn/framework3/trunk@11700 4d416f70-5f16-0410-b530-b9f4589650da
 2011-02-02 21:26:29 +00:00
Stephen Fewer 41e5a4c61d Fix for #3482, the empty value occurs when no service pack is present. The fix simply tests for this. Also remove the two unused params on the _snprintf call. 
git-svn-id: file:///home/svn/framework3/trunk@11542 4d416f70-5f16-0410-b530-b9f4589650da
 2011-01-11 14:29:16 +00:00
James Lee dd61fa950f when socket creation fails, return a relevant windows error code so the client will raise ::Rex::ConnectionError instead of just erroring out with a RequestError. This fixes some problems with backtraces when routing through a php meterp. See r9794, #3481. 
git-svn-id: file:///home/svn/framework3/trunk@11532 4d416f70-5f16-0410-b530-b9f4589650da
 2011-01-10 08:31:10 +00:00
James Lee bf8a534a72 clean up process handling in php meterp a bit, fixes the 'shell' command and hopefully makes process interaction a little more robust. 
git-svn-id: file:///home/svn/framework3/trunk@11531 4d416f70-5f16-0410-b530-b9f4589650da
 2011-01-10 08:04:17 +00:00
Matt Weeks 599df0a71a Fix error with recording on certain Windows versions. 
git-svn-id: file:///home/svn/framework3/trunk@11311 4d416f70-5f16-0410-b530-b9f4589650da
 2010-12-12 20:12:03 +00:00
Matt Weeks 61242f3c2c Catch invalid webcam frame requests. 
git-svn-id: file:///home/svn/framework3/trunk@11160 4d416f70-5f16-0410-b530-b9f4589650da
 2010-11-29 02:23:01 +00:00
Matt Weeks 2e72926638 Add audio (microphone) recording support to stdapi. 
git-svn-id: file:///home/svn/framework3/trunk@11087 4d416f70-5f16-0410-b530-b9f4589650da
 2010-11-22 00:32:39 +00:00
Matt Weeks 560c1847c3 Properly return error if no webcams present (instead of killing session). 
git-svn-id: file:///home/svn/framework3/trunk@11041 4d416f70-5f16-0410-b530-b9f4589650da
 2010-11-14 19:59:31 +00:00
Matt Weeks 594a46bfc7 Merge webcam extension into stdapi. 
git-svn-id: file:///home/svn/framework3/trunk@10997 4d416f70-5f16-0410-b530-b9f4589650da
 2010-11-11 22:36:54 +00:00
Matt Weeks 2d2e1989aa Fix memory leak. 
git-svn-id: file:///home/svn/framework3/trunk@10964 4d416f70-5f16-0410-b530-b9f4589650da
 2010-11-09 23:37:56 +00:00
Matt Weeks db602dd478 Add functional in-memory webcam support. 
git-svn-id: file:///home/svn/framework3/trunk@10954 4d416f70-5f16-0410-b530-b9f4589650da
 2010-11-09 02:24:28 +00:00
pks 20b96ae0c1 Partial implementation of in memory execution and update binary 
git-svn-id: file:///home/svn/framework3/trunk@10839 4d416f70-5f16-0410-b530-b9f4589650da
 2010-10-28 12:44:39 +00:00
James Lee ecc98849a6 remove debugging error_reporting 
git-svn-id: file:///home/svn/framework3/trunk@10778 4d416f70-5f16-0410-b530-b9f4589650da
 2010-10-21 22:47:16 +00:00
James Lee 5960dc6753 take out debugging 
git-svn-id: file:///home/svn/framework3/trunk@10745 4d416f70-5f16-0410-b530-b9f4589650da
 2010-10-19 12:51:09 +00:00
HD Moore 2e9138ebbc This commit overhauls much of the meterpreter timeouts and staging processes. This fixes a bug with concurrent session handling, reduces CPU load by caching a single SSL certificate for all sessions, increases all of the critical timeouts, and generally makes mass ownage work better. We still need to limit the maximum number of concurrent on_session() threads to something sane to prevent sesssion spikes from dragging out the process even longer. The C-side meterpreter change is minimal and will only help with future compatibility if we move to non-blocking fd's for the SSL socket. 
git-svn-id: file:///home/svn/framework3/trunk@10595 4d416f70-5f16-0410-b530-b9f4589650da
 2010-10-08 04:11:47 +00:00
pks 754225a80d Implement per dispatch run channel_write of packets, remove __FUNCTION__ due to dprintf changes, and fix shutting down networkpug interfaces. Re-add networkpug binary. 
git-svn-id: file:///home/svn/framework3/trunk@10586 4d416f70-5f16-0410-b530-b9f4589650da
 2010-10-07 11:52:38 +00:00
pks 14cabd2611 Allow debugging to be enabled. 
This will make it easier to hopefully track down bugs.

exploitme-posix.c - make complete stack executable. On some kernel versions, execstack doesn't do the trick.

git-svn-id: file:///home/svn/framework3/trunk@10485 4d416f70-5f16-0410-b530-b9f4589650da
 2010-09-26 05:58:59 +00:00
pks 50241faa57 Implement a sniffer for posix meterpreter using libpcap. 
This version of the sniffer supports packet filtering after the packet count variable, like so:

meterpreter > sniffer_interfaces

1 - 'eth0' ( type:0 mtu:1514 usable:false dhcp:false wifi:false )
2 - 'any' ( type:0 mtu:1514 usable:false dhcp:false wifi:false )
3 - 'lo' ( type:0 mtu:1514 usable:false dhcp:false wifi:false )

meterpreter > use sniffer
Loading extension sniffer...success.
meterpreter > sniffer_start 1 500000 icmp <-- picks up only icmp packets.
[*] Capture started on interface 1 (500000 packet buffer)
meterpreter > sniffer_stop 1
[*] Capture stopped on interface 1

git-svn-id: file:///home/svn/framework3/trunk@10424 4d416f70-5f16-0410-b530-b9f4589650da
 2010-09-21 11:43:30 +00:00
pks a179836fca Initial import of networkpug, a pivoting interface using libpcap to monitor/inject packets on a interface on the remote machine. 
git-svn-id: file:///home/svn/framework3/trunk@10423 4d416f70-5f16-0410-b530-b9f4589650da
 2010-09-21 09:35:46 +00:00
pks 4fd054476c Update the posix meterpreter binaries. 
git-svn-id: file:///home/svn/framework3/trunk@10420 4d416f70-5f16-0410-b530-b9f4589650da
 2010-09-21 05:14:07 +00:00
Stephen Fewer 7957c8872e add in the new bins (and delete the old railgun dll) 
git-svn-id: file:///home/svn/framework3/trunk@10320 4d416f70-5f16-0410-b530-b9f4589650da
 2010-09-14 23:31:35 +00:00
Joshua Drake 007ffc1821 updated binary, see #2418 
git-svn-id: file:///home/svn/framework3/trunk@10316 4d416f70-5f16-0410-b530-b9f4589650da
 2010-09-14 20:38:14 +00:00
James Lee 07f1b6affb update to java meterpreter, now supports file search, thanks mihi! see #406 
git-svn-id: file:///home/svn/framework3/trunk@10295 4d416f70-5f16-0410-b530-b9f4589650da
 2010-09-11 17:55:10 +00:00
James Lee b453665e5f avoid infinite recursion when links cause circular directory paths by not following symlinks 
git-svn-id: file:///home/svn/framework3/trunk@10244 4d416f70-5f16-0410-b530-b9f4589650da
 2010-09-05 22:18:43 +00:00
James Lee 35fab7b5ae default to the current directory instead of failing 
git-svn-id: file:///home/svn/framework3/trunk@10243 4d416f70-5f16-0410-b530-b9f4589650da
 2010-09-05 22:08:05 +00:00
James Lee efeffe3185 add support for file search to php meterp 
git-svn-id: file:///home/svn/framework3/trunk@10242 4d416f70-5f16-0410-b530-b9f4589650da
 2010-09-05 21:49:48 +00:00
James Lee 9060ce379b add preliminary support for querying registry values when running on Windows 
git-svn-id: file:///home/svn/framework3/trunk@10241 4d416f70-5f16-0410-b530-b9f4589650da
 2010-09-05 20:54:32 +00:00
Joshua Drake 1bd084ff9f add posix meterpreter linux x86 binaries from philip 
git-svn-id: file:///home/svn/framework3/trunk@10223 4d416f70-5f16-0410-b530-b9f4589650da
 2010-09-02 16:56:47 +00:00
Stephen Fewer a0f86c62e3 Meterpreter search support to leverage the index on older systems (2000/XP/2003) via Windows Desktop Search v2. 
git-svn-id: file:///home/svn/framework3/trunk@10187 4d416f70-5f16-0410-b530-b9f4589650da
 2010-08-30 09:50:41 +00:00
Stephen Fewer aa6ef3615e ...and the bins for file searching. 
git-svn-id: file:///home/svn/framework3/trunk@10166 4d416f70-5f16-0410-b530-b9f4589650da
 2010-08-27 14:45:36 +00:00
Stephen Fewer 49d34d048f ...and the bins 
git-svn-id: file:///home/svn/framework3/trunk@10054 4d416f70-5f16-0410-b530-b9f4589650da
 2010-08-19 11:35:17 +00:00
James Lee ec1db10fa3 stupid missing files. /me grumbles 
git-svn-id: file:///home/svn/framework3/trunk@9975 4d416f70-5f16-0410-b530-b9f4589650da
 2010-08-09 17:49:01 +00:00
James Lee 4a5f800064 i swear i added this before. 
git-svn-id: file:///home/svn/framework3/trunk@9973 4d416f70-5f16-0410-b530-b9f4589650da
 2010-08-09 16:18:35 +00:00
James Lee 02167b8d16 move the stdapi constants into the stdapi extension to save a little space when php meterpreter is standalone 
git-svn-id: file:///home/svn/framework3/trunk@9939 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-27 21:16:15 +00:00
James Lee 8de510f914 add udp support for tunneling. tested with udp_probe 
git-svn-id: file:///home/svn/framework3/trunk@9816 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-13 22:51:15 +00:00
HD Moore 30d3440b5d New bins, implements the server side of multi-call railgun 
git-svn-id: file:///home/svn/framework3/trunk@9806 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-13 19:19:21 +00:00
Stephen Fewer a47ced6ac4 Partial solution for #1448. Fall back to CreateProcessWithTokenW when CreateProcessAsUser fails with ERROR_PRIVILEGE_NOT_HELD. While only available on 2003 and above this works on my server 2008 test case which was failing before. 
git-svn-id: file:///home/svn/framework3/trunk@9781 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-11 18:36:57 +00:00
Stephen Fewer 7a57ca57a6 Bug fix for a misplaced & in call to DestroyEnvironmentBlock() during process_execute(), was causing a hang on Vista and an Access Violation on server 2008. 
git-svn-id: file:///home/svn/framework3/trunk@9779 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-11 16:37:50 +00:00
HD Moore d3a6418e53 Revert changes to elevate, still not getting around restrictions on primary token creation, needs a deeper look 
git-svn-id: file:///home/svn/framework3/trunk@9759 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-09 21:59:31 +00:00
HD Moore 3d01172af5 Binaries for the previous commit 
git-svn-id: file:///home/svn/framework3/trunk@9757 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-09 21:41:06 +00:00
HD Moore ec9156827e Switch the elevator methods to DuplicateHandleEx to get a primary token 
git-svn-id: file:///home/svn/framework3/trunk@9755 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-09 21:23:05 +00:00
HD Moore 29f9f6671e This *should* fix all cases where execute -t would fail to use an impersonated token 
git-svn-id: file:///home/svn/framework3/trunk@9754 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-09 19:32:51 +00:00
HD Moore 972e7bc282 Clean up some of the token impersonation code around process execution 
git-svn-id: file:///home/svn/framework3/trunk@9751 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-09 18:54:20 +00:00
James Lee 114ca4e535 replace / and \ with the current system's directory separator so it doesn't matter what the user types 
git-svn-id: file:///home/svn/framework3/trunk@9727 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-07 20:40:19 +00:00
HD Moore 38d15c016d Rebuilds of meterpreter, including x64 
git-svn-id: file:///home/svn/framework3/trunk@9716 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-07 16:47:35 +00:00
HD Moore ce1116e622 Add railgun binary 
git-svn-id: file:///home/svn/framework3/trunk@9711 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-07 16:29:55 +00:00
HD Moore e34bbc281a Merge railgun binary and new builds 
git-svn-id: file:///home/svn/framework3/trunk@9710 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-07 16:29:37 +00:00
James Lee 2638153f46 abstract connect out into it's own function 
git-svn-id: file:///home/svn/framework3/trunk@9617 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-25 00:39:48 +00:00
James Lee c9c3e806a5 use $GLOBALS instead of assuming vars declared outside of a function will be global. allows it to work inside a create_function() eval 
git-svn-id: file:///home/svn/framework3/trunk@9597 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-23 22:38:01 +00:00
James Lee c3d183c98d split stadpi out into an extension, add a reverse_tcp stager, make the main meterpreter stage-aware so it will work as a standalone or eval'd by a stager that sets $msgsock and $msgsock_type; see #2128 
git-svn-id: file:///home/svn/framework3/trunk@9594 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-23 20:00:27 +00:00
James Lee 998509529c don't consider compression when looking for a tlv 
git-svn-id: file:///home/svn/framework3/trunk@9527 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-15 17:55:37 +00:00
James Lee dacd38c49c consolidate debugging functions in the file 
git-svn-id: file:///home/svn/framework3/trunk@9517 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-15 00:33:24 +00:00
James Lee 7498c30b30 replace $setsockopt with a function, remove unused hexdump function 
git-svn-id: file:///home/svn/framework3/trunk@9516 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-14 23:20:57 +00:00
James Lee e2740c9e2b watch stderr as well as stdout 
git-svn-id: file:///home/svn/framework3/trunk@9513 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-14 05:01:37 +00:00
James Lee a39a0df5dc shell interaction works in linux, still broken in windows. kill and ps work in windows now 
git-svn-id: file:///home/svn/framework3/trunk@9512 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-13 16:44:22 +00:00
James Lee 975e2c326e ps now works in windows by shelling out to tasklist.exe 
git-svn-id: file:///home/svn/framework3/trunk@9497 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-11 22:07:23 +00:00
James Lee d47ded220f overhaul socket handling to use fsockopen if socket_create isn't available. portfwd now works on default Windows and Ubuntu installs 
git-svn-id: file:///home/svn/framework3/trunk@9450 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-08 07:59:36 +00:00
James Lee f13417be08 stdapi is still in the base payload, but this file needs to exist 
git-svn-id: file:///home/svn/framework3/trunk@9446 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-07 17:00:47 +00:00
James Lee ff0af3fb5a turn off debug logging 
git-svn-id: file:///home/svn/framework3/trunk@9428 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-04 15:59:45 +00:00
James Lee 07ec574c3c fail if the socket couldn't connect 
git-svn-id: file:///home/svn/framework3/trunk@9427 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-04 15:28:11 +00:00
James Lee b23696a916 Woot, portfwd works. 
git-svn-id: file:///home/svn/framework3/trunk@9418 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-04 02:43:17 +00:00
James Lee c068e8e6dc standardize whitespace 
git-svn-id: file:///home/svn/framework3/trunk@9413 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-03 23:18:21 +00:00
James Lee 5c87771a89 basic client sockets, connect and write work 
git-svn-id: file:///home/svn/framework3/trunk@9404 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-03 04:45:48 +00:00
James Lee e4e2bc61a4 break out of the main loop when we get eof (or any other area) on the main socket. fixes infinite loop in the server when client exits 
git-svn-id: file:///home/svn/framework3/trunk@9402 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-03 00:24:55 +00:00
James Lee 975b207710 switch debug logging to the webserver error_log for easier perusement; add fs_stat which fixes downloads; only return success from delete_file if it actually deleted the file 
git-svn-id: file:///home/svn/framework3/trunk@9399 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-02 22:43:03 +00:00
James Lee 4f0ee6d44c add support for deleting files 
git-svn-id: file:///home/svn/framework3/trunk@9398 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-02 18:36:14 +00:00
James Lee cf4597df3f use posix_getuid if it exists 
git-svn-id: file:///home/svn/framework3/trunk@9397 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-02 18:08:09 +00:00
James Lee fe43e91bad initial commit of php meterpreter, see #391. upload, download, cd, pwd, ls, cat, sysinfo, getpid, and ps all work fine. 
* execute works with channel read/write but no interact yet
* getuid is weird, since php's get_current_user() and getmyuid() return the owner of the file instead of the running uid (wtf?)



git-svn-id: file:///home/svn/framework3/trunk@9393 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-02 08:28:39 +00:00
HD Moore c6c956ab46 Small patch to enable a new stager 
git-svn-id: file:///home/svn/framework3/trunk@8984 4d416f70-5f16-0410-b530-b9f4589650da
 2010-04-03 05:21:15 +00:00
Stephen Fewer edf030df53 ...and finally the bins! 
git-svn-id: file:///home/svn/framework3/trunk@8789 4d416f70-5f16-0410-b530-b9f4589650da
 2010-03-11 17:12:31 +00:00
Stephen Fewer 195d1ab4b8 Commit snojobs jpeg patch for espia with an x64 build and some minor changes on the ruby side (The 'screenshot' command is now 'screengrab' to avoid a future conflict with changes happening in stdapi). 
git-svn-id: file:///home/svn/framework3/trunk@8726 4d416f70-5f16-0410-b530-b9f4589650da
 2010-03-05 15:50:24 +00:00
Stephen Fewer 4ed9e71b76 Commit the meterpreter C side (and bins) for transparent zlib (zlib.c copied from the posix meterpreter source) compression of TLV's and channels. To use transparent compression with channels, create them with CHANNEL_FLAG_COMPRESS. To use transparent compression with any TLV value, bitwise or the TLV type with TLV_META_TYPE_COMPRESSED (Don't create the TLV type with TLV_META_TYPE_COMPRESSED as the compressed flag is removed on the remote end after compression). For consistency with the ruby side we could at a later stage add a boolean compress parameter to all the packet_add_tlv_* functions so you don't have to manually specify TLV_META_TYPE_COMPRESSED flag. 
git-svn-id: file:///home/svn/framework3/trunk@8515 4d416f70-5f16-0410-b530-b9f4589650da
 2010-02-16 14:56:24 +00:00
Stephen Fewer 23901c83ea ...and the bins. 
git-svn-id: file:///home/svn/framework3/trunk@8433 4d416f70-5f16-0410-b530-b9f4589650da
 2010-02-09 16:48:13 +00:00
Stephen Fewer b12ac46d9e ...and the stdapi bins. 
git-svn-id: file:///home/svn/framework3/trunk@8385 4d416f70-5f16-0410-b530-b9f4589650da
 2010-02-06 18:00:09 +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
Stephen Fewer 0099fedeb3 ...and the bins for the ps command fix. 
git-svn-id: file:///home/svn/framework3/trunk@8323 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-29 12:01:26 +00:00
Stephen Fewer fc6eca57ec ...and finally the bins. 
git-svn-id: file:///home/svn/framework3/trunk@8320 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-29 01:14:23 +00:00
HD Moore 284af1260a Disable debug tracing 
git-svn-id: file:///home/svn/framework3/trunk@8312 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-28 23:10:58 +00:00
HD Moore f3408fd327 Fixes #744. The core issue was the migrate code waiting on SetEvent, but the migrate stub was blocked on a WSASocket due to a pending packet_receive in the main server thread. Simply settin the thread termination signal did not work, as the SSL_read was already in progress. This change forcible terminates the main server thread before waiting on the event in order to bypass this deadlock. The downside is a failed migrate has no way to recover if it makes it this far. 
git-svn-id: file:///home/svn/framework3/trunk@8309 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-28 22:55:41 +00:00
Stephen Fewer 6772efb79c ...and finally the bins. 
git-svn-id: file:///home/svn/framework3/trunk@8297 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-28 13:59:00 +00:00
Stephen Fewer de691597b6 ...and finally the bins :) 
git-svn-id: file:///home/svn/framework3/trunk@8200 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-22 19:48:21 +00:00
Stephen Fewer c92d7b68bf ...and the bins! 
git-svn-id: file:///home/svn/framework3/trunk@8159 4d416f70-5f16-0410-b530-b9f4589650da
 2010-01-19 11:10:55 +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 9bf88af0cc Add 64-bit 
git-svn-id: file:///home/svn/framework3/trunk@8047 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-31 15:56:09 +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
HD Moore 68aafc8e13 Fixes #658 by adding a 250ms sleep to the dispatch of the close call. 
git-svn-id: file:///home/svn/framework3/trunk@7934 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-21 19:53:10 +00:00
HD Moore cf6732d570 Fresh bins (including sniffer). See #672 
git-svn-id: file:///home/svn/framework3/trunk@7807 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-10 18:36:01 +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 353fa1dba5 Updated binaries (32/64) with the first round of socket fixes 
git-svn-id: file:///home/svn/framework3/trunk@7751 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-08 15:01:44 +00:00
HD Moore e99e2a8d95 Rebuild with Stephen's mutex changes (rebuild of sniffer, but checking in the others as well to match). 
git-svn-id: file:///home/svn/framework3/trunk@7734 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-07 14:44:35 +00:00
Stephen Fewer 56a64a0e2d Commit the latest windows x86/x64 build of the multi-threaded meterpreter (An x64 build of espia has been added too). 
git-svn-id: file:///home/svn/framework3/trunk@7733 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-07 13:07:26 +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
HD Moore 8a186921e7 Rebuilt Stephen's changes locally, including the sniffer extension 
git-svn-id: file:///home/svn/framework3/trunk@7700 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-04 17:54:01 +00:00
Stephen Fewer 10d9105708 Initial commit of the multi-threaded meterpreter binaries. Only x86 today (minus the sniffer extension), x64 will follow next Monday. 
git-svn-id: file:///home/svn/framework3/trunk@7699 4d416f70-5f16-0410-b530-b9f4589650da
 2009-12-04 17:39:32 +00:00
Stephen Fewer 54f952129a A fresh build of the x64 meterpreter and extensions to sync up with the recent changes with SSL in #7311 and the addition of the rm/del command from #7291 
git-svn-id: file:///home/svn/framework3/trunk@7316 4d416f70-5f16-0410-b530-b9f4589650da
 2009-11-01 16:49:01 +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 8325b46694 Add Alexander Sotirov's metsvc binaries to the metepreter data directory 
git-svn-id: file:///home/svn/framework3/trunk@7214 4d416f70-5f16-0410-b530-b9f4589650da
 2009-10-20 18:43:27 +00:00
HD Moore bf5068f6b1 Fixes #288 and #320. This should fix the BSoD issue with the sniffer module (other than the mac filter change, this matches the vendor's example) and confirmed that the keyscan_dump fix works 
git-svn-id: file:///home/svn/framework3/trunk@7066 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-26 16:26:05 +00:00
et 3993aaf79c espia dll 
git-svn-id: file:///home/svn/framework3/trunk@7064 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-26 04:25:37 +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
Stephen Fewer 36d60d5d12 Commit the x64 build of the meterpreter incognito extension. 
git-svn-id: file:///home/svn/framework3/trunk@7009 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-07 09:25:25 +00:00
Stephen Fewer ff9efacffa Commit the x64 build of the meterpreter priv extension. 
git-svn-id: file:///home/svn/framework3/trunk@7008 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-07 09:17:29 +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
Stephen Fewer 8bb0efb97e the first binaries for the windows x64 meterpreter. only metsrv and stdapi for now. source code to follow later. 
git-svn-id: file:///home/svn/framework3/trunk@6998 4d416f70-5f16-0410-b530-b9f4589650da
 2009-09-03 17:50:41 +00:00
HD Moore da32f1bdea Updated meterpreter code/binaries to scrub memory after use, works around Peter's memoryze signatures from BH/DC 2009 
git-svn-id: file:///home/svn/framework3/trunk@6942 4d416f70-5f16-0410-b530-b9f4589650da
 2009-08-08 14:22:32 +00:00
HD Moore ed02a67367 Updated to match the new hashing alg from Stephen Fewer 
git-svn-id: file:///home/svn/framework3/trunk@6924 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-31 17:58:11 +00:00
HD Moore 2a7467dd7f Update the meterp binaries with clean builds from svn 
git-svn-id: file:///home/svn/framework3/trunk@6888 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-24 04:01:26 +00:00
HD Moore 0d931953cf The sniffer module is now compiled against the dnet headers for packet decodes 
git-svn-id: file:///home/svn/framework3/trunk@6831 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-18 00:10:10 +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
HD Moore 148ca687f5 Updated libraries and source code now using OpenSSL 
git-svn-id: file:///home/svn/framework3/trunk@6773 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-13 03:10:39 +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 f76d73a823 Free packet memory when the capture is stopped 
git-svn-id: file:///home/svn/framework3/trunk@6765 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-11 18:19:42 +00:00
HD Moore 4989f9bdbe Fixes a bug where if the sniffer SDK could not initialize, it would still be treated as initialized the next time it was checked. 
git-svn-id: file:///home/svn/framework3/trunk@6764 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-11 17:52:40 +00:00
HD Moore 645ca020e9 Fixes a memory corruption issue with the SSL file descriptor (was using a stack reference instead of the Remote->fd reference), adds the source code sans the Packet SDK for the sniffer module 
git-svn-id: file:///home/svn/framework3/trunk@6763 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-11 17:32:50 +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
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 485d3fcb17 Merge in the meterpreter binaries with the new kernel32 loader code 
git-svn-id: file:///home/svn/framework3/trunk@6745 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-05 20:27:33 +00:00
HD Moore 0c4c05fb24 Commit the SSL-updated meterpreter binaries 
git-svn-id: file:///home/svn/framework3/trunk@6741 4d416f70-5f16-0410-b530-b9f4589650da
 2009-07-05 05:22:06 +00:00
HD Moore 43372de9f0 Fix a bug in the new SSL code that broke large transfers 
git-svn-id: file:///home/svn/framework3/trunk@6720 4d416f70-5f16-0410-b530-b9f4589650da
 2009-06-27 01:52:36 +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
et 746a3c533a ext. sample dll. not ready for production enviroments 
git-svn-id: file:///home/svn/framework3/trunk@6506 4d416f70-5f16-0410-b530-b9f4589650da
 2009-04-29 03:38:42 +00:00
HD Moore b360e42171 Updated sysinfo and setdesktop code 
git-svn-id: file:///home/svn/framework3/trunk@6462 4d416f70-5f16-0410-b530-b9f4589650da
 2009-04-07 15:46:45 +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 8b27f5faef Updated binaries, adds enumdesktops, setdesktop is still broken 
git-svn-id: file:///home/svn/framework3/trunk@6383 4d416f70-5f16-0410-b530-b9f4589650da
 2009-03-23 21:05:13 +00:00
HD Moore ebcc19c54b Recompiled, adds the grabdesktop, keyscan_start, keyscan_stop, and keyscan_dump commands to UI 
git-svn-id: file:///home/svn/framework3/trunk@6367 4d416f70-5f16-0410-b530-b9f4589650da
 2009-03-22 23:58:58 +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
HD Moore 95f48966ed Add the msfcli exe 
git-svn-id: file:///home/svn/framework3/trunk@5838 4d416f70-5f16-0410-b530-b9f4589650da
 2008-11-04 20:09:16 +00:00
HD Moore 187f79eddf Switch the DLLs for vnc/meterp to Stephen Fewer's reflective versions, check in the reflectve_meterpreter source code project 
git-svn-id: file:///home/svn/framework3/trunk@5837 4d416f70-5f16-0410-b530-b9f4589650da
 2008-11-04 20:08:24 +00:00
Matt Miller d94bfaf373 better support for nx with dllinject payloads/meterp 
git-svn-id: file:///home/svn/framework3/trunk@5510 4d416f70-5f16-0410-b530-b9f4589650da
 2008-05-26 06:34:12 +00:00
Matt Miller e63a121341 merge incognito updates from Luke Jennings 
git-svn-id: file:///home/svn/framework3/trunk@5499 4d416f70-5f16-0410-b530-b9f4589650da
 2008-04-28 16:57:49 +00:00
Matt Miller c9b652fb50 correct memset in libloader 
git-svn-id: file:///home/svn/framework3/trunk@4725 4d416f70-5f16-0410-b530-b9f4589650da
 2007-04-21 20:21:52 +00:00
Matt Miller 80460af77e fix DEP issue with meterp, fixes #48 
git-svn-id: file:///home/svn/framework3/trunk@4704 4d416f70-5f16-0410-b530-b9f4589650da
 2007-04-19 03:14:58 +00:00
Matt Miller 3b1a8f31c6 updated meterp stdapi to properly detect windows vista 
git-svn-id: file:///home/svn/framework3/trunk@4603 4d416f70-5f16-0410-b530-b9f4589650da
 2007-04-01 22:04:24 +00:00
Matt Miller cc898298a9 new priv dll with proper page protections 
git-svn-id: file:///home/svn/framework3/trunk@3879 4d416f70-5f16-0410-b530-b9f4589650da
 2006-09-14 03:47:56 +00:00
Matt Miller 243127447b some meterp bugfixes found while creating a blog post :) 
git-svn-id: file:///home/svn/incoming/trunk@3592 4d416f70-5f16-0410-b530-b9f4589650da
 2006-04-07 03:02:37 +00:00
Matt Miller 9612409872 timestomp integration 
git-svn-id: file:///home/svn/incoming/trunk@3219 4d416f70-5f16-0410-b530-b9f4589650da
 2005-12-14 00:34:05 +00:00
Matt Miller e645a3f467 initial import of the priv esc extension 
git-svn-id: file:///home/svn/incoming/trunk@3209 4d416f70-5f16-0410-b530-b9f4589650da
 2005-12-13 05:59:59 +00:00
Matt Miller d9ac34db33 support for locking images in memory to prevent swap out 
git-svn-id: file:///home/svn/incoming/trunk@3208 4d416f70-5f16-0410-b530-b9f4589650da
 2005-12-13 04:09:12 +00:00
Matt Miller 954588ea9e support for RevertToSelf 
git-svn-id: file:///home/svn/incoming/trunk@3207 4d416f70-5f16-0410-b530-b9f4589650da
 2005-12-13 03:57:20 +00:00
Matt Miller 9becfdf944 added a command, cleaned up some code 
git-svn-id: file:///home/svn/incoming/trunk@3179 4d416f70-5f16-0410-b530-b9f4589650da
 2005-12-06 03:56:29 +00:00
Matt Miller d99e5b4f89 fix module dependency problem, made it so the server sock in meterp isn't inherited 
git-svn-id: file:///home/svn/incoming/trunk@2842 4d416f70-5f16-0410-b530-b9f4589650da
 2005-08-22 01:42:13 +00:00
Matt Miller 9842cdc33b migration now enables the debug privilege first so it can migrate to system services, added reboot/shutdown wrappers 
git-svn-id: file:///home/svn/incoming/trunk@2834 4d416f70-5f16-0410-b530-b9f4589650da
 2005-07-26 04:52:59 +00:00
Matt Miller 7eb2c68d58 fix interactive channels 
git-svn-id: file:///home/svn/incoming/trunk@2833 4d416f70-5f16-0410-b530-b9f4589650da
 2005-07-26 04:08:01 +00:00
Matt Miller 539af94716 made ls prettier/faster 
git-svn-id: file:///home/svn/incoming/trunk@2821 4d416f70-5f16-0410-b530-b9f4589650da
 2005-07-23 17:52:29 +00:00
Matt Miller 71f0bf7a23 pay attention to flags too 
git-svn-id: file:///home/svn/incoming/trunk@2818 4d416f70-5f16-0410-b530-b9f4589650da
 2005-07-22 04:28:37 +00:00
Matt Miller 7e1879d4d2 fixed in mem shit 
git-svn-id: file:///home/svn/incoming/trunk@2817 4d416f70-5f16-0410-b530-b9f4589650da
 2005-07-22 04:25:57 +00:00
Matt Miller 60baa323ea new stdapi with in mem fixes 
git-svn-id: file:///home/svn/incoming/trunk@2816 4d416f70-5f16-0410-b530-b9f4589650da
 2005-07-22 04:12:22 +00:00
Matt Miller ded1cec87a new stdapi with in-mem support and sysinfo and getuid 
git-svn-id: file:///home/svn/incoming/trunk@2810 4d416f70-5f16-0410-b530-b9f4589650da
 2005-07-22 03:40:39 +00:00
Spoon M 9f7f7f0e53 new version with the mad new skills 
git-svn-id: file:///home/svn/incoming/trunk@2677 4d416f70-5f16-0410-b530-b9f4589650da
 2005-07-08 03:16:26 +00:00
Matt Miller f699fd0a23 updated metsrv.dll 
git-svn-id: file:///home/svn/incoming/trunk@2592 4d416f70-5f16-0410-b530-b9f4589650da
 2005-06-08 06:52:18 +00:00
Matt Miller 24f53393f3 maybe 
git-svn-id: file:///home/svn/incoming/trunk@2518 4d416f70-5f16-0410-b530-b9f4589650da
 2005-05-24 22:19:51 +00:00
Matt Miller ec177c9de2 stdapi 
git-svn-id: file:///home/svn/incoming/trunk@2517 4d416f70-5f16-0410-b530-b9f4589650da
 2005-05-24 21:11:57 +00:00