Commit Graph

4354 Commits (687aaf5c7123fdc8263a07c824bc6b3ac85bd194)

Author SHA1 Message Date
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 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 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
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
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
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
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
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 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
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 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 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
HD Moore b24b787e0a Add the right class wrappers
git-svn-id: file:///home/svn/framework3/trunk@12426 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-24 19:35:25 +00:00
HD Moore 4426a1b7f2 Port of the python Manifest.mbdb parser
git-svn-id: file:///home/svn/framework3/trunk@12424 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-24 18:21:13 +00:00
HD Moore bfe3c58d8b Correct the logic around Host object parameters
git-svn-id: file:///home/svn/framework3/trunk@12421 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-24 02:41:29 +00:00
HD Moore eacf1d3c8c Lets not break the trunk after all
git-svn-id: file:///home/svn/framework3/trunk@12420 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-24 02:32:43 +00:00
HD Moore 25971ff2ac Pass a host object into the nse parser from a host object cache.
git-svn-id: file:///home/svn/framework3/trunk@12416 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-24 00:54:43 +00:00
HD Moore 5918e6c0ac Allow report_auth_info() to accept a Host object instead of an address like all the other methods.
git-svn-id: file:///home/svn/framework3/trunk@12415 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-24 00:48:05 +00:00
HD Moore 9d715a1492 Switch from readpartial to read_nonblock, which works around an OpenSSL deadlock. This also adds support for the openssl-nonblock gem's specific exceptions
git-svn-id: file:///home/svn/framework3/trunk@12414 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-23 20:45:49 +00:00
Jonathan Cran 56049012cb remove my code out of the tree, tests all passing. thanks chao-mu!
git-svn-id: file:///home/svn/framework3/trunk@12413 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-23 02:49:14 +00:00
Jonathan Cran c9ab8f248d commit the rest of chao's patch :/
git-svn-id: file:///home/svn/framework3/trunk@12412 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-23 01:10:49 +00:00
HD Moore b0d81f4385 This mega-patch solves a few outstanding issues:
1) The database queue is no longer used, all threads have their own connection. This officially breaks sqlite3 support, even though sqlite3 was pretty broken to being with.
2) The report_* calls prefer a Host object in the :host parameter instead of :address. This lets it skip a lookup on the host table
3) The importers now pass in the Host object, significantly speeding up large imports
4) The host record is no longer updated by every change to a child object, this was too much of a bottleneck.

TL;DR: Database stuff is faster



git-svn-id: file:///home/svn/framework3/trunk@12409 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-22 20:16:55 +00:00
James Lee 53809926c1 the database *is* available at startup if there is a ~/.msf3/database.yml or if msfconsole was started with -y. There's a check for the db anyway, so this shouldn't ever bomb out
git-svn-id: file:///home/svn/framework3/trunk@12407 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-22 19:49:44 +00:00
HD Moore 4c0c282cf8 Fix a stack trace when one of these is nil
git-svn-id: file:///home/svn/framework3/trunk@12406 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-22 19:27:50 +00:00
HD Moore 5fc0f4eaf1 Fix typo
git-svn-id: file:///home/svn/framework3/trunk@12405 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-22 19:07:41 +00:00
James Lee 537e312c13 set RHOSTS directly when we have a short list
git-svn-id: file:///home/svn/framework3/trunk@12404 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-22 18:31:55 +00:00
amaloteaux 91bb4b0130 auxiliary: add a basic pcap replay module
git-svn-id: file:///home/svn/framework3/trunk@12403 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-22 18:25:19 +00:00
James Lee 96ee780967 merge the_listener's patch for adding ability to set RHOSTS from db_services. extends it by adding the same support in db_hosts and db_notes, see #308
git-svn-id: file:///home/svn/framework3/trunk@12401 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-22 05:08:08 +00:00
James Lee 1be4b0831b add support for dumping services as a csv file like hosts. merges partial patch from the_listener, thanks! fixes #3120
git-svn-id: file:///home/svn/framework3/trunk@12400 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-22 02:22:21 +00:00
HD Moore a61e7290b0 Do not modify the string passed to write() operations
git-svn-id: file:///home/svn/framework3/trunk@12394 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-21 17:29:11 +00:00
HD Moore 8b920a8f95 Dont modify the data buffer passed to write
git-svn-id: file:///home/svn/framework3/trunk@12393 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-21 17:17:26 +00:00
HD Moore 1a4d4340bf Make Ruby 1.8.7 happy
git-svn-id: file:///home/svn/framework3/trunk@12382 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-20 20:06:45 +00:00
HD Moore 545025dbea Add a warning when the imported vulnerability data is missing the service protocol/port (looks like just one vendor today has this problem).
git-svn-id: file:///home/svn/framework3/trunk@12381 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-20 18:33:27 +00:00
Tod Beardsley 41cc038eca Undoing r12379 in anticipation of a different version.
git-svn-id: file:///home/svn/framework3/trunk@12380 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-20 18:29:04 +00:00
Tod Beardsley 93a07df541 Add a :warning handler for db_import.
git-svn-id: file:///home/svn/framework3/trunk@12379 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-20 18:22:18 +00:00
HD Moore 07fb337ad9 Fix the actual thread cap
git-svn-id: file:///home/svn/framework3/trunk@12378 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-20 17:56:38 +00:00
James Lee 86bca6438f add a routes table; delete each comm's routes when flushing
git-svn-id: file:///home/svn/framework3/trunk@12377 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-20 17:49:27 +00:00
Joshua Drake 78d3998854 Fixes #4125, add hostname support to the Rex DHCP server & aux module
git-svn-id: file:///home/svn/framework3/trunk@12375 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-20 14:21:36 +00:00
Tod Beardsley b164ac6539 Actually store the title for Nexpose imports.
git-svn-id: file:///home/svn/framework3/trunk@12374 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-19 23:00:19 +00:00
Jonathan Cran 0437d20f9d Commit railgun tests from chao-mu: http://blog.minorcrash.com/2011/04/railgun-update-1st-milestone-almost.html
~/framework$ ruby lib/rex/post/meterpreter/extensions/stdapi/railgun.rb.ts.rb 
Loaded suite lib/rex/post/meterpreter/extensions/stdapi/railgun.rb.ts
Started
.............
Finished in 8.804126009 seconds.
13 tests, 30 assertions, 0 failures, 0 errors






