d4162565f2
updating the db:schema for inet support
2014-09-04 13:06:34 -05:00
5e693a043b
we need action_controller/railties
2014-09-04 13:06:14 -05:00
19a063e861
cucumber rails is not required by default anymore
2014-09-04 13:04:08 -05:00
3b75b98148
updating to rails 4
2014-09-03 12:20:51 -05:00
77f0a2d420
fixing a merge error with travis.yml
2014-09-02 19:07:39 -05:00
794dc136f6
Merge branch 'aruba-testing-with-updated-master' into aruba-testing
2014-09-02 19:00:46 -05:00
50e804d9cb
updating how we use cucumber to match lukes changes
2014-09-02 18:57:55 -05:00
5b3800c13a
removing the hacked stty solution
2014-09-02 13:57:48 -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
1cdf1c2c6e
Land #3709 , @nnam's wing ftp admin console cmd exec
2014-08-29 13:46:01 -04:00
8095b4893c
Rename and apply rubocop style to wing_ftp_admin_exec
2014-08-29 13:42:11 -04:00
40f581458a
Land #3570 , @ikkini scanner for rsync
2014-08-28 18:48:32 -05:00
9fb9ab813c
Add URL reference
2014-08-28 18:47:56 -05:00
bc542a011d
Change module filename
2014-08-28 18:42:30 -05:00
213fe23970
Clean rsync_modules_list
2014-08-28 18:40:55 -05:00
b4e3ce0fdc
Merge branch 'master' of github.com:rapid7/metasploit-framework
2014-08-28 17:14:07 -05:00
fa77caa819
Merge branch 'bug/MSP-11153/database-config-overrides'
...
MSP-11153 #land
2014-08-28 17:12:37 -05:00
20bcb8029b
Land #3723 , solves #3719 msfcli crash
2014-08-28 17:09:53 -05:00
031445fee7
Check for nil resource files
...
See #3719
2014-08-28 16:27:33 -05:00
20177c7c23
Restore backup database.yml when retesting after interrupt
...
MSP-11153
Restore the config/database.yml backed up to
config/database.yml.cucumber.bak in the db:config:restore task, which is
made a dependency of the environment rake task so that
config/database.yml is restored before Rails tries to use it in the
environment task. This specifically, allows for rake cucumber to be
interrupted when the config/database.yml has been moved to
config/database.yml.cucumber.bak and a subsequence rake cucumber to
succeed and restore config/database.yml, but any task that depends on
environment will restore the config/database.yml.
2014-08-28 15:20:53 -05:00
02bbd53b82
Fix failure messages for check().
2014-08-28 12:09:35 -07:00
7a8d7a38d1
Remove debugging 'puts'
...
MSP-11153
2014-08-28 13:48:46 -05:00
6c90a50e47
Handle res.nil case in check(). Revert check for res.nil in
...
execute_command() because it was failing prior to the reverse_shell
connecting.
2014-08-28 10:57:52 -07:00
0788ce9745
Removed unused require and import. Handle the res.nil case in
...
execute_command() and authenticate().
2014-08-28 10:30:30 -07:00
5ab8fcd026
Remove realpath call from expected user_configurations_pathname
...
MSP-11153
realpath is not used in the actual code anymore because it doesn't work
for non-existent paths.
2014-08-28 11:51:25 -05:00
58091b9e2b
Land #3708 , @pedrib fix for manage_engine_dc_pmp_sqli
2014-08-28 10:47:03 -05:00
d8c15766bd
Land #3567 @OJ's fixes to the MQAC local exploit solving conflicts
2014-08-28 10:19:47 -05:00
9d3d25a3b3
Solve conflicts
2014-08-28 10:19:12 -05:00
dd8690323a
Land #3722 , fix typos in openssl ccs scanner
2014-08-28 10:50:18 -04:00
784ece574e
Found additional typos.
2014-08-28 09:03:19 -05:00
cb634cfef3
Fixed annoying typo that shows up in validation screenshots
2014-08-28 08:50:30 -05:00
188f5d012a
Add scenario for no database.yml
...
MSP-11153
2014-08-27 22:02:16 -05:00
7453f6fa3a
Project "database.yml" scenario
...
MSP-11153
2014-08-27 21:47:31 -05:00
e6750b985c
Add 'the' to make steps read better
...
MSP-11153
2014-08-27 21:38:46 -05:00
972470c241
Ensure a fake project database.yml is used for scenarios
...
MSP-11153
Ensures that cucumber still works if config/database.yml is not set and
so other location is being used to run cucumber.
2014-08-27 21:36:23 -05:00
496865e591
Order database.yml definitions to match precedence
...
MSP-11153
2014-08-27 21:15:00 -05:00
d752cdccf6
Remove unneeded command_line.yml
...
MSP-11153
Remove definition of command_line.yml in scenarios that don't use --yaml
flag.
2014-08-27 21:09:49 -05:00
b701ba5dcf
~/.msf4/database.yml scenario
...
MSP-11153
2014-08-27 20:57:08 -05:00
b1e745aa16
MSF_DATABASE_CONFIG scenario
...
MSP-11153
2014-08-27 20:33:52 -05:00
6d45f75b47
Land #3690 , credential_collect refactor
...
@TomSellers strikes again!
2014-08-27 18:31:59 -05:00
9b0c5dfb0c
Minor fix
2014-08-27 18:31:13 -05:00
275fa5cb50
Remove unnecessary return
...
MSP-11153
Leftover from earlier design.
2014-08-27 16:58:45 -05:00
83b6f268b4
Remove unnecessary realpath
...
MSP-11153
Causes errors on machines that don't have ~/.msf4 like travis-ci.
2014-08-27 16:58:05 -05:00
2b2d9085d3
Add cucumber to test matrix
...
MSP-11153
2014-08-27 16:50:25 -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
1da7ab9bda
Rake will only show the load error when features are called
...
if you dont have cucumber installed it will only display the message if you call
rake features
2014-08-27 12:13:30 -05:00
951ce15b44
Move database.yml selection to Metasploit::Framework::Database
...
MSP-11153
Test the following paths in order and only return them if the path
exists:
1. MSF_DATABASE_CONFIG environment variable
2. ~/.msf4/database.yml
3. <project>/config/database.yml
2014-08-27 12:01:43 -05:00
darkbushido