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

158 Commits (145e610c0f1a9f11025d1927cd4265b97db7082a)

Author SHA1 Message Date
Trevor Rosen 8511dc4131
Merge branch 'landing/4135' into upstream-master 
Land #4135

* Improve Bundle management:
* Option to install w/out DB group
* Option to install w/out pcap support
 2014-11-10 09:26:42 -06:00
Luke Imhoff 122928d952
Remove redundant rb-readline from Gemfile 
MSP-11585

The entry in the gemspec is sufficient.
 2014-11-06 14:51:10 -06:00
Luke Imhoff 06222911f6
Move pcap bundler group to metasploit-framework-pcap.gemspec 
MSP-11578

This will allow Metasploit Pro to use the
metasploit-framework-pcap.gemspec to ensure it has the correct version of
gems that were previously only in metasploit-framework's Gemfile and so
weren't being checked for version compatibility when Pro used
metasploit-framework.gemspec.
 2014-11-05 09:40:57 -06:00
Luke Imhoff a56a063b84
Move db bundler group to metasploit-framework-db.gemspec 
MSP-11578

This will allow Metasploit Pro to use the
metasploit-framework-db.gemspec to ensure it has the correct version of
gems that were previously only in metasploit-framework's Gemfile and so
weren't being checked for version compatibility when Pro used
metasploit-framework.gemspec.
 2014-11-05 08:58:46 -06:00
James Lee 867329d4b3 Fix readline by mucking with load path 2014-10-29 22:14:49 -05:00
James Lee a65ee6cf30
Land #3373, recog 
Conflicts:
	Gemfile
	Gemfile.lock
	data/js/detect/os.js
	lib/msf/core/exploit/remote/browser_exploit_server.rb
	modules/exploits/android/browser/webview_addjavascriptinterface.rb
 2014-10-03 18:05:58 -05:00
Matt Buck 478dbd32f2
Bump to newly-released versions of gems 
MSP-11412
 2014-10-03 12:07:23 -05:00
Matt Buck f748256e47
Use the prerelease versions of the gems 
MSP-11412
 2014-10-03 10:29:10 -05:00
Matt Buck 04dbfb9ad6
Bump metasploit gem dependencies 
MSP-11412
 2014-10-02 18:11:13 -05:00
Matt Buck 71efeb0c26
Also PATH out the deps for metasploit-credential and metasploit_data_models 
MSP-11412
 2014-10-02 14:08:35 -05:00
Matt Buck 05c71af03c PATH out the deps to metasploit-concern and metasploit-model, for the moment 2014-10-02 13:29:50 -05:00
jvazquez-r7 80d36ec08a
Land #3833, @darkbushido's cucumber fixes 2014-09-19 11:03:41 -05:00
Luke Imhoff 39d302a120
Update metasploit_data_models 
MSP-11359

Include fix for loading from metasploit_data_models/lib.
 2014-09-18 12:35:26 -05:00
Luke Imhoff 03cc69d902
Update gems 
MSP-11359
 2014-09-18 11:33:22 -05:00
Luke Imhoff 21d6e4afb3
Move metasploit-concern to gemspec 
MSP-11359

The dependency on `metasploit-concern` should not have been in the db
group as `Metasploit::Concern.run` is called for
`Msf::Exploit:Remote::HttpServer`, which works without the db group
installed.  This is a fix for a bug from #3781.
 2014-09-18 09:33:57 -05:00
darkbushido 93cd53a800
setting cucumber-rails require to false in Gemfile 
this stops the warning about cucumber being double required from showing up
 2014-09-11 15:47:42 -05:00
Joe Vennix 6ade4d8dab
Kill empty line in Gemfile. 2014-09-11 14:47:17 -05:00
Joe Vennix 37e6173d1f
Make Metasploit::Concern a first-class dep. 
Also adds a Concern hook to HttpServer, so Pro can more
easily change its behavior.
 2014-09-11 13:28:45 -05:00
darkbushido 13a0b8da83
Merge branch 'master' into aruba-testing-with-updated-master 
Conflicts:
	Gemfile.lock
	config/cucumber.yml
	features/support/env.rb
	features/support/hooks.rb
	lib/tasks/cucumber.rake
 2014-09-02 13:56:02 -05:00
Luke Imhoff bfc509c18a
Add feature that tests --yaml is favored over others 
MSP-11153
 2014-08-27 16:46:23 -05:00
Luke Imhoff 1857c6ae39
Add aruba 
MSP-11153

aruba adds steps for testing commandline applications with cucumber.
 2014-08-27 14:22:20 -05:00
Luke Imhoff 2f48f7c48c
rails generate cucumber:install 
MSP-11153

