Commit Graph

114 Commits (6a72572237eae086df7a270c8780a8ff7aca7706)

Author SHA1 Message Date
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
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
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 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
James Lee 1ee32b3b98
Bump metasploit-model so we can use Realm::Key map 2014-07-29 12:19:03 -05:00
James Lee 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
James Lee 1931024c86 Bump credential version for #to_s fixes 2014-07-27 14:08:39 -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
Lance Sanchez 7e338aa828
updating Gemfile.lock
MSP-10728
2014-07-16 16:19:59 -05:00
Lance Sanchez 1e2df81397
Attempting to fix a gemfile mergeconflict
MSP-10721
2014-07-16 10:22:27 -05:00
David Maloney 098054e902
gemfile.lock 2014-07-16 09:45:59 -05:00
David Maloney 52a29856b3
Merge branch 'master' into staging/electro-release
Conflicts:
	Gemfile
	Gemfile.lock
2014-07-16 09:38:44 -05:00
Trevor Rosen 2f460f32c3
Fix Gemfile deps 2014-07-15 21:52:57 -05:00
David Maloney 846679bef9
change Result status
result bojects now use Login::status constants
for their status
2014-07-15 11:39:38 -05:00
Tod Beardsley 038d1e210a
Merge upstream/master to deconflict.
Conflicts:
	Gemfile.lock
2014-07-09 17:43:42 -05:00
David Maloney 59c90bba22
version lock rspec
rspec 3 will cause problems for us right now
2014-07-09 12:21:41 -05:00
David Maloney 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
Luke Imhoff dd75c645c3
Update metasploit-credential
MSP-10663
2014-07-08 19:44:38 -05:00
Lance Sanchez 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
Luke Imhoff 271fae07cf
Update to compatible dependencies
MSP-10654
2014-07-07 14:41:03 -05:00
HD Moore 8f39590f0f
Framework is currently pegged to 0.17.0. Closes #3495 2014-07-07 09:43:05 -05:00
Tod Beardsley 8b63d3d467 Revert the revert of #3446
This reverts commit 9b35b0e13a.

This should not land on master until the Metasploit Pro folks (@trosen-r7
and friends) get their Meterpreter path specifications working the
same way as Framework's does.
2014-06-29 17:22:21 -05:00
Chris Doughty 9b35b0e13a Revert "Land #3446 -- Meterpreter bins gem switch" due to build failures
This reverts commit bba8bd3498, reversing
changes made to 002234993f.
2014-06-25 13:24:07 -05:00
David Maloney 06da2d81e4
use fixed version of credential 2014-06-20 12:34:42 -05:00
David Maloney 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
Tod Beardsley 1b9d24ad0c
Include the Meterpreter bins 2014-06-19 16:04:40 -05:00
James Lee b606448976
Merge branch 'feature/MSP-9689/jtr_cracker' into staging/electro-release 2014-06-19 10:14:57 -05:00
Joe Vennix b8cedf14a8
Update gemfile dependencies. I have no idea if i need to tag this or wtf. 2014-06-17 12:14:17 -05:00
Luke Imhoff 99330ea40a
Update to use corrected v0.4.2-electro-release tag 2014-06-17 11:14:59 -05:00
Samuel Huckins 57c7d30bc4
Updated MC tag to 0.4.2
MSP-10006
2014-06-16 15:34:42 -05:00
David Maloney a5fb898904
actually set max run time
make maxrutnime affect the crack command
2014-06-14 20:03:56 -05:00
Joe Vennix eeef98d0e4
Update gemfile. 2014-06-12 15:43:44 -05:00
Trevor Rosen 8d06cb7679 Creds version bump 2014-06-11 14:09:31 -05:00
Samuel Huckins 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
Samuel Huckins 1903542683
Merge branch 'staging/electro-release' into bug/MSP-10004/rubyzip
Conflicts:
	Gemfile
	Gemfile.lock
2014-06-11 13:42:26 -05:00
Trevor Rosen e8752f9c56 Point to correct creds version 2014-06-11 13:38:35 -05:00
Trevor Rosen a92660376c Update credentials tag 2014-06-11 13:29:09 -05:00
Samuel Huckins b26a8fa76d
Updating with latest MC tag
MSP-10004
2014-06-11 11:36:49 -05:00
Luke Imhoff b92e95ee7f
Add rubyzip 1.1.X
MSP-10004
2014-06-10 13:23:40 -05:00
David Maloney 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
David Maloney 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
Luke Imhoff c7a43ecced
Update Gemfile.lock
MSP-9994
2014-06-09 14:24:44 -05:00
Lance Sanchez eead9f097a
updating creds to v0.3.0
MSP-9653
2014-06-05 16:31:17 -05:00
Lance Sanchez 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
Luke Imhoff 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
Luke Imhoff 80a75e1e9c
Update Gemfile.lock
MSP-9653

Forgot to `bundle install` after changing the metasploit-credential
version.
2014-06-02 13:27:56 -05:00
Luke Imhoff 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