git-svn-id: file:///home/svn/framework3/trunk@12366 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-19 14:15:45 +00:00
HD Moore b94d09cdf1 Try a little harder to make this module more reliable through TCP proxies
git-svn-id: file:///home/svn/framework3/trunk@12359 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-18 20:53:21 +00:00
HD Moore d2d66f3285 This patch changes how VNC sessions are handled, making them a now-unique type that is not registered in the normal sense. This works around a corner case due to recent session work.
git-svn-id: file:///home/svn/framework3/trunk@12358 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-18 20:07:53 +00:00
Tod Beardsley 8b5d004997 Adding an nmap version checker so NSE modules can tell if it's okay to run or not.
git-svn-id: file:///home/svn/framework3/trunk@12357 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-18 19:52:13 +00:00
HD Moore f1f15ba448 Allow socks4a to relay through meterpreter
git-svn-id: file:///home/svn/framework3/trunk@12353 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-18 18:17:49 +00:00
James Lee debc16bea5 vnc sessions don't have an arch
git-svn-id: file:///home/svn/framework3/trunk@12352 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-18 16:53:58 +00:00
James Lee 99d5affbc7 put session_* events back in until we can sort out some issues with the change
git-svn-id: file:///home/svn/framework3/trunk@12351 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-18 16:29:15 +00:00
James Lee 069eb808f1 store closed_at in utc to avoid discrepancies with opened_at
git-svn-id: file:///home/svn/framework3/trunk@12348 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-18 15:59:25 +00:00
HD Moore 1b63d36c85 Fix typo reported by mubix
git-svn-id: file:///home/svn/framework3/trunk@12346 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-18 04:40:06 +00:00
Mario Ceballos 1d0d6195bd fixes a load error
git-svn-id: file:///home/svn/framework3/trunk@12344 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-17 02:08:42 +00:00
James Lee 5effb0ca04 use Table#to_csv to generate csv a file that isn't broken when data contains commas
git-svn-id: file:///home/svn/framework3/trunk@12343 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-17 01:07:53 +00:00
James Lee 03fdd9a0d0 add support method used in previous commit (r12341)
git-svn-id: file:///home/svn/framework3/trunk@12342 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-17 00:35:32 +00:00
James Lee c14580adf3 add help for several meterp commands and allow the channel command to do everything the associated with channels (list, interact, read, write, close)
git-svn-id: file:///home/svn/framework3/trunk@12341 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-17 00:34:45 +00:00
Matt Weeks ff07d00b51 Simpler interrupt handling in RPC consoles.
git-svn-id: file:///home/svn/framework3/trunk@12339 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-16 23:03:30 +00:00
James Lee 05f0f3739f add help for several db commands
git-svn-id: file:///home/svn/framework3/trunk@12338 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-16 22:49:31 +00:00
Matt Weeks b53545e875 Seach post modules by default too.
git-svn-id: file:///home/svn/framework3/trunk@12336 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-16 18:03:13 +00:00
James Lee 827bec98d6 ljust the option names so we don't have funky alignment for multi-char option names
git-svn-id: file:///home/svn/framework3/trunk@12335 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-16 15:57:52 +00:00
James Lee 9c1b4ddca5 add a load command. this will later deprecate the use command under meterpreter for 3.7 release
git-svn-id: file:///home/svn/framework3/trunk@12334 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-16 13:59:57 +00:00
Matt Weeks a0cbbdfab0 Support 'jar' format when generating payloads.
git-svn-id: file:///home/svn/framework3/trunk@12331 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-16 02:11:12 +00:00
James Lee d294f511b6 add logging for interactive meterpreter channels
git-svn-id: file:///home/svn/framework3/trunk@12328 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-15 21:10:15 +00:00
Tod Beardsley f386a2c587 Adding an additional sessions mapping to workspaces.
git-svn-id: file:///home/svn/framework3/trunk@12327 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-15 20:36:10 +00:00
Mike Smith 175cae5047 Add associations between Host, Session & SessionEvent model objects.
git-svn-id: file:///home/svn/framework3/trunk@12325 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-15 18:54:27 +00:00
HD Moore 50155919ea Add File.exists? as a wrapper to File.stat
git-svn-id: file:///home/svn/framework3/trunk@12324 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-15 15:29:57 +00:00
Carlos Perez 904e7af88b added API call for extracting keystrokes from client.ui.keyscan_dump
git-svn-id: file:///home/svn/framework3/trunk@12323 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-15 02:21:40 +00:00
Tod Beardsley d63fe9a7ba Adding a column for local_id to the sessions table in order to better handle database-mediated session operations.
git-svn-id: file:///home/svn/framework3/trunk@12321 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-14 23:14:36 +00:00
Tod Beardsley 93ee866669 Prevent new sessions from being opened several hours in the past so that we don't accidentally create spatiotemporal paradoxes and erase ourselves from history.
git-svn-id: file:///home/svn/framework3/trunk@12319 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-14 21:53:03 +00:00
James Lee 96af5e2af6 store session info in the db
git-svn-id: file:///home/svn/framework3/trunk@12317 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-14 18:28:44 +00:00
James Lee d6edeebcef actually log errors from reporting the session fingerprint. would have helped greatly in tracking down #4128
git-svn-id: file:///home/svn/framework3/trunk@12313 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-13 23:03:00 +00:00
Jonathan Cran c5c7ca3657 loglevel max is actually 5
git-svn-id: file:///home/svn/framework3/trunk@12312 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-13 21:22:38 +00:00
Tod Beardsley f8be06bd88 See #4129. This patches up shell_read and shell_write to use the new ring buffer mechanisms with no significant API changes. Still need to run through a test on Armitage to ensure it's all still flowing smoothly, should be done within the hour.
git-svn-id: file:///home/svn/framework3/trunk@12310 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-13 17:02:45 +00:00
James Lee f43fe6e31b clarify the help for getprivs
git-svn-id: file:///home/svn/framework3/trunk@12309 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-13 16:01:40 +00:00
James Lee 361922c634 don't use in-place gsub, it breaks on 1.9.2 since the string was a hash key at one point and apparently gets frozen, fixes #4128
git-svn-id: file:///home/svn/framework3/trunk@12308 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-13 01:48:37 +00:00
James Lee 05e47166a3 push the check for msf up to the main meterpreter command dispatcher and fire events for file upload/download.
git-svn-id: file:///home/svn/framework3/trunk@12307 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-12 20:39:46 +00:00
James Lee 9831dd5ca6 take linux sysinfo into account for os fingerprints
git-svn-id: file:///home/svn/framework3/trunk@12303 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-11 23:15:05 +00:00
James Lee 857b5c786b don't store less accurate nmap fingerprints, see #4099
git-svn-id: file:///home/svn/framework3/trunk@12302 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-11 23:05:07 +00:00
James Lee b2eb5a4908 store the service pack from nexpose (previously not returned from the xml parser, see r12298); store hostname and more version info from nmap; see #4099
git-svn-id: file:///home/svn/framework3/trunk@12300 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-11 22:29:53 +00:00
James Lee 36367f8a67 save os version info (usually windows service packs) and close the names tag, so we don't store every xml tag's text as a hostname
git-svn-id: file:///home/svn/framework3/trunk@12298 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-11 22:16:25 +00:00
Patrick Webster e9e8026832 Fixed author name in modules for myself.
git-svn-id: file:///home/svn/framework3/trunk@12292 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-11 02:25:36 +00:00
James Lee a82c47789d silly debug print, see #4099
git-svn-id: file:///home/svn/framework3/trunk@12290 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-11 01:41:35 +00:00
Mike Smith d5d9d56081 Create a dedicated db table to track sessions & session events.
* Add new db tables for session & session_events
* Migrate existing session data from events db table
* Modify session report methods to log to the new tables