Add cucumber-rails for testing msfconsole's loading of database.yml from
different paths.
 2014-08-27 14:10:04 -05:00
darkbushido 984f073c7d
changing from cucumber to cucumber-rails 
using the MSF_DATABASE_CONFIG to tell msfconsole where to find the database.yml
 2014-08-27 13:44:34 -05:00
darkbushido 2877cdc362 Merge branch 'master' into aruba-testing 2014-08-25 14:09:37 -05:00
David Maloney e9dea358b8
gemfile change 2014-08-19 10:32:44 -05:00
darkbushido a09037ffa3
Merge branch 'master' into aruba-testing 
Conflicts:
	.rubocop.yml
	Gemfile
	Gemfile.lock
	Rakefile
	lib/metasploit/framework/command/console.rb
	lib/metasploit/framework/common_engine.rb
	lib/metasploit/framework/parsed_options/console.rb
	lib/metasploit/framework/require.rb
	lib/metasploit/framework/version.rb
	lib/msf/core/modules/namespace.rb
	modules/auxiliary/analyze/jtr_postgres_fast.rb
	spec/lib/msf/core/framework_spec.rb
 2014-08-19 09:06:53 -05:00
HD Moore 6d92d701d7 Merge feature/recog into post-electro master for this PR 2014-08-16 01:19:08 -05:00
Samuel Huckins 149c3ecc63
Various merge resolutions from master <- staging 
* --ask option ported to new location
* --version option now works
* MSF version updated
* All specs passing
 2014-08-15 11:33:31 -05:00
darkbushido c82ba34f7c
working on a first pass at cucumber for framework 2014-08-13 14:28:28 -05:00
Luke Imhoff 225c6da616
Remove rubocop because it causes backtrace 
MSP-11046

See https://gist.github.com/limhoff-r7/7c398b5f4c44ed40cf1f
 2014-08-12 10:47:26 -05:00
Tod Beardsley 47cb906408
Remove rubocop and msftidy touchpoints 
Rubocop replaces the default YAML library which makes development
testing difficult. It does not cause problems on Travis, but according
to reports, it does cause instability with many individual dev
environments.

While I would love to have a more solid source of this bug report, right
now this was an oral report from @shuckins-r7 (who I tend to believe a
lot).
 2014-08-12 10:37:58 -05:00
Brandon Turner 91bb0b6e10 Metasploit Framework 4.9.3-2014072301 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJT0CeVAAoJEJMMBVMNnmqO/7AP/0CBRHjtgiR9VnFKSQ+iWTQV
 iPNMBevn0mpSRq/gpoKCeFBZ6b+YQYrOLXDKVk62VV9LCslkr/P8LW8ul+m+JtB0
 mM6V5esUXM1XhgGEyTnTLRx6BR/WQU1RHlb56ae3nZjQlwCuH/5zEmcy5toZxpsY
 6HO46zE0GGBoLr/VgyYlfT08bfoQ+ICyJN0H5ixoovCc3iW0K1MNqLMfdani8zBJ
 gYJaMysV7XtepumWWQMSC+b/EuertdXXzWDy2bwe0Q3cQXNXzrkPAvtMqucWG+gy
 783OLKCPtVoEZiX87xAptkwmVCRdNGPclaWH7YRZDAh1tqBfRQUg72V/TIrOHCP1
 /lYO7yp5pBQg+1UNnpH+xI2YePFfYdHpYDNT5FSQGOnQjJg30ll4SqCm7cVmo2h5
 BRSYXkPCsQeXGaFarxGERNb8e+qN/WzSrHzY45tQw8mDuhg94tlf3VtDag3FXxhj
 zCxd6bu+tdboVm7FERS85T46kxzmeIycZ4p+Sf7d8gXitl2RKbBdKFNDi1gzeK1T
 yN7bDl4sL7qtDgZLXjFrnyC8vXyAqIrAgmFr2JywMBRm6TiCGQvgnrs+sScU3RFU
 W2tblGbKQq+CwDeC59uQPqxRkm72SMUrKX9448VEQ+9XbKE3TMQ5Q4qCxmnw31Op
 aJ0QgKJz8thZgafZc89I
 =e1z9
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCgAGBQJT4pb8AAoJEA+Ckxyj7hsHn+8P/3FlEYCmoqQ/JzsVtmP3Yi4Q
 gBRva+crY831mCCQXFrPJBvWfmy5HOzVh+Zh7zWF0GQ1WuuMppHfR5ARFVwmiDs3
 qwndhXwziDzBnznf0JKSgT5eJsH23s/ots1lyWymKJvPuT6hn6MRAHUawgnNmYR9
 ttnawmHvCM9Iha2oz3nmkLcNd+83bdBfEWi5l8AQ7jJxwMC2/8VPpMscVVwXqPzd
 CoQugAYZW5VeaEiGio5+19Ix9EPkIDvs6wnfGBtfPfeaOIDZV4XOFoIFUtEeZd5o
 olvEpYvdqscy4Qujzn4C++3wX3bUxkIbHTJHgrKmlD83dI7Cu1JH716G+yfLoJo0
 pQBWTGeWYKEh6leK/9J5Bo1/tOJ/ylbcbvH0Y0tmdu4icHar6uYe1QBrCB9xIdh1
 F+xo4guYnVo616DXJQSwjIye83b5dBxACrfA3bqCnFVFgTM5jXGV1cqiBgs9Dl++
 tIDPgUJkCe/bIdQ7PntlGRzxKihHahlxhCa++YaGKqSq7gXie8Rl4qgloIrbfNZ/
 z3XsoOLNdbMGO7ip88Zjwq4Khj5WZu7ijfCtXO7GU1UJZL1tJ2yK2ic7ZDLc251Y
 8EGMSTG53+6yvZYFtWMZeQzjwD2cpuF04dOmHOKi6KGJJ7KRPhn6gpsbc6U1mbH9
 AjGcfOzhhcsY+WAQ7OG+
 =Pjob
 -----END PGP SIGNATURE-----

