Commit Graph

1999 Commits (6fb4a5630a0895481b5d547ffbe55bfee10e6f6a)

Author SHA1 Message Date
HD Moore dfa7fb7d0b Move away from Kernel.select in exchange for IO.select, solves some issues with windows compatibility
git-svn-id: file:///home/svn/framework3/trunk@9330 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-20 20:42:17 +00:00
James Lee 088d501095 default to postgres
git-svn-id: file:///home/svn/framework3/trunk@9328 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-20 19:37:46 +00:00
Tod Beardsley 87ba4a9594 Fixes #1990. Turns out, we were counting on resolved hostnames, and skipping anything with an unresolved IP address.
git-svn-id: file:///home/svn/framework3/trunk@9327 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-20 14:08:29 +00:00
James Lee 8e648dc7e0 proto is not required, fixes #1976
git-svn-id: file:///home/svn/framework3/trunk@9326 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-19 19:08:08 +00:00
James Lee 346f1b715f bump version to 3.4.1-dev
git-svn-id: file:///home/svn/framework3/trunk@9325 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-19 16:20:21 +00:00
HD Moore f66d19567e 3.4.0-release time
git-svn-id: file:///home/svn/framework3/trunk@9321 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-18 07:35:09 +00:00
Carlos Perez ef919600f6 Fix error when writing data to file
git-svn-id: file:///home/svn/framework3/trunk@9320 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-17 23:35:43 +00:00
Carlos Perez d19fabffda Removed redundant function, API call already for this
git-svn-id: file:///home/svn/framework3/trunk@9319 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-17 23:35:05 +00:00
James Lee 5e920cad93 whitespace and a clearer warning message
git-svn-id: file:///home/svn/framework3/trunk@9312 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-17 15:20:30 +00:00
James Lee eb29533ee1 get rid of unnecessary dbms-specific disconnect methods
git-svn-id: file:///home/svn/framework3/trunk@9311 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-17 04:49:17 +00:00
James Lee a17dd47908 move a method closer to where it's used
git-svn-id: file:///home/svn/framework3/trunk@9310 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-17 04:39:07 +00:00
James Lee f754b9178a convert db_autopwn -I and -X to use RangeWalker; this has bugged me for a long time
git-svn-id: file:///home/svn/framework3/trunk@9309 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-17 04:35:33 +00:00
James Lee bfe47b85d8 whitespace and a typo
git-svn-id: file:///home/svn/framework3/trunk@9308 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-17 04:01:26 +00:00
Joshua Drake 5dabc4ba3f add more validation to return value from exploit check methods
git-svn-id: file:///home/svn/framework3/trunk@9305 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-14 19:53:06 +00:00
James Lee 6d69b3870f use the ActiveRecord tests for DB liveness instead of a simple boolean. fixes #1383
git-svn-id: file:///home/svn/framework3/trunk@9304 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-14 18:57:48 +00:00
HD Moore 10364dc70d Fixes #1915. Only clear the connection pool if it exists
git-svn-id: file:///home/svn/framework3/trunk@9301 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-14 15:55:01 +00:00
Tod Beardsley 084a6e971c More nessus import fun. NBE files, this time.
git-svn-id: file:///home/svn/framework3/trunk@9297 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-12 23:00:21 +00:00
Tod Beardsley dbbfec125e Adjusts more Nessus import foo.
git-svn-id: file:///home/svn/framework3/trunk@9296 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-12 22:23:40 +00:00
Tod Beardsley 754a939f82 Skip non-IPv4 address in Nessus reports. Namely, this will allow imports that hit a SCAN-ERROR due to homefeed.
git-svn-id: file:///home/svn/framework3/trunk@9292 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-12 18:10:37 +00:00
James Lee 4cfc84a2e4 fix data->info bug in msfe xml import
git-svn-id: file:///home/svn/framework3/trunk@9284 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-11 15:39:24 +00:00
James Lee fc793f3cfc print an error if a resource file doesn't exist, fixes #1358
git-svn-id: file:///home/svn/framework3/trunk@9280 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-11 03:20:44 +00:00
James Lee 2e9d342bf3 fix another missed data->info
git-svn-id: file:///home/svn/framework3/trunk@9275 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-10 23:42:06 +00:00
James Lee afec0407c8 fix nessus and nexpose simplexml imports after the vuln.data->info change
git-svn-id: file:///home/svn/framework3/trunk@9271 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-10 16:16:38 +00:00
James Lee c5efb3c557 add db_status command, fixes #1159
git-svn-id: file:///home/svn/framework3/trunk@9270 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-10 09:23:53 +00:00
James Lee 29c222d575 document that sqlite is not supported, clarify the db_create deprecation warning to indicate the new ability of db_connect to also create the database
git-svn-id: file:///home/svn/framework3/trunk@9268 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-10 06:27:47 +00:00
James Lee 1e85142054 try to create the database through ActiveRecord
git-svn-id: file:///home/svn/framework3/trunk@9267 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-10 06:14:57 +00:00
James Lee abbd6aeef7 change vulns.data to vulns.info, fixes #1660
git-svn-id: file:///home/svn/framework3/trunk@9265 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-09 23:32:43 +00:00
HD Moore 0db9cd2746 Update the jruby warning
git-svn-id: file:///home/svn/framework3/trunk@9260 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-09 17:05:15 +00:00
HD Moore 22213466d2 Remove object handle hack
git-svn-id: file:///home/svn/framework3/trunk@9259 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-09 17:03:02 +00:00
Carlos Perez b43a143126 Enable Meterpreter Mixins
git-svn-id: file:///home/svn/framework3/trunk@9252 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-08 18:38:49 +00:00
Carlos Perez c501e65288 Update of the mixin
git-svn-id: file:///home/svn/framework3/trunk@9249 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-08 03:47:51 +00:00
Tod Beardsley 7d9819a9df Altering the MSFE export format.
git-svn-id: file:///home/svn/framework3/trunk@9243 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-07 21:59:35 +00:00
James Lee e70dabf3e3 warn and remove commas from CERTCN to prevent a crash bug in Rjb's keytool, fixes 1543
git-svn-id: file:///home/svn/framework3/trunk@9241 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-07 18:19:50 +00:00
Tod Beardsley 044d7758d8 Sometimes, imported nmap hosts are all marked as "up," even if they're not, thanks to the "user-set" reason. Since that's not very trustworthy, only import hosts that actually have a port list.
git-svn-id: file:///home/svn/framework3/trunk@9240 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-07 17:35:49 +00:00
James Lee ef7c628ff8 add loots to host model
git-svn-id: file:///home/svn/framework3/trunk@9239 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-07 06:37:00 +00:00
Carlos Perez 2b8ffee307 Initial Meterpreter Mixin commands
git-svn-id: file:///home/svn/framework3/trunk@9238 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-07 02:38:22 +00:00
Tod Beardsley cb7706f80d Normalizing report names for import.
git-svn-id: file:///home/svn/framework3/trunk@9231 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-05 20:11:03 +00:00
Tod Beardsley 8632146be4 Adds imported file metadata to imported hosts as a "host.imported" note, indicating the source filename, the detected file type, and the imported time.
git-svn-id: file:///home/svn/framework3/trunk@9227 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-05 19:45:48 +00:00
HD Moore 47cea7bbb3 Respin of the service file
git-svn-id: file:///home/svn/framework3/trunk@9226 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-05 18:25:26 +00:00
James Lee fd5b26ad43 add a timestamp to session opened messages, fixes #1776
git-svn-id: file:///home/svn/framework3/trunk@9216 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-03 20:06:25 +00:00
HD Moore df9ec8a08c Updates to the nessus parser. Closes #1715
git-svn-id: file:///home/svn/framework3/trunk@9211 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-03 01:49:00 +00:00
HD Moore 59a0277ff5 Correct syntax
git-svn-id: file:///home/svn/framework3/trunk@9210 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-03 01:19:36 +00:00
HD Moore c8b9edd2df Change 'r' to 'rb' read mode, will solve some encoding issues
git-svn-id: file:///home/svn/framework3/trunk@9209 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-03 01:17:20 +00:00
HD Moore b10d68f3f9 Fixes #1791. Apply patch from jduck to fix bad returns from within proc
git-svn-id: file:///home/svn/framework3/trunk@9208 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-03 01:03:49 +00:00
HD Moore 74e64c12fd Skip port-0 endpoints for now
git-svn-id: file:///home/svn/framework3/trunk@9207 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 23:51:54 +00:00
HD Moore 7d737ccfba Remove certainty from service.info for now
git-svn-id: file:///home/svn/framework3/trunk@9206 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 23:50:41 +00:00
HD Moore aea08c56b0 Put colons between each octet of the imported mac address
git-svn-id: file:///home/svn/framework3/trunk@9205 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 23:43:41 +00:00
HD Moore 94d67d57f6 Append to the array, dont reset it to an int
git-svn-id: file:///home/svn/framework3/trunk@9204 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 23:13:21 +00:00
James Lee bbc9c14b1e put hosts into the right workspace, change os_vendor back to :vendor
git-svn-id: file:///home/svn/framework3/trunk@9203 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 22:23:43 +00:00
James Lee 1ab399d0ea use a stream parser to import NeXpose raw xml, short-circuit find_or_create_ref to avoid going to the task queue when possible
git-svn-id: file:///home/svn/framework3/trunk@9199 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 19:16:52 +00:00
HD Moore 39a06a88c3 Patch ActiveRecord to use marshal instead of yaml for serialization
git-svn-id: file:///home/svn/framework3/trunk@9198 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 16:46:44 +00:00
Tod Beardsley 66e258da2d Adding a framework.db.sync for on_session_open -- otherwise it can be to quick and session.tunnel_peer can be nil.
git-svn-id: file:///home/svn/framework3/trunk@9197 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 16:25:52 +00:00
HD Moore 704702729b Switch from serialize to marshalize, ugly code still, will consolidate before release
git-svn-id: file:///home/svn/framework3/trunk@9196 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 06:09:08 +00:00
HD Moore 49932f9ef5 Deprecate db_create, change the suggested postgres driver to 'postgres'
git-svn-id: file:///home/svn/framework3/trunk@9195 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 02:07:30 +00:00
HD Moore 7631b193fd Glue to tie Metasploit mixins into Rex::Script::Meterpreter
git-svn-id: file:///home/svn/framework3/trunk@9193 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-02 00:09:01 +00:00
HD Moore cbd675e369 Add user.prefs
git-svn-id: file:///home/svn/framework3/trunk@9191 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-01 22:02:00 +00:00
HD Moore 42da9e899a Improvements to the cleanup process, close sockets properly for exploits and auxiliary
git-svn-id: file:///home/svn/framework3/trunk@9187 4d416f70-5f16-0410-b530-b9f4589650da
2010-05-01 16:26:24 +00:00
Tod Beardsley af38610728 Allows for an early exit in the event of a guessed credential.
git-svn-id: file:///home/svn/framework3/trunk@9180 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-30 21:17:27 +00:00
HD Moore bd928017de Use gsub over tr to handle binary strings better
git-svn-id: file:///home/svn/framework3/trunk@9157 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-27 14:46:00 +00:00
HD Moore 45425c32da Ignore incoming data when the socket has already been closed. This may not be correct for WebRPC, but it causes problems with the default mode
git-svn-id: file:///home/svn/framework3/trunk@9156 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-27 14:39:51 +00:00
HD Moore 8b93465d46 Remove global extend -> include change, identify common cases and change instead
git-svn-id: file:///home/svn/framework3/trunk@9152 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-27 01:00:43 +00:00
Tod Beardsley 111f105117 Handle importing timestamps from Metasploit Express reports.
git-svn-id: file:///home/svn/framework3/trunk@9149 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-26 21:51:29 +00:00
Tod Beardsley 3fa96688f2 Moved the common rexmlifier to its own function for consistency. Ensure that nulls stay null for MSFE import.
git-svn-id: file:///home/svn/framework3/trunk@9146 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-26 20:25:42 +00:00
Tod Beardsley 1b910c1862 Expose a means to import MSFE reports to the user.
git-svn-id: file:///home/svn/framework3/trunk@9144 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-26 19:10:40 +00:00
Tod Beardsley fab458579e Implements methods to import reports from Metasploit Express.
git-svn-id: file:///home/svn/framework3/trunk@9141 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-26 18:40:49 +00:00
HD Moore 6511e4fa77 Workaround for a memory leak on some versions of Ruby
git-svn-id: file:///home/svn/framework3/trunk@9136 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-25 23:49:20 +00:00
James Lee 30b210a896 make task exception logs a little more readable.
git-svn-id: file:///home/svn/framework3/trunk@9127 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-24 18:34:21 +00:00
James Lee 016ec84531 fix auth lookups on mysql ('==' != '=')
git-svn-id: file:///home/svn/framework3/trunk@9126 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-24 15:53:20 +00:00
James Lee 928389e8b0 update comments to explain the reason for not running init_ui
git-svn-id: file:///home/svn/framework3/trunk@9114 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-20 07:01:46 +00:00
James Lee 4243ce5bf4 preliminary fix for the meterpreter-breaks-tab-completion bug pending some testing, see #1180
git-svn-id: file:///home/svn/framework3/trunk@9113 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-20 03:59:27 +00:00
James Lee dc2b42a8c2 typo fix? actually pass the options instead of always using an empty Hash.
git-svn-id: file:///home/svn/framework3/trunk@9107 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-19 23:19:12 +00:00
HD Moore 7e4515cd7e Handle task processing errors better
git-svn-id: file:///home/svn/framework3/trunk@9087 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-15 19:25:48 +00:00
Tod Beardsley 888e80f92c Fixes up various usability bugs with AuthBrute, many of which revolved around smb_login tests.
git-svn-id: file:///home/svn/framework3/trunk@9086 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-15 17:29:47 +00:00
HD Moore dff1132e08 Remove stderr
git-svn-id: file:///home/svn/framework3/trunk@9084 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-15 15:29:28 +00:00
James Lee 086f82630a don't queue a task from within a task; error out earlier when we don't have a host
git-svn-id: file:///home/svn/framework3/trunk@9081 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-15 09:00:16 +00:00
Joshua Drake 5aea21fcb8 speel more godoer
git-svn-id: file:///home/svn/framework3/trunk@9080 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-15 02:09:08 +00:00
Joshua Drake 6fec79926c revert service name string insertion
git-svn-id: file:///home/svn/framework3/trunk@9079 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-14 22:17:19 +00:00
Joshua Drake 730b27eed1 fixup some of the payload exe generation/templating stuff, add pe/dll template+src
git-svn-id: file:///home/svn/framework3/trunk@9073 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-14 21:44:23 +00:00
HD Moore 914a90a714 Fix the print lins
git-svn-id: file:///home/svn/framework3/trunk@9068 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-14 02:46:43 +00:00
James Lee e1639ce853 truncate host and service info to the size of the database field, see #912
git-svn-id: file:///home/svn/framework3/trunk@9064 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-13 21:15:15 +00:00
HD Moore 52d17d73da Show the URL, print an OK error for unknown requests
git-svn-id: file:///home/svn/framework3/trunk@9058 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-13 16:05:37 +00:00
HD Moore 32b8f366de Do not try to bind to LHOST
git-svn-id: file:///home/svn/framework3/trunk@9057 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-13 15:38:01 +00:00
HD Moore 197595839a Add a close method, fix a memory leak
git-svn-id: file:///home/svn/framework3/trunk@9056 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-12 19:25:29 +00:00
HD Moore be7f2fdac8 Handle cases where the session has a target_host by not tunnel_peer
git-svn-id: file:///home/svn/framework3/trunk@9052 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-11 22:11:31 +00:00
James Lee c8a8a6a3fe log a little more info when a migration fails
git-svn-id: file:///home/svn/framework3/trunk@9050 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-11 16:33:21 +00:00
Joshua Drake df16eec4d7 revert r9038, see r9039, fixes #1531, fixes #531
git-svn-id: file:///home/svn/framework3/trunk@9040 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-07 23:42:04 +00:00
James Lee a502c2647d tell readline that the color escapes shouldn't be counted as part of the line length, thanks to Niklas Baumstark. fixes 1531, fixes 531
git-svn-id: file:///home/svn/framework3/trunk@9038 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-07 23:24:54 +00:00
HD Moore 36836423d9 Add a warning, cosmetic comment to asm
git-svn-id: file:///home/svn/framework3/trunk@9037 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-07 20:51:05 +00:00
Joshua Drake 4e23992588 move to more indirect method for defining syscall sets
git-svn-id: file:///home/svn/framework3/trunk@9035 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-07 16:49:48 +00:00
HD Moore b2568a33df Change the gem name
git-svn-id: file:///home/svn/framework3/trunk@9034 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-07 16:21:14 +00:00
Joshua Drake 71426f1af7 fix db_destory help
git-svn-id: file:///home/svn/framework3/trunk@9033 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-07 16:09:01 +00:00
HD Moore af10ee5e57 Handle timeout errors more gracefully
git-svn-id: file:///home/svn/framework3/trunk@9023 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-06 02:05:50 +00:00
HD Moore 724f980842 Make auth reports critical by default
git-svn-id: file:///home/svn/framework3/trunk@9022 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-06 00:04:52 +00:00
HD Moore 987757246f Speed up the queue processing a little
git-svn-id: file:///home/svn/framework3/trunk@9019 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-05 20:34:41 +00:00
HD Moore ca5963fbc7 Check for the host first
git-svn-id: file:///home/svn/framework3/trunk@9017 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-05 19:58:18 +00:00
HD Moore 97026edee6 Aggressively update the host.updated_at during report_* calls
git-svn-id: file:///home/svn/framework3/trunk@9016 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-05 19:38:51 +00:00
HD Moore 756c981c2b Add timestamps to print_good() too
git-svn-id: file:///home/svn/framework3/trunk@9011 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-04 22:48:35 +00:00
Joshua Drake 8d6f934570 provide better error messages when dealing failing to generate AIX payloads
git-svn-id: file:///home/svn/framework3/trunk@9010 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-04 20:57:17 +00:00
HD Moore c8defe9716 Size tweaks to bring the ssl stager + encoder + target_id to exactly 400 bytes
git-svn-id: file:///home/svn/framework3/trunk@8998 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 07:48:53 +00:00
HD Moore eac38aaa23 Allow alphanumeric targetid's
git-svn-id: file:///home/svn/framework3/trunk@8996 4d416f70-5f16-0410-b530-b9f4589650da
2010-04-03 06:21:00 +00:00