Commit Graph

1049 Commits (5f01b6abc97f9ac144a904eed81a7f4fe721f5a4)

Author SHA1 Message Date
Brent Cook 916b4b2261
Land #9936, Narrow rescue scope to StandardError with database 2018-04-26 17:45:15 -05:00
Matthew Kienow c79e39377e
Narrow rescue scope to StandardError 2018-04-26 14:55:41 -04:00
Matthew Kienow 1aad9f0879
Revert NoteDataService to raise RuntimeError 2018-04-26 10:43:03 -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
Matthew Kienow 43edf46c43
Fix set data service for no database YAML case 2018-04-24 18:34:16 -04:00
Matthew Kienow 359ef27834
Narrow rescue scope to StandardError 2018-04-24 17:19:54 -04:00
Matthew Kienow f66029d129
Validate remote data service instance
Adds simple data service instance validation when registering and
setting a data service.
2018-04-24 16:54:10 -04:00
Matthew Kienow 01dd79173b
Add data proxy and service for online check 2018-04-24 15:11:16 -04:00
James Barnett e5513409db
Include :workspace in db_import opts 2018-04-24 13:53:55 -05:00
James Barnett 31be847213
Add workspace when reporting vuln_attempt 2018-04-19 11:09:13 -05:00
James Barnett aa40ef1789
Grab session_dto workspace from host 2018-04-18 17:38:42 -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 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 daf67999d6
Raise NotImplementedError in NoteDataService stubs 2018-04-13 12:07:35 -04:00
Matthew Kienow e639fda53c
Fix DB initialization with no database YAML 2018-04-11 09:15:38 -04: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 90542779ff
Audit models to ensure :workspace is passed only when needed 2018-04-09 14:50:37 -05:00
William Vu e17a788ab5 Remove stray dlog filling framework.log 2018-04-09 13:58:10 -05:00
James Barnett 852bc3d237
Dont inject :workspace into every HTTP request. 2018-04-04 16:30:25 -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
James Barnett e892911fbe
Use a constant for default workspace name 2018-04-02 17:02:14 -05:00
William Vu 840923d591
Land #9738, msfconsole user-friendliness changes 2018-04-01 02:12:53 -05:00
James Barnett ecbbf1d940
Pass workspace when using db_nmap 2018-03-30 15:27:32 -05:00
Matthew Kienow 2b7c3872d4
Add proxy method for find_or_create_note 2018-03-29 18:43:34 -04:00
James Barnett 3b1e3a4256
Missed one more bug in append_workspace 2018-03-29 15:18:31 -05:00
James Barnett 19e01b4b66
Fix bug in append workspace when using :wspace 2018-03-29 15:04:00 -05:00
James Barnett 7f42235ad7
Create default workspace if it doesnt exist 2018-03-28 15:39:24 -05: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
Matthew Kienow 0b5d3d31f9
WIP remote note read, update, delete 2018-03-27 16:36:56 -04:00
James Barnett cfa03a999c
Finish moving current_workspace tracking to client 2018-03-26 15:58:47 -05:00
James Barnett def0e4d93b
Merge branch 'goliath' into MS-3062_workspaces 2018-03-23 11:37:01 -05:00
James Barnett 6b3a4a56dc Merge branch 'rapid7/master' into goliath 2018-03-23 11:26:31 -05:00
James Barnett ed5b22a541
Address more code review comments 2018-03-22 21:47:59 -05:00
James Barnett 6c5a7a663a
Merge branch 'goliath' into MS-2879_db_export 2018-03-22 21:22:23 -05:00
James Barnett 466c97f114
WIP: move tracking active workspace to client side
* Move the @current_workspace tracking to workspace proxy
* Create helper for handling workspace value in opts
* Call framework.db.proxy across dbmanager files now that active ws is tracked in proxy

NOTE: This commit throws an exception when adding a remote data service.
2018-03-22 21:00:06 -05:00
James Barnett 93d4f5cd0b
Last few review comments 2018-03-21 17:50:11 -05:00
James Barnett eee24366c9
Address code review comments and bug 2018-03-21 17:42:54 -05:00
Matthew Kienow 553789557b
Merge branch 'goliath' into MS-2910-remote-vuln-read-update-delete 2018-03-21 01:45:58 -04:00
Aaron Soto 7e5214fef5
Improved CTRL-C edge case, Invalid Options edge case, help output, version output 2018-03-20 13:34:15 -05:00
James Barnett 90bebc2096
Convert workspace update to new api 2018-03-19 14:24:16 -05:00
James Barnett 929fb041ab
Fix bug when adding workspace remotely 2018-03-19 11:01:22 -05:00
James Barnett 35bc8e905e
Refactor workspace delete to be consistent with other commands 2018-03-16 16:11:09 -05:00
James Barnett 8ddaae5fe4
Remove unused code 2018-03-15 12:12:12 -05:00
christopher lee 4d04319d2a Merged master 2018-03-15 11:31:44 -05:00