261159aa66
update lockfile
2015-03-10 14:38:01 -05:00
b37a975108
Use metasploit_data_models staging branch
2015-03-09 01:28:27 -05:00
8d6ba0e775
fix transient factory bug
...
pulled re-released metasploit-credential to fix
bug by a hidden change to factories
MSP-1244
2015-03-04 14:58:49 -06:00
6b9cf40110
update gemfile.lock
...
update gemfile lock for new credential version
MSP-12244
2015-03-04 12:29:04 -06:00
4fd2f6867f
Switch to rb-readline-r7 for now
2015-02-21 11:30:40 -06:00
62fbf81f8a
Update Gemfile.lock and schema.rb
2015-02-18 15:17:17 -06:00
73435c6d1c
Land #4743 - Bump met bins, update Linux bins.
...
Includes a merge of Gemfile.lock
2015-02-11 08:21:23 +10:00
184b4e8a13
Merge branch 'master' into feature/MSP-11141/extract-cache-from-metasploit-model
...
MSP-11141
Conflicts:
Gemfile.lock
metasploit-framework-db.gemspec
2015-02-10 14:09:18 -06:00
5df13364b2
Update to latest metasploit dependencies
...
MSP-11141
2015-02-10 14:01:49 -06:00
7ab7add721
bump meterpreter_bins to 0.0.14, update Linux binaries.
...
Hopefully the last manual build before packaging the Linux bins into
meterpreter_bins as well.
This includes all of the fixes and improvements over the past month.
rapid7/meterpreter#116
rapid7/meterpreter#117
rapid7/meterpreter#121
rapid7/meterpreter#124
2015-02-10 12:43:47 -06:00
13e8659c45
Bump version of metasploit-credential
...
Bumped version of metasploit-credential to pull in bumped version of
MDM, which fixes some old Rails-3 style ActiveRecord calls.
MSP-12127
2015-02-09 15:46:13 -06:00
37ef46264a
Pulling in latest MDM and credential versions
...
* Fully removing service uniqueness validation for now, more work to be
done on that to avoid regressions.
2015-02-05 14:05:24 -06:00
8a04e37de8
Updating to latest MDM, metasploit-credential
...
Rails 4 compatibility related
2015-02-01 00:49:12 -06:00
00f99b917c
Updating to latest MDM
...
MSP-12014
* Updates find_all_by to where
2015-01-31 21:38:24 -06:00
8c55b660fc
Using latest MDM and credential gems
...
* Had to revert changes related to service uniqueness validation
(MSP-11643) due to newly discovered regressions
2015-01-28 16:14:48 -06:00
ef821564e8
resolve lockfile conflict Merge branch 'master' into bug/MSP-11643/service-uniqueness-validation
...
Conflicts:
Gemfile.lock
metasploit-framework-db.gemspec
2015-01-16 12:11:05 -06:00
1bb1a51127
updated gemfile and lock file
2015-01-16 12:07:29 -06:00
ce87b126c1
Update to the latest meterpreter_bins
...
This removes checked-in sniffer extension in favor of the gem-packaged version.
It also pulls in the changes for verifying #4411
2015-01-09 16:57:10 -06:00
b4eef14ac6
Update metasploit gems
2015-01-08 15:33:23 -06:00
2cd5be021b
Merge branch 'master' into staging/rails-4.0
...
Conflicts:
Gemfile
Gemfile.lock
db/schema.rb
metasploit-framework-db.gemspec
metasploit-framework.gemspec
2015-01-08 13:12:27 -06:00
14a35eb28a
Bump metasploit-credential to 0.13.11
2015-01-08 09:35:07 -06:00
fcf0a3f096
pull latest credential
2015-01-07 15:09:01 -06:00
95a9d5010c
Use metasploit-model with metasploit-cache extracted
...
MSP-11141
Test that metasploit-model with metasploit-cache extracted and the
compatible metasploit_data_models and metasploit-credential are
compatible with metasploit-framework without changes.
2014-12-31 15:20:58 -06:00
067bda43e7
Updating lockfile post MDM version bump
2014-12-19 20:58:09 -06:00
db0aeb2a05
Make the version constraint a range
2014-12-19 13:54:13 -06:00
cfc3a31289
Upgrade rails to 3.2.21
2014-12-17 17:50:10 -06:00
4c994d84e0
Updating version to 4.11 for Flood release
2014-12-15 14:42:09 -06:00
3ee60101cf
Updating lockfile for credential 0.13.8
...
Logfile cleanup
2014-12-14 21:12:32 -06:00
38bcca9d0b
Land #4368 , metasploit-credential version bump
2014-12-12 09:42:24 -06:00
7228958738
update lockfile
2014-12-12 09:27:34 -06:00
ecd73e5901
Update meterpreter_bins to 0.0.12
...
This adjusts to the new grouped TLV format for the extapi adsi and
window list commands.
2014-12-11 22:03:23 -06:00
703f6128e6
update lock file
2014-12-09 15:37:40 -06:00
947a64dc2d
Merge pull request #4299 from techpeace/bump-metasploit-credential
...
Bump metasploit-credential version
2014-12-02 18:01:21 -06:00
a84ee27aef
Bump metasploit-credential version
2014-12-02 17:13:25 -06:00
0249e0a800
Merge branch 'master' into staging/rails-4.0
...
Conflicts:
Gemfile.lock
db/schema.rb
metasploit-framework-db.gemspec
2014-12-02 09:47:47 -06:00
5db7d1edd5
Bump mdm version number
2014-11-17 10:59:41 -06:00
768d7477d7
metasploit-credential bump to 0.13.3
...
MSP-11609
2014-11-13 12:56:58 -06:00
49f10e6ed8
use latest version of metasploit-credential
...
MSP-11609
2014-11-13 11:26:05 -06:00
bfc7bfdd9a
Land #4179 , Meterpreter_bins update
...
Actually fixes #3787 as well, since this is the last component needed to
fix that.
See rapid7/meterpreter#102
Also see
055eddeb18
2014-11-12 15:14:20 -06:00
66fde33a0c
Get framework working on rails 4 branch with new gemspecs
2014-11-12 14:06:51 -06:00
e0163a325d
update metasploit-credential to 0.13.2
2014-11-12 11:16:51 -06:00
fb751e3b9f
Update meterpreter_bins to 0.0.11
...
This adds support for the getsid command in the binaries.
2014-11-12 07:21:00 +10:00
64aaa50132
Revert 14514d7 as well
...
Another one snuck in there, see #4175
Revert "update gemspec for metasploit-credential"
This reverts commit 14514d7b8b6653d5e913
2014-11-11 14:53:04 -06:00
bf1558d702
update gemspec for metasploit-credential
...
update gemspec to use newest metasploit-credential
MSP-11592
2014-11-10 14:54:09 -06:00
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
122928d952
Remove redundant rb-readline from Gemfile
...
MSP-11585
The entry in the gemspec is sufficient.
2014-11-06 14:51:10 -06:00
9137bd6527
Revert "Update Gemfile.lock"
...
MSP-11578
This reverts commit a3829b800d
2014-11-05 11:10:51 -06:00
a3829b800d
Update Gemfile.lock
...
MSP-11578
2014-11-05 09:55:31 -06:00
5619b6d554
Add metasploit-framework as dependency of metasploit-framework-pcap
...
MSP-11578
Any of the optional depenency gems should depend on the minimal
metasploit-framework as it supplies the versioning information.
2014-11-05 09:51:38 -06:00
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
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
2d7c517e2f
Merge branch 'master' into staging/rails-4.0
...
Conflicts:
Gemfile.lock
2014-11-04 15:34:25 -06:00
867329d4b3
Fix readline by mucking with load path
2014-10-29 22:14:49 -05:00
bc91dbb450
updating metasploit_data_models
2014-10-29 12:44:25 -05:00
979394946a
Merge branch 'master' into staging/rails-4.0
...
Conflicts:
Gemfile.lock
lib/msf/core/db.rb
2014-10-28 15:34:37 -05:00
50a2f4c2a7
Adding missing lock changes from #4030
2014-10-15 20:39:13 -05:00
4f32cc8c01
Bump to meterpreter_bins 0.0.10
2014-10-15 19:36:48 -05:00
8afe4ab5e0
Update Gemspec for meterpreter 0.0.8
2014-10-15 19:00:19 -05:00
14835dfc0d
Update Gemfile.lock
2014-10-14 15:21:59 -05:00
25d1caabb5
Merge branch 'master' into staging/rails-4.0
...
Conflicts:
Gemfile
Gemfile.lock
metasploit-framework.gemspec
2014-10-14 15:20:15 -05:00
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
478dbd32f2
Bump to newly-released versions of gems
...
MSP-11412
2014-10-03 12:07:23 -05:00
f748256e47
Use the prerelease versions of the gems
...
MSP-11412
2014-10-03 10:29:10 -05:00
71efeb0c26
Also PATH out the deps for metasploit-credential and metasploit_data_models
...
MSP-11412
2014-10-02 14:08:35 -05:00
05c71af03c
PATH out the deps to metasploit-concern and metasploit-model, for the moment
2014-10-02 13:29:50 -05:00
90bffe3cbc
Update Gemfile.lock
2014-10-01 13:29:12 -05:00
a215f0d64a
updating metasploit-credentail and mdm
2014-09-29 15:49:17 -05:00
701291e029
Merge branch 'master' into staging/rails-4.0
...
Conflicts:
Gemfile.lock
2014-09-29 15:48:12 -05:00
a316875269
updating metasploit-credential
2014-09-29 14:27:18 -05:00
4c492423af
updating metasploit-credential
2014-09-26 15:58:46 -05:00
9b61451c46
updating mdm to use postgres_ext
2014-09-26 13:12:12 -05:00
e39bed5e79
updating mdm and changing db.rb
2014-09-26 10:30:22 -05:00
b96a7ed1d0
Install a global object in firefox payloads, bump jsobfu.
2014-09-24 16:05:00 -05:00
d6dcd887d7
Merge branch 'master' into staging/rails-4.0
...
Conflicts:
Gemfile
Gemfile.lock
db/schema.rb
metasploit-framework.gemspec
2014-09-23 13:40:34 -05:00
d52236fe05
Land #3835 - JSObfu to a gem
2014-09-20 01:38:45 -05:00
8e1b00ce95
Adds JSObfu.disabled for spec stubbing, fixes BES specs.
2014-09-19 20:42:05 -05:00
0f4be63903
Move JSObfu a gem then pull it into the Rex namespace.
2014-09-19 19:10:39 -05:00
39d302a120
Update metasploit_data_models
...
MSP-11359
Include fix for loading from metasploit_data_models/lib.
2014-09-18 12:35:26 -05:00
0f854ce5ed
Update to released metasploit-model
...
MSP-11359
2014-09-18 11:33:41 -05:00
03cc69d902
Update gems
...
MSP-11359
2014-09-18 11:33:22 -05:00
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
3824ba3827
updating mdm in Gemfile.lock
2014-09-10 11:15:56 -05:00
3b75b98148
updating to rails 4
2014-09-03 12:20:51 -05:00
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
bfc509c18a
Add feature that tests --yaml is favored over others
...
MSP-11153
2014-08-27 16:46:23 -05:00
1857c6ae39
Add aruba
...
MSP-11153
aruba adds steps for testing commandline applications with cucumber.
2014-08-27 14:22:20 -05:00
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
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
73e4ec709f
Fix smb_port and require 'recog' when no DB/MDM
2014-08-25 15:42:18 -05:00
2877cdc362
Merge branch 'master' into aruba-testing
2014-08-25 14:09:37 -05:00
5d708b65b4
Land #3676 , updated Meterpreter bins!
...
For KB2871997.
2014-08-22 14:33:27 -05:00
05afe416a9
Update lockfile to pull in new msf-cred versions.
2014-08-21 15:44:16 -05:00
a6b7262611
Updated to meterpreter_bins version 0.0.7
...
This has been a long time coming! Kiwi has been broken for a while and
this updated fixes that problem.
Details of the binaries build date/commits are in the gemspec in the
main meterpreter_bins repo.
2014-08-20 12:30:34 +10:00
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
6d92d701d7
Merge feature/recog into post-electro master for this PR
2014-08-16 01:19:08 -05:00
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
c82ba34f7c
working on a first pass at cucumber for framework
2014-08-13 14:28:28 -05:00
bbcd63cd10
Update Gemfile.lock as well for PR #3639
2014-08-12 12:28:39 -05:00
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
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
David Maloney
James Lee
HD Moore
Trevor Rosen
OJ
Luke Imhoff
Brent Cook
Matt Buck
Samuel Huckins
Matt Buck
Tod Beardsley
darkbushido
Joe Vennix
sinn3r
William Vu
joev
Brandon Turner