Commit Graph

1241 Commits

Author SHA1 Message Date
christopher lee 038fe03777 Merge branch 'master' into ms-2962 2018-05-02 15:31:57 -05:00
Matthew Kienow cb8131ab22 Validate search cmd arguments 2018-04-30 00:02:03 -04:00
Matthew Kienow 89d86b1f48 Remove code related to unused search cmd options 2018-04-29 23:16:30 -04:00
Matthew Kienow ca7b10af39 Add search cmd option to write CSV output file 2018-04-29 23:08:24 -04:00
christopher lee 516b61ebaa Merged master 2018-04-26 16:02:56 -05:00
Matthew Kienow c79e39377e Narrow rescue scope to StandardError 2018-04-26 14:55:41 -04:00
James Barnett a5172e066d Land #9926, check remote data service before connecting
This PR adds a check prior to connecting to a remote data service
to verify it is online and returning expected data. This prevents
crashes that were occurring when unexpected responses were returned
2018-04-25 14:07:33 -05:00
christopher lee 071a191055 Merge master + workspace removal from http remote data service 2018-04-25 13:39:46 -05:00
Matthew Kienow 359ef27834 Narrow rescue scope to StandardError 2018-04-24 17:19:54 -04:00
Aaron Soto a1027d56c9 Land #9912, Fix type validation in the notes add operation 2018-04-23 16:58:13 -05:00
Wei Chen ec1294d3f6 Land #9858, fix error handling in cmd_route
Land #9858
2018-04-23 08:46:38 -05:00
Wei Chen b20042abbd Fix indent and add elog 2018-04-23 08:45:34 -05:00
Matthew Kienow d2831536ca Fix type validation in the notes add operation
Make variable nil checks explicit for better style.
2018-04-23 01:46:46 -04:00
James Barnett ea79c65b8e Handle workspace delete if target does not exist 2018-04-20 11:33:35 -05:00
James Barnett 8d09f23b91 Fixes around workspace messaging 2018-04-20 11:25:24 -05:00
James Barnett 7e971721f0 Adjust messaging when renaming workspaces 2018-04-19 11:52:30 -05:00
James Barnett 348eb293d0 Handle case when renaming nonexistant workspace 2018-04-18 13:02:31 -05:00
James Barnett 81d00fa5b7 Fix edge cases in workspace update 2018-04-18 12:56:38 -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 74cb9c38b2 Change source for host address value in output 2018-04-16 14:09:19 -04: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 f60bbdd831 Remove cmd notes make_sortable helper method 2018-04-12 10:51:03 -04: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
Matthew Kienow e639fda53c Fix DB initialization with no database YAML 2018-04-11 09:15:38 -04: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
Auxilus f1240b0454 resolves #9855 2018-04-10 22:20:27 +05:30
James Barnett 462db05f4c Re-enable port search functionality 2018-04-10 11:10:32 -05:00
James Barnett 6a02712674 Merge remote-tracking branch 'mkienow/MS-3061-remote-notes-read-update-delete' into MS-3062_workspaces 2018-04-04 16:03:43 -05:00
Brent Cook b0123b2095 Land #9787, Fix adding IPv6 routes with subnets or CIDR masks 2018-04-02 22:57:15 -05:00
James Barnett e892911fbe Use a constant for default workspace name 2018-04-02 17:02:14 -05:00
Brent Cook f386ae0ba3 Land #9731, tool updates 2018-04-01 23:26:42 -05:00
James Barnett 7d58b0a5f4 Merge branch 'goliath' into MS-3062_workspaces 2018-03-30 16:35:26 -05:00
Spencer McIntyre c8033d69c5 Use the new keyword style for v6 2018-03-30 13:56:15 -04:00
Spencer McIntyre bb17bdb6dd Fix adding IPv6 routes with subnets or cidr masks 2018-03-30 13:18:03 -04:00
Matthew Kienow f10924a5c0 Update cmd note operations, validation and output 2018-03-29 23:15:10 -04:00
James Barnett d23e33a7bc Make workspace -v work with updates 2018-03-28 13:31:49 -05:00
James Barnett 1b6aa86d92 Merge remote-tracking branch 'mkienow/MS-3061-remote-notes-read-update-delete' into MS-3062_workspaces 2018-03-27 15:57:41 -05:00
William Vu e761d211b9 Land #9708, reload_lib command for msfconsole 2018-03-26 17:10:11 -05:00
James Barnett cfa03a999c Finish moving current_workspace tracking to client 2018-03-26 15:58:47 -05:00
Matthew Kienow 991f4e35ea Remove added regex options from search_term 2018-03-26 14:07:21 -04:00
Jon Hart d0ef5617fa Merge master and resolve conflict 2018-03-23 14:25:21 -07:00
James Barnett def0e4d93b Merge branch 'goliath' into MS-3062_workspaces 2018-03-23 11:37:01 -05:00