adam/metasploit-gs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,513 Commits 27 Branches 1,043 Tags
2dfd501e5f6263779e69378cf67c2db33db5ae05
Commit Graph

118 Commits

Author SHA1 Message Date
Tod Beardsley cb49500b8f A still cleaner checksummed URI generator 
Now with http and https support.
 2012-03-28 14:33:23 -06:00
Tod Beardsley 7278946ecb Revert "Precalculate some uri strings in case the 1000-round generation fails" 
This reverts commit 7161a548f4.

Prepping for a more sane solution that doesn't change the URI sizes and
succeeds without fallingback to a pre-generated list.
 2012-03-28 14:32:27 -06:00
hdm 7d2095bad4 Precalculate some uri strings in case the 1000-round generation fails 2012-03-28 14:32:27 -06:00
Tod Beardsley 4f4200a7b7 Revert "Precalculate some uri strings in case the 1000-round generation fails" 
This reverts commit 7161a548f4.

Prepping for a more sane solution that doesn't change the URI sizes and
succeeds without fallingback to a pre-generated list.
 2012-03-28 14:32:27 -06:00
Tod Beardsley 9bc309958d A nicer checksum fixer 
Just use a checksum digit like a cc#, no need for precalculated lists,
will be correct every time.
 2012-03-28 14:31:23 -06:00
hdm dea92a1e29 Precalculate some uri strings in case the 1000-round generation fails 2012-03-28 14:29:31 -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 17cc89ebad Add IPv6 specific HTTP(S) handlers and payloads (simplifies 
options/usage)
 2011-12-11 13:26:48 -06:00
James Lee bf105f48cb massive removal of spaces at EOL and some bad tabs 2011-11-20 12:32:06 +11:00
HD Moore 616913c4c1 Handle situations where the user set LHOST to 0.0.0.0 in the handler by defaulting LHOST to our locally visible IP for the specific client. Solves some integration issues where 0.0.0.0 was accidentally used 
git-svn-id: file:///home/svn/framework3/trunk@13782 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-23 17:04:24 +00:00
James Lee c0ddf56ec0 hmf, missed this one, too. see #5288 
git-svn-id: file:///home/svn/framework3/trunk@13743 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-16 21:31:21 +00:00
Matt Weeks acae5dcdc8 Killing puts. 
Die, puts, die!!



git-svn-id: file:///home/svn/framework3/trunk@13715 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-11 02:42:39 +00:00
HD Moore a63f1cb830 Make the comment honest 
git-svn-id: file:///home/svn/framework3/trunk@13708 4d416f70-5f16-0410-b530-b9f4589650da
 2011-09-08 05:30:37 +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
HD Moore 2ea46552ad Apply a fix that was already in reverse_https 
git-svn-id: file:///home/svn/framework3/trunk@13205 4d416f70-5f16-0410-b530-b9f4589650da
 2011-07-18 14:17:19 +00:00
HD Moore a03b030465 Typo 
git-svn-id: file:///home/svn/framework3/trunk@13054 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-28 21:35:27 +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 8249ce243f Show invalid requests (useful for debugging) 
git-svn-id: file:///home/svn/framework3/trunk@12819 4d416f70-5f16-0410-b530-b9f4589650da
 2011-06-02 20:56:02 +00:00
James Lee d1e2f274f9 add ability to use arbitrary certs with SSL server sockets. 
git-svn-id: file:///home/svn/framework3/trunk@12675 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-20 23:12:35 +00:00
HD Moore 9ce47c01bd Reverting the autoload changes until we can upgrade to a new ActiveSupport library or find a workaround 
git-svn-id: file:///home/svn/framework3/trunk@12600 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-12 20:03:55 +00:00
James Lee 06779bc8c0 remove unnecessary requires for stuff in rex. autoload and a high-level require 'rex' in lib/msf/core.rb should take care of everything. see #4371, #4373, r12587, and r12554. 
git-svn-id: file:///home/svn/framework3/trunk@12588 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-12 00:53:33 +00:00
James Lee 2192532a0c don't read from the rsock as that's already taken care of by monitor_rsock in StreamAbstraction. fixes EVERYTHING. also fixes #4321 
git-svn-id: file:///home/svn/framework3/trunk@12520 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-03 04:12:41 +00:00
HD Moore fdc19b5e4a Add the second required argument to write() 
git-svn-id: file:///home/svn/framework3/trunk@12518 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-03 03:09:20 +00:00
HD Moore d98f8dfd89 Make it clear that all Rex::IO::Stream implementations must accept a second parameter called opts for the read, write, and put methods 
git-svn-id: file:///home/svn/framework3/trunk@12515 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-02 21:39:09 +00:00
James Lee 8fd84e3c3d fix cmd/unix/reverse by adding proper read() and write() methods to TcpReverseDoubleSessionChannel 
git-svn-id: file:///home/svn/framework3/trunk@12514 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-02 20:42:53 +00:00
HD Moore 2c3e85af05 Major cleanups to the session manager, serialized processing of incoming connections, concurrent processing (up to a max scheduler thread count) of meterpreter initialization/scripts. This is to avoid a potential deadlock in openssl and ensure consistent, reliable session staging. This commit also fixes a bug that would mark database sessions as closed too early. 
git-svn-id: file:///home/svn/framework3/trunk@12485 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-30 18:51:50 +00:00
HD Moore c28ad8ea0c Minor improvements and corner case bug fixes to session handling. This fixes issues that can come up when a stream is shut down 
git-svn-id: file:///home/svn/framework3/trunk@11371 4d416f70-5f16-0410-b530-b9f4589650da
 2010-12-18 03:00:26 +00:00
