Brings in neinwechter's BAP fixes. Seems to not only be a more sane
strategy, but in practice, ends up with tons more shells for at least
MSIE which is what most people are using it for anyway.
[Closes#1612]
This is effectively an empty commit, but keeps master a descendant of
release.
Conflicts:
db/schema.rb
lib/gemcache/ruby/1.9.1/gems/metasploit_data_models-0.6.2/spec/dummy/db/schema.rb
lib/gemcache/ruby/1.9.1/gems/metasploit_data_models-0.6.3/spec/dummy/db/schema.rb
This lands the Mdm update to release. It shouldn't conflict with master
but if it does, please tell todb@metasploit.com how you resolved it.
[See #1620]
Not only does this remove the patch, but adds in specs to cover the test
cases that the patch resolved. Verified all steps and landed #1592 before
landing #1611, so this is complete.
[Closes#1611]
Pulling out the set_rhosts_from_addrs -- that's not required for
grep-like functionality, and adding this method to the global namespace
is undesirable.
This reverts commit 52596ae3b4.
Resolved a conflict between grep and go_pro (go_pro was added after
grep). Adds @kernelsmith's grep command. Josh is determined to have
msfconsole be his default shell, it seems.
[Closes#1320]
Conflicts:
lib/msf/ui/console/command_dispatcher/core.rb
[#46224565]
The following rake tasks are added and work similar to how they work in
rails apps:
* db:create
* db:drop
* db:migrate
* db:migrate:status
* db:rollback
* db:schema:dump
* db:schema:load
* db:seed (but no db seeds defined at this time)
* db:setup
* db:version
The hidden task db:test:prepare is also available, which means `rake
spec` can depend on it so that the test database is dropped and
recreated from the development database when running specs (Although
there are yet to be database tests, this branch is in preparation for
that work that will be split between multiple developers.)
Committed this a little backwards which ended up with a merge conflict.
My bad. This should be all copacetic now.
[Fixes#1586]
Conflicts:
lib/msf/ui/console/command_dispatcher/db.rb
Tod Beardsley
Brandon Turner
jvazquez-r7
Joshua Abraham
sinn3r
dougsko
Tasos Laskos
Luke Imhoff