Commit Graph

9316 Commits (b93e13419599de82f9df2b36be7517985748ef1c)

Author SHA1 Message Date
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
HD Moore 5758f2ab46 Add support for non-blocking OpenSSL sockets when the Ruby version supports them (1.9.2+ or with openssl-nonblock gem).
git-svn-id: file:///home/svn/framework3/trunk@12480 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 07:59:33 +00:00
HD Moore 6bdf2a4e2b Proactively wrap each() in other Hash based classes to avoid situations that trigger modification during enumeration
git-svn-id: file:///home/svn/framework3/trunk@12479 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 04:59:27 +00:00
HD Moore 23d0c7d7d0 This overrides the framework.sessions.each method to use a temporary list instead of the native hash method. This avoids a rare race condition where a thread is enumerating sessions while another thread tries to register one.
git-svn-id: file:///home/svn/framework3/trunk@12478 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 04:50:06 +00:00
Tod Beardsley dfb8a9e24b Catching more nils in db_import.
git-svn-id: file:///home/svn/framework3/trunk@12477 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 04:33:52 +00:00
HD Moore 20c949d1fb Fix some bad copypasta from non-blocking write commit. This should make stream sessions happy again.
git-svn-id: file:///home/svn/framework3/trunk@12476 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 04:25:42 +00:00
HD Moore 321e5bd292 Qualify the exception namespace
git-svn-id: file:///home/svn/framework3/trunk@12475 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 03:33:45 +00:00
Wei Chen 9c619c3a40 Added mjm quickplayer s3m bof
git-svn-id: file:///home/svn/framework3/trunk@12474 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 02:37:14 +00:00
Wei Chen 72af607aef Added MJM Coreplayer s3m bof
git-svn-id: file:///home/svn/framework3/trunk@12473 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 02:36:14 +00:00
Tod Beardsley 94be33e8ee A little cleaner method for determining the nature of imported zip files.
git-svn-id: file:///home/svn/framework3/trunk@12472 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-30 01:49:55 +00:00
Matt Weeks e99b5a4f35 Un-break DHCP server when not using served_over.
Variable must be initialized before use regardless of whether HOSTNAME is defined.




git-svn-id: file:///home/svn/framework3/trunk@12471 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-29 22:58:55 +00:00
Mario Ceballos be2f68afbd this method doesnt work with a licensed install.
git-svn-id: file:///home/svn/framework3/trunk@12470 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-29 22:17:40 +00:00
HD Moore d942442bcd Officially remove sqlite3 support (its been deprecated for approximately a year). SQLite3 has not been usable for a long time due to thread concurrency and stability issues. This is the final nail in the coffin now that the DB backend has gone through an overhaul.
git-svn-id: file:///home/svn/framework3/trunk@12469 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-29 17:22:53 +00:00
HD Moore d9bee35456 Handle cases where iTunes is not installed or the base user directory has been changed
git-svn-id: file:///home/svn/framework3/trunk@12468 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-29 16:10:29 +00:00
HD Moore 743a401a47 Add the ability to reset the last read pointer from the ringer buffer
git-svn-id: file:///home/svn/framework3/trunk@12467 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-29 16:02:24 +00:00