christopher lee
038fe03777
Merge branch 'master' into ms-2962
2018-05-02 15:31:57 -05:00
christopher lee
41307e62f8
remove puts
2018-04-27 15:50:21 -05:00
christopher lee
0a73a5007c
Removed duplicated online test
2018-04-27 09:37:17 -05:00
christopher lee
9c7db375bf
Fix broken tests after latest merge with master
2018-04-26 16:39:56 -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
christopher lee
071a191055
Merge master + workspace removal from http remote data service
2018-04-25 13:39:46 -05:00
Matthew Kienow
0d284197cb
Add MsfServlet to host endpoint for online check
2018-04-24 15:01:17 -04:00
James Barnett
31be847213
Add workspace when reporting vuln_attempt
2018-04-19 11:09:13 -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
christopher lee
3aed6d6666
Initial
2018-04-02 08:08:23 -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
def0e4d93b
Merge branch 'goliath' into MS-3062_workspaces
2018-03-23 11:37:01 -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
James Barnett
f6fddb3113
Fix indent
2018-03-21 17:16:44 -05:00
Matthew Kienow
8d660084fc
Omit parentheses for no argument get_db calls
2018-03-21 18:03:27 -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
James Barnett
8ddaae5fe4
Remove unused code
2018-03-15 12:12:12 -05:00
Matthew Kienow
334da2477c
Get first Vuln record
2018-03-14 18:49:49 -04:00
James Barnett
100a64ae6c
Fix bug when saving to path that doesnt exist
2018-03-14 16:43:04 -05:00
James Barnett
b179603b4a
Externalize db_export command
2018-03-14 15:06:28 -05:00
James Barnett
ac5669388a
Merge branch 'goliath' into MS-2879_db_export
2018-03-14 11:37:08 -05:00
James Barnett
9099ef0bf1
Enable exec_report_job to handle includes
2018-03-13 11:34:44 -05:00
Matthew Kienow
636284d530
Update session inferred vuln handling
...
Add remote vuln attempt
2018-03-12 14:26:03 -04:00
James Barnett
c058d0fba0
WIP: port db_export command
2018-03-06 15:15:27 -06:00
James Barnett
b0012d6f36
Include hosts when returning services
2018-03-02 16:32:02 -06:00
James Barnett
06d2482e86
Implement services update
...
NOTE: This changes functionality for the services command flags.
Previously -s and -p were used for searching for services.
Now the commands will only be used for adds/updates.
If you would like to search, please use -s and pass a search string
2018-02-28 15:12:23 -06:00
James Barnett
dffbc67e71
Implement service delete
...
Also fix bug searching for services by host address
2018-02-27 17:17:07 -06:00
James Barnett
96709600e1
Condense services to use opts instead of individual params
2018-02-27 13:38:50 -06:00
James Barnett
9dc6089fcf
Merge branch 'goliath' into MS-2909
2018-02-27 11:14:15 -06:00
Matthew Kienow
22752518ea
WIP remote vuln read, update, delete
2018-02-22 13:53:22 -05:00
James Barnett
3c9092f9a6
Complete services GET
2018-02-20 14:41:49 -06:00
James Barnett
c50b8b5c4f
Store loot data as-is, not base64
2018-02-08 18:15:31 -06:00
James Barnett
bbd25fc97b
WIP: getting services add working
2018-02-08 17:20:50 -06:00
James Barnett
f114092445
Merge branch 'goliath' into MS-2833
2018-02-08 14:32:03 -06:00
jbarnett-r7
352cf295b5
Merge branch 'goliath' into MS-2833
2018-02-07 14:38:26 -06:00
Matthew Kienow
52b8f405bd
Refactor change host methods, remove debug output
2018-02-06 18:54:05 -05:00
James Barnett
5bc38206c0
Few more loot bugs
2018-02-06 17:22:09 -06:00
James Barnett
0dfc10b1ec
Fix a couple of bugs in loot servlet
2018-02-06 17:02:17 -06:00
James Barnett
6e2503bbd8
Add loot update
2018-02-06 16:16:22 -06:00
Matthew Kienow
629f79ebf7
WIP remote host update
2018-02-06 16:11:46 -05:00
James Barnett
49b88dbef7
Pass loot search using query string
2018-02-05 18:15:05 -06:00
jbarnett-r7
f176e339bc
Merge pull request #12 from clee-r7/ms-2911
...
Ms 2911
2018-02-05 15:46:28 -06:00