git-svn-id: file:///home/svn/framework3/trunk@12273 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-07 21:59:32 +00:00
Joshua Drake 875858e78e See #4089, fix method definitions
git-svn-id: file:///home/svn/framework3/trunk@12267 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-07 13:19:43 +00:00
Joshua Drake 1a7cc50530 Fixes #4089, Pass DECODERSTUB advopt when calling generate_stager too
git-svn-id: file:///home/svn/framework3/trunk@12266 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-07 13:17:03 +00:00
Joshua Drake 8057c7e969 sync up with metasm tip, yay for Yoann and autoload
git-svn-id: file:///home/svn/framework3/trunk@12252 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-06 17:40:01 +00:00
HD Moore f3717302cd Fixes #4073 by applying a patch from Francois Ropert for parsing DMVPN keys from Cisco configuration files
git-svn-id: file:///home/svn/framework3/trunk@12248 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-05 15:45:01 +00:00
Tod Beardsley b91c81a182 Fixes #4074 -- corrects the affected regexes.
git-svn-id: file:///home/svn/framework3/trunk@12238 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-04 22:19:59 +00:00
James Lee 485211288f doc formatting
git-svn-id: file:///home/svn/framework3/trunk@12237 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-04 18:06:41 +00:00
James Lee cd8866d22f add doc for initialize
git-svn-id: file:///home/svn/framework3/trunk@12235 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-04 17:32:17 +00:00
James Lee dcefdc5f28 whitespace and rdoc fixes
git-svn-id: file:///home/svn/framework3/trunk@12234 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-04 17:27:12 +00:00
James Lee 7444436750 fix directives for rdoc
git-svn-id: file:///home/svn/framework3/trunk@12233 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-04 17:06:59 +00:00
amaloteaux 3e0982a792 enable ntlmv2 by default for smb, mssql and http
git-svn-id: file:///home/svn/framework3/trunk@12227 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-03 21:06:50 +00:00
amaloteaux f9680c854b reworj http ntlm authentificaion and correct some bug
git-svn-id: file:///home/svn/framework3/trunk@12225 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-03 20:38:27 +00:00
amaloteaux b38a187631 mssql login : enable ntlmv2 authentification
git-svn-id: file:///home/svn/framework3/trunk@12223 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-03 17:02:23 +00:00
James Lee 16eac54a39 and now back to your regular scheduled msfconsole
git-svn-id: file:///home/svn/framework3/trunk@12220 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-02 15:51:48 +00:00
amaloteaux c5e137d7d3 correct a bug on ntlm signing
git-svn-id: file:///home/svn/framework3/trunk@12211 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-01 20:58:11 +00:00
James Lee 0c9dbbf9f3 a few more cosmetic changes
git-svn-id: file:///home/svn/framework3/trunk@12201 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-01 06:48:36 +00:00
James Lee a305d3bd27 deprecate windows. What day is it today?
git-svn-id: file:///home/svn/framework3/trunk@12200 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-01 06:35:25 +00:00
HD Moore fea84dccda Text alignment
git-svn-id: file:///home/svn/framework3/trunk@12199 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-01 06:03:42 +00:00
HD Moore f97790ec8b Cosmetic change
git-svn-id: file:///home/svn/framework3/trunk@12198 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-01 06:01:25 +00:00
James Lee ae1d3b78bc add host.imported notes for import types other than nmap, see r9277; don't double-report hosts for nessus and ip360 imports
git-svn-id: file:///home/svn/framework3/trunk@12197 4d416f70-5f16-0410-b530-b9f4589650da
2011-04-01 01:01:11 +00:00
Tod Beardsley e1499657c9 Overhaul the nexpose vuln importer to be a little more friendly to all the XML data we can gather about vulns, beyond just their ID and references.
git-svn-id: file:///home/svn/framework3/trunk@12182 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-29 22:22:58 +00:00
HD Moore e0e8d986e7 Fix up psexec by adding a reqwuire for the wbemexec mixin
git-svn-id: file:///home/svn/framework3/trunk@12180 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-29 16:35:26 +00:00
James Lee b823ea9876 fix undefined method error by using the correct class
git-svn-id: file:///home/svn/framework3/trunk@12169 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-28 18:42:22 +00:00
amaloteaux 19a4a2d88a move some code from lib/rex/proto/smb/client to lib/rex/proto/ntlm/util and add a mini mixin for ntlm
git-svn-id: file:///home/svn/framework3/trunk@12162 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-27 20:14:56 +00:00
Jonathan Cran 3c6b33bd80 continuation of tests / fixes from chao.
git-svn-id: file:///home/svn/framework3/trunk@12155 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-27 00:37:54 +00:00
amaloteaux 08df8179cc mssql login : enable windows authentification and add an encrypion check through tds prelogin mechanism
see issue #402 for some comment on the implementation and the todo's


git-svn-id: file:///home/svn/framework3/trunk@12154 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-27 00:24:19 +00:00
Jonathan Cran d18f14de4e add a test suite for railgun
git-svn-id: file:///home/svn/framework3/trunk@12152 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-26 19:49:08 +00:00
Jonathan Cran 35c33020ca merge in test updates from chao-mu
git-svn-id: file:///home/svn/framework3/trunk@12150 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-26 19:29:59 +00:00
Jonathan Cran 4892a67fa1 small tweaks, remove model - no longer necessary
git-svn-id: file:///home/svn/framework3/trunk@12143 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-26 00:46:55 +00:00
James Lee cf3fbdad71 unneeded require in comments
git-svn-id: file:///home/svn/framework3/trunk@12142 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-26 00:45:52 +00:00
Jonathan Cran 50d573f282 doh! commit the rest of chao's railgun work
git-svn-id: file:///home/svn/framework3/trunk@12141 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-26 00:33:05 +00:00
Jonathan Cran 29061c5799 merge in chao-mu's changes. all tests passing :)
git-svn-id: file:///home/svn/framework3/trunk@12138 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-25 21:16:41 +00:00
amaloteaux 695bd76a30 typo fix
git-svn-id: file:///home/svn/framework3/trunk@12134 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-25 18:28:27 +00:00
Tod Beardsley 9895d01d51 Moving lib_mysqludf_sys*.dll to a more obvious subdirectory of the exploit binaries.
git-svn-id: file:///home/svn/framework3/trunk@12128 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-24 17:48:19 +00:00
James Lee c09be5561d this should have been a raise all along, see r9752
git-svn-id: file:///home/svn/framework3/trunk@12119 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-23 23:15:11 +00:00
James Lee ad5073d6b1 only close the session when we get socket-related exceptions, fixes #4005
git-svn-id: file:///home/svn/framework3/trunk@12118 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-23 22:21:59 +00:00
amaloteaux ec5e61966d oops revert the unwanted early commit on mssql
git-svn-id: file:///home/svn/framework3/trunk@12114 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-23 20:53:57 +00:00
Tod Beardsley 2b4acb3b6c Misplaced (and redundant) functon in the postgres library, removed.
git-svn-id: file:///home/svn/framework3/trunk@12113 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-23 20:52:07 +00:00
amaloteaux 46cf938475 fix typo
git-svn-id: file:///home/svn/framework3/trunk@12112 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-23 20:47:49 +00:00
Tod Beardsley b1178686cf Fixes #3988. Adds a command execution module for PostgreSQL by uploading a UDF library and adding sys_exec() as a temporary function. Requires the target to be Windows, uses Bernardo Damele A. G.'s binaries.
Also fixes a typo in the arguments to handler which clears up a heretofore mysterious exception (see exploit.rb).



