aa2e26f8f2
Allow RAILS_ENV to override default environment of 'production'
...
MSP-10964
2014-07-31 13:24:23 -05:00
38c6e2d3e0
Merge remote-tracking branch 'upstream/staging/electro-release' into staging/electro-release
2014-07-31 10:16:00 -05:00
6a72572237
Wrap comments at 80
2014-07-31 09:41:08 -05:00
735ccda4db
Add an example for add-ssh-key
2014-07-31 09:40:36 -05:00
73ed9f89f0
Merge remote-tracking branch 'upstream/staging/electro-release' into staging/electro-release
2014-07-31 08:31:37 -05:00
77d99b7374
Land #3586 , fix msfconsole when running without db
...
Conflicts:
Gemfile.lock
metasploit-framework.gemspec
2014-07-30 17:24:21 -05:00
1c35ec4271
Land #3585 , fix fd leak in pwdump import
...
Conflicts:
db/schema.rb
2014-07-30 15:17:27 -05:00
f7aa324c35
Update metasploit-model and metasploit_data_models deps
2014-07-30 13:10:09 -05:00
3e915e5059
Merge branch 'staging/electro-release' into bug/MSP-10715/import-security-issues
...
Update deps
Conflicts:
Gemfile
Gemfile.lock
2014-07-30 12:49:15 -05:00
14341c68a3
Merge remote-tracking branch 'upstream/staging/electro-release' into staging/electro-release
2014-07-30 12:24:10 -05:00
ea72a7e5c3
Merge pull request #3583 from jlee-r7/feature/MSP-9932/creds-add-subcommands
...
Add `creds` subcommands
MSP-9932 #land
2014-07-30 12:01:36 -05:00
85b00eede6
Add #present? checks
2014-07-30 11:52:59 -05:00
ef59d88f64
Fix spec failure due to workspace mismatch
...
Also fixes intermittent failure from FactoryGirl picking a heinous
Origin type.
2014-07-30 11:26:35 -05:00
e4f665fe72
Require 'active_record/railtie' for specs
...
MSP-10905
2014-07-30 11:10:02 -05:00
d7a0c1f3e8
Optionally require 'active_record/railtie` in Rakefile
...
MSP-10905
Require in Rakefile so that db tasks are defined. Make it optionally so
that `rake` doesn't error out when metasploit-framework installed with
`bundle install --without db`.
2014-07-30 10:10:20 -05:00
ceb8a0f5c2
Extract option require pattern to helper Module
...
MSP-10905
`Metasplot::Framework::Require.optionally` can be used to optionally
require a library and then issue a warning if the require fails or run a
block when it succeeds.
2014-07-30 10:07:53 -05:00
d863ff907e
Merge pull request #3576 from dmaloney-r7/feature/MSP-9641/cred-rpc-calls
...
Feature/msp 9641/cred roc calls
MSP-9641 #land
2014-07-30 09:40:38 -05:00
1a6d4843c7
Merge branch 'staging/electro-release' into bug/MSP-10905/msfconsole-database
...
MSP-10905
2014-07-29 15:52:11 -05:00
a77ca325ea
Merge remote-tracking branch 'upstream/staging/electro-release' into staging/electro-release
2014-07-29 15:51:48 -05:00
ba4891bca0
Restore Rails.groups arguments
...
MSP-10905
They don't cause a problem.
2014-07-29 15:50:52 -05:00
8fda4ee239
Fix fd leak and blind IO#gets in pwdump import
...
MSP-10715
2014-07-29 15:15:47 -05:00
f5ff22eba4
msfconsole with bundle install --without db
...
MSP-10905
2014-07-29 14:46:44 -05:00
38da44c26b
Fix arity difference between rails and msfconsole options
...
MSP-10905
2014-07-29 14:32:42 -05:00
04541ac724
Parse msfconsole options before initializing Rails
...
MSP-10905
2014-07-29 14:07:14 -05:00
8e7dd1b658
Add missing require
...
MSP-10905
2014-07-29 14:06:27 -05:00
9a5085cbba
Prevent circular dependency
...
MSP-10905
Use Metasploit::Framework::Version directly instead of
Msf::Framework to prevent circular dependency when starting msfconsole.
2014-07-29 14:04:15 -05:00
24a5a155f4
Require gems
...
MSP-10905
2014-07-29 14:02:56 -05:00
0876302fba
Merge pull request #3580 from dmaloney-r7/bug/MSP-10869/credential-parent
...
Credential Parent References
2014-07-29 14:00:59 -05:00
539817fddb
Add metasploit-model as a direct dependency
...
MSP-10905
Metasploit::Model constants need to be accessible without the db group
installed.
2014-07-29 13:55:56 -05:00
1ee32b3b98
Bump metasploit-model so we can use Realm::Key map
2014-07-29 12:19:03 -05:00
78a3263cfe
have Credentials remember their aprents
...
a Credential object can be created from several
other types of objects. Keep a reference to the originating
'parent' so we can find our way back
2014-07-29 11:20:52 -05:00
ef7f5fe967
Make metasploit-model a direct dep
...
Needed for all the scanners that use Metasploit::Model::Realm::Key
constants.
2014-07-29 10:30:46 -05:00
3870b59873
remove rpg_get_auth_info
...
this is an rpc call that calls a method that
does not even exist...
WAT?!
2014-07-28 15:13:03 -05:00
c9d231b48b
remove old rpc methods
...
added rpc methods to create new creds
removing the old methods for
the obsolete cred models
2014-07-28 14:52:53 -05:00
e29b2aed9b
add credential rpc calls
2014-07-28 14:49:35 -05:00
49d0fc37c2
Add support for different realm_key
2014-07-28 14:39:24 -05:00
533d0be2fb
Merge remote-tracking branch 'upstream/staging/electro-release' into staging/electro-release
2014-07-28 12:12:45 -05:00
1e32574768
Merge branch 'staging/electro-release' into feature/MSP-9641/cred-rpc-calls
2014-07-28 11:10:59 -05:00
c65db18090
Add rudimentary specs and fix some help wording
2014-07-28 09:19:09 -05:00
1931024c86
Bump credential version for #to_s fixes
2014-07-27 14:08:39 -05:00
a35e7371bb
Add simple tabbing for creds command
2014-07-27 14:08:38 -05:00
b8bb4c7bc0
Add add-ssh-key to help output, fix some warnings
2014-07-27 13:46:38 -05:00
a38a627b94
Merge branch 'staging/electro-release' into feature/MSP-9932/creds-add-subcommands
2014-07-27 13:38:33 -05:00
bc836f3606
Add a little easter egg in the NTLM hash
2014-07-24 16:37:24 -05:00
b8b3509c96
Re-add the ability to delete creds
2014-07-24 15:44:52 -05:00
18ce342e2a
Refactor a bit for readability
2014-07-24 15:42:36 -05:00
1470f3de30
Fix padding when a cell value is nil
2014-07-24 14:00:09 -05:00
7a49f218d4
update .yardopts
2014-07-24 13:59:04 -05:00
8a279d202c
Whitespace
2014-07-24 13:56:57 -05:00
5286b7cc22
Land #3566 , ducktype better
2014-07-24 11:19:40 -05:00
Luke Imhoff
James Lee
Matt Buck
Trevor Rosen
Trevor Rosen
jvennix-r7
David Maloney