Commit Graph

44836 Commits (352cf295b599a7ac91981492c27d8c28e936f9c6)

Author SHA1 Message Date
jbarnett-r7 352cf295b5
Merge branch 'goliath' into MS-2833 2018-02-07 14:38:26 -06:00
James Barnett 5b35662dbf
Address PR comments 2018-02-07 14:21:31 -06:00
James Barnett cb093d8063
Use proper logging 2018-02-07 10:25:56 -06:00
James Barnett 74f811d865
Add TODOs 2018-02-06 17:31:42 -06: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
James Barnett 49b88dbef7
Pass loot search using query string 2018-02-05 18:15:05 -06:00
James Barnett c72c41e7f3
Move loot search to db_manager 2018-02-05 16:43:02 -06:00
jbarnett-r7 f176e339bc
Merge pull request #12 from clee-r7/ms-2911
Ms 2911
2018-02-05 15:46:28 -06:00
James Barnett 272c5bc43e
key file isnt always necessary, but cert is. 2018-02-05 15:23:00 -06:00
christopher lee 1759621b03 Make 8080 default service port 2018-02-05 15:01:03 -06:00
christopher lee 020a28f5c7 Unify data service command 2018-02-05 13:28:17 -06:00
James Barnett e8b29af208 Merge branch 'goliath' into MS-2833 2018-02-02 17:32:17 -06:00
jbarnett-r7 13aa1c682d
Merge pull request #13 from clee-r7/externalize-host-data-search
Externalize host data search
2018-02-02 17:23:10 -06:00
Matthew Kienow dcf4171cfb
Fix query array encoding issue 2018-02-02 17:16:12 -05:00
James Barnett 326fdacc41
couple of fixes
- Handle bug with hostless loot
- include host data in the JSON
2018-02-02 15:44:42 -06:00
James Barnett f52cf28e56
cmd_loot now queries on loot directly 2018-02-02 14:07:58 -06:00
Matthew Kienow 67b7af3385
Add tag conditions to host search 2018-02-02 01:33:15 -05:00
christopher lee 5a899d5126 Renamed msfdb to avoid omnibus collision, removed inline data service startup code 2018-02-01 16:28:36 -06:00
christopher lee 3bc0608579 Finish POC cleanup 2018-02-01 13:59:15 -06:00
christopher lee 59bc1a34d5 Remove 'puts' logging and cleanup AWS poc 2018-02-01 13:38:20 -06:00
James Barnett fc7ab6cbff
Merge branch 'externalize-host-data-search' into MS-2833 2018-02-01 11:24:11 -06:00
Matthew Kienow 5c38207a8e
WIP externalize host data search 2018-01-31 16:34:42 -05:00
James Barnett 3ff613db8f
"fix" adding loot from the command line 2018-01-31 10:31:09 -06:00
James Barnett e1b61b8180 Merge branch 'goliath' into MS-2833 2018-01-31 10:06:36 -06:00
jbarnett-r7 be0ca39ac3
Merge pull request #11 from clee-r7/fix-workspace-query-data-remote-http-data-service
Fix issue with workspace in query data
2018-01-25 16:48:31 -06:00
Matthew Kienow 3a01a16dcb
Fix issue with workspace in query data 2018-01-25 17:29:58 -05:00
jbarnett-r7 8e09c9d0f0
Merge pull request #10 from clee-r7/add-http-put-request
Add HTTP PUT request method
2018-01-25 10:13:42 -06:00
Matthew Kienow 4989e94e68
Add HTTP PUT request method 2018-01-25 10:40:57 -05:00
James Barnett 858981d814
Convert hosts delete to use id method 2018-01-24 17:38:51 -06:00
James Barnett 5505996518 Add loot delete 2018-01-24 16:42:16 -06:00
Matthew Kienow 89a44e869e
Land #5, Add HTTPS support 2018-01-24 00:38:53 -05:00
Matthew Kienow 2ffd627c56
Merge branch 'goliath' into add_https 2018-01-23 18:59:59 -05:00
Matthew Kienow 1c3b43b8cc
Merge pull request #7 from clee-r7/MS-2891
Land #7, fix test issues
2018-01-23 18:27:05 -05:00
James Barnett bfcb7f2e50
Add long option for cert. 2018-01-23 17:10:10 -06:00
christopher lee dd65141a22 Merge branch 'goliath' into MS-2891 2018-01-23 10:45:44 -06:00
christopher lee 802b3db766 Merge branch 'goliath' of github.com:clee-r7/metasploit-framework into goliath 2018-01-23 10:45:22 -06:00
James Barnett d10cd2d92a
Add verification methods to HTTPS
This commit enables peer verification for SSL.
It also gives the user options to verify the server if the server uses a self-signed cert.
There is an override to skip verification as well.
2018-01-22 18:08:16 -06:00
Christopher Lee 6ffae7f6ad
Merge pull request #9 from clee-r7/correct-api-url
Update API URLs
2018-01-22 15:17:09 -06:00
Christopher Lee 207adfc93d
Merge pull request #8 from clee-r7/add-query-data-remote-http-data-service
Add URI query data option to request methods
2018-01-22 15:16:54 -06:00
christopher lee 2521c941d4 Ported singleton calls 2018-01-22 14:57:28 -06:00
Matthew Kienow 2211459b9d
Correct workspace_associations_counts API path 2018-01-20 14:54:14 -05:00
Matthew Kienow b7e5b0f161
Update API URLs per design discussion 2018-01-20 14:50:59 -05:00
James Barnett 8022294d1d
Fix bug with -s flag 2018-01-19 16:18:20 -06:00
Matthew Kienow cb4999c1ac
Add URI query data option to request methods 2018-01-19 16:51:49 -05:00
James Barnett 4f3ee6dd83
Address PR comments regarding command options 2018-01-19 15:46:24 -06:00
christopher lee d5978803eb Fix all failing rspec for goliath 2018-01-19 15:16:19 -06:00
christopher lee 505f1fd547 Merge branch 'goliath' of github.com:clee-r7/metasploit-framework into goliath 2018-01-19 13:40:38 -06:00
James Barnett b8296a809c Merge branch 'goliath' into add_https 2018-01-19 13:33:24 -06:00