adam/metasploit-gs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,052 Commits 27 Branches 1,043 Tags
fafbc4db3f73e46df48deae207cacd6ff4ae84bf
Commit Graph

8697 Commits

Author SHA1 Message Date
William Vu ce40c1152a Land #4014, msfconsole spinnerz 2014-10-17 16:25:31 -05:00
Tod Beardsley a431bff13f @wvu-r7 is a skilled negotiator. s/stdout/stderr/ 2014-10-17 13:13:44 -05:00
Tod Beardsley 5978bd5e62 Control the startup msg with -q, too 2014-10-17 12:41:58 -05:00
Tod Beardsley a45b21b6bf -q will quiet the animation, too 2014-10-17 12:32:28 -05:00
Luke Imhoff 200d64040d Fully-qualify Msf::ServiceState 
MSP-11152

Replace unqualified `ServiceState` with `Msf::ServiceState`.
 2014-10-17 11:58:11 -05:00
Luke Imhoff 9f32cbd476 Use :: to force top-level constant resolution 
MSP-11152

When `Msf::DBManager::Import::MetasploitFramework` is included in
`Msf::DBManager::Import`, it's child namespace of
`Msf::DBManager::Import::MetasploitFramework::Zip becomes resolvable as
`Zip` in `Msf::DBManager::Import` methods, so need to use `::Zip` to
cause `Zip` to be resolved from rubyzip gem.
 2014-10-17 10:15:59 -05:00
Luke Imhoff 13923a8ca5 Fully-qualify Msf::DBImportError 
MSP-11152

Constant was unqualified in some of the reorganized Msf::DBManager code
because that code was take advantage of the old nested lexical scope
that included `Msf`.
 2014-10-17 09:29:01 -05:00
Trevor Rosen c503e8a3d8 Merge branch 'landing/4026' into upstream-master 
Land #4026

* db.rb (DBManager) now in multiple files
* Cucumber coverage for DB-related msfconsole commands
 2014-10-16 11:52:57 -05:00
Tod Beardsley d5a0b81680 Land #4024, auto-negotiate SSL versions 
Thanks @hmoore-r7!
 2014-10-15 16:04:38 -05:00
Tod Beardsley 62be638258 Add 'Auto' to tcp.rb as well. 2014-10-15 16:01:42 -05:00
Luke Imhoff 9456506e3d Merge branch 'master' into feature/MSP-11124/msf-dbmanager-reorg 
MSP-11124
 2014-10-15 14:08:55 -05:00
Luke Imhoff 1f7ad1cac9 unserialize_object -> Msf::DBManager::Import::MetasploitFramework 
MSP-11124
 2014-10-15 14:03:18 -05:00
Luke Imhoff bed98fe43b nils_for_nulls -> Msf::DBManager::Import::MetasploitFramework 
MSP-11124
 2014-10-15 13:59:03 -05:00
HD Moore fcd9b4b293 Allow non-SSLv3 Meterpreters (auto-negotiate) 2014-10-15 13:57:51 -05:00
Luke Imhoff ac30990177 Move libpcap helpers to Libpcap module 
MSP-11124
 2014-10-15 13:55:24 -05:00
Luke Imhoff 7aed88f11b Extract Msf::DBManager::Import::Report 
MSP-11124
 2014-10-15 13:51:57 -05:00
HD Moore cb3a4afac5 Typo: request -> requested in message 2014-10-15 13:48:22 -05:00
Luke Imhoff e5e051c905 Extract Msf::DBManager::Import::Wapiti 
MSP-11124
 2014-10-15 13:42:54 -05:00
Luke Imhoff e65a386d3d Extract Msf::DBManager::Import::Spiceworks 
MSP-11124
 2014-10-15 13:37:35 -05:00
HD Moore 7516512650 Raise an ArgumentError vs RuntimeError for backwards compatibility 2014-10-15 13:30:38 -05:00
HD Moore a762d871bf Autonegotiate SSL/TLS versions when not explicit 2014-10-15 13:26:40 -05:00
Luke Imhoff dfe690ac52 Extract Msf::DBManager::Import::Retina 
MSP-11124
 2014-10-15 13:23:12 -05:00
Luke Imhoff 8af280b1cb Extract Msf::DBManager::Import::Outpost24 
MSP-11124
 2014-10-15 13:16:11 -05:00
Luke Imhoff eff95221da Order methods 
MSP-11124
 2014-10-15 13:14:20 -05:00
Luke Imhoff cf555e2390 Extract Msf::DBManager::Import::OpenVAS 
MSP-11124
 2014-10-15 13:11:49 -05:00
Luke Imhoff 5d6044786a Extract Msf::DBManager::Import::Nmap 
MSP-11124
 2014-10-15 13:06:28 -05:00
Luke Imhoff cf3a3a0d65 Move nexpose requires to appropriate module 
MSP-11124
 2014-10-15 12:54:30 -05:00
Luke Imhoff 16f143c2ed Extract Msf::DBManager::Import::Nikto 
MSP-11124
 2014-10-15 12:51:16 -05:00
Luke Imhoff e64a14c748 Extract Msf::DBManager::Import::Nexpose::Simple 
MSP-11124
 2014-10-15 12:40:04 -05:00
Tod Beardsley c4d1a4c7dc Revert #4022, as the solution is incomplete 
Revert "Land 4022, datastore should default TLS1 vs SSL3"

This reverts commit 4c8662c6c1, reversing
changes made to 0937f32ff9.
 2014-10-15 12:32:08 -05:00
Luke Imhoff 2b861f91e9 Extract Msf::DBManager::Import::Nexpose::Raw 
MSP-11124
 2014-10-15 11:59:03 -05:00
Luke Imhoff c371eab26a Extract Msf::DBManager::Import::Netsparker 
MSP-11124
 2014-10-15 11:46:38 -05:00
Luke Imhoff a73b0e2283 Move requires for nessus parses to appropriate module 
MSP-11124
 2014-10-15 11:42:00 -05:00
Luke Imhoff b43035145d Move nessus helper function to closest module 
MSP-11124
 2014-10-15 11:39:23 -05:00
Luke Imhoff aae6dc9066 Extract Msf::DBManager::Import::Nessus::XML::V* 
MSP-11124

Extract different versions of Nessus XML format.
 2014-10-15 11:34:37 -05:00
Luke Imhoff a0494b2eeb Extract Msf::DBManager::Import::Nessus::XML 
MSP-11124
 2014-10-15 11:27:23 -05:00
Luke Imhoff 0c861848bc Extract Msf::DBManager::Import::Nessus::NBE 
MSP-11124
 2014-10-15 11:21:26 -05:00
Luke Imhoff d0d0c478aa Extract Msf::DBManager::Import::MetasploitFramework::Credential 
MSP-11124
 2014-10-15 11:12:13 -05:00
Luke Imhoff 46a2c47dfe Extract Msf::DBManager::Import::MetasploitFramework::Zip 
MSP-11124
 2014-10-15 10:59:41 -05:00
Tod Beardsley 1754b23ffb Datastore options should default to TLS1, not SSL3 
Otherwise, we risk getting our connections killed by particularly
aggressive DPI devices (IPS, firewalls, etc)

Squashed commit of the following:

commit 5e203851d5c9dce1fe984b106ce3031a3653e54b
Author: Tod Beardsley <tod_beardsley@rapid7.com>
Date:   Wed Oct 15 10:19:04 2014 -0500

    Whoops missed one

commit 477b15a08e06e74d725f1c45486b37e4b403e3c2
Author: Tod Beardsley <tod_beardsley@rapid7.com>
Date:   Wed Oct 15 10:16:59 2014 -0500

    Other datastore options also want TLS1 as default

commit 8d397bd9b500ff6a8462170b4c39849228494795
Author: Tod Beardsley <tod_beardsley@rapid7.com>
Date:   Wed Oct 15 10:12:06 2014 -0500

    TCP datastore opts default to TLS1

    Old encryption is old. See also: POODLE
 2014-10-15 10:28:53 -05:00
Luke Imhoff 65885c8cc8 MsfXml -> MetasploitFramework::XML 
MSP-11124
 2014-10-15 10:25:42 -05:00
Luke Imhoff ac9a593b43 import_msf_file -> Msf::DBManager::Import::MsfXml 
MSP-11124
 2014-10-15 10:02:42 -05:00
Luke Imhoff d870188377 Extract Msf::DBManager::Import::MBSA 
MSP-11124
 2014-10-15 09:54:03 -05:00
Luke Imhoff f29408680f Extract Msf::DBManager::Import::Libpcap 
MSP-11124
 2014-10-15 09:48:23 -05:00
Luke Imhoff 44968400e9 Extract Msf::DBManager::Import::IPList 
MSP-11124
 2014-10-15 09:42:11 -05:00
Luke Imhoff e5236e9b56 Extract Msf::DBManager::Import::FusionVM 
MSP-11124
 2014-10-15 09:36:29 -05:00
Luke Imhoff 2e85dc910a Extracts Msf::DBManager::Import::Foundstone 
MSP-11124
 2014-10-15 09:27:53 -05:00
Luke Imhoff 68a1ebd2fb Extract Msf::DBManager::Import::CI 
MSP-11124
 2014-10-15 09:23:08 -05:00
Luke Imhoff 8d628c221b Extract Msf::DBManager::Import::Burp 
MSP-11124
 2014-10-15 09:16:57 -05:00
Luke Imhoff f42307a6ff Extract Msf::DBManager::Import::Appscan 
MSP-11124
 2014-10-15 09:12:38 -05:00