Merge tag '2014072301' into staging/electro-release

Conflicts:
	Gemfile.lock
	modules/post/windows/gather/credentials/gpp.rb

This removes the active flag in the gpp.rb module.  According to Lance,
the active flag is no longer used.
 2014-08-06 15:58:12 -05:00
Samuel Huckins 49a91ac5bb
Updating metasploit-credential dep to v0.8.6 2014-08-02 17:43:08 -05:00
Luke Imhoff 3bd4279038
Update metasploit-credential 
MSP-10963
 2014-08-02 01:01:53 -05:00
Luke Imhoff c69c06af89
Update metasploit-credential 
MSP-10963
 2014-08-01 22:05:45 -05:00
Trevor Rosen 8fda4ee239
Fix fd leak and blind IO#gets in pwdump import 
MSP-10715
 2014-07-29 15:15:47 -05:00
Luke Imhoff f3eb708dd1
Update metasploit_data_models and metasploit-credential for tag search 
MSP-10029

Use metasploit_data_models that supports searching Mdm::Tag and a
compatible metasploit-credential.  Needed so
Metasploit::Credential::Core#tags can be searched in Pro.
 2014-07-22 09:07:18 -05:00
Luke Imhoff f8af435df6
Fix version restrictions on metasploit-credential 
MSP-10029

The '<' version should have been '0.8' and not '0.7.10' because '0.8' is
the next incompatible version number.
 2014-07-21 19:44:20 -05:00
Luke Imhoff 1a10b21e7f
Use metasploit-credential with association search 
MSP-10029
 2014-07-21 13:39:17 -05:00
Luke Imhoff a4e5c36de5
Update to metasploit-credential to use gem. 
MSP-10808
 2014-07-21 12:57:20 -05:00
Tod Beardsley 19477dbfef
Land #3537 from @PagedeGeek, msfcrawler fix 2014-07-17 13:38:15 -05:00
Joshua Smith 9fb18f13cc
Land #3541, adds hpricot to gemfile 2014-07-17 11:14:13 -05:00
David Maloney 0d3abf26e8
use latest metasploit-credential 2014-07-16 15:38:50 -05:00
Tod Beardsley 5fa639c640
Land #3528, add Rubocop from @jhart-r7 
This adds the gem to the :development group in the Gemfile, as well as
wires up msftidy to use it.
 2014-07-16 13:45:44 -05:00
Lance Sanchez 1e2df81397
Attempting to fix a gemfile mergeconflict 
MSP-10721
 2014-07-16 10:22:27 -05:00
David Maloney 52a29856b3
Merge branch 'master' into staging/electro-release 
Conflicts:
	Gemfile
	Gemfile.lock
 2014-07-16 09:38:44 -05:00
Samuel fe72bac8c8 fix crawler hpricot 2014-07-16 13:23:40 +02:00
Trevor Rosen 2f460f32c3
Fix Gemfile deps 2014-07-15 21:52:57 -05:00
David Maloney 7c0633f0a7
gemfile fix 2014-07-15 15:38:02 -05:00
Jon Hart 73736c70b6 Add Rubocop to the Metasploit project 
This is a work in progress because the code base is old and the style
varies wildly, however .rubocop.yml can (and should) be tweaked over
time to change standards as we see fit.  As it stands right now there
are few (if any) modules that pass Rubocop.
 2014-07-15 10:43:08 -07:00