christopher lee
038fe03777
Merge branch 'master' into ms-2962
2018-05-02 15:31:57 -05: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
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
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
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
James Barnett
e892911fbe
Use a constant for default workspace name
2018-04-02 17:02:14 -05: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
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
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
Jon Hart
a1287a0776
Remove blank before services output
2018-03-22 18:26:50 -07:00
Jon Hart
2ce8423883
Make vulns and notes with -o similar to services and hosts
...
Now all of them will simply save the requested information to an output
file if specified and will let you know where the file is when done.
Previously, notes and vulns would also print out all of the notes and
vulns, which just felt weird and inconsistent. So, I fixed it.
2018-03-22 18:18:12 -07:00
Matthew Kienow
975948439d
Make vulns cmd option string literals consistent
2018-03-21 16:35:06 -04:00
Matthew Kienow
09bea3ec39
Remove vulns cmd help short-circuit
2018-03-21 16:34:11 -04:00
Matthew Kienow
553789557b
Merge branch 'goliath' into MS-2910-remote-vuln-read-update-delete
2018-03-21 01:45:58 -04:00
James Barnett
90bebc2096
Convert workspace update to new api
2018-03-19 14:24:16 -05:00
Matthew Kienow
cd7ecc4b74
Display vulns information column based on option
2018-03-19 14:29:38 -04:00
James Barnett
35bc8e905e
Refactor workspace delete to be consistent with other commands
2018-03-16 16:11:09 -05:00
James Barnett
ac5669388a
Merge branch 'goliath' into MS-2879_db_export
2018-03-14 11:37:08 -05:00
Matthew Kienow
e4cc2a565a
Correct services cmd help message for protocol
2018-03-13 16:09:35 -04:00
James Barnett
2e287135c4
Fix bug in services search
2018-03-12 16:37:16 -05:00
James Barnett
b18ed03407
Merge branch 'goliath' into MS-2909
2018-03-07 14:55:50 -06:00
James Barnett
c670748fe3
Update services signature
2018-03-07 13:59:09 -06:00