Commit Graph

1238 Commits (f44031722581d1e10c7070fe928d70abc049170a)

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