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

873 Commits (217b263af71887e932b156b173f28186f46820a4)

Author SHA1 Message Date
James Lee 6b996ed9de Add checks for data being null, too, just in case 2012-03-30 16:46:49 -06:00
James Lee b424475774 Add a makefile 
Compiles with an old -target so it will work on older JVMs
 2012-03-30 16:25:47 -06:00
sinn3r e018c6604f Modify CVE-2012-0507 2012-03-30 02:06:56 -05:00
Tod Beardsley f069a32223 Merge pull request #288 from wchen-r7/cve_2012_0507 
Adding sinn3r and juan's exploit for CVE-2012-0507. Blog post coming soon.
 2012-03-29 08:46:49 -07:00
sinn3r 791ebdb679 Add CVE-2012-0507 (Java) 2012-03-29 10:31:14 -05:00
HD Moore 64b0f50baa Update for compatibility 2012-03-27 15:29:28 -05:00
HD Moore e9d6309143 Fix 1.9.2 compatibility issues and C99 warnings 2012-03-22 19:09:16 -05: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 bd3f27afa8 Remove some debug output 2012-03-14 13:24:34 -06:00
James Lee 48486a6518 malloc properly in Linux instead of living on hopes and dreams 
Also fixes a mem leak in windows.
 2012-03-14 13:02:11 -06:00
James Lee 5ca9c95f1d Remove some debugging junk 2012-03-14 12:51:09 -06:00
James Lee 5fafb8bf02 Refactor entryCount -> tlv_cnt for consistency 2012-03-14 12:50:45 -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
gaspmat@gmail.com 248a73a73c change sniffer behaviour when stopping capture. workaround if pcap_findalldev fails 2012-03-14 11:07:31 -06: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 3ba471176e Return an appropriate error when stat() fails 
Tested on Linux and Windows

[Fixes #6517]
 2012-03-13 01:45:58 -06:00
James Lee 5dc03c6ac0 Fix up Linux after changes for Windows 2012-03-11 22:08:44 -06:00
James Lee 602408743c 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.
 2012-03-11 21:56:11 -06:00
sinn3r befb60217c Add CVE-2012-0754 .as source 2012-03-07 19:25:51 -06:00
James Lee 806a3c01b7 Wrap Windows-specifc headers in ifdef 2012-03-06 15:34:09 -07:00
James Lee 085b3b5640 Adds IPv6 addrs to win32 get_interfaces response 2012-03-05 21:57:39 -07:00
James Lee cd990917be Don't distinguish between 4 and 6. 
The client can figure it out from the length.
 2012-03-05 09:10:47 -07:00
James Lee c81dce2013 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]
 2012-03-05 09:10:47 -07:00
James Lee cb998b91e5 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-05 09:10:46 -07:00
HD Moore cea4529f5e Add an example of preconfigured proxy stager 2012-03-05 00:59:47 -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
HD Moore 165257db75 Remove unused "plus" code 2012-03-02 17:46:59 -06:00
HD Moore b70b41091b Tested fairly well - this randomizes the URLs and removes the user-agent string from the request 2012-03-02 17:44:23 -06:00
HD Moore ce94ffd755 First round of changes to http(s) payloads 2012-03-02 17:13:51 -06:00
James Lee 2d0d7b4470 777 is not the same as 0777 
Fixes a bug where meterpreter created directories with absurd
permissions on posix (777 = 01411 = dr----x--t).
 2012-03-02 13:16:52 -07:00
James Lee fbc8e25aaa Add the new stdapi/net TLVs to java 2012-02-29 20:31:12 -07:00
James Lee 14dfcce63a Add the MTU when it's available 
This doesn't work on 1.4, but I'm not Java-savvy enough to figure out
how to only compile it for 1.4, so do a ghetto try-catch block in case
the method doesn't exist.
 2012-02-29 20:30:03 -07:00
James Lee 4a5d7debd5 Add the usleep back in 
MM convinced me.
 2012-02-29 02:20:23 -07:00
James Lee ed3700b5da Fix a few more compiler warnings 2012-02-28 08:23:35 -07:00
James Lee 98157475af Fix a type-safety warning 2012-02-28 08:17:39 -07:00
James Lee ae37f74864 Fix a couple of warnings and a typo 2012-02-28 08:16:06 -07:00
James Lee a80056e6e5 Get rid of an unnecessary sleep() 2012-02-24 16:42:12 -07:00
MM f83a7f14ac Switch to netlink for listing interfaces 
* Adds support for listing IPv6 addresses on POSIX meterpreter
* Ensures crash logs are only created if debugging is enabled
* Fixes a bug in sniffer where a lock was not acquired correctly

