Commit Graph

46004 Commits (77558cd2d72f101720c1a80326f64e5e9b5782bf)

Author SHA1 Message Date
James Barnett 77558cd2d7
Remove unused code 2018-04-17 14:28:28 -05:00
James Barnett 82798424b2
Support getting a workspace via id
Also implements a helper method to sanitize sinatra injected
params since it was causing issues downstream. Updated each
use of sinatra params to use this helper method.
2018-04-17 12:35:22 -05:00
James Barnett b569498250
Address more code review comments 2018-04-17 10:52:56 -05:00
James Barnett a8a95a03a3
Implement remote workspace delete 2018-04-17 10:19:40 -05:00
James Barnett f27490dc61
Address PR suggestions and add comments 2018-04-16 16:45:23 -05:00
James Barnett 68ad91763a Merge branch 'rapid7/master' into MS-3062_workspaces 2018-04-16 15:33:59 -05:00
James Barnett 2ef451c349
Land #9873, add notes functionality to remote datastore
This PR enables create, update, and delete functionality for the notes
command and data model when using a remote data service.
2018-04-16 15:03:27 -05:00
Matthew Kienow e283f109a7
Remove commented out code 2018-04-16 14:14:46 -04:00
Matthew Kienow 74cb9c38b2
Change source for host address value in output 2018-04-16 14:09:19 -04:00
Adam Cammack 47a324815d
Land #9872, Fix JSONRPC fields in external modules 2018-04-13 15:00:26 -05:00
Adam Cammack 9ff16d96b4
Land #9874, Add option for STDIN timeout 2018-04-13 14:55:47 -05:00
Jeffrey Martin 60c69314b6
Weekly dependency update 2018-04-13 12:33:03 -05:00
Jeffrey Martin b466c19599
Land #9875, Lock rex-text due to compatibility issues 2018-04-13 11:55:31 -05:00
Jeffrey Martin e7a7bcfd7d
Lock rex-text due to compatibility issues
The new depndency on the openssl gem creates compatibility issues
in some of the currently supported enviornments.  Lock version until
this is sorted out.
2018-04-13 11:15:55 -05:00
Matthew Kienow daf67999d6
Raise NotImplementedError in NoteDataService stubs 2018-04-13 12:07:35 -04:00
Green-m 73371e9f9c Add timeout option 2018-04-13 07:31:34 -04:00
Green-m cff91ee096 Add timeout option 2018-04-13 07:16:11 -04:00
Adam Cammack e65de2b56f
Conform to JSONRPC 2.0 spec in external modules
Responses to queries had a `response` field instead of the required
`result` field.
2018-04-12 16:55:27 -05:00
Matthew Kienow 37479d8fd4
Modify notes search to handle serialized data
Initial Goliath notes search implementation attempted to use Arel and
decode base64 serialized data column, however, this was not without
issue. Updated implementation retrieves all records that match
conditions, thus data has been deserialized and then filters using
specified search term.
2018-04-12 17:37:16 -04:00
William Vu cc9426860b
Land #9871, search without arguments shows help
Lol, you can still specify an empty string to search all modules.
2018-04-12 15:39:54 -05:00
William Vu d2a683d2df Add whitespace and update help 2018-04-12 15:39:04 -05:00
Auxilus 0b3f50ea80
show help when no arguments provided to `search` 2018-04-13 01:27:22 +05:30
Matthew Kienow 4e49b99783
Add cmd notes option to sort by column number 2018-04-12 15:56:42 -04:00
Matthew Kienow 5b2bbe7432
Update test for removed make_sortable method 2018-04-12 15:23:35 -04:00
Matthew Kienow f60bbdd831
Remove cmd notes make_sortable helper method 2018-04-12 10:51:03 -04:00
Adam Cammack 2a6acfd1d0
Land #9823, Private IP leak via WebRTC 2018-04-11 17:37:56 -05:00
Adam Cammack 7e4caa16ff
Add more example output to module doc 2018-04-11 17:29:18 -05:00
Matthew Kienow 518d672ad5
Update cmd_notes help message test 2018-04-11 18:09:48 -04:00
Adam Cammack 8c7f929636
Land #9865, Update Meterpreter `ls`/`dir` help 2018-04-11 17:05:18 -05:00
Matthew Kienow 087ae447c5
Remove cmd notes sort operation 2018-04-11 17:46:13 -04:00
James Barnett 86b6009999
Land #9860, Fix DB init when database.yml is missing
This PR fixes a bug introduced with goliath that caused incorrect error messages
and other error messages when no database.yml was present. It also improves the
messaging around that use case and loads CommandDispatcher::Db correctly.
2018-04-11 16:13:40 -05:00
Adam Cammack f1d426d257
Land #9833, Remove broken feature detection 2018-04-11 15:02:53 -05:00
Aaron Soto b9d71b7147
Renamed 'mask' to 'glob' 2018-04-11 14:50:27 -05:00
Aaron Soto 21467d7938
Update stdapi/fs help output to match searching/masking parameters 2018-04-11 14:19:33 -05:00
James Barnett 4e5e0f2c40 Merge branch 'master' of github.com:rapid7/metasploit-framework 2018-04-11 13:59:43 -05:00
James Barnett 059ba7472c
Land #9863, Fix crash when tab completing option values
The signature for services was udpated, and each_service was not calling
using the updated method. This was causing tab completion to crash
msfconsole when being used with option values.
2018-04-11 13:52:30 -05:00
William Vu 8b6f267987
Land #9864, command stager debugging fix 2018-04-11 13:51:44 -05:00
William Vu 6c6aa8db82 Print generated CmdStager with inspect, not join
I dun goofed. I knew I should have just printed it verbatim.

tl;dr I thought I had accounted for command compression. I was wrong.
This should also give us more information about what exactly is being
run and how many times.
2018-04-11 13:49:00 -05:00
Matthew Kienow 3db19fe4f2
Fix DBManager::Service use of services method
services method was previously modified to use a hash as the parameter,
but each_service was passing a workspace. Make each_service method
consistent with other DBManager modules.
2018-04-11 11:43:12 -04:00
Matthew Kienow e639fda53c
Fix DB initialization with no database YAML 2018-04-11 09:15:38 -04:00
Dhiraj Mishra 8b6bfcb2f0
Added documentation 2018-04-11 11:28:50 +05:30
Brent Cook 41a21def80
Land #9857, Restore services search semantics 2018-04-10 17:25:48 -05:00
James Barnett cd48b47760 Fix failing tests.
-Was accidentally deleting opts[:workspace] instead of processing
-Update notes help text expectations
2018-04-10 17:10:32 -05:00
James Barnett e51f41fa34
Merge remote-tracking branch 'msf_jbarnett/fix_services_bugs' into MS-3062_workspaces 2018-04-10 13:35:33 -05:00
James Barnett f8cbb9d7c0
Update test 2018-04-10 13:14:16 -05:00
James Barnett 462db05f4c
Re-enable port search functionality 2018-04-10 11:10:32 -05:00
Adam Cammack 4495eea1ca
Land #9836, Force #! for external modules 2018-04-10 11:08:15 -05:00
Adam Cammack 81ec33b0e4
Refactor script path check into base module loader 2018-04-10 11:07:21 -05:00
Brendan Coles 154951cd37
minor update 2018-04-11 01:45:41 +10:00
James Barnett 48c0bbfa7a
Only display the services for a given workspace 2018-04-10 10:28:02 -05:00