HD Moore 04f9aec2d8 Pass framework into the TcpReverseDoubleSessionChannel class 
git-svn-id: file:///home/svn/framework3/trunk@11100 4d416f70-5f16-0410-b530-b9f4589650da
 2010-11-22 19:18:24 +00:00
HD Moore a12d9f8dbf This patch adds detailed thread tracking across the metasploit framework, along with a new console command (threads) to manage these. This level of tracking is required to accurately monitor background tasks, assist with debugging, and kill orphaned threads. 
git-svn-id: file:///home/svn/framework3/trunk@11003 4d416f70-5f16-0410-b530-b9f4589650da
 2010-11-12 06:19:49 +00:00
HD Moore 9e01b0f4e5 Fix a race condition in concurrent session handling 
git-svn-id: file:///home/svn/framework3/trunk@10596 4d416f70-5f16-0410-b530-b9f4589650da
 2010-10-08 04:46:53 +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
HD Moore adeae9fdec Expose ReverseListenerComm to the reverse_https and passivex handlers as well 
git-svn-id: file:///home/svn/framework3/trunk@10535 4d416f70-5f16-0410-b530-b9f4589650da
 2010-10-04 02:17:09 +00:00
HD Moore 1b4190df38 This commit brings configurability to TCP Servers as to which Comm they use. The ReverseListenerComm and ListenerComm advanced options can be used to prevent a given listener from trying to bind a listener over the pivoted routed. This is useful for a number of situations and not possible to configure explicitly before. 
git-svn-id: file:///home/svn/framework3/trunk@10534 4d416f70-5f16-0410-b530-b9f4589650da
 2010-10-04 02:11:22 +00:00
HD Moore faf58c2b62 Allows 0.0.0.0/::0 to be used in place of the real "any" address regardless of socket type when the bind address is specified 
git-svn-id: file:///home/svn/framework3/trunk@10473 4d416f70-5f16-0410-b530-b9f4589650da
 2010-09-25 03:28:19 +00:00
HD Moore 3b31f56894 This commit adds a new option to all reverse handlers: ReverseListenerBindAddress. This setting determines exactly what address is bound on the local system 
git-svn-id: file:///home/svn/framework3/trunk@10472 4d416f70-5f16-0410-b530-b9f4589650da
 2010-09-25 03:25:09 +00:00
Joshua Drake 33b479e696 adjust https handler status message 
git-svn-id: file:///home/svn/framework3/trunk@9872 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-20 00:17:58 +00:00
HD Moore 914a90a714 Fix the print lins 
git-svn-id: file:///home/svn/framework3/trunk@9068 4d416f70-5f16-0410-b530-b9f4589650da
 2010-04-14 02:46:43 +00:00
HD Moore 52d17d73da Show the URL, print an OK error for unknown requests 
git-svn-id: file:///home/svn/framework3/trunk@9058 4d416f70-5f16-0410-b530-b9f4589650da
 2010-04-13 16:05:37 +00:00
HD Moore 32b8f366de Do not try to bind to LHOST 
git-svn-id: file:///home/svn/framework3/trunk@9057 4d416f70-5f16-0410-b530-b9f4589650da
 2010-04-13 15:38:01 +00:00
HD Moore c8defe9716 Size tweaks to bring the ssl stager + encoder + target_id to exactly 400 bytes 
git-svn-id: file:///home/svn/framework3/trunk@8998 4d416f70-5f16-0410-b530-b9f4589650da
 2010-04-03 07:48:53 +00:00
HD Moore eac38aaa23 Allow alphanumeric targetid's 
git-svn-id: file:///home/svn/framework3/trunk@8996 4d416f70-5f16-0410-b530-b9f4589650da
 2010-04-03 06:21:00 +00:00
HD Moore 949874e541 Remove close message 
git-svn-id: file:///home/svn/framework3/trunk@8995 4d416f70-5f16-0410-b530-b9f4589650da
 2010-04-03 06:14:58 +00:00
HD Moore e98af96779 Revert - sort out a bug 
git-svn-id: file:///home/svn/framework3/trunk@8994 4d416f70-5f16-0410-b530-b9f4589650da
 2010-04-03 06:14:10 +00:00
HD Moore 84e30cd71e Switch from int to string, no reason not to 
git-svn-id: file:///home/svn/framework3/trunk@8993 4d416f70-5f16-0410-b530-b9f4589650da
 2010-04-03 06:11:45 +00:00
HD Moore 3c4024a0c6 Expose the server client list, set the keepalive 
git-svn-id: file:///home/svn/framework3/trunk@8992 4d416f70-5f16-0410-b530-b9f4589650da
 2010-04-03 06:05:06 +00:00
HD Moore 32f50fac66 Woops. Add the missing base class: 
git-svn-id: file:///home/svn/framework3/trunk@8987 4d416f70-5f16-0410-b530-b9f4589650da
 2010-04-03 05:37:40 +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
HD Moore aaea62bb92 Report the correct local/peer names for the session information. Fix a return value check 
git-svn-id: file:///home/svn/framework3/trunk@8765 4d416f70-5f16-0410-b530-b9f4589650da
 2010-03-10 07:13:18 +00:00
HD Moore 6bd2a954cf Lots of small changes, the big one is moving from sysread -> readpartial in the stream base class 
git-svn-id: file:///home/svn/framework3/trunk@8764 4d416f70-5f16-0410-b530-b9f4589650da
 2010-03-10 06:43:46 +00:00
Stephen Fewer 300cede801 Fix for #291, Meterpreter over PassiveX now working again :) 
git-svn-id: file:///home/svn/framework3/trunk@8653 4d416f70-5f16-0410-b530-b9f4589650da
 2010-02-26 05:13:58 +00:00