Commit Graph

136 Commits (147ff13080053d9e137a1e47b7aa6c8acc43e164)

Author SHA1 Message Date
Luke Imhoff 1edad5e0b7
Extract Msf::DBManager::Import::Libpcap shared examples
MSP-11124
2014-10-15 09:49:58 -05:00
Luke Imhoff 8b8befeee1
Extract Msf::DBManager::Import::IPList shared examples
MSP-11124
2014-10-15 09:43:49 -05:00
Luke Imhoff 66b1dcc42d
Extract Msf::DBManager::Import::FusionVM shared examples
MSP-11124
2014-10-15 09:38:44 -05:00
Luke Imhoff 0bfc496824
Extract Msf::DBManager::Import::Foundstone shared examples
MSP-11124
2014-10-15 09:31:17 -05:00
Luke Imhoff 56c8bad6c5
Extract Msf::DBManager::Import::CI shared examples
MSP-11124
2014-10-15 09:24:46 -05:00
Luke Imhoff 85f35bd29b
Extract Msf::DBManager::Import::Burp shared examples
MSP-11124
2014-10-15 09:18:22 -05:00
Luke Imhoff 33e1213010
Extract Msf::DBManager::Import::Appscan shared examples
MSP-11124
2014-10-15 09:14:12 -05:00
Luke Imhoff 6a1f718c3a
Extract Msf::DBManager::Import::Amap shared examples
MSP-11124
2014-10-15 09:08:50 -05:00
Luke Imhoff d85ee2ee0a
Extract Msf::DBManager::Import::IP360::V3 shared examples
MSP-11124
2014-10-14 16:17:34 -05:00
Luke Imhoff 7e05900428
Extract Msf::DBManager::Import::IP360::ASPL shared examples
MSP-11124
2014-10-14 16:02:44 -05:00
Luke Imhoff c28f1fce3a
Extract Msf::DBManager::Import::Acunetix shared examples
MSP-11124
2014-10-14 15:45:07 -05:00
Luke Imhoff 55ca928fee
Extract Msf::DBManager::Import::Qualys::Scan shared examples
MSP-11124
2014-10-14 15:31:01 -05:00
Luke Imhoff dd5ae26174
Extract Msf::DBManager::Import::Qualys::Asset shared examples
MSP-11124
2014-10-13 16:09:41 -05:00
Luke Imhoff a7d1577494
ImportMsfXml -> Import::MsfXml
MSP-11124
2014-10-13 15:46:13 -05:00
Luke Imhoff acdf6e7dbf
Move missed Msf::DBManager::Connection examples
MSP-11124
2014-10-13 15:06:46 -05:00
Luke Imhoff 92aaecf94b
Move add_rails_engine_migrations_paths to Msf::DBManager::Migration
MSP-11124
2014-10-13 15:02:20 -05:00
Luke Imhoff 66ce59725b
Extract Msf::DBManager::Adapter shared examples
MSP-11124
2014-10-13 14:53:40 -05:00
Luke Imhoff 2b4150ac46
Extract Msf::DBManager::Connection shared examples
MSP-11124
2014-10-13 14:47:22 -05:00
Luke Imhoff 43a4858fe3
Extract Msf::DBManager::Web shared examples
MSP-11124
2014-10-13 12:01:49 -05:00
Luke Imhoff 3a2f8b7684
Extract Msf::DBManager::VulnAttempt shared examples
MSP-11124
2014-10-13 11:34:12 -05:00
Luke Imhoff adfeef2aa9
Extract Msf::DBManager::Route shared examples
MSP-11124
2014-10-13 11:28:19 -05:00
Luke Imhoff e1ae403292
Extract Msf::DBManager::SessionEvent shared examples
MSP-11124
2014-10-13 11:15:07 -05:00
Luke Imhoff 98142def08
Extract Msf::DBManager::HostTag shared examples
MSP-11124
2014-10-13 11:03:21 -05:00
Luke Imhoff 6fb263d989
Extract Msf::DBManager::Session shared examples
MSP-11124
2014-10-13 10:52:39 -05:00
Luke Imhoff 4aab5129b0
Extract Msf::DBManager::HostDetail shared examples
MSP-11124
2014-10-13 10:27:55 -05:00
Luke Imhoff 8026352433
Extract Msf::DBManager::Ref shared examples
MSP-11124
2014-10-13 10:12:09 -05:00
Luke Imhoff 7a5b3c9ee7
Move report_artifact example to Msf::DBManager::Report
MSP-11124
2014-10-13 10:01:08 -05:00
Luke Imhoff a970d76a2a
Extract Msf::DBManager::VulnDetail shared examples
MSP-11124
2014-10-13 09:58:59 -05:00
Luke Imhoff 97b3198923
Extract Msf::DBManager::ExploitAttempt shared examples
MSP-11124
2014-10-13 09:43:40 -05:00
Luke Imhoff b007fba79f
Extract Msf::DBManager::Task shared examples
MSP-11124
2014-10-13 09:32:42 -05:00
Luke Imhoff 66845508d9
Extract Msf::DBManager::Report shared examples
MSP-11124
2014-10-13 09:24:27 -05:00
Luke Imhoff e82a46cc47
Extract Msf::DBManager::Event shared examples
MSP-11124
2014-10-13 09:12:49 -05:00
Luke Imhoff 0e93b55397
Extract Msf::DBManager::Client shared examples
MSP-11124
2014-10-13 08:40:34 -05:00
Luke Imhoff b05a466e0a
Extract Msf::DBManager::Vuln shared examples
MSP-11124
2014-10-09 15:51:39 -05:00
Luke Imhoff e403e54896
Extract Msf::DBManager::Note shared examples
MSP-11124
2014-10-09 15:39:55 -05:00
Luke Imhoff e42d60801d
Extract Msf::DBManager::Loot shared examples
MSP-11124
2014-10-09 15:21:43 -05:00
Luke Imhoff 2c6753a2e0
Extract Msf::DBManager::Import shared examples
MSP-11124
2014-10-09 15:07:17 -05:00
Luke Imhoff 45f5fe36f1
Extract Msf::DBManager::ExploitedHost shared examples
MSP-11124
2014-10-09 12:58:30 -05:00
Luke Imhoff 3ec93dea43
Extract Msf::DBManager::Cred shared examples
MSP-11124
2014-10-09 11:44:15 -05:00
Luke Imhoff 96b4491d8e
Extract Msf::DBManager::Service shared examples
MSP-11124
2014-10-09 11:35:07 -05:00
Luke Imhoff e7800697eb
Extract Msf::DBManager::Host shared examples
MSP-11124
2014-10-09 11:16:04 -05:00
Luke Imhoff 148ad8b050
Extract Msf::DBManager::WMAP shared examples
MSP-11124
2014-10-09 10:49:26 -05:00
Luke Imhoff e723aa7eb3
Extract Msf::DBManager::IPAddress shared examples
MSP-11124
2014-10-09 09:40:11 -05:00
Luke Imhoff f5ea81cd97
Test for #match_values
MSP-11124
2014-10-09 09:20:27 -05:00
Luke Imhoff 37c38ad27b
Extract Msf::DBManager::ModuleCache shared examples
MSP-11124
2014-10-09 09:14:45 -05:00
Luke Imhoff 70d4f672e2
Extract Msf::DBManager::Workspace examples to shared example
MSP-11124
2014-10-08 15:54:29 -05:00
Luke Imhoff a64036f6cf
Move Msf::DBManager#sync to Msf::DBManager::Sink
MSP-11124

