Commit Graph

14637 Commits

Author SHA1 Message Date
Erin Bleiweiss ffe4dbcc19 refactor out of db_manager and into web_services 2018-07-24 15:25:23 -05:00
Erin Bleiweiss 2215cab7df refactor search to work with existing console search function, and expand console keyword options 2018-07-23 16:37:11 -05:00
Erin Bleiweiss 6c7650eec3 add call to warden.authenticate! 2018-07-20 10:34:07 -05:00
Erin Bleiweiss 2cd5c11342 remove unnecessary whitespace 2018-07-19 15:56:04 -05:00
Erin Bleiweiss ad2bd35858 add a requirement that there must be at least one search parameter 2018-07-19 14:56:51 -05:00
Erin Bleiweiss 04a6cf8f0a pull latest changes and re-register module servlet in new sinatra base 2018-07-19 14:42:39 -05:00
Erin Bleiweiss 77fbd4b443 strip whitespace from field params 2018-07-19 14:34:47 -05:00
Erin Bleiweiss ce7eb9f3fe add list of valid fields to documenation and update aliases 2018-07-19 14:31:46 -05:00
Erin Bleiweiss 7dc37c8c79 add aliases to prevent ambiguity with plurals 2018-07-19 14:24:12 -05:00
Erin Bleiweiss 3d58ec3a53 add aliases for field keywords 2018-07-19 14:23:47 -05:00
Erin Bleiweiss dd4279fc2a add more robust searching to reflect all metadata values 2018-07-19 13:07:16 -05:00
Brent Cook 08290b81c0 Land #10282, Add support for running external modules outside of msfconsole 2018-07-18 17:38:40 -05:00
Erin Bleiweiss 8010c58220 add module documentation to swagger (WIP) 2018-07-18 17:36:31 -05:00
James Barnett 612959d9ab Land #10323, add authentication to REST API 2018-07-18 17:29:22 -05:00
Matthew Kienow ee6de3da39 Make endpoint plural and uniform with the others 2018-07-18 17:35:47 -04:00
Erin Bleiweiss 93ce09cbd2 indicate private methods 2018-07-18 15:55:25 -05:00
Erin Bleiweiss 6955a9a58b filter search result using comma delimited fields 2018-07-18 15:52:47 -05:00
Erin Bleiweiss 389b015047 fix typo (reference -> references) 2018-07-18 15:10:11 -05:00
Matthew Kienow 257a05d5d7 Add long port option for data_services cmd 2018-07-18 14:29:32 -04:00
Matthew Kienow 3147b8307b Fix issue when adding authenticated data service
Add authentication to MsfServlet as a simple workaround to an issue
that occurs when data_services cmd is used to add a remote service
that requires an API token and no token or an invalid token are
provided.
2018-07-18 14:08:30 -04:00
Matthew Kienow 4ff39e3799 Fix error code returned by authentication failure
Previously an authentication failure message would indicate that the
error was permissions related yet the error code remained 401. The fix
allows the Authentication::Strategies classes to specify an error code
that is returned to the user.
2018-07-18 14:04:09 -04:00
Erin Bleiweiss a2da40a104 refactor endpoint under /v1/modules/ 2018-07-18 12:06:25 -05:00
Erin Bleiweiss 64fff449f8 refactor platform/target search 2018-07-18 10:59:46 -05:00
William Vu 9d2bed2596 Fix grep's prompt rewriting
Missed in #9261.
2018-07-17 21:08:21 -05:00
William Vu 94297de256 Add grep -C to msfconsole 2018-07-17 20:52:46 -05:00
William Vu 38daeb1b9f Fix #10283, SOUNDTRACK and LOGO refs
Some dupe code came in from master. Fixing and refactoring.
2018-07-17 19:36:35 -05:00
William Vu 6a38b36a45 Land #10283, SOUNDTRACK and LOGO refs
:'(
2018-07-17 19:11:52 -05:00
William Vu 07203dccc6 Clean up some things 2018-07-17 19:11:26 -05:00
Erin Bleiweiss ad74ab7cf9 proof of concept searching with query params 2018-07-17 17:29:12 -05:00
William Vu 39e381049a Remove unnecessary include 2018-07-17 15:36:23 -05:00
William Vu 59278aef99 Add command dispatcher for developer commands 2018-07-17 15:07:50 -05:00
William Vu 7adc178345 Land #10309, PID check for self-migrate 2018-07-17 14:33:32 -05:00
William Vu 29f05339a9 Clean up code 2018-07-17 14:33:10 -05:00
Matthew Kienow 5d048a6eb2 Use a class variable for auth initialized flag 2018-07-16 18:22:47 -04:00
Matthew Kienow 65c290fa39 Make API token optional on data_services cmd 2018-07-16 16:44:44 -04:00
James Barnett d5814ae9f6 Use the unpkg hosted versions of SwaggerUI 2018-07-16 15:16:27 -05:00
Matthew Kienow 70104ab25e Rename request env variables to conform with Rack 2018-07-16 15:04:05 -04:00
Matthew Kienow f7a4c577d6 Add UserServlet and admin_api scope 2018-07-16 12:56:43 -04:00
Matthew Kienow 4680455041 Implement report_user and password hashing 2018-07-16 12:55:00 -04:00
Matthew Kienow 67721bc616 Refactor strategies to support admin token role 2018-07-16 12:51:41 -04:00
Auxilus 71e25f1494 show error if server.pid == pid
This PR adds changes to catch error when `server.pid` and `pid` are the same
2018-07-14 16:32:38 +05:30
Brent Cook 4e5ad576b2 Land #10267, defer bind payload connections until exploit has run 2018-07-13 17:35:27 -05:00
William Vu c8891206af Add vprint_status back to bind_named_pipe
I thought it was redundant with the improved handler start message, but
it broke consistency with the other print statements. Fixing.
2018-07-13 17:29:52 -05:00
William Vu 2c9d85606c Refactor and add error messages 2018-07-13 16:29:09 -05:00
Brendan Coles bf53896aa7 Rex::Compat.getenv 2018-07-14 06:24:04 +10:00
William Vu 3cec9026ae Add janky console command to display framework.log
Works best with alternate screen enabled...
2018-07-13 06:11:32 -05:00
Brendan Coles 104e4cee2e Merge branch 'master' into soundtrack_logo_module_refs 2018-07-13 03:01:33 +10:00
William Vu 147f59836a Fuel the hype machine 2018-07-12 11:34:09 -05:00
Jacob Robles f30c4e0465 Land #10226, Add code randomization capabilities to Metasploit::Framework::Compiler 2018-07-12 11:20:04 -05:00
William Vu e72b873f56 Fire off bind handlers when session_created? runs
Also refactor because bind handlers don't use setup_handler.
2018-07-12 10:45:59 -05:00