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

9330 Commits (98831c3285646e239220ca4f132695bb51852f16)

Author SHA1 Message Date
Tod Beardsley 98831c3285 Clean up an SNMP rescue clause that makes Windows Ruby builds sad. 
git-svn-id: file:///home/svn/framework3/trunk@12530 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-03 07:51:09 +00:00
HD Moore 4c84181c44 This adds a migrated flag to the framework.db object, to prevent a race condition between session_manager startup and db availability while the schema loads. This also makes the session_manager code try again (up to a max count) when it encounters an exception 
git-svn-id: file:///home/svn/framework3/trunk@12529 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-03 07:09:34 +00:00
James Lee e621828cac check for a nil return value from write(), fixes #4329 
git-svn-id: file:///home/svn/framework3/trunk@12528 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-03 06:55:15 +00:00
Wei Chen eb2c0a5919 Fixed more typos 
git-svn-id: file:///home/svn/framework3/trunk@12527 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-03 05:29:59 +00:00
Wei Chen c4e8889119 Fixed typo. 
git-svn-id: file:///home/svn/framework3/trunk@12526 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-03 05:27:54 +00:00
HD Moore 8d7e8620b2 Map write to syswrite for BufferSock 
git-svn-id: file:///home/svn/framework3/trunk@12525 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-03 05:25:41 +00:00
Wei Chen c0baf731f8 Updated print_error() for sqlite3's rescue 
git-svn-id: file:///home/svn/framework3/trunk@12524 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-03 05:23:51 +00:00
HD Moore 93b0c5beb3 Check for the database first 
git-svn-id: file:///home/svn/framework3/trunk@12523 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-03 04:49:18 +00:00
HD Moore f3ecba153e Fix URL 
git-svn-id: file:///home/svn/framework3/trunk@12522 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-03 04:41:40 +00:00
James Lee 73ba020547 release! 
git-svn-id: file:///home/svn/framework3/trunk@12521 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-03 04:40:41 +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 1c86441f12 This removes the abortive_close code for stream sockets, it was leading to inconsistencies in how dead sessions were cleaned up 
git-svn-id: file:///home/svn/framework3/trunk@12519 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-03 03:59:02 +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 23c355ba2c Just use :mac not :host_mac 
git-svn-id: file:///home/svn/framework3/trunk@12517 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-03 03:03:38 +00:00
HD Moore b93e134195 Use shell_write vs ring.put 
git-svn-id: file:///home/svn/framework3/trunk@12516 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-02 23:07:02 +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
James Lee 259bf9695a don't kill a session when the user ctrl-C's during a command run by sessions -c or a script/postmod 
git-svn-id: file:///home/svn/framework3/trunk@12513 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-02 20:40:19 +00:00
HD Moore 366bc8979d Only try to report to the database if the database driver is active. Fixes #4306 
git-svn-id: file:///home/svn/framework3/trunk@12512 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-02 20:29:01 +00:00
HD Moore 7cb8e56cfe Fix upexec handle_connection_stage arguments 
git-svn-id: file:///home/svn/framework3/trunk@12511 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-02 18:54:02 +00:00
Joshua Drake 602854c095 revamp msfpayload usage =) 
git-svn-id: file:///home/svn/framework3/trunk@12510 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-02 17:58:56 +00:00
HD Moore c668534105 This normalizes openssl non-blocking support across both 1.8.x/1.9.1 and 1.9.2+ 
git-svn-id: file:///home/svn/framework3/trunk@12509 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-02 17:25:26 +00:00
HD Moore eb78aac8dd Only try to catch the non-blocking exceptions if they are defined 
git-svn-id: file:///home/svn/framework3/trunk@12508 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-02 16:30:45 +00:00
HD Moore 8a69b464ec Merge an updated screenspy, fixes #3255 
git-svn-id: file:///home/svn/framework3/trunk@12507 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-02 16:10:09 +00:00
HD Moore d402ebf6fb Fix #3498 by showing post module options in the info output 
git-svn-id: file:///home/svn/framework3/trunk@12506 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-02 16:06:37 +00:00
James Lee e81d3440b8 don't try to store session events for sessions without a db_record. fixes #4301 
git-svn-id: file:///home/svn/framework3/trunk@12505 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-02 06:45:21 +00:00
HD Moore 9f53aa15a5 Catch other error types from SNMP 
git-svn-id: file:///home/svn/framework3/trunk@12504 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-02 05:38:13 +00:00
HD Moore 732a1f3993 Skip empty vulnerability names 
git-svn-id: file:///home/svn/framework3/trunk@12503 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-02 05:20:07 +00:00
Joshua Drake 1eee55b3cf remove a crufty require 
git-svn-id: file:///home/svn/framework3/trunk@12502 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-02 03:42:26 +00:00
Joshua Drake e9372d0e51 add another require 
git-svn-id: file:///home/svn/framework3/trunk@12501 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-02 03:40:34 +00:00
Joshua Drake ed86305675 add a require 
git-svn-id: file:///home/svn/framework3/trunk@12500 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-02 03:40:03 +00:00
HD Moore 92a066e7e9 Move the framework instantion to after the fork 
git-svn-id: file:///home/svn/framework3/trunk@12499 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-02 02:59:14 +00:00
HD Moore 078fb3e7ae Move the fork AFTER the framework instance has been created 
git-svn-id: file:///home/svn/framework3/trunk@12498 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-02 02:55:26 +00:00
Joshua Drake 91658ac45e remove crufty require 
git-svn-id: file:///home/svn/framework3/trunk@12497 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-02 01:35:21 +00:00
James Lee e30d2bbdd4 revert r12476, as it breaks interactive meterpreter channels. r12495 and r12494 should deal with what it was it was trying to solve in the first place. fixes #4293. 
git-svn-id: file:///home/svn/framework3/trunk@12496 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-02 00:29:48 +00:00
James Lee 61ac192d0d read() instead of sysread(), fixes ssh sessions 
git-svn-id: file:///home/svn/framework3/trunk@12495 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-02 00:23:42 +00:00
James Lee 178ae10e22 make sure telnet sessions use crlf for write() as well as put() 
git-svn-id: file:///home/svn/framework3/trunk@12494 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-01 23:56:57 +00:00
Wei Chen 352fc92539 Show OTR key and save it to disk 
git-svn-id: file:///home/svn/framework3/trunk@12493 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-01 22:36:20 +00:00
James Lee a170d37c62 make it a little clearer what getprivs actually does 
git-svn-id: file:///home/svn/framework3/trunk@12492 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-01 22:28:09 +00:00
Joshua Drake 94fa25ee7a remove crufty method 
git-svn-id: file:///home/svn/framework3/trunk@12491 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-01 22:07:49 +00:00
Joshua Drake 946bb351e0 remove crufty comment 
git-svn-id: file:///home/svn/framework3/trunk@12490 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-01 22:07:14 +00:00
James Lee 7a45ce0616 get rid of some warnings on 1.8 
git-svn-id: file:///home/svn/framework3/trunk@12489 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-01 20:23:25 +00:00
Mario Ceballos 0522b69de2 s instead of n 
git-svn-id: file:///home/svn/framework3/trunk@12488 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-01 13:31:08 +00:00
Wei Chen 94832059e5 The path fix would work if I remembered to uncomment the code... geez. 
git-svn-id: file:///home/svn/framework3/trunk@12487 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-01 00:32:17 +00:00
Wei Chen b763d66b39 Fixed two issues: NoMethodError undefined method `text' for nil:NilClass and The system cannot find the file specified. 
git-svn-id: file:///home/svn/framework3/trunk@12486 4d416f70-5f16-0410-b530-b9f4589650da
 2011-05-01 00:20:57 +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 39cab9b076 Correct use of select and expand the listen queue for TCP Servers 
git-svn-id: file:///home/svn/framework3/trunk@12484 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-30 18:08:52 +00:00
Tod Beardsley 140a304032 Specify IO::select for sleep directly. 
git-svn-id: file:///home/svn/framework3/trunk@12483 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-30 17:56:38 +00:00
HD Moore 22537ffbde A few more tweaks to non-blocking ssl mode 
git-svn-id: file:///home/svn/framework3/trunk@12482 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-30 10:24:52 +00:00
HD Moore 96ac0fd51a Swap out exceptions 
git-svn-id: file:///home/svn/framework3/trunk@12481 4d416f70-5f16-0410-b530-b9f4589650da
 2011-04-30 08:47:32 +00:00