The comment on `#sync` says it's related to `sink`, so move it into its
Module.
2014-10-08 15:38:56 -05:00
Luke Imhoff 37e0b9ffe0
Extract Msf::DBManagerSink examples to shared example
MSP-11124
2014-10-08 15:30:20 -05:00
sinn3r 9e5826c4eb
Land #3844 - Add the JSObfu mixin to Firefox exploits 2014-09-29 11:15:14 -05:00
Joe Vennix ec88957ff4
Whitespace tweaks. 2014-09-21 23:57:58 -05:00
Joe Vennix d9e6f2896f
Add the JSObfu mixin to a lot of places. 2014-09-21 23:45:59 -05:00
Luke Imhoff b863978028
Remove fastlib
MSP-11368
MSP-11143

Remove fastlib as it slows down the code loading process.  From the
previous commit, the mean loading for
`METASPLOIT_FRAMEWORK_PROFILE=true msfconsole -q -x exit` was
27.9530±0.3485 seconds (N=10).  The mean after removal of fastlib
was 17.9820±0.6497 seconds (N=10).  This means an average 35.67%
reduction in boot time.
2014-09-18 15:24:21 -05:00
jvazquez-r7 fdb66d978b Fix remainings be_truthy and be_falsey conditionals 2014-09-02 13:22:21 -05:00
jvazquez-r7 d7af3a628d Avoid its on Msf::ModuleManager::Cache shared examples specs 2014-09-02 12:02:26 -05:00
Joshua Smith 1fa26e2afb cleans up a bunch of spec msftidy issues 2014-08-26 15:24:08 -05:00
jvazquez-r7 41420a97d5 Solve conflicts 2014-08-26 09:04:05 -05:00
jvazquez-r7 60ecf4e8c4 Use be_truthy instead of be_true 2014-08-25 23:58:08 -05:00
jvazquez-r7 dd1c015e4e Use be_falsey 2014-08-25 17:34:55 -05:00
Luke Imhoff af99c0c01e
Remove `should_receive(:with_connection)` from specs
MSP-10127