Squashed commit of the following:

commit 955124b264a675c7d67187703bf23b58f0aba6d8
Author: MM <gaspmat@gmail.com>
Date:   Thu Feb 23 23:42:26 2012 +0100

    posix meterpreter - IPv6 support for route and ipconfig using netlink sockets

[Closes #196]
 2012-02-24 16:42:12 -07:00
James Lee 0ef8d8bb3a Ensure the dir exists before copying files there 
Thanks MM for pointing out that this was missed.  The other dirs
referenced in #183 were addressed in 134b6c874f

[Closes #183]
 2012-02-22 20:54:20 -07:00
James Lee c39f14591f No need for pcap in stdapi anymore 
Pcap used to be required for the ipconfig command but since the fix
for #6328, it is no longer necessary.

[See #6328]
 2012-02-18 12:46:13 -07:00
James Lee 134b6c874f Ensure output paths exist for compiled object files 
Fixes build on clean checkout
 2012-02-18 11:42:27 -07:00
James Lee a0bbbb0b7d Compile pcap without libnl since bionic doesn't have headers 
Fixes build on systems that have libnl installed.
 2012-02-18 11:41:09 -07:00
juan e69037959f Added CVE-2010-0842 2012-02-15 23:32:31 +01:00
James Lee 8e8188d752 Add the missing include that broke Windows build 
I swear I committed this before...

[See #6372]
 2012-02-15 11:51:00 -07:00
James Lee 64cf8bb7ee Fix brokenness with the debug target 
If a test returns false, make exits.  Duh.

[Fixes #6343]
 2012-02-14 16:56:48 -07:00
James Lee bd86bfc6d5 Remove redundant __FUNCTION__ references in dprintf calls 
From the Department of Redundancy Department.
 2012-02-13 18:40:25 -07:00
James Lee 3e61fc1154 Adds a depclean target 
Don't blow away libc with the "clean" target because I'm tired of
rebuilding everything.
 2012-02-13 17:59:01 -07:00
James Lee 9e814bdf19 Whitespace cleanup 2012-02-13 15:21:01 -07:00
James Lee 60706033f4 Remove unnecessary -gstabs and fix a logic error 
This drops the sniffer extension to a size of around 55k bytes.
 2012-02-10 15:57:01 -07:00
James Lee 13c231afbc Really set the flag so we don't strip later 
Oversight from last commit
 2012-02-10 15:57:01 -07:00
James Lee d44c7896b6 Add a 'debug' target for posix meterpreter build 
This new target adds debugging symbols and doesn't strip binaries. New
bins are considerably bigger, but may be more helpful when diagnosing
problems or adding new features.

[Fixes #6343]
 2012-02-10 15:57:01 -07:00
James Lee fc088fa379 Don't use the verboten 127.0.0.1 
Alleviates some unnecessary headaches with the database
 2012-02-10 15:57:01 -07:00
James Lee b5dc50968b Simplify creation of .h files from libs 
Suffix rules are awesome.
 2012-02-10 15:57:00 -07:00
James Lee 3d1c8ae383 Fix another errant use of dprintf 2012-02-08 16:45:12 -07:00
Joshua J. Drake 1a6cbd2bf0 Fix another dprintf from #6334, oops 2012-02-06 11:42:12 -06:00
Joshua J. Drake 4b2d8f88e8 Fix dprintf statements in meterpreter C src #6334 2012-02-06 11:38:14 -06:00
Joshua J. Drake d6616cd8a9 Fix up posix meterpreter rtld/Makefile rule 2012-02-06 11:28:59 -06:00
James Lee e045accfc3 Refactor interface listing 
[See #6328]
 2012-02-02 00:14:38 -07:00
James Lee 026c24c184 Replace the root-only pcap iface listing technique 
Leaks memory, will remedy momentarily

[See #6328]
 2012-02-02 00:14:38 -07:00
James Lee 10bd708a69 Just rm libpcap add re-extract instead of cleaning 
It's faster.
 2012-02-02 00:14:38 -07:00
HD Moore 0c2a18d765 Fix up reverse_tcp ipv6 stager for freebsd 2012-02-01 01:41:24 -06:00
HD Moore 45a785fde0 Adds BSD IPv6 payloads and stagers 2012-02-01 00:54:42 -06:00
HD Moore 7630ef17e3 Add BSD IPv6 payloads (source only for now) 2012-02-01 00:54:42 -06:00
James Lee c56d326368 Use the proper dirsep and allocate correctly 
Thanks, mm__ for the bug report and the patch!

[Fixes #6322]
 2012-01-31 17:31:15 -07:00
James Lee ba50f84229 More i386 and -m32 fixes for compiling meterpreter 
This should be the last change necessary to compile a 32-bit meterpreter
from a 64-bit build host.

See #6268
 2012-01-31 10:12:42 -07:00
scriptjunkie fd9aab4de1 Get output format list in msfgui dynamically from RPC. 2012-01-28 23:38:46 -05: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 e0a312e38d Get the return values in the right place 
This should convert stat values to something portable enough to work on
POSIX and Windows.

Fixes #6294
 2012-01-27 18:56:01 -07:00
James Lee 628f85cea3 Add -m32 and -march=i386 to the Jam build for bionic 
This is hopefully the last thing that needs to be fixed up for i386
compatibility.

See #6268
 2012-01-27 18:02:37 -07:00
James Lee 5bc1701a5a Ensure make.sh returns success 2012-01-27 17:20:36 -07:00
James Lee e7b15180d1 Add clean targets for openssl and libpcap 
Also, a 'really-clean' target that does everything
 2012-01-27 17:20:36 -07:00
James Lee 289dc81d60 Add -m32 to all the Makefiles 
This is in an attempt to get it compilation working on 64-bit hosts.
 2012-01-27 17:20:36 -07:00
James Lee 1a187c00aa Add a platform-independent stat struct 
This should help with various issues on linux
 2012-01-27 17:13:46 -07:00
James Lee 5be58513f9 Ensure make.sh returns success 2012-01-27 16:37:48 -07:00
James Lee 8108bf888e Add clean targets for openssl and libpcap 
Also, a 'really-clean' target that does everything
 2012-01-27 16:33:27 -07:00
James Lee abf031f224 Add -m32 to all the Makefiles 
This is in an attempt to get it compilation working on 64-bit hosts.
 2012-01-27 15:14:47 -07:00
James Lee 10237f7c12 Changes openssl/build.sh to create its own target 
This should ensure we build everything for i386 and only link the lib
files we mean to.  Also no longer builds any of the superfluous openssl
executables since all we need are the .so files.

See #6268
 2012-01-25 17:54:13 -07:00
James Lee e928efaa8c Force gcc to compile for i386 
Makes meterpreter for linux work on older CPUs.

Fixes #6268
 2012-01-23 15:20:36 -07:00
scriptjunkie 9fe18cdc86 Add x64 LoadLibraryA payload. Because it should exist. 2012-01-17 21:16:26 -06:00
scriptjunkie 1e811aed02 Adds scriptjunkie's multilingual admin fie for pxexploit 
Also removes duplicated code between external/source/exploits/pxesploit
and external/source/pxesploit.

[Closes #63]

Squashed commit of the following:

commit 325f52527233ded1bf6506c366ec8cb9efdc2610
Author: scriptjunkie <scriptjunkie@scriptjunkie.us>
Date:   Fri Dec 16 12:14:18 2011 -0600

    Jetzt auf Deutsch! y español! 中國人！
    [update pxexploit to resolve administrators' group name rather than assume the English 'Administrators']
    Also remove duplicate/old pxexploit source code from the tree.
 2011-12-23 12:24:45 -06:00
scriptjunkie 5bad92e021 Gui Bugfixen: Msgpack-error-fixen, Unneccessary-error-message-removen, popup-showen, und lock-contention-reducen. 
Viel besser!
 2011-12-16 09:52:12 -06:00
scriptjunkie e34555dc22 Remove XML RPC option for msfgui. 2011-12-11 14:44:12 -06:00
sinn3r e7c179d0b5 The more description the better 2011-12-01 03:03:37 -06:00
sinn3r 9e71be8ed0 Add source for CVE-2011-3544 2011-11-29 18:04:31 -06:00
HD Moore cc4fdcc8f7 Merge in a PCAP_NETMASK_UNKNOWN condition define to build with pcap 1.0.0. See https://github.com/shadowbq/pcaprub/issues/8 2011-11-25 15:46:58 -06:00
scriptjunkie 8d58ea227f Add UAC bypass to default pxesploit attack. 2011-11-16 08:16:22 -08:00
scriptjunkie 8358edac2e Add badchars field to msfgui payload popup, so badchars can be added (in hex form) 2011-11-11 14:05:58 -06:00
HD Moore d6cf3dbf9f Fixes #5420 by merging in a simple patch, thank you 2011-11-10 19:59:33 -06:00
Matt Buck 16f45fc894 Add empty directories from svn repo. 2011-11-09 18:41:40 -06:00
Matt Weeks ce5b999e5e Change of case on error message and convert db time field to date. 
git-svn-id: file:///home/svn/framework3/trunk@14199 4d416f70-5f16-0410-b530-b9f4589650da
 2011-11-09 03:48:50 +00:00
Matt Weeks fb6e828a30 Only poll for sessions/jobs once a connection comes in. 
git-svn-id: file:///home/svn/framework3/trunk@14198 4d416f70-5f16-0410-b530-b9f4589650da
 2011-11-09 03:13:29 +00:00
Matt Weeks 2dd0417941 Fix progress bar on initial start. 
git-svn-id: file:///home/svn/framework3/trunk@14195 4d416f70-5f16-0410-b530-b9f4589650da
 2011-11-08 21:28:39 +00:00
Matt Weeks 0b4996a38c Put tables into an array. 
git-svn-id: file:///home/svn/framework3/trunk@14178 4d416f70-5f16-0410-b530-b9f4589650da
 2011-11-07 01:54:24 +00:00
Matt Weeks b1bb0ae729 Backward-compatible for recent DB changes. 
git-svn-id: file:///home/svn/framework3/trunk@14177 4d416f70-5f16-0410-b530-b9f4589650da
 2011-11-07 00:17:09 +00:00
Matt Weeks 4629c0867b Address #5887 and #5888 for RPC DB and msfgui 
git-svn-id: file:///home/svn/framework3/trunk@14167 4d416f70-5f16-0410-b530-b9f4589650da
 2011-11-05 18:12:10 +00:00
Matt Weeks 11c5801895 Clean up error opening Events table and reading new database credentials. 
git-svn-id: file:///home/svn/framework3/trunk@14123 4d416f70-5f16-0410-b530-b9f4589650da
 2011-10-30 22:24:29 +00:00
Matt Weeks cf9ad43683 Specify MsgPack API Version. 
git-svn-id: file:///home/svn/framework3/trunk@14019 4d416f70-5f16-0410-b530-b9f4589650da
 2011-10-20 22:21:36 +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 7a3be4fe38 Allow hidden windows to resurrect properly after restart. 
git-svn-id: file:///home/svn/framework3/trunk@13770 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-22 03:04:34 +00:00
Matt Weeks b3f29cbddf Fix MsgRPC over SSL support. 
git-svn-id: file:///home/svn/framework3/trunk@13754 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-18 23:02:31 +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 9ada448a16 Replace references to tabbedPane since that may not exist. 
git-svn-id: file:///home/svn/framework3/trunk@13746 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-17 15:09:04 +00:00
James Lee c6c133673f add reverse_https support for java meterpreter, fixes #5288; thanks mihi! 
git-svn-id: file:///home/svn/framework3/trunk@13741 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-16 21:10:11 +00:00
Matt Weeks 0293417c29 Whoops - make status bar visible again. 
git-svn-id: file:///home/svn/framework3/trunk@13732 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-15 00:29:11 +00:00
Matt Weeks 5847de9435 Whoops fix pane splitting. 
And minor scroll speed improvement on payload popup.



git-svn-id: file:///home/svn/framework3/trunk@13720 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-12 00:49:41 +00:00
Matt Weeks ea2a1be834 Save and restore splitpane layout 
fix issues with splitpane layout - focus locking with multiple panes & splitting panes that can't be split


git-svn-id: file:///home/svn/framework3/trunk@13719 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-11 20:59:28 +00:00
Matt Weeks adcc9fcbbb Fix issue with URI decoding. 
git-svn-id: file:///home/svn/framework3/trunk@13717 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-11 03:47:01 +00:00
Matt Weeks 35a6f26654 Add pane-splitting. 
git-svn-id: file:///home/svn/framework3/trunk@13714 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-11 00:21:01 +00:00
Matt Weeks 135e4c25e3 Start msfrpcd in root of metasploit tree to avoid path issues. 
git-svn-id: file:///home/svn/framework3/trunk@13693 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-04 21:55:08 +00:00
Matt Weeks a57769f336 Address a few remaining MsgPack/XML differences, 
remove Msg warning.



git-svn-id: file:///home/svn/framework3/trunk@13649 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-28 21:09:03 +00:00
Matt Weeks b3d169b590 Standardize locking and tabbing for GUI. 
git-svn-id: file:///home/svn/framework3/trunk@13648 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-28 20:29:06 +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
amaloteaux df73c7e88e remove some comments 
git-svn-id: file:///home/svn/framework3/trunk@13624 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-24 20:37:27 +00:00
Matt Weeks 4ec69f3dfd Fix more encoding issues with msgpack RPC, especially with payload generation/encoding. 
git-svn-id: file:///home/svn/framework3/trunk@13623 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-24 20:31:18 +00:00
amaloteaux 8b6440468c pcaprub : 
- netiface and paprub are now using the same interface name under windows
- add a function to retrieve some additionnal information on network interfaces under windows


git-svn-id: file:///home/svn/framework3/trunk@13622 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-24 20:27:55 +00:00
Matt Weeks 161b4eacb5 Fix some base64 encoding issues with MsgPack. 
Use "busy" indicator in console.



git-svn-id: file:///home/svn/framework3/trunk@13617 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-24 03:05:09 +00:00
Matt Weeks 7a933bdf2c MessagePack support for GUI. Woohoo! Still backend errors though; see #5309 
git-svn-id: file:///home/svn/framework3/trunk@13616 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-24 01:06:53 +00:00
Matt Weeks 31d1628dde Some payload fixes 
git-svn-id: file:///home/svn/framework3/trunk@13596 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-20 02:18:20 +00:00
James Lee 851bc8d7b8 add a single shell payload for java, partially reverts r13213 
git-svn-id: file:///home/svn/framework3/trunk@13588 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-19 16:31:19 +00:00
HD Moore 521b95b0c2 This fixes garbled characters in lsass hashdump on some platforms 
git-svn-id: file:///home/svn/framework3/trunk@13582 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-19 05:09:49 +00:00
Matt Weeks 3e0c3e5f76 Add source for pxesploit tools. 
git-svn-id: file:///home/svn/framework3/trunk@13534 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-11 22:57:21 +00:00
amaloteaux fb496ea080 this file is generated by extconf.rb 
git-svn-id: file:///home/svn/framework3/trunk@13515 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-10 20:37:49 +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
HD Moore 842bfdebe8 Lets just leave this here (insurance against my laptop melting down between now and tomorrow morning). Nothing to see here, move along ;) 
git-svn-id: file:///home/svn/framework3/trunk@13483 4d416f70-5f16-0410-b530-b9f4589650da
 2011-08-03 22:58:55 +00:00
Matt Weeks f866b3ecdf Use different check to see if SSL will work. 
git-svn-id: file:///home/svn/framework3/trunk@13440 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-31 00:56:40 +00:00
Matt Weeks 630fb999f8 Don't display or load events table by default. Also, only reload visible windows on refresh. 
git-svn-id: file:///home/svn/framework3/trunk@13436 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-30 21:51:07 +00:00
Matt Weeks 8447141a0c Include check for crypto algorithm support. 
git-svn-id: file:///home/svn/framework3/trunk@13430 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-30 19:38:35 +00:00
Matt Weeks b4a58989c4 Give choice of rpcd to connect to when last remembered connection is still running. 
git-svn-id: file:///home/svn/framework3/trunk@13424 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-30 15:22:27 +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 6b1dfd5908 meterpreter compiles on modern linux! see #2418 
git-svn-id: file:///home/svn/framework3/trunk@13333 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-25 07:59:51 +00:00
James Lee dd84169187 tell the linker to make DT_HASH sections instead of DT_GNU_HASH which msflinker can't handle 
git-svn-id: file:///home/svn/framework3/trunk@13332 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-24 23:50:55 +00:00
James Lee 5c5861cc9b add a 'clean' target 
git-svn-id: file:///home/svn/framework3/trunk@13328 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-24 19:25:19 +00:00
HD Moore 75bef2b98a Apply a diff to fix bad ifdef usage 
git-svn-id: file:///home/svn/framework3/trunk@13324 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-23 20:31:58 +00:00
HD Moore 47eb4cbd86 Add an ifdef around the wininet setup routine 
git-svn-id: file:///home/svn/framework3/trunk@13323 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-23 20:16:19 +00:00
Matt Weeks 9ebbe84a4a Update to version 4. 
Add first-run detection that farms out database initialization to msfconsole.
Autostart RPC if no other option is selected.
Check for RPC death in startup.
More lenient socket timeouts.



git-svn-id: file:///home/svn/framework3/trunk@13301 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-23 00:05:38 +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 0d585ffb4c add the source files for RMILoader and RMIPayload. fixes #4738, which has nothing to do with #4378 that i dyslexified in r13185 
git-svn-id: file:///home/svn/framework3/trunk@13187 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-15 22:28:40 +00:00
James Lee 1d25a6d7d1 add an exploit for java's rmid and rmiregistry code-execution-by-design and supporting source. fixes #4378, thanks mihi! 
git-svn-id: file:///home/svn/framework3/trunk@13185 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-15 20:42:31 +00:00
Matt Weeks 8f79fd1e5f Add "crack passwords" option. 
git-svn-id: file:///home/svn/framework3/trunk@13169 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-14 03:06:07 +00:00
Matt Weeks fdf6660a55 Properly filter error messages which have changed, 
escape options passed through command line,
run database reload in separate thread,
and make connecting to the database even more automagical.



git-svn-id: file:///home/svn/framework3/trunk@13168 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-14 02:39:16 +00:00
James Lee cdeacc85f3 fix some incorrect arguments to memset, thanks sbz for noticing. 
git-svn-id: file:///home/svn/framework3/trunk@13123 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-07 23:14:44 +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 8816d2135f Merge in changes from thelightcosine that add RegLoadKey/RegUnloadKey support 
git-svn-id: file:///home/svn/framework3/trunk@13089 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-02 04:03:23 +00:00
HD Moore e9bb388593 Use size_t instead of int 
git-svn-id: file:///home/svn/framework3/trunk@13063 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-29 06:35:44 +00:00
HD Moore 35801febd7 Lets try this again, POSIX style 
git-svn-id: file:///home/svn/framework3/trunk@13061 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-29 06:30:24 +00:00
HD Moore 96ff575998 Add md5/sha1 
git-svn-id: file:///home/svn/framework3/trunk@13060 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-29 06:12:15 +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 dc1e42af2c Make sure empty replies are take into account for the session keep alive 
git-svn-id: file:///home/svn/framework3/trunk@13052 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-28 21:22:48 +00:00
HD Moore 80643cc152 Adds a remote shutdown api 
git-svn-id: file:///home/svn/framework3/trunk@13050 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-28 18:11:17 +00:00
HD Moore c1935eda06 Re-add the missing SendRequest, make migrate work 
git-svn-id: file:///home/svn/framework3/trunk@13048 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-28 17:25:37 +00:00
HD Moore c53899f9b7 Clean a few things up 
git-svn-id: file:///home/svn/framework3/trunk@13046 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-28 07:40:32 +00:00
HD Moore 3bb2a2d07f Rework this for compatibility with older OSs 
git-svn-id: file:///home/svn/framework3/trunk@13045 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-28 07:30:48 +00:00
HD Moore fdfaf5b17b Merge in some recent meterpreter work, still a ways off before this is ready to use. 
git-svn-id: file:///home/svn/framework3/trunk@13044 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-28 05:57:36 +00:00
Matt Weeks b70eeec942 Cleanup error messages; more descriptive and appropriate. 
git-svn-id: file:///home/svn/framework3/trunk@13021 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-25 03:53:32 +00:00
HD Moore 46eb182d81 Adds support for connecting to remote registry services with the current processes' credentials. See #1894 
git-svn-id: file:///home/svn/framework3/trunk@12923 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-12 00:00:56 +00:00
HD Moore 662840404f Fixes #4296 by merging in David Maloney's registry patch. The ruby side will be merged once the new binaries are in SVN 
git-svn-id: file:///home/svn/framework3/trunk@12920 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-11 23:04:25 +00:00
HD Moore 46dbaae454 Check the correct counter before bailing, this would cause a segmented header to kill the session. Pointed out by an anonymous contributor (new bins once the rest of the pending merge work is finished). 
git-svn-id: file:///home/svn/framework3/trunk@12918 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-11 22:53:04 +00:00
HD Moore 69b684ad0c Remove an unused variable 
git-svn-id: file:///home/svn/framework3/trunk@12917 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-11 22:43:31 +00:00
HD Moore 3833d2a098 Fix up the sniffer build environment, add the pivot project to the solution (even though its not part of the OSS tree). 
git-svn-id: file:///home/svn/framework3/trunk@12916 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-11 22:42:59 +00:00
Matt Weeks 2ea3e5ee0f Fix issues with showing popups on exit, and make it clear why start/connect fails on bad creds. 
git-svn-id: file:///home/svn/framework3/trunk@12914 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-11 22:25:14 +00:00
James Lee a002b6dbbe no need to keep the old, unused installer builders around anymore 
git-svn-id: file:///home/svn/framework3/trunk@12874 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-06 21:23:59 +00:00
HD Moore afa11f51a4 Fix up check for IPv6 constant, some minor grammar typos 
git-svn-id: file:///home/svn/framework3/trunk@12811 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-02 00:29:28 +00:00
amaloteaux 40f06cd3e1 pcaprub : -add several native function to get all the informations about the network intefaces, original code is a python c extension called netifaces 
-add also some initial wrappers into capture mixin
-Fixes #4376


git-svn-id: file:///home/svn/framework3/trunk@12799 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-01 17:22:48 +00:00
Matt Weeks d4e9e303c6 rejigger session list columns. 
git-svn-id: file:///home/svn/framework3/trunk@12789 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-31 23:09:44 +00:00
amaloteaux c022ac447e pcaprub : make it compilable under mingw on windows , need some more testing but it looks like it is running too, see issue #4554 for comment 
git-svn-id: file:///home/svn/framework3/trunk@12770 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-30 18:26:20 +00:00
HD Moore 3e0f3639ef This adds a quick windows/loadlibrary payload for folks who have a need for such things. The library path can be a UNC location and works fine over WebDAV... 
git-svn-id: file:///home/svn/framework3/trunk@12765 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-30 03:44:59 +00:00
Matt Weeks 23ee4b3aa8 Display additional version info in about box. 
git-svn-id: file:///home/svn/framework3/trunk@12658 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-18 21:43:52 +00:00
Matt Weeks 543ec2c3a1 Format fix. 
git-svn-id: file:///home/svn/framework3/trunk@12613 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-14 17:19:28 +00:00
Stephen Fewer c48633cff0 Merge in a rewritten windows x86 reverse_ipv6_tcp stager (The previous one seems hosed since r6744 due to new host/port offsets[1] but the shellcode blob remained the same after modification[2]) - This new one uses the block_api_call technique, is 37 bytes smaller and can handle arbitrary size stages. 
[1] https://dev.metasploit.com/redmine/projects/framework/repository/revisions/6744/diff/modules/payloads/stagers/windows/reverse_ipv6_tcp.rb
[2] https://dev.metasploit.com/redmine/projects/framework/repository/revisions/6744/diff/external/source/shellcode/windows/stager_reverse_ipv6_tcp_nx.asm

git-svn-id: file:///home/svn/framework3/trunk@12562 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-08 01:44:08 +00:00
Matt Weeks 5fa2a9458f Don't encode when not instructed. 
git-svn-id: file:///home/svn/framework3/trunk@12561 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-07 21:22:03 +00:00
Matt Weeks 971b6f96f6 pxesploit update; compatibility with x64, compatibility with different windows versions. 
Still no custom payload yet.



git-svn-id: file:///home/svn/framework3/trunk@12430 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-25 02:51:07 +00:00
James Lee 30bc742740 merge mihi's patch for adding ps and audio recording to java meterpreter, fixes #3898 
git-svn-id: file:///home/svn/framework3/trunk@12372 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-19 22:39:25 +00:00
Matt Weeks fa808addd0 New Icon. 
git-svn-id: file:///home/svn/framework3/trunk@12345 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-17 13:29:01 +00:00
Matt Weeks 86ef20a6c2 Removing unnecessary print. 
git-svn-id: file:///home/svn/framework3/trunk@12340 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-16 23:07:12 +00:00
Matt Weeks 41d3b6fb93 Accessibility/personalization: Allow choosing custom foreground/background color. 
git-svn-id: file:///home/svn/framework3/trunk@12337 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-16 22:12:34 +00:00
Matt Weeks 8e60901ebf Add support for changing font size application-wide. Also make Look and Feel changes immediately visible and added jar output format support for payloads. 
git-svn-id: file:///home/svn/framework3/trunk@12332 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-16 02:15:35 +00:00
amaloteaux b536d25b38 pcaprub: add a function lookupaddrs(dev) to retrieve the list of ipv4 adresses of a given interfaces 
to test, recompile and in irb Pcap.lookupaddrs("eth0")


git-svn-id: file:///home/svn/framework3/trunk@12326 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-15 20:31:46 +00:00
Matt Weeks aa72f18ec2 Use quotes less. Fixes browsing to directories with spaces in them issue. 
git-svn-id: file:///home/svn/framework3/trunk@12222 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-03 00:26:25 +00:00
Matt Weeks 6024459780 Better autoreconnect on crash/kill. 
git-svn-id: file:///home/svn/framework3/trunk@12149 4d416f70-5f16-0410-b530-b9f4589650da
 2011-03-26 18:53:16 +00:00
David Rude 8c614a9296 made the shellcode request random to avoid signatures 
git-svn-id: file:///home/svn/framework3/trunk@12148 4d416f70-5f16-0410-b530-b9f4589650da
 2011-03-26 16:00:52 +00:00
David Rude ff3659aa37 Lots of work to make this a lot more reliable =) 
git-svn-id: file:///home/svn/framework3/trunk@12146 4d416f70-5f16-0410-b530-b9f4589650da
 2011-03-26 06:35:28 +00:00
Matt Weeks b220156911 Get rid of error message for non-error. 
git-svn-id: file:///home/svn/framework3/trunk@12120 4d416f70-5f16-0410-b530-b9f4589650da
 2011-03-24 00:15:18 +00:00
Matt Weeks 5274cfdc13 Save workspace. 
git-svn-id: file:///home/svn/framework3/trunk@12076 4d416f70-5f16-0410-b530-b9f4589650da
 2011-03-23 00:21:37 +00:00
Matt Weeks 1a68ab3b07 Retry on certain timeouts, and properly synchronize timeouts. 
git-svn-id: file:///home/svn/framework3/trunk@12075 4d416f70-5f16-0410-b530-b9f4589650da
 2011-03-22 23:58:10 +00:00
Matt Weeks b1b0004aa4 Stack trace on session list errors. Should help addressing #3677 
git-svn-id: file:///home/svn/framework3/trunk@12064 4d416f70-5f16-0410-b530-b9f4589650da
 2011-03-22 01:05:48 +00:00
Matt Weeks 299de38302 Fix some option processing. 
git-svn-id: file:///home/svn/framework3/trunk@12054 4d416f70-5f16-0410-b530-b9f4589650da
 2011-03-21 03:40:26 +00:00
Matt Weeks fd4712e795 Typo. 
git-svn-id: file:///home/svn/framework3/trunk@12053 4d416f70-5f16-0410-b530-b9f4589650da
 2011-03-21 03:13:15 +00:00
Matt Weeks b06e9b5696 Fix locking issue and set default LnF to nimbus. (works better with, e.g. Backtrack) 
git-svn-id: file:///home/svn/framework3/trunk@12052 4d416f70-5f16-0410-b530-b9f4589650da
 2011-03-21 03:08:20 +00:00
Matt Weeks b413b8aa99 Fix null pointer bug. 
git-svn-id: file:///home/svn/framework3/trunk@12047 4d416f70-5f16-0410-b530-b9f4589650da
 2011-03-21 01:49:54 +00:00
Matt Weeks 931e2179b7 Add ability to arbitrarily change Look and Feel. 
git-svn-id: file:///home/svn/framework3/trunk@12038 4d416f70-5f16-0410-b530-b9f4589650da
 2011-03-20 20:17:51 +00:00
Matt Weeks ea274d1537 Tabs-moveable in, out of, and between windows. 
Databse nmap and export added.
Number of view preferences added.
Some bugs fixed.



git-svn-id: file:///home/svn/framework3/trunk@12031 4d416f70-5f16-0410-b530-b9f4589650da
 2011-03-20 00:59:38 +00:00
Joshua Drake fb6107ffb5 enable java payloads, currently via one-off method 
git-svn-id: file:///home/svn/framework3/trunk@12012 4d416f70-5f16-0410-b530-b9f4589650da
 2011-03-17 23:57:11 +00:00
Joshua Drake 4644110962 add exploit for cve-2010-4452, currently windows only and no payloads :( 
git-svn-id: file:///home/svn/framework3/trunk@11982 4d416f70-5f16-0410-b530-b9f4589650da
 2011-03-16 04:50:25 +00:00