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

26114 Commits (b910dfbf566eb0f24b331df3270c7109b6142905)

Author SHA1 Message Date
Luke Imhoff b910dfbf56
Merge remote-tracking branch 'upstream/staging/electro-release' into staging/electro-release 2014-08-06 12:40:07 -05:00
Samuel Huckins 69e8edf6b2
Bumping ruby patch to proper latest 2014-08-05 11:49:35 -05:00
Luke Imhoff 7013a2755b
Favor MSF_DATABASE_CONFIG for paths['config/database'] 
MSP-10848

Use these locations, in order for
Metasploit::Framework::Application.config.paths['config/database']:

1. MSF_DATABASE_CONFIG environment variable
2. ~/.msf4/database.yml (if it exists)
3. config/database.yml
 2014-08-05 10:16:33 -05:00
Luke Imhoff 2818b4e2f2
Merge remote-tracking branch 'upstream/staging/electro-release' into staging/electro-release 2014-08-05 09:11:44 -05:00
Trevor Rosen b769b419ae Merge pull request #3615 from limhoff-r7/bug/MSP-10848/nightly-msfconsole 
require 'action_view/railtie' for pro compatibility
 2014-08-05 07:56:37 -05:00
Luke Imhoff d56dd318b9
require 'action_view/railtie' for pro compatibility 
MSP-10848

Other railties, like jquery-rails, need 'action_view/railtie', but don't
require it themselves, so require it explictly in
`config/application.rb` to prevent msfconsole boot errors.
 2014-08-04 20:12:28 -05:00
Luke Imhoff ec5c1c588a Merge pull request #3614 from limhoff-r7/bug/MSP-10848/nightly-msfconsole 
# MSP-10848

Add missing require
 2014-08-04 19:11:17 -05:00
Luke Imhoff 9c29b78b9a
Add missing require 
MSP-10848

Not triggered on OSX development machines, only on Linux.
 2014-08-04 18:23:25 -05:00
Luke Imhoff 6bc7643475
Merge remote-tracking branch 'upstream/staging/electro-release' into staging/electro-release 2014-08-04 18:06:54 -05:00
sinn3r 1691795901
Land #3598 to electro-release - Refactor sso to use Credential::Creation 2014-08-04 16:31:49 -05:00
dmaloney-r7 594b0e1abb Merge pull request #3611 from shuckins-r7/bug/MSP-11021/import-reports-attr-fix 
Date attrs set after creation in report import
 2014-08-04 14:39:56 -05:00
Samuel Huckins 8fe9ec098e
Date attrs set after creation in report import 
MSP-11021

* created_at and updated_at are protected against mass-assignment, so
these need to be set after for reports and report artifacts
 2014-08-04 14:02:59 -05:00
Samuel Huckins dd550013ce Merge branch 'bug/MSP-10963/realm-uniqueness' into staging/electro-release 2014-08-02 17:48:40 -05:00
Samuel Huckins 49a91ac5bb
Updating metasploit-credential dep to v0.8.6 2014-08-02 17:43:08 -05:00
Samuel Huckins 95e6599d5b Merge branch 'staging/electro-release' of github.com:rapid7/metasploit-framework into staging/electro-release 2014-08-02 13:55:26 -05:00
Luke Imhoff 3bd4279038
Update metasploit-credential 
MSP-10963
 2014-08-02 01:01:53 -05:00
Luke Imhoff d696b5f4e5 Merge pull request #3602 from limhoff-r7/bug/MSP-10998/float-versions 
MSP-10998

Remove Msf::Framework::VersionAPI and Msf::Framework::VersionCore
 2014-08-02 00:57:11 -05:00
Luke Imhoff c69c06af89
Update metasploit-credential 
MSP-10963
 2014-08-01 22:05:45 -05:00
Luke Imhoff 3057af773a
Merge branch 'bug/MSP-10998/float-versions' into bug/MSP-10963/realm-uniqueness 
MSP-10963
 2014-08-01 22:04:34 -05:00
Luke Imhoff a37244c14e
Fix specs 
MSP-10998
 2014-08-01 21:55:10 -05:00
Luke Imhoff 6603443df4
Add missing require 
MSP-10998
 2014-08-01 21:54:41 -05:00
Luke Imhoff 9096a8a1f5
Remove Msf::Framework::VersionAPI 
MSP-10998

