Commit Graph

967 Commits (b3b7d5205bd241ee519b86cdcb5b0c4f4ca7eeeb)

Author SHA1 Message Date
David Maloney 2319290522 updated mdm 2013-03-09 15:47:34 -06:00
Luke Imhoff 8d13fc5578 Update Gemfile to metasploit_data_models 0.6.2
[#45816713]

0.6.2 fixes Mdm::WebVuln#confidence erroroneously not accepting a value
of 0.
2013-03-07 20:26:51 -06:00
Brandon Turner addb73ec28 Update the 0.6.1 tag to the merged commit
[Story #45771305]
2013-03-07 16:15:54 -06:00
Luke Imhoff 7ca33c12bd Update Gemfile to metasploit_data_models 0.6.1
[#45771305]

MetasploitDataModels 0.6.1 adds a re-usable yard.rake so that all
Metasploit project don't have to define their own.  It also adds guards
so that the YARD tasks aren't defined (and don't cause errors) if YARD
is not available.

This also adds support for making the Rakefile work with `bundle install
--without development test` so it still functions in the bundle building
environment for Pro.
2013-03-07 14:22:35 -06:00
Luke Imhoff 36e20807b0 Update Gemfile to metaploit_data_models 0.6.0
[#44034071]
2013-03-06 09:53:26 -06:00
Luke Imhoff bd8f94c43d Update to master tag of 0.5.1 of metasploit_data_models
[#44034071]
2013-03-01 13:44:52 -06:00
Luke Imhoff 239e1934b8 Use migrations from metasploit_data_models
[#44034071]

metasploit_data_models version 0.5.0 copied the migrations from
metasploit-framework/data/sql/migrate to
metasploit_data_models/db/migrate so that specs could be written the Mdm
models in metasploit_data_models.  As part of the specs, :null => false
columns that should be :null => true were discovered, so a new migration
was added, but to metasploit_data_models/db/migrate, so it could be
tested.  Instead of replicating migrations back and forth, I'm removing
the migrations completely from metasploit-framework and changing the
default migration path in Msf::DbManager#migration_paths to
MetasploitDataModels.root.join('db', 'migrate').
2013-03-01 09:03:45 -06:00
Tod Beardsley 71abcdbd1a Update Gemfile.lock 2013-02-11 21:56:56 -06:00
Luke Imhoff f8e1ccc27e Remove cred_files migration
[#41837027]

Mdm::CredFile is only used in Pro, so for metasploit_data_models 0.4.0,
Mdm::CredFiles has been moved to Pro, so the migration has been moved to
Pro too.
2013-01-10 17:50:00 -06:00
Luke Imhoff 0fb36f2024 Get pg as a dependency of metasploit_data_models
[#38274165]

metasploit_data_models already declares pg as a runtime dependency in
its gemspec, so there is no need to add pg as a direct dependency of
metasploit-framework, since metasploit-framework only needs pg for
metasploit_data_models.
2012-12-28 13:28:19 -06:00
James Lee 73f5986139 Upgrade rspec to 2.12
Adds .and_call_original, which is super handy.
2012-12-12 15:36:06 -06:00
Luke Imhoff 236db52d3d Add simplecov for code coverage
Conflicts:
	Gemfile.lock
2012-11-06 16:30:41 -06:00
Luke Imhoff 76c3decffb Update Gemfile(.lock) to use tag 0.3.0 for metasploit_data_models
Ensures that Gemfile uses same version as in gemcache.
2012-11-01 08:57:57 -05:00
Luke Imhoff 93469604a7 Fix missed rename when adding fastlib under directory
I missed a spot where I referenced the nested_paths as nested_pathnams
after I renamed the variable.  Now, Msf::ModuleManager#add_module_paths
has rspec tests.

Rspec can be invoked with `rake` as the default task or `rake spec`
explicitly.

I changed RuntimeError to ArgumentError since that error  was more
specific to having a bad argument error.  I adding missing dependencies
to the Gemfile and a require to msf/core/db_manager.rb where it errored
out trying to access Msf::Config when I just did require 'msf/core' in
the spec.
2012-10-08 16:14:37 -05:00
Luke Imhoff fb266d5eb9 Refactor demand_load_module
[#36737359]

Refactor the behavior of loading symbolic modules from cache by renaming
methods so it's clearer what they do and ensure that cached modules from
Fastlibs and directories can both be loaded, which was not previously
possible since the demand_load_module only called load_module_from_file.
2012-10-04 11:14:08 -05:00
Luke Imhoff 7443fed86d Explicitly require 'active_support/concern'
[#36737359]

When starting msfconsole, 'bundler/setup' is not required, the
'msf/env/gemcache' is required instead. Unlike 'bundler/setup' the
msf/env gemcache does not do the automatic requires for gems in the
cache, so explicit requires on 'active_support/concern' is needed to get
ActiveSupport::Concern defined.  (I could have done require
'active_support' to match the behavior of 'bundler/setup', but a smaller
require seemed more appropriate.
2012-10-03 15:42:14 -05:00
Luke Imhoff 555a9f2559 Refactor Msf::ModuleManager
[Fixes #36737359]

Refactor Msf::ModuleManager into concerns so its easier to understand and
duplicate code can be made DRY.  The refactoring also ensures that when
loading from directories, Fastlibs, or reloading, the wrapper module will
always be named so that activesupport/dependencies will function.
2012-10-01 13:09:30 -05:00