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
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
b96a7ed1d0
Install a global object in firefox payloads, bump jsobfu.
2014-09-24 16:05:00 -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
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
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
49a91ac5bb
Updating metasploit-credential dep to v0.8.6
2014-08-02 17:43:08 -05:00
3bd4279038
Update metasploit-credential
...
MSP-10963
2014-08-02 01:01:53 -05:00
c69c06af89
Update metasploit-credential
...
MSP-10963
2014-08-01 22:05:45 -05:00
915e09ac50
Update framework version spec and Gemfile
2014-08-01 09:26:38 -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
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
8fda4ee239
Fix fd leak and blind IO#gets in pwdump import
...
MSP-10715
2014-07-29 15:15:47 -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
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
1931024c86
Bump credential version for #to_s fixes
2014-07-27 14:08:39 -05:00
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
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
1a10b21e7f
Use metasploit-credential with association search
...
MSP-10029
2014-07-21 13:39:17 -05:00
a4e5c36de5
Update to metasploit-credential to use gem.
...
MSP-10808
2014-07-21 12:57:20 -05:00
19477dbfef
Land #3537 from @PagedeGeek, msfcrawler fix
2014-07-17 13:38:15 -05:00
9fb18f13cc
Land #3541 , adds hpricot to gemfile
2014-07-17 11:14:13 -05:00
feee142f32
Updating Gemfile lock so Travis doesn't fail.
2014-07-17 10:18:22 -05:00
7e338aa828
updating Gemfile.lock
...
MSP-10728
2014-07-16 16:19:59 -05:00
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
1e2df81397
Attempting to fix a gemfile mergeconflict
...
MSP-10721
2014-07-16 10:22:27 -05:00
098054e902
gemfile.lock
2014-07-16 09:45:59 -05:00
52a29856b3
Merge branch 'master' into staging/electro-release
...
Conflicts:
Gemfile
Gemfile.lock
2014-07-16 09:38:44 -05:00
2f460f32c3
Fix Gemfile deps
2014-07-15 21:52:57 -05:00
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
846679bef9
change Result status
...
result bojects now use Login::status constants
for their status
2014-07-15 11:39:38 -05:00
038d1e210a
Merge upstream/master to deconflict.
...
Conflicts:
Gemfile.lock
2014-07-09 17:43:42 -05:00
59c90bba22
version lock rspec
...
rspec 3 will cause problems for us right now
2014-07-09 12:21:41 -05:00
e5abfea36a
require new metasploit-credential and -model
...
get the new Realm Key constants after the
move to -model
2014-07-09 10:43:57 -05:00
dd75c645c3
Update metasploit-credential
...
MSP-10663
2014-07-08 19:44:38 -05:00
d7450dcbdf
updating dependencies
...
metasploit-credential to pre.electro.pre.release
metasploit-data-models to 0.18.0
MSP-10654
2014-07-07 17:02:22 -05:00
271fae07cf
Update to compatible dependencies
...
MSP-10654
2014-07-07 14:41:03 -05:00
8f39590f0f
Framework is currently pegged to 0.17.0. Closes #3495
2014-07-07 09:43:05 -05:00
16af8b8c5c
Use MDM 0.17.0 stock as master branch is broken.
...
This resolves all issues I know of with the recog branch on
Metasploit Framework, but obviously most of the benefits of
this branch come from having a recog-aware MDM, something
that can't happen until MDM 0.17.6+ is supported by the
framework.
In short, this should be good to merge, but will not solve
the intended problems until MDM 0.17.6+ is fixed for MSF
2014-07-06 09:36:08 -05:00
43d65cc93a
Merge branch 'master' into feature/recog
...
Resolves conflicts:
Gemfile
data/js/detect/os.js
modules/exploits/android/browser/webview_addjavascriptinterface.rb
2014-07-06 09:17:44 -05:00
8b63d3d467
Revert the revert of #3446
...
This reverts commit 9b35b0e13a
2014-06-29 17:22:21 -05:00
9b35b0e13a
Revert "Land #3446 -- Meterpreter bins gem switch" due to build failures
...
This reverts commit bba8bd3498002234993f
2014-06-25 13:24:07 -05:00
06da2d81e4
use fixed version of credential
2014-06-20 12:34:42 -05:00
a929a55404
fix show command parsing
...
this ius better than a regex and handles special charachters
in usernames and passwords far better than the previous way
2014-06-20 10:48:42 -05:00
1b9d24ad0c
Include the Meterpreter bins
2014-06-19 16:04:40 -05:00
b606448976
Merge branch 'feature/MSP-9689/jtr_cracker' into staging/electro-release
2014-06-19 10:14:57 -05:00
b8cedf14a8
Update gemfile dependencies. I have no idea if i need to tag this or wtf.
2014-06-17 12:14:17 -05:00
99330ea40a
Update to use corrected v0.4.2-electro-release tag
2014-06-17 11:14:59 -05:00
57c7d30bc4
Updated MC tag to 0.4.2
...
MSP-10006
2014-06-16 15:34:42 -05:00
a5fb898904
actually set max run time
...
make maxrutnime affect the crack command
2014-06-14 20:03:56 -05:00
eeef98d0e4
Update gemfile.
2014-06-12 15:43:44 -05:00
8d06cb7679
Creds version bump
2014-06-11 14:09:31 -05:00
84aa0d42ed
Merge pull request #57 from rapid7/bug/MSP-10004/rubyzip
...
Trevor added a 0.4.1 tag right before this PR landed, making this unmergable. Pulled in staging/electro-release, specs passing.
2014-06-11 13:48:03 -05:00
1903542683
Merge branch 'staging/electro-release' into bug/MSP-10004/rubyzip
...
Conflicts:
Gemfile
Gemfile.lock
2014-06-11 13:42:26 -05:00
e8752f9c56
Point to correct creds version
2014-06-11 13:38:35 -05:00
a92660376c
Update credentials tag
2014-06-11 13:29:09 -05:00
b26a8fa76d
Updating with latest MC tag
...
MSP-10004
2014-06-11 11:36:49 -05:00
b92e95ee7f
Add rubyzip 1.1.X
...
MSP-10004
2014-06-10 13:23:40 -05:00
e9d9806408
invalidate_login
...
added invalidate_login call
also made to_s on credential drop the @
if there is no realm present
2014-06-10 11:07:15 -05:00
dc590008a7
add invalidate_login call
...
add the new invalidate login call to make sure
we update the status on failed logins appropriately
2014-06-10 10:58:27 -05:00
c7a43ecced
Update Gemfile.lock
...
MSP-9994
2014-06-09 14:24:44 -05:00
eead9f097a
updating creds to v0.3.0
...
MSP-9653
2014-06-05 16:31:17 -05:00
d10867ea9e
updating the gemfile
...
metasploit-concern v0.1.0 has been released
metasploit-credential is now on the v0.2.0-electro-release tag
MSP-9653
2014-06-05 14:26:40 -05:00
9e78509aac
Merge branch 'staging/electro-release' into feature/MSP-9653/use-metasploit-concern-in-pro
...
MSP-9653
Conflicts:
Gemfile
Gemfile.lock
2014-06-02 13:40:11 -05:00
80a75e1e9c
Update Gemfile.lock
...
MSP-9653
Forgot to `bundle install` after changing the metasploit-credential
version.
2014-06-02 13:27:56 -05:00
898b108863
Gemspec
...
MSP-9653
Add gemspec for metasploit-framework so that pro can declare it as a
proper dependency. DO NOT release metasploit-framework to rubygems: it
is 47 MB and would be not be nice to their servers.
2014-06-02 13:03:07 -05:00
ba525c7b78
use metasploit-credential creation methods
2014-05-30 13:07:11 -05:00
967b0d49b1
Merge branch 'master' into staging/electro-release
...
Conflicts:
Gemfile
Gemfile.lock
2014-05-28 09:39:56 -05:00
cc1e81ecb7
Add sqlite3 to Gemfile
...
Fixes all the post modules that require it to parse pilfered sqlite DB
files.
2014-05-27 10:29:55 -05:00
1d205081cb
Merge Gemfile changes properly
2014-05-18 11:10:31 -05:00
14cf51db91
Remove unused DatabaseCleaner
...
MSP-9606
DatabaseCleaner is no longer used in the specs since the use of railties
allowed the use of transactional fixtures.
2014-05-13 09:13:47 -05:00
b1598e83c3
Re-enable `bundle install --without db` support
...
MSP-9606
Catch LoadError in config/application.rb when trying to require
'active_record/railtie` so that end-users can run without any of the
database gems installed. NOTE: you can't run in the development or
test environment without the database because factory_girl needs
ActiveRecord.
2014-05-12 15:39:34 -05:00
Tod Beardsley
James Lee
Matt Buck
Joe Vennix
sinn3r
Luke Imhoff
darkbushido
HD Moore
William Vu
joev
OJ
Samuel Huckins
Brandon Turner
Trevor Rosen
Joshua Smith
Lance Sanchez
David Maloney
Trevor Rosen
Jon Hart
Chris Doughty