Commit Graph

2615 Commits (eacf1d3c8cdc7fdf701e032ba79111d457ad18d2)

Author SHA1 Message Date
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 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 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
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
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
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
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
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 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
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
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 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 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
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
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
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