git-svn-id: file:///home/svn/framework3/trunk@12111 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-23 19:36:07 +00:00
James Lee 8bb95f02c5 load the config after adding any module paths so we can start msfconsole using a module from a non-default path
git-svn-id: file:///home/svn/framework3/trunk@12105 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-23 16:19:55 +00:00
HD Moore ac75160741 Add sinn3r and bannedit to authors
git-svn-id: file:///home/svn/framework3/trunk@12084 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-23 03:28:19 +00:00
Tod Beardsley 02165304c2 Adding an additional error code for postgresql, new as of version 9.
git-svn-id: file:///home/svn/framework3/trunk@12071 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-22 17:43:36 +00:00
Tod Beardsley 3ed59574e1 Another postgresql fingerprint, now when auths are enabled.
git-svn-id: file:///home/svn/framework3/trunk@12070 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-22 17:39:19 +00:00
Tod Beardsley 8bca6d4d54 Adding a quickie fingerprint for PostgreSQL on windows (9.0.3)
git-svn-id: file:///home/svn/framework3/trunk@12069 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-22 17:26:57 +00:00
HD Moore 3395ee226e Associate the replicant exploit instance with the replicant payload, otherwise the wrong exploit instance will be used by the payload handler. Fixes #4004.
git-svn-id: file:///home/svn/framework3/trunk@12065 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-22 03:19:56 +00:00
Tod Beardsley 46dfafa81f Fixes #3987. Don't raise on the attr set, raise when the command actually wants to get run.
git-svn-id: file:///home/svn/framework3/trunk@12063 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-21 20:52:08 +00:00
David Rude cf04b2f387 fix a stack trace if nmap is not installed
git-svn-id: file:///home/svn/framework3/trunk@12062 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-21 20:11:12 +00:00
HD Moore 7043e25ae9 Clarify the license and the usability
git-svn-id: file:///home/svn/framework3/trunk@12061 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-21 19:00:35 +00:00
James Lee e72a4e36bd add 'show actions' for post mods, oversight from r12008. see #3965
git-svn-id: file:///home/svn/framework3/trunk@12058 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-21 17:07:11 +00:00
James Lee 3527aa2472 correct width calculation for sysinfo
git-svn-id: file:///home/svn/framework3/trunk@12057 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-21 16:58:24 +00:00
HD Moore c6b3bfacfe Merge in an openvas-bridge update from kost
git-svn-id: file:///home/svn/framework3/trunk@12056 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-21 05:02:14 +00:00
HD Moore 3d59be3586 This patch adds a 'reload_all' command to msfconsole. This will flush and reload all modules from all module paths
git-svn-id: file:///home/svn/framework3/trunk@12040 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-20 22:22:07 +00:00
HD Moore 2e267bdca3 This patch removes the unimplemented "persist" command. This has been sitting in half-done state for too many years and its time to go.
git-svn-id: file:///home/svn/framework3/trunk@12039 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-20 21:41:09 +00:00
Joshua Drake 12ea375d25 See #3183: Pad the plain text before trying DES on it.
git-svn-id: file:///home/svn/framework3/trunk@12033 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-20 08:55:12 +00:00
Jonathan Cran d45b2aaa20 bugfix & cleanup of the vm loading and a speedup / bugfix for the regex lib
git-svn-id: file:///home/svn/framework3/trunk@12032 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-20 02:33:39 +00:00
Matt Weeks a31eadc554 Change IPs before offer instead of between offer and ack. Fixes #3973.
git-svn-id: file:///home/svn/framework3/trunk@12030 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-20 00:33:02 +00:00
Carlos Perez b5bd7599fd Updated usage message to reflect that more than one resource file can be used
git-svn-id: file:///home/svn/framework3/trunk@12017 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-18 02:47:58 +00:00
Carlos Perez 3416862f13 Resource command for Meterpreter Sessions
git-svn-id: file:///home/svn/framework3/trunk@12016 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-18 02:44:15 +00:00
Matt Weeks e094c7e941 Fix typo in db_creds
git-svn-id: file:///home/svn/framework3/trunk@12011 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-17 22:13:10 +00:00
Tod Beardsley f2057f54a8 De-dup'ed get_link_filter() in the crawler module. Added some comment
docs on crawler_process_page(). Nothing exciting.



git-svn-id: file:///home/svn/framework3/trunk@12010 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-17 21:21:21 +00:00
James Lee ded3ff9c75 add support for actions in post modules. fixes #3965~
git-svn-id: file:///home/svn/framework3/trunk@12008 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-17 05:39:30 +00:00
Matt Weeks c4bd210eae Fixes #3959.
git-svn-id: file:///home/svn/framework3/trunk@12006 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-17 04:12:51 +00:00
Matt Weeks 91a48cd04b Fix error with undefined variable 'name' when clearing default workspace
git-svn-id: file:///home/svn/framework3/trunk@12005 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-17 04:10:22 +00:00
Matt Weeks 6cd1699c42 Enable command passthru in "web" console, since it's awfully convenient and no longer provides any security since msfweb was removed.
(console access already provides the ability to execute OS commands)



git-svn-id: file:///home/svn/framework3/trunk@12004 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-17 00:17:45 +00:00
Carlos Perez e49ab08e21 Add support to scripts for Meterpreter Accounts Mixin and add new method is_system? for checking if sessions is running as SYSTEM, uses SID so as at to ensure compatibility with multiple language versions of windows.
git-svn-id: file:///home/svn/framework3/trunk@11997 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-16 22:44:36 +00:00
amaloteaux f4ceb83e40 send spn avp by default ; it wont hurt at all
git-svn-id: file:///home/svn/framework3/trunk@11992 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-16 20:01:28 +00:00
amaloteaux 91c50f7683 use self.rhost instead of datastore['RHOST']
git-svn-id: file:///home/svn/framework3/trunk@11973 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-16 00:34:07 +00:00
amaloteaux a7d2a34fe2 move comment
git-svn-id: file:///home/svn/framework3/trunk@11972 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-16 00:27:44 +00:00
amaloteaux b7a0a305ee allow psexec to success when SPN validation level is required on windows seven / 2008r2 servers
git-svn-id: file:///home/svn/framework3/trunk@11971 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-16 00:12:07 +00:00
Tod Beardsley ecb89c785b Actually use the API for appending command line arguments for nmap.
git-svn-id: file:///home/svn/framework3/trunk@11970 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-15 21:59:35 +00:00
Tod Beardsley 292f357f7a Moving requires from oracle_login to nmap. Duh.
git-svn-id: file:///home/svn/framework3/trunk@11966 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-15 20:46:03 +00:00
Tod Beardsley 9e15c487b5 Adding pid info for nmap.
git-svn-id: file:///home/svn/framework3/trunk@11964 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-15 18:31:17 +00:00
Matt Weeks fa3c038f1d Check for nulls/nils when retrieving client list
git-svn-id: file:///home/svn/framework3/trunk@11963 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-15 16:52:01 +00:00
Matt Weeks f3ddb869be Clean these too.
git-svn-id: file:///home/svn/framework3/trunk@11962 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-15 01:53:45 +00:00
James Lee 7d12151ec6 add support for http digest authentication. fixes #2504, thanks oliver kleinecke for the patch!
git-svn-id: file:///home/svn/framework3/trunk@11961 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-14 22:37:16 +00:00
Tod Beardsley 6e0e23f5ba Fixups on the Oracle/Nmap stuff. Adding back in the Scanner module, since it has some handy process mgmt functions.
git-svn-id: file:///home/svn/framework3/trunk@11960 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-14 22:13:57 +00:00
Tod Beardsley e073a3a01c Fixes #3941. This should deal with the path problems I ran into on Windows. otherwise, works like a champ, so resolving.
git-svn-id: file:///home/svn/framework3/trunk@11951 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-14 03:31:40 +00:00
Tod Beardsley b68396351a See #3941. This is a first attempt at supporting driving nmap via a metasploit module. It's a somewhat hefty checkin that includes the Nmap auxiliary mixin as well as an oracle login bruteforce module that uses it.
This definitely needs to be tested on Win32 before it can be called f i x e d, due to the differences between the nmap binaries and the way files are created and used.

Also, the oracle_login scanner could use another once-over for error handling -- don't rely on that yet.

Once this all works the way I expect, I'll document the procedure more thoroghly so people can take advantage.