Causes specs to randomly fail when with_connection calls from
before(:each) or after(:each) are intercepted by the should_receive
call.
2014-06-19 16:24:53 -05:00
Luke Imhoff ca63d2201e
Update init_module_paths spec to match Rails::Engine behavior
MSP-9653
2014-06-02 14:26:35 -05:00
Luke Imhoff 3370465d84
Use railties to load Metasploit::Credential correctly
MSP-9606

In order to support Metasploit::Credential correctly,
metasploit-framework needs to support Metasploit::Concern, which does
all its magic using a Rails::Engine initializer, so the easiest path is
to make metasploit-framework be able to use Rails::Engines.  To make
Rails::Engine use Rails::Engine, make a dummy Rails::Application
subclass so that all the initializers will be run when anything requires
msfenv.
2014-05-12 15:03:51 -05:00
Tab Assassin 2e8d19edcf Retab all the things (except external/) 2013-09-30 13:47:53 -05:00
Brandon Turner 4760000bca Replace mock with double in specs
mock is deprecated - https://www.relishapp.com/rspec/rspec-mocks/docs
2013-09-06 09:34:05 -05:00
sinn3r ed51d284fa Change name, change how data is passed, fix rspec 2013-07-24 17:15:56 -05:00
James Lee 0f2ea755c5 Add encoding comment to spec files for 2.0 compat 2013-06-07 13:27:39 -05:00
Luke Imhoff e0e348a17e Specs to ensure File.mtime error is caught.
[#47720609]
2013-05-30 13:09:40 -05:00
Luke Imhoff 4ba571346e Spec Msf::Simple::Framework#init_module_paths
[#47720609]
2013-05-24 12:33:42 -05:00
Luke Imhoff 1a487e476d Merge branch 'master' into bug/module-load-cache-update 2013-05-23 14:23:14 -05:00
Luke Imhoff 2b70ec2e08 Payload compatible cache_in_memory
[#47720609]

Msf::PayloadSet#add_module does NOT return an annotated module class as
Msf::ModuleSet#add_module does because a payload module is defined as a
ruby Module instead of a ruby Class.   Since add_module doesn't always
return an annotated_class, the logic in
Msf::ModuleManager#on_module_load needed to change to NOT use
annotated_class and create #add_module as return [void].  Thus, it is
necessary to pass in all the metasploit module metadata to
Msf::ModuleManager#cache_in_memory instead of assuming they can be
derived from the (payload) Module or (other) Class.
2013-05-22 16:06:02 -05:00
Luke Imhoff 57576de85f Update in-memory cache to fix file_changed?
[#47720609]

Msf::ModuleManager#module_info_by_path was not being updated when a
module was loaded, so if a load_module was called again, say during
start up of prosvc, the module would reload even though there was no
change in the file because file_changed? couldn't find an entry for the
module's path in module_info_by_path.
2013-05-22 12:28:42 -05:00
Luke Imhoff eede80509f Reuse appropriate terminology in docs
[#47720609]

Fix some docs and variable names to make it clearer when methods are
expecting module instance and module classes.  Change some 'name'
variables to 'reference_name' since that's the proper terminology.
2013-05-21 08:19:47 -05:00
Luke Imhoff a70d63ebad Spec Msf::ModuleManager#on_module_load
[#47720609]
2013-05-20 14:52:37 -05:00
Luke Imhoff 89bd5b4791 Reset column information after running migrations
[#50179803]
[SeeRM #7967]
[SeeRM #7870]

Because metasploit-framework runs migrations with the same process and
with the same connection as it later accesses the database, the column
information can become cached prematurely and be incorrect by the end of
the migrations.  Fix the bad cache by automatically resetting the column
information for all model classes after the migrations have run.
2013-05-20 13:08:07 -05:00
Luke Imhoff 0e435d378c Move Msf::DBManager#migrate(d) to module
[#50179803]

Move Msf::DBManager#migrate and the migrated attribute to
Msf::DBManager::Migration module to lower complexity of db_manager.rb
and in preparation for more migration related code on this branch.
2013-05-20 12:45:17 -05:00
Luke Imhoff c8657fb46b Fix Mdm::Module::Detail#stance bug
[#49858419]
[SEERM #7958]

metasploit_data_models 0.14.3 relaxes the validation on
Mdm::Module::Detail#stance so it only needs to be in
Mdm::Module::Detail::STANCES if Mdm::Module::Detail#mtype is 'auxiliary'
or 'exploit' as framework only supplies a stance for those types when
using Mdm::Module::Detail.
2013-05-17 11:58:10 -05:00
Luke Imhoff bc92b43408 Update to metasploit_data_models 0.11.0
[#47979793]
2013-05-09 13:25:26 -05:00
Luke Imhoff 249a09cd52 Update to metasploit_data_models 0.7.1
[#47979793]
2013-04-26 13:14:38 -05:00
Luke Imhoff 24b97137ea Msf::DBManager Mdm::Module* specs
[#47979793]
2013-04-25 09:46:53 -05:00
Luke Imhoff 492b081280 Msf::DBManager::Export#extract_module_detail_info spec
[#47979793]
2013-04-20 16:44:42 -05:00
Luke Imhoff 3bf3cfccc6 Use be_within to loosen tolerance for Time comparisons
[#47979793]
[#48414569]

Even though using Timecop locally on OS X makes the `should == <Time>`
work, it fails on travis-ci, so try using `should
be_within(1.second).of(<Time>)` instead.
2013-04-19 12:07:12 -05:00
Luke Imhoff 2c681005c0 Msf::ModuleManager::Cache spec coverage
[#47979793]
2013-04-15 13:08:12 -05:00
Luke Imhoff 0709395570 Msf::ModuleManager::Loading shared example
[#47979793]
2013-04-12 15:18:16 -05:00
Luke Imhoff ff7a8e6351 Msf::ModuleManager::ModulePaths shared example
[#47979793]
2013-04-12 15:14:04 -05:00
Luke Imhoff 7d5f010e4e Fix typo in spec let
[#46491831]

The root element was web_page in the source for example that tests that
import_msf_web_vuln_element creates an Mdm::WebVuln.  The root element
name did not actually matter for the example, but it looked like an
error and was confusing to read the setup that root element was web_page
instead of the correct web_vuln.
2013-04-02 09:11:43 -05:00
Luke Imhoff 0bb79ba890 Msf::DBManager#import_msf_xml refactor
[#46491831]

Move Msf::DBManager#import_msf_xml into
Msf::DBManager::ImportMsfXml#import_msf_xml and include
Msf::DBManager::ImportMsfXml to cut down size of the infamous db.rb.
Break up #import_msf_xml to have separate methods for parsing web_forms,
web_pages, and web_vulns.  The method for
web_vulns, #import_msf_web_vuln_element is needed so that it can be overridden in
Pro to handle the Pro-only changes to Mdm::WebVuln.
2013-04-01 16:06:40 -05:00
Luke Imhoff 8c6a9d5622 Turn shared prefixes into directories
[#46491831]

Change the shared msf_modules_* prefixes in spec/support/shared/* into
directories.
2013-03-28 15:39:07 -05:00