It's compacting of the version parts into a single float doesn't work
with APIMinor over 10, so replace with Gem::Version, which compares
parts correctly.
 2014-08-01 21:43:14 -05:00
Luke Imhoff 22db5aad8a
Remove Msf::Framework::VersionCore 
MSP-10998

It can't handle 4.10.0 because it tries to compact the multiple part
version into one float using (1 / 10.0).
 2014-08-01 21:31:48 -05:00
Samuel Huckins c45728509c Merge branch 'staging/electro-release' of github.com:rapid7/metasploit-framework into staging/electro-release 2014-08-01 20:44:36 -05:00
Luke Imhoff 75dfcb2791
Merge remote-tracking branch 'upstream/staging/electro-release' into staging/electro-release 2014-08-01 20:04:23 -05:00
darkbushido ceaffce727
Merge branch 'pr/3593' into staging/electro-release 2014-08-01 16:01:10 -05:00
Samuel Huckins 31b7ffe32d Merge branch 'staging/electro-release' of github.com:rapid7/metasploit-framework into staging/electro-release 2014-08-01 13:14:11 -05:00
dmaloney-r7 e6a0e079b6 Merge pull request #3596 from darkbushido/bug/MSP-10937/adding-parent-to-cores-to-credential 
.to_credential now assigns a parent
 2014-08-01 13:13:48 -05:00
Brandon Turner 915e09ac50
Update framework version spec and Gemfile 2014-08-01 09:26:38 -05:00
Brandon Turner 0ad2a7c89b
Bump version to 4.10.0 2014-07-31 23:43:46 -05:00
James Lee 62240537db
Refactor sso to use Credential::Creation 2014-07-31 16:06:23 -05:00
darkbushido ad6eed01a2
.to_credential now assigns a parent 
Metasploit::Credential::Core#to_credential will set the parent to the original core objext
Metasploit::Framework::Credential#to_credential also sets the parent to itself.
 2014-07-31 14:52:27 -05:00
Luke Imhoff 7cc5af589f
Only require config/application.rb when Rails.application not set 
MSP-10964

Allows other Rails::Applications to use the commands.
 2014-07-31 13:32:22 -05:00
Luke Imhoff f9ab7f7a88
Only error out if Rails.env differs from options.environment 
MSP-10964
 2014-07-31 13:28:21 -05:00
Luke Imhoff aa2e26f8f2
Allow RAILS_ENV to override default environment of 'production' 
MSP-10964
 2014-07-31 13:24:23 -05:00
Samuel Huckins 735687e6a1 Merge branch 'staging/electro-release' of github.com:rapid7/metasploit-framework into staging/electro-release 2014-07-31 12:31:27 -05:00
Luke Imhoff 38c6e2d3e0
Merge remote-tracking branch 'upstream/staging/electro-release' into staging/electro-release 2014-07-31 10:16:00 -05:00
James Lee 6a72572237
Wrap comments at 80 2014-07-31 09:41:08 -05:00
James Lee 735ccda4db
Add an example for add-ssh-key 2014-07-31 09:40:36 -05:00
Luke Imhoff 73ed9f89f0
Merge remote-tracking branch 'upstream/staging/electro-release' into staging/electro-release 2014-07-31 08:31:37 -05:00
James Lee 77d99b7374
Land #3586, fix msfconsole when running without db 
Conflicts:
	Gemfile.lock
	metasploit-framework.gemspec
 2014-07-30 17:24:21 -05:00
James Lee 1c35ec4271
Land #3585, fix fd leak in pwdump import 
Conflicts:
	db/schema.rb
 2014-07-30 15:17:27 -05:00
Samuel Huckins 1e7ef15923 Merge branch 'staging/electro-release' of github.com:rapid7/metasploit-framework into staging/electro-release 2014-07-30 13:13:08 -05:00
Matt Buck f7aa324c35
Update metasploit-model and metasploit_data_models deps 2014-07-30 13:10:09 -05:00
Trevor Rosen 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
Samuel Huckins 8a3df99b01 Merge branch 'staging/electro-release' of github.com:rapid7/metasploit-framework into staging/electro-release 2014-07-30 12:36:03 -05:00
Luke Imhoff 14341c68a3
Merge remote-tracking branch 'upstream/staging/electro-release' into staging/electro-release 2014-07-30 12:24:10 -05:00
Trevor Rosen 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
James Lee 85b00eede6
Add #present? checks 2014-07-30 11:52:59 -05:00
James Lee 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