git-svn-id: file:///home/svn/framework3/trunk@11948 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-13 22:52:50 +00:00
amaloteaux 468f500e31 add a function to detect if ntlm response comes from an empty pwd
git-svn-id: file:///home/svn/framework3/trunk@11936 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-11 20:24:49 +00:00
James Lee dbcb02b8de future-proof the sysinfo command by generically looping over the values returned by the server instead of hardcoding keys
git-svn-id: file:///home/svn/framework3/trunk@11925 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-10 17:23:47 +00:00
Tod Beardsley 98a6b7db4c Missing space between hosts and services in db_notes
git-svn-id: file:///home/svn/framework3/trunk@11919 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 22:11:29 +00:00
amaloteaux b5323c129c when ntlmssp is not used, better to disable signing then raising an error
git-svn-id: file:///home/svn/framework3/trunk@11918 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 21:51:11 +00:00
amaloteaux fea87fb82b enable pass-the-hash when signing is required
git-svn-id: file:///home/svn/framework3/trunk@11917 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 21:13:04 +00:00
amaloteaux 2fa2ca174c use the correct exception
git-svn-id: file:///home/svn/framework3/trunk@11916 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 17:31:53 +00:00
amaloteaux 7755cdd983 correct a bug on ntlmv2_response and comment style compliance
git-svn-id: file:///home/svn/framework3/trunk@11915 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 16:57:33 +00:00
HD Moore 612c2e6796 This commit fixes much of the NTLM crypt code to work properly again, fixing #3918 as well.
git-svn-id: file:///home/svn/framework3/trunk@11914 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 05:04:42 +00:00
HD Moore 046d75533a This patch adds a method for recognizing LM/NTLM hashes, disables signing when no user is specified and the server denies our NTLMSSP logon with an empty user, and cleans up the indents and formatting for some of the new code
git-svn-id: file:///home/svn/framework3/trunk@11912 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 03:35:25 +00:00
HD Moore 315a1cb4f2 Disable signing when we reach this corner case, required to setup null sessions to XP SP2/SP3 (no domain)
git-svn-id: file:///home/svn/framework3/trunk@11910 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 03:08:11 +00:00
amaloteaux b04ac2d446 enable pass-the-hash for ntlmv2 as well, signing is not yet suported
git-svn-id: file:///home/svn/framework3/trunk@11908 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 02:41:50 +00:00
amaloteaux 1f948c1e17 re-enable pass-the-hash for smb client when ntlmv1 or ntlm2_session is used ( ntlmv2 or signing not yet supported but coming soon)
git-svn-id: file:///home/svn/framework3/trunk@11906 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 01:56:09 +00:00
amaloteaux fc8c0681de remove an option present twice
git-svn-id: file:///home/svn/framework3/trunk@11905 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-09 00:42:12 +00:00
HD Moore e71e609ab0 Rework this option as well
git-svn-id: file:///home/svn/framework3/trunk@11903 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-08 23:46:44 +00:00
HD Moore c2aede0a59 Revert an overzealous search/replace
git-svn-id: file:///home/svn/framework3/trunk@11902 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-08 23:31:06 +00:00
HD Moore 5c2abe4dd7 This patch reworks some of the new SMB names to match the standard option format
git-svn-id: file:///home/svn/framework3/trunk@11901 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-08 23:29:34 +00:00
Tod Beardsley 42531e097f Fixes #3916. Adds a module for mysql delivery of a payload via a UDF, using Bernardo's quite excellent UDF libraries.
git-svn-id: file:///home/svn/framework3/trunk@11899 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-08 22:42:26 +00:00
Tod Beardsley a5275fa6e5 Fixes #3915. This comments out two more raiseable conditions -- neither seem particularly useful to raise on in the first place anyway, though.
Some day, I need to go over all this with some decent version switching and submit some upstream patches.



git-svn-id: file:///home/svn/framework3/trunk@11897 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-08 21:28:20 +00:00
Tod Beardsley 79903eb724 Fixes #3910. Backporting the upstream fix by dropping the f1 check. Ought to uprev the whole thing from the git repo, but need to figure out if we have any local changes first.
git-svn-id: file:///home/svn/framework3/trunk@11894 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-08 00:08:26 +00:00
amaloteaux 5f6995e8d3 enable ntlmv2 and signing for smb client stack (pth implementation is coming), fixes #11678 and #152
git-svn-id: file:///home/svn/framework3/trunk@11893 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-07 19:57:53 +00:00
HD Moore d535e74f47 Bump trunk to 3.7.0-dev to start on the next release
git-svn-id: file:///home/svn/framework3/trunk@11890 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-07 04:09:45 +00:00
HD Moore 31970fb09a Release time, mark this as 3.6.0
git-svn-id: file:///home/svn/framework3/trunk@11889 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-07 02:46:51 +00:00
James Lee c92ab3f6b5 only dup if we've got something to dup. fixes #3896
git-svn-id: file:///home/svn/framework3/trunk@11880 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-05 20:15:36 +00:00
James Lee c775f07a82 this test works, re-enable. fix a 1.9 compat issue.
git-svn-id: file:///home/svn/framework3/trunk@11877 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-04 16:43:20 +00:00
HD Moore 3b5c467c47 Fix db_hosts when -c is passed
git-svn-id: file:///home/svn/framework3/trunk@11862 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-02 17:12:10 +00:00
HD Moore 3e99eea120 Adds a to_csv method to the table class
git-svn-id: file:///home/svn/framework3/trunk@11861 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-02 15:06:43 +00:00
James Lee 6904ce8c7b 3.6.0-beta\!
git-svn-id: file:///home/svn/framework3/trunk@11852 4d416f70-5f16-0410-b530-b9f4589650da
2011-03-01 06:15:15 +00:00
Tod Beardsley 4a41e4e352 Fixes #3742 by sanitizing utf-8 characters for the username and system name in session.info.
Tested with German Win2k3EE and a session created with exploit/windows/mssql/mssql_payload.



