Commit Graph

9684 Commits (1fced297f4792148a077c00df39c2544062babca)

Author SHA1 Message Date
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
HD Moore 882c4b52f8 Monkey patch xmlrpc to handle 64-bit integers (meterpreter file sizes) and deal with nil more gracefully.
git-svn-id: file:///home/svn/framework3/trunk@12466 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-29 06:10:41 +00:00
Tod Beardsley 4053764f21 In the event an import file isn't an msf_zip, pcapfile, and doesn't have a newline, bail.
git-svn-id: file:///home/svn/framework3/trunk@12465 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-29 04:16:42 +00:00
Tod Beardsley 07e02ce44a When reporting a session from an import, :routes should always end up an an array.
git-svn-id: file:///home/svn/framework3/trunk@12464 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-29 04:10:46 +00:00
Tod Beardsley 1693a21b06 Fixes nessus_v2 imports to indicate a service name correctly.
git-svn-id: file:///home/svn/framework3/trunk@12463 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-28 18:52:35 +00:00
James Lee 0a638aebfc make modules' class.inspect useful. this has bugged me for *years*
git-svn-id: file:///home/svn/framework3/trunk@12462 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-28 16:50:57 +00:00
Wei Chen 8fa4443a68 Added Subtitle Processor 7.7.1 bof
git-svn-id: file:///home/svn/framework3/trunk@12461 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-28 08:12:32 +00:00
Mario Ceballos be83842dff added exploit module emc_homebase_exec.rb
git-svn-id: file:///home/svn/framework3/trunk@12458 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-27 20:29:27 +00:00
HD Moore 77328e7327 Fix report calls, thanks Minga!
git-svn-id: file:///home/svn/framework3/trunk@12457 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-27 19:39:28 +00:00
Wei Chen f59db11f0e Fixed typo in description. Thanks ragecyr.
git-svn-id: file:///home/svn/framework3/trunk@12456 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-27 16:54:49 +00:00
David Rude 5e374e1d36 Post module title changes for consistency
git-svn-id: file:///home/svn/framework3/trunk@12455 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-27 16:25:15 +00:00
Wei Chen 46c919cc8a Removed meetRequirements(). No need since it's already specified in SessionTypes.
git-svn-id: file:///home/svn/framework3/trunk@12454 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-27 15:48:35 +00:00
Wei Chen 2f6b941584 Fixed a bug with "TypeError can't convert nil into String"
git-svn-id: file:///home/svn/framework3/trunk@12453 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-27 15:41:37 +00:00
HD Moore 95e9153b33 Move to Windows to reflect the removal of the OS X target
git-svn-id: file:///home/svn/framework3/trunk@12452 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-27 15:29:56 +00:00
James Lee 0978047673 clean up help a little for several meterpreter file commands
git-svn-id: file:///home/svn/framework3/trunk@12451 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-27 00:38:15 +00:00
HD Moore 8ba356271f Fixes #4223 on Windows by catching the specific exception class
git-svn-id: file:///home/svn/framework3/trunk@12450 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-27 00:20:32 +00:00
James Lee dbf2f5a4af add a post module for stealing obfuscated winscp stored passwords, fixes #4210, thanks TheLightCosine!
git-svn-id: file:///home/svn/framework3/trunk@12449 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-26 23:55:56 +00:00
James Lee 859fd9216f report module_run and script_run session events
git-svn-id: file:///home/svn/framework3/trunk@12448 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-26 21:57:01 +00:00
James Lee f04782904e move @@reload_opts to the correct class, fixes 'help reload' from a non-exploit module context
git-svn-id: file:///home/svn/framework3/trunk@12447 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-26 21:53:45 +00:00
James Lee f72c94b514 default last_seen to sane values so we don't orphan all sessions right away. =/
git-svn-id: file:///home/svn/framework3/trunk@12446 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-26 21:29:47 +00:00
James Lee 956dcfa6d2 deal with the odd 'No Service Pack' by normalizing to 'Service Pack 0', fixes odd 2003 detection
git-svn-id: file:///home/svn/framework3/trunk@12444 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-26 19:31:56 +00:00
James Lee 81391d6ebf fix a stupid bug where retina, nessus, and qualys os fingerpritns would not be saved; improve fingerprints for 2003, 2008
git-svn-id: file:///home/svn/framework3/trunk@12443 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-26 19:13:35 +00:00
Tod Beardsley 2031c0d288 Importing Nexpose reports should retain test keys (which are usually some kind of proof or expanded details about a vulnerability).
git-svn-id: file:///home/svn/framework3/trunk@12442 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-26 17:31:26 +00:00
James Lee 8cf4733535 change the close_reason to be more accurate now that the close isn't happening at startup
git-svn-id: file:///home/svn/framework3/trunk@12441 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-26 16:19:59 +00:00
HD Moore 1d8dca6268 Merge the stale session reaper code into the session manager
git-svn-id: file:///home/svn/framework3/trunk@12437 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-26 05:10:14 +00:00
HD Moore cc0904b27e Unbreak trunk for now, this code needs to be fixed, its throwing errors. Fixes #4218
git-svn-id: file:///home/svn/framework3/trunk@12436 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-26 02:22:05 +00:00
Tod Beardsley 905044b03b Sources credentials gained from exploits by a session ID directly, rather than going through the ExploitedHost table.
git-svn-id: file:///home/svn/framework3/trunk@12435 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-25 21:01:24 +00:00
James Lee b87d943eeb updates for smartlocker, fixes #4216, fixes #3400, thanks mubix
git-svn-id: file:///home/svn/framework3/trunk@12434 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-25 18:13:22 +00:00
James Lee 80fe4c22e3 don't bomb out when there are no stale sessions
git-svn-id: file:///home/svn/framework3/trunk@12433 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-25 17:18:29 +00:00
James Lee b61d83a0ae add a last-seen column to the sessions table so we can cull dead sessions on startup
git-svn-id: file:///home/svn/framework3/trunk@12432 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-25 16:11:02 +00:00
Wei Chen e39739231d Added CVE reference
git-svn-id: file:///home/svn/framework3/trunk@12431 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-25 05:37:41 +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
HD Moore cbce0e2cb2 Update hacking with some other gotchas
git-svn-id: file:///home/svn/framework3/trunk@12429 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-25 02:48:23 +00:00