infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,497 Commits
7 Branches
556 Tags
421 MiB
Commit Graph

168 Commits (7c540583b5ca5cfeba06106e99077670f2afc51c)

Author SHA1 Message Date
Tod Beardsley 99e2218d13 Be a little more careful with credential sources and update new services in the current workspace. 
git-svn-id: file:///home/svn/framework3/trunk@10339 4d416f70-5f16-0410-b530-b9f4589650da
 2010-09-16 19:45:51 +00:00
Joshua Drake 57dac0dbf8 remove newlines when importing from an ip list 
git-svn-id: file:///home/svn/framework3/trunk@10230 4d416f70-5f16-0410-b530-b9f4589650da
 2010-09-03 15:04:09 +00:00
Tod Beardsley b65be82387 Handle updating the updated_at time for just-checked credentials better. 
git-svn-id: file:///home/svn/framework3/trunk@10213 4d416f70-5f16-0410-b530-b9f4589650da
 2010-09-01 22:06:52 +00:00
Tod Beardsley 21540e22ed Checking in missing reporting stuff for bruteforce. Namely, report_exploit, also changes ftp's pw type to just "password" and re-opens newly verified sessions. 
git-svn-id: file:///home/svn/framework3/trunk@10205 4d416f70-5f16-0410-b530-b9f4589650da
 2010-08-31 20:33:16 +00:00
Tod Beardsley 1db9d8eb01 Fixes #2444. Adds an ExploitedHost table, adds the db_exploited command, adds the report_exploit() function. 
Tested with meterpreter, shell, and clientside exploit sessions. 


git-svn-id: file:///home/svn/framework3/trunk@10130 4d416f70-5f16-0410-b530-b9f4589650da
 2010-08-24 21:57:04 +00:00
Tod Beardsley acef967d5a Updating importing to deal with importing credentials from Metasploit Express XML. 
git-svn-id: file:///home/svn/framework3/trunk@10111 4d416f70-5f16-0410-b530-b9f4589650da
 2010-08-23 17:45:36 +00:00
Tod Beardsley d0ea2737c5 Don't overwrite source_id just because we don't have one. 
git-svn-id: file:///home/svn/framework3/trunk@10067 4d416f70-5f16-0410-b530-b9f4589650da
 2010-08-19 23:19:34 +00:00
Tod Beardsley 6d6a547b34 Fixes #2412. Adds a creds table, modifies the db_report_auth API, adds the db_creds and db_add_cred commands. 
git-svn-id: file:///home/svn/framework3/trunk@10034 4d416f70-5f16-0410-b530-b9f4589650da
 2010-08-18 00:58:20 +00:00
Tod Beardsley 01c1d1d6df Makes sure that Qualys reports only try to report sensible data -- fixes DB complaints about null in non-null contrained columns. 
git-svn-id: file:///home/svn/framework3/trunk@9707 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-07 14:53:16 +00:00
Tod Beardsley dffd8c0c97 Deal with marshaled data for msfx imports. 
git-svn-id: file:///home/svn/framework3/trunk@9699 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-07 00:28:34 +00:00
HD Moore d5e9453a9c Allow yaml for v1/v2, not for v3, tested 
git-svn-id: file:///home/svn/framework3/trunk@9691 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-06 19:33:27 +00:00
HD Moore ef3dbf3841 Workaround for Ruby 1.8's fragile Marshal code 
git-svn-id: file:///home/svn/framework3/trunk@9689 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-06 18:35:49 +00:00
HD Moore 8f967af2f3 Dont fallback to yaml for service.info, its either base64 or a string 
git-svn-id: file:///home/svn/framework3/trunk@9686 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-06 18:17:14 +00:00
HD Moore 7847a645cd Remove the 'delete' 
git-svn-id: file:///home/svn/framework3/trunk@9681 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-06 16:44:04 +00:00
HD Moore fbdf5dca3c Try the three-way fallback for serialized fields (service.info and note.data) 
git-svn-id: file:///home/svn/framework3/trunk@9680 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-06 16:33:27 +00:00
HD Moore 0d40a69f16 Dont mangle the service.info field this way 
git-svn-id: file:///home/svn/framework3/trunk@9678 4d416f70-5f16-0410-b530-b9f4589650da
 2010-07-06 16:10:05 +00:00
Tod Beardsley 03918eeeda Adds an explicit function for import file validation acceptability. 
git-svn-id: file:///home/svn/framework3/trunk@9636 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-30 15:28:49 +00:00
Tod Beardsley 7e247e2f29 db migration to convert services info from varchar(65535) to text, and save info as a yaml'ed form in order to preserve funny characters. 
git-svn-id: file:///home/svn/framework3/trunk@9633 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-28 22:42:50 +00:00
Tod Beardsley 4953b3b69f If the :fix_services option is used for nmap, actually fix the services, and in addition, skip hosts which only present filtered ports. 
git-svn-id: file:///home/svn/framework3/trunk@9585 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-22 22:37:14 +00:00
Tod Beardsley 3591143f3a When importing MSFX data, just report unique collateral once. 
git-svn-id: file:///home/svn/framework3/trunk@9584 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-22 20:30:43 +00:00
Tod Beardsley 50c59a9ab1 Skip nmap port imports where the result is unknown and the target is really localhost. 
git-svn-id: file:///home/svn/framework3/trunk@9553 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-18 03:03:11 +00:00
Tod Beardsley 9924a8d40e Incorporates a service name map that makes nmap scanning a little more useful for MSFX out of the gate. 
git-svn-id: file:///home/svn/framework3/trunk@9536 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-16 18:22:42 +00:00
Tod Beardsley 1b5e35b059 Fixes #2089. Getting rid of zip_requires() in favor of always loading Zip, Dirtmp, and FileUtils. 
git-svn-id: file:///home/svn/framework3/trunk@9496 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-11 21:21:59 +00:00
Tod Beardsley d4e6e75f7d Handle loot, tasks, and report times that come from a MSFX ZIP report. 
git-svn-id: file:///home/svn/framework3/trunk@9493 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-11 18:56:16 +00:00
Tod Beardsley 6f37ea2aeb Adding a 3rd party zip library (rubyzip by Thomas Sondergaard and Technorama Ltd, released under the Ruby license), and a method to import ZIP reports generated by Metasploit Express (still needs work, but is mildly functional right now). 
git-svn-id: file:///home/svn/framework3/trunk@9478 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-10 21:06:06 +00:00
Tod Beardsley d4e1da2fc9 Fixes amap log importing, hopefully once and for all. 
git-svn-id: file:///home/svn/framework3/trunk@9454 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-08 22:14:25 +00:00
Tod Beardsley 38674cf62f Implements callbacks for importing data from vulnerability scanners. 
git-svn-id: file:///home/svn/framework3/trunk@9452 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-08 19:16:20 +00:00
Tod Beardsley 432284ce5a Handle multiple versions of Metasploit Express XML files. 
git-svn-id: file:///home/svn/framework3/trunk@9431 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-04 18:54:50 +00:00
Tod Beardsley c6da645a93 First part of a db import overhaul. Next up: implementing callbacks so the user can follow along with the import to get a sense of where they're at. 
git-svn-id: file:///home/svn/framework3/trunk@9426 4d416f70-5f16-0410-b530-b9f4589650da
 2010-06-04 14:57:58 +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
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 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
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
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