git-svn-id: file:///home/svn/framework3/trunk@11848 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-28 21:39:25 +00:00
HD Moore e7dbf28626 This patch adds a register_parent() method to the module class, making it easy to propogate things like ParentUUID, Workspace, and Owner down. The multi/handler post modules were updated to use this new api. This fixes an issue where the session generated by a post module would be registered to the wrong workspace.
git-svn-id: file:///home/svn/framework3/trunk@11846 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-28 04:24:35 +00:00
James Lee 1cdc5d8c0a add_row instead of just adding to self.rows. fixes #3825
git-svn-id: file:///home/svn/framework3/trunk@11844 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-28 02:30:47 +00:00
HD Moore f912d2e0c2 Add db_loot (basic)
git-svn-id: file:///home/svn/framework3/trunk@11843 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-27 16:30:17 +00:00
HD Moore 30c14fe45c Remove a duplicate host column from db_services
git-svn-id: file:///home/svn/framework3/trunk@11842 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-27 15:58:08 +00:00
James Lee d7eecc9d67 make sure registry is there before including it, fixes #3806, fixes #3726
git-svn-id: file:///home/svn/framework3/trunk@11840 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-26 23:52:28 +00:00
HD Moore 424adcd74d Remove the near-worthless loot report message
git-svn-id: file:///home/svn/framework3/trunk@11839 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-26 18:07:48 +00:00
HD Moore c204f38e84 Remove the near-worthless loot report message
git-svn-id: file:///home/svn/framework3/trunk@11838 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-26 18:07:25 +00:00
HD Moore 1f3000dc41 Cleaner default output for db_hosts and db_services
git-svn-id: file:///home/svn/framework3/trunk@11837 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-26 17:42:03 +00:00
HD Moore 9bc2a2cd3a Store keystrokes as loot
git-svn-id: file:///home/svn/framework3/trunk@11835 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-26 04:54:45 +00:00
HD Moore fa16dcb098 Add the ability to enumerate compatible post modules for a given session id
git-svn-id: file:///home/svn/framework3/trunk@11832 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-26 03:50:12 +00:00
HD Moore 941c0f446f Change the CustomPrintPrefix to apply to lines (before the status/timestamp)
git-svn-id: file:///home/svn/framework3/trunk@11829 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-26 02:35:38 +00:00
HD Moore 880ffeb1f7 This updates the (C) for 2011, adds a CustomPrintPrefix option to set a unique prefix for a module and cleans up some post modules
git-svn-id: file:///home/svn/framework3/trunk@11828 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-26 02:02:34 +00:00
James Lee 52d8e59b43 work around what i can only assume is a bizarre ruby bug where session_has_registry_ext?() never gets called and is assumed false, but session_has_registry_ext() works fine.
git-svn-id: file:///home/svn/framework3/trunk@11822 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-24 21:33:32 +00:00
Tod Beardsley 57966c66d8 This allows for blank usernames in the normal case, as well as a domain/<blank> sort of construct for smb logins.
git-svn-id: file:///home/svn/framework3/trunk@11820 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-24 20:42:14 +00:00
James Lee 21ed434f24 better test for registry extension
git-svn-id: file:///home/svn/framework3/trunk@11819 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-24 19:36:22 +00:00
James Lee 4721fd4539 unbreak scripts that use is_uac_enabled?()
git-svn-id: file:///home/svn/framework3/trunk@11818 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-24 18:14:40 +00:00
James Lee db619828f2 add a session_compatible? method to post modules, include platform in compatibility checks.
git-svn-id: file:///home/svn/framework3/trunk@11802 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-23 04:40:21 +00:00
James Lee fb98f96984 fix a pasto and simplify the return value
git-svn-id: file:///home/svn/framework3/trunk@11801 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-23 04:28:11 +00:00
James Lee f647088fba give the timeout a default value. fixes everything that uses shell_command_token_* with one arg
git-svn-id: file:///home/svn/framework3/trunk@11800 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-23 01:33:39 +00:00
Carlos Perez 7e2fb81cb5 Initial set of OSX Shell Post modules for general basic enumeration and for dumping hashes (SHA, LM and NTLM) for OSX 10.4 and above
git-svn-id: file:///home/svn/framework3/trunk@11792 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-22 14:00:47 +00:00
James Lee 1cbadda8c0 add 2008 to the list of versions on which UAC is enabled
git-svn-id: file:///home/svn/framework3/trunk@11787 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-21 20:26:14 +00:00
James Lee b97ccd5d88 don't error out and die if a post module doesn't have a SessionTypes
git-svn-id: file:///home/svn/framework3/trunk@11786 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-21 20:00:21 +00:00
James Lee 50614260f1 remove superfluous stuff from the test module, fix an ArgumentError in the mixin. see r11783 and r11784
git-svn-id: file:///home/svn/framework3/trunk@11785 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-21 19:22:19 +00:00
James Lee e71cd9b524 add shell support for registry methdos, thanks kernelsmith!
git-svn-id: file:///home/svn/framework3/trunk@11784 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-21 19:13:11 +00:00
James Lee 5db118fa9b add support for reading various WinAPI data structures, thanks, chao-mu! fixes #3721
git-svn-id: file:///home/svn/framework3/trunk@11778 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-18 19:23:36 +00:00
Jonathan Cran bbbb86d571 patch by Hauke of the Fidus Project to fixup my bugs in the virtualbox controller :) -- thanks!
git-svn-id: file:///home/svn/framework3/trunk@11775 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-18 17:03:19 +00:00
HD Moore ad691ec05b Additional commands for the nexpose engine
git-svn-id: file:///home/svn/framework3/trunk@11774 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-18 09:16:06 +00:00
James Lee 64529011a0 add the meterpreter platform to the output of sysinfo command
git-svn-id: file:///home/svn/framework3/trunk@11772 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-18 00:29:43 +00:00
James Lee f8c2fa6b72 aesthetic
git-svn-id: file:///home/svn/framework3/trunk@11771 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-18 00:25:36 +00:00
James Lee d6b8ef4c16 don't show meta type for packets (since they don't have one)
git-svn-id: file:///home/svn/framework3/trunk@11768 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-17 20:04:46 +00:00
James Lee b7d1ccb304 add packet-type to meterpreter packets' inspect
git-svn-id: file:///home/svn/framework3/trunk@11767 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-17 19:59:12 +00:00
Joshua Drake 160c683f18 Add WbemExec mixin, modify MS10-061 to use MOF technique
git-svn-id: file:///home/svn/framework3/trunk@11766 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-17 19:22:11 +00:00
James Lee e8e0841afc don't error out if we previously loaded the client extension
git-svn-id: file:///home/svn/framework3/trunk@11763 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-17 04:32:26 +00:00
Jonathan Cran a8de0591b2 vhost should be used when it's available
git-svn-id: file:///home/svn/framework3/trunk@11761 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-17 02:16:20 +00:00
James Lee b56f6293a3 stupid debugging
git-svn-id: file:///home/svn/framework3/trunk@11760 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-17 02:09:32 +00:00
James Lee 974d9ad6c2 clean up comments
git-svn-id: file:///home/svn/framework3/trunk@11759 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-16 22:34:43 +00:00
James Lee 24f37e25de add a search path for client extensions
git-svn-id: file:///home/svn/framework3/trunk@11758 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-16 21:13:44 +00:00
Jonathan Cran 38e7beda4f minor typo
git-svn-id: file:///home/svn/framework3/trunk@11755 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-16 02:20:12 +00:00
Jonathan Cran 5172768cb9 Merging in VirtualBox control functionality from Hauke / Fidius Project
git-svn-id: file:///home/svn/framework3/trunk@11753 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-16 02:15:24 +00:00
James Lee 257fe9d47c add more descriptive usage for meterpreter run command
git-svn-id: file:///home/svn/framework3/trunk@11751 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-15 22:34:46 +00:00
James Lee e94d39af2c un-ghetto meterpreter output logging
git-svn-id: file:///home/svn/framework3/trunk@11750 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-15 05:45:01 +00:00
James Lee 21b1945cd4 add a commandline switch for loading plugins at startup
git-svn-id: file:///home/svn/framework3/trunk@11748 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-13 22:19:43 +00:00
et d26e955e69 Test unique forms wmap
git-svn-id: file:///home/svn/framework3/trunk@11747 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-13 04:36:00 +00:00
Joshua Drake 708ff0e2ce fix 1.8 vs 1.9 compat in option parsing
git-svn-id: file:///home/svn/framework3/trunk@11745 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-12 22:25:02 +00:00
James Lee f6b5974feb add help for use command
git-svn-id: file:///home/svn/framework3/trunk@11744 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-11 23:42:46 +00:00
Jonathan Cran f8d03ea257 make the _snapshot / running_list methods a little more sane
git-svn-id: file:///home/svn/framework3/trunk@11742 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-11 15:04:33 +00:00
Jonathan Cran 224bd1c6a2 make vm type available
git-svn-id: file:///home/svn/framework3/trunk@11738 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-10 10:56:36 +00:00
Tod Beardsley 2efa01e8bd Deal with importing and exporting tags.
git-svn-id: file:///home/svn/framework3/trunk@11737 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-10 00:17:20 +00:00
James Lee f876b7fb4b back to dev
git-svn-id: file:///home/svn/framework3/trunk@11735 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-09 16:04:53 +00:00
Matt Weeks eba4b05237 Make sure registry functions are always present (errors when rerunning post modules)
git-svn-id: file:///home/svn/framework3/trunk@11732 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-09 02:41:22 +00:00
Tod Beardsley 749e9215bc Adding smcintyre's patch for allowing for AuthBrute to automatically generate a password the same as a username. Thanks!
git-svn-id: file:///home/svn/framework3/trunk@11731 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-09 01:46:27 +00:00
Tod Beardsley 742e9bca94 Adding the model that goes with r11726.
git-svn-id: file:///home/svn/framework3/trunk@11728 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-08 20:46:02 +00:00
James Lee 25554992d0 beta -> release!
git-svn-id: file:///home/svn/framework3/trunk@11727 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-08 18:55:01 +00:00
Tod Beardsley 14e6809b2b migrations for tags
git-svn-id: file:///home/svn/framework3/trunk@11726 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-08 18:53:55 +00:00
HD Moore 070f48e16a Work around some weirdness between report_website and report_host not accepting hostnames as :host by forcing :host to be the address
git-svn-id: file:///home/svn/framework3/trunk@11723 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-08 17:32:37 +00:00
Jonathan Cran 81f659f8b1 ugh, replace this with vixr soon.
git-svn-id: file:///home/svn/framework3/trunk@11722 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-08 07:37:06 +00:00
Jonathan Cran 3c86009e54 updates to do basic input filtering, and stubbing out a few other controllers
git-svn-id: file:///home/svn/framework3/trunk@11721 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-08 07:26:18 +00:00
Jonathan Cran 02e11ec338 allow usage: $ controller["machine1].start
git-svn-id: file:///home/svn/framework3/trunk@11718 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-07 23:42:20 +00:00
Jonathan Cran 670b28c65b updates for the lab plugin
git-svn-id: file:///home/svn/framework3/trunk@11715 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-04 21:29:24 +00:00
James Lee b05fd2c9a3 fix a stack trace when trying to loadpath a non-existant directory
git-svn-id: file:///home/svn/framework3/trunk@11714 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-04 20:53:08 +00:00
Tod Beardsley 19c8673346 See #3655. Don't crash if there isn't an sname. :/
git-svn-id: file:///home/svn/framework3/trunk@11713 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-04 15:32:12 +00:00
Tod Beardsley dda837a06c See #3655. Explicitly pass the sname if it's present from report_note to report_service.
git-svn-id: file:///home/svn/framework3/trunk@11712 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-04 15:29:57 +00:00
Jonathan Cran 7a606033ea somewhat less breaky. -- need to apply todb's patches yet, and make sure this is working with the lab plugin
git-svn-id: file:///home/svn/framework3/trunk@11711 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-04 09:17:11 +00:00
et baab86fc52 WMAP 1.0 and first pass on some modules
git-svn-id: file:///home/svn/framework3/trunk@11709 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-04 05:57:26 +00:00
Joshua Drake f09c1c8155 auto-close socket (and set to nil) when errors occur
git-svn-id: file:///home/svn/framework3/trunk@11708 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-04 03:33:37 +00:00
James Lee 2c2f9cd4dc bump version to 3.5.2-beta
git-svn-id: file:///home/svn/framework3/trunk@11704 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-03 18:04:55 +00:00
Carlos Perez 64c5393a10 Corrected mispelled word
git-svn-id: file:///home/svn/framework3/trunk@11702 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-02 23:40:15 +00:00
Tod Beardsley d7f291e41b Downcase all nexpose vuln id's.
git-svn-id: file:///home/svn/framework3/trunk@11694 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-01 23:42:07 +00:00
Tod Beardsley 4df940e81e Updating db.rb to account for nexpose raw vuln refs.
git-svn-id: file:///home/svn/framework3/trunk@11693 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-01 22:22:08 +00:00
James Lee 648214cad2 make help work the same in meterpreter as main console
git-svn-id: file:///home/svn/framework3/trunk@11690 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-01 01:20:55 +00:00
James Lee 13f7ad406a make it more obvious when portfwd usage is wrong, add a help cmd for it
git-svn-id: file:///home/svn/framework3/trunk@11689 4d416f70-5f16-0410-b530-b9f4589650da
2011-02-01 01:14:25 +00:00
Joshua Drake 9bfdcfece1 Fixes #3625 by replacing with proper calls to create Rex sockets.
git-svn-id: file:///home/svn/framework3/trunk@11686 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-31 16:47:51 +00:00
Joshua Drake c61fc6cfa5 Fixes #3623, make RC <ruby> block start/stop handling more liberal
git-svn-id: file:///home/svn/framework3/trunk@11684 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-31 07:11:33 +00:00
James Lee 5e9fdc28e7 move shell token stuff up to a mixin so meterpreter can use it, too
git-svn-id: file:///home/svn/framework3/trunk@11682 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-31 05:20:16 +00:00
James Lee 9163a7f0dd exploit should call run, like in aux modules
git-svn-id: file:///home/svn/framework3/trunk@11681 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-30 21:43:38 +00:00
James Lee 4037543072 whitespace
git-svn-id: file:///home/svn/framework3/trunk@11680 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-30 21:41:54 +00:00
James Lee 8b6cb60a20 whitespace
git-svn-id: file:///home/svn/framework3/trunk@11679 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-30 21:38:05 +00:00
HD Moore ac651fba6b Merge code from Alexandre Maloteaux, fixes #3615
git-svn-id: file:///home/svn/framework3/trunk@11678 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-30 19:26:35 +00:00
James Lee de7ad3f111 unbreak store_loot
git-svn-id: file:///home/svn/framework3/trunk@11677 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-30 19:11:27 +00:00
James Lee aeddee0f03 typo. good thing nothing actually uses this module?
git-svn-id: file:///home/svn/framework3/trunk@11676 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-30 05:54:50 +00:00
James Lee 8da92a7bb9 don't bomb out when given no args or an invalid module for the info command, fixes #3558, thanks chao-mu for the patch!
git-svn-id: file:///home/svn/framework3/trunk@11672 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-29 18:07:30 +00:00
James Lee 3b3bb4d874 clarify SRVHOST description
git-svn-id: file:///home/svn/framework3/trunk@11671 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-29 17:59:46 +00:00
James Lee 05022b6fe4 client.framework, there's no top-level framework obj in rex. see #3557
git-svn-id: file:///home/svn/framework3/trunk@11670 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-29 16:46:41 +00:00
Joshua Drake 4f3cdf0b26 See #3470, forgot a debug line, oops
git-svn-id: file:///home/svn/framework3/trunk@11669 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-29 03:35:42 +00:00
Joshua Drake 647b41cc96 Fixes #3470 by canonicalizing module paths as they are added
git-svn-id: file:///home/svn/framework3/trunk@11668 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-29 03:34:48 +00:00
James Lee 1ee9b205b8 session -> address is now taken care of by the underlying db.rb, don't bother in Auxiliary::Report
git-svn-id: file:///home/svn/framework3/trunk@11667 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-29 02:44:32 +00:00
James Lee 01d116f60f allow a Session as the :host argument to some report_* methods that make sense
git-svn-id: file:///home/svn/framework3/trunk@11666 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-29 02:42:45 +00:00
James Lee 3af1cf8279 failure to reload is an error
git-svn-id: file:///home/svn/framework3/trunk@11665 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-29 02:39:27 +00:00
HD Moore 2618e4fffe Add traceroute parsing to nmap
git-svn-id: file:///home/svn/framework3/trunk@11661 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-28 23:32:14 +00:00
James Lee 88a5b1982e always reload post modules when run from meterpreter prompt, fail and error out instead of running the old one when a reload fails. Fixes #3557
git-svn-id: file:///home/svn/framework3/trunk@11659 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-28 17:02:26 +00:00
James Lee a7b5e831f7 clean up how help works, pull cmd_reload up so all module types can use it
git-svn-id: file:///home/svn/framework3/trunk@11658 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-28 03:29:20 +00:00
Joshua Drake 9682091cca Add SQLI version of MSSQL Payload from Rodrigo Marcos!
git-svn-id: file:///home/svn/framework3/trunk@11655 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-27 16:48:07 +00:00
Joshua Drake a1b74eee0d Fixes #3607, Removes the module count cache since it seems to have no performance impact (and was broken)
git-svn-id: file:///home/svn/framework3/trunk@11653 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-27 00:13:13 +00:00
James Lee 47a706962a do the win32api thing if it's mingw. thanks Ludovic Courgnaud
git-svn-id: file:///home/svn/framework3/trunk@11651 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-26 19:20:45 +00:00
Tod Beardsley 1c58943edd Backing out r11616 since OptFloat will surely cause problems with RPC. Nothing to see here. Verified that all OptInt options are now actually Ints and not Floats with a grep -r "OptInt" trunk | grep "[0-9]\.[0-9]"
git-svn-id: file:///home/svn/framework3/trunk@11648 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-26 15:29:26 +00:00
Jonathan Cran 19d9185ca3 updated for remote workstation control
git-svn-id: file:///home/svn/framework3/trunk@11647 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-26 07:33:59 +00:00
James Lee d2670d52ec add BufferRegister and BufferOffset support for shikata_ga_nai. see #3563. tested this pretty extensively. /me crosses fingers
git-svn-id: file:///home/svn/framework3/trunk@11646 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-26 04:24:41 +00:00
Joshua Drake 4b777686d8 whitespace fixes
git-svn-id: file:///home/svn/framework3/trunk@11645 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-26 03:13:40 +00:00
Joshua Drake 53bba0bd54 Move cache logic from statistics->module_manager, More modularization in ModuleManager
git-svn-id: file:///home/svn/framework3/trunk@11643 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-26 00:07:34 +00:00
Joshua Drake a2e6f0e96c add -q option to suppress banner, improve -n warning
git-svn-id: file:///home/svn/framework3/trunk@11642 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-25 22:58:21 +00:00
Joshua Drake 56b112e03b See #3596, Only force encoding for rubies that support encoding
git-svn-id: file:///home/svn/framework3/trunk@11640 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-25 20:03:33 +00:00
Joshua Drake 1e6365ed58 Fixes #3596, Force Rex::Text.gzip to use ASCII-8BIT strings, Reverts r10653
git-svn-id: file:///home/svn/framework3/trunk@11639 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-25 19:59:56 +00:00
Carlos Perez 05fd7b4e57 Patch for railgun and post mixin; and module from cha-mou to add capability to delete users on windows hosts.
git-svn-id: file:///home/svn/framework3/trunk@11638 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-25 13:02:35 +00:00
HD Moore 3794ed35cc Apply patches from Matthew Weeks (scriptjunkie) to fix traversal flaws outlined in his Black Hat DC talk:
https://media.blackhat.com/bh-dc-11/Weeks/BlackHat_DC_2011_Weeks_Counterattack-wp.pdf
https://media.blackhat.com/bh-dc-11/Weeks/BlackHat_DC_2011_Weeks_Counterattack-Slides.pdf



git-svn-id: file:///home/svn/framework3/trunk@11636 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-25 02:24:37 +00:00
Joshua Drake 8a4c23ffd4 small adjustment
git-svn-id: file:///home/svn/framework3/trunk@11635 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-25 02:15:25 +00:00
Joshua Drake 81ff9483bf add ms09-004 exploit via sql injection from Rodrigo Marcos
git-svn-id: file:///home/svn/framework3/trunk@11631 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-24 19:37:58 +00:00
Joshua Drake 0af8915fd5 Fixes #1936, Add accounts mixin and accompanying post module
git-svn-id: file:///home/svn/framework3/trunk@11629 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-24 17:23:48 +00:00
Joshua Drake 3346a30023 See #1936, Add FreeSid definition and convert several PSID* out params to PDWORD
git-svn-id: file:///home/svn/framework3/trunk@11628 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-24 05:36:38 +00:00
James Lee 8bf60c6d11 carlos forgot to delete this, see r11550, r11551
git-svn-id: file:///home/svn/framework3/trunk@11624 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-22 00:56:37 +00:00
James Lee d7cda0f85a accept a client argument for get_uri()
git-svn-id: file:///home/svn/framework3/trunk@11623 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-22 00:16:57 +00:00
Tod Beardsley 8b5f0f6559 Allow getsystem to report its success as a host note.
git-svn-id: file:///home/svn/framework3/trunk@11622 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-22 00:08:35 +00:00
James Lee f8120a8e3f servers don't have a sock().
git-svn-id: file:///home/svn/framework3/trunk@11621 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-21 23:42:56 +00:00
James Lee e7ced5f887 disable ssl for the php include server, and try the address with the default gateway for get_uri when SRVHOST is inaddr_any
git-svn-id: file:///home/svn/framework3/trunk@11620 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-21 23:19:11 +00:00
Joshua Drake b8b3d9e00f See #1936, Apply patch from Chao Mu - PSID is kind of opaque, so we treat it as a pointer only (not a blob)
git-svn-id: file:///home/svn/framework3/trunk@11618 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-21 22:05:28 +00:00
Tod Beardsley 63f893dd90 Adds an OptFloat option class, for when people actually want floats and not integers.
git-svn-id: file:///home/svn/framework3/trunk@11616 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-21 17:21:42 +00:00
Tod Beardsley e1e35ea15b Adds a attribute_locked? method to Host objects. If an attribute is locked, report_host() won't update it. (These aren't very serious locks since you can still set them directly on objects, but if you use the API, and you should, locks will be respected.)
git-svn-id: file:///home/svn/framework3/trunk@11613 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-20 23:10:27 +00:00
Tod Beardsley a12f5556cb Fixes #3564 by better randomizing the temp directory for extraction (minimizing the chance of a filesystem name collision), correctly extracting the original workspace name, and identifying the correct XML file to work off of for importing hosts and services.
git-svn-id: file:///home/svn/framework3/trunk@11609 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-20 17:32:48 +00:00
James Lee dfbef1e38c make sure we have the right kind of args. fixes argument processing for scripts
git-svn-id: file:///home/svn/framework3/trunk@11605 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-19 23:36:11 +00:00
Joshua Drake 987ce12ba8 Fixes #3552, add ConvertStringSidtoSid
git-svn-id: file:///home/svn/framework3/trunk@11604 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-19 23:15:42 +00:00
Jonathan Cran d8fddbfcd4 missing file
git-svn-id: file:///home/svn/framework3/trunk@11603 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-19 21:23:29 +00:00
Matt Weeks 067c612d9e Make creds visible to RPC and GUI.
git-svn-id: file:///home/svn/framework3/trunk@11602 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-19 20:09:18 +00:00
James Lee bd2dcdb5c3 add the scriptable mixin. fixes #3550, see #3541. /me grumbles
git-svn-id: file:///home/svn/framework3/trunk@11600 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-19 16:01:12 +00:00
James Lee d120892e7c post modules working for shell sessions, fixes #3541
git-svn-id: file:///home/svn/framework3/trunk@11599 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-19 02:24:21 +00:00
James Lee 6210fea1f3 add post/ module support for meterpreter autorunscript, see #3541
git-svn-id: file:///home/svn/framework3/trunk@11595 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 23:48:19 +00:00
James Lee 5429c73b3b don't try to store to the database if there isn't one. fixes #3540
git-svn-id: file:///home/svn/framework3/trunk@11594 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 23:41:01 +00:00
James Lee aca1a0d8e4 allow passive post modules, fixes #3542. add 'Passive' => true to the module info for a passive module
git-svn-id: file:///home/svn/framework3/trunk@11591 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 22:00:12 +00:00
James Lee 437b060ab9 fix a namespace problem, maybe related to #3592
git-svn-id: file:///home/svn/framework3/trunk@11590 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 20:53:57 +00:00
James Lee 9df78e8f47 correct passive?() for post modules, see #3542
git-svn-id: file:///home/svn/framework3/trunk@11589 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 20:50:30 +00:00
James Lee 63934c34ec check for a ancestors instead of a straight comparison of classes when matching payloads for generics, fixes #3477
git-svn-id: file:///home/svn/framework3/trunk@11585 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 17:15:43 +00:00
Jonathan Cran 4384618950 add workstation-over-ssh control into the lab vm-control plugin
git-svn-id: file:///home/svn/framework3/trunk@11584 4d416f70-5f16-0410-b530-b9f4589650da
2011-01-17 05:58:16 +00:00