Commit Graph

101 Commits

Author SHA1 Message Date
Trevor Rosen c1e02d4539 Update deps again
MSP-9948
2014-07-14 18:16:12 -05:00
Trevor Rosen 0966949203 Merge branch 'staging/electro-release' into feature/MSP-9948/update-db-import
Upstream merge

Conflicts:
	Gemfile
	Gemfile.lock
2014-07-14 17:59:54 -05:00
Trevor Rosen aca627489e Pass workspace down in import of creds dump
MSP-9948
2014-07-14 16:40:41 -05:00
Trevor Rosen b05b2657bc Now importing creds dumps inside msf zips
MSP-9948
2014-07-13 11:07:01 -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
Trevor Rosen 574f4356e8 Update deps 2014-07-08 18:20:20 -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
Trevor Rosen 1d7de8fef9 Mid-work commit
MSP-9848
2014-07-07 15:44:29 -05:00
Luke Imhoff 271fae07cf Update to compatible dependencies
MSP-10654
2014-07-07 14:41:03 -05:00
Trevor Rosen c1fc68e1b1 Replace to_pwdump internals
MSP-9948
2014-07-03 15:41:26 -05:00
Trevor Rosen 45a1c6f0e6 Update deps 2014-07-03 13:55:10 -05:00
Trevor Rosen 2da890810a Make db_import use Metasploit Credential
MSP-9948

* Special-case the pwdump file to be IO
* Had to use lotsa shims
2014-06-30 13:32:59 -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
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
David Maloney ba525c7b78 use metasploit-credential creation methods 2014-05-30 13:07:11 -05:00
David Maloney 967b0d49b1 Merge branch 'master' into staging/electro-release
Conflicts:
	Gemfile
	Gemfile.lock
2014-05-28 09:39:56 -05:00
James Lee 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
Luke Imhoff 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
Luke Imhoff 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
Luke Imhoff 3370465d84 Use railties to load Metasploit::Credential correctly
MSP-9606

In order to support Metasploit::Credential correctly,
metasploit-framework needs to support Metasploit::Concern, which does
all its magic using a Rails::Engine initializer, so the easiest path is
to make metasploit-framework be able to use Rails::Engines.  To make
Rails::Engine use Rails::Engine, make a dummy Rails::Application
subclass so that all the initializers will be run when anything requires
msfenv.
2014-05-12 15:03:51 -05:00
David Maloney cea12c9d0c remove metasploit-credential dep
remove from the Gemfile for now. we don't need it
just yet, and there are dependency resolution issues
2014-04-28 11:09:31 -05:00
David Maloney 8430851a98 Add metasploit-credential to gemfile
add a temp reference to the metasploit-credential
gem to the gemfile. Need this for access to ssh key
factories for tests
2014-04-25 14:22:52 -05:00
Brandon Turner 97ef53a1d1 Add upper bound for active-* gems
We do not yet support ActiveRecord and ActiveSupport 4.x, so ensure our
Gemfile declares this.
2014-04-18 16:45:07 -05:00
Tod Beardsley af19efbd71 Use the new bcrypt gem, not bcrypt-ruby
See the change upstream at:

https://github.com/codahale/bcrypt-ruby/commit/273946f2ba549b9119868331388e8cf30d2af37c

Reported by @ZeroChaos
2014-04-18 15:02:42 -05:00
Joe Vennix 57aa1eec11 Kick rkelly out to a gem, add rkelly-remixed.
rkelly-remixed is a faster fork of rkelly that is more frequently updated
nowadays. With the new gem, jsobfu obfuscates os.js about twice as fast on
my dev environment.
2014-04-09 17:21:22 -05:00
Samuel Huckins a78bc822d0 Gemfile update for new MDM version
* Updated MDM is live
2014-03-19 15:04:20 -05:00
Tod Beardsley 1599d9a134 Update Gemfile.lock 2013-12-23 14:47:32 -06:00