Commit Graph

16492 Commits

Author SHA1 Message Date
Green-m 6c1a28d2d6 Add multiple commands' tabs and help 2018-07-26 05:25:38 -04:00
Green-m 6a0534de14 Update splitkey method to match better on windows 2018-07-26 05:23:27 -04:00
Green-m 746b63f76a Add method to glob the given filename. 2018-07-26 05:21:12 -04:00
William Vu 8e6a1d203b Futureproof FingerprintCheck until we delete it 2018-07-25 21:39:02 -05:00
William Vu 4e46ebdb9c Call check_simple when RHOSTS is a single host 2018-07-25 21:27:20 -05:00
William Vu 25ef422168 Handle connection errors and fail_with in check
Also fix FingerprintCheck to tell us when it doesn't receive a response.
2018-07-25 21:11:40 -05:00
Brent Cook e78337d59a Land #10374, Net::SSH::CommandStream fixes 2018-07-25 18:21:39 -05:00
William Vu 8753c5bf62 Land #10303, HttpClient Rex::ConnectionError fix 2018-07-25 18:02:44 -05:00
Sonny Gonzalez f5ccdcfcd2 Net SSH CommandStream fixes implemented
* Net::SSH::CommandStream typos fixed
* Net::SSH::CommandStream cleanup made more robust and refactored
* require 'net/ssh/command_stream' added to various modules
2018-07-25 11:22:28 -05:00
Wei Chen 625ea87ea9 Land #10368, PhpMyAdmin Login Scanner Module 2018-07-24 23:25:27 -05:00
Erin Bleiweiss 9205159e7d update console help documentation 2018-07-24 16:43:30 -05:00
Erin Bleiweiss e6e06fea84 update rank param to accept descriptive names 2018-07-24 16:43:16 -05:00
Erin Bleiweiss 87434ef22d pull changes 2018-07-24 15:42:31 -05:00
James Barnett 503a2276f2 Convert creds to use new format 2018-07-24 15:25:48 -05:00
Erin Bleiweiss ffe4dbcc19 refactor out of db_manager and into web_services 2018-07-24 15:25:23 -05:00
Jeffrey Martin 6d878a9bb6 Land #10367, Pass a framework instance to external module shims 2018-07-24 15:22:47 -05:00
Adam Cammack de52e8c631 Update Rspec expected thread count
External modules start threads during the test run, so the thread
manager is always running by the end in addition to the main VM thread.
2018-07-24 15:14:47 -05:00
Shelby Pace 4f81fcdc87 retn versions in chk_setup, tests to reflect, doc 2018-07-24 14:51:00 -05:00
James Barnett eccd223a3e Merge branch 'master' into conform_to_api_standards 2018-07-24 12:11:14 -05:00
Adam Cammack 230e36f5f0 Pass the framework instance to exec module shims 2018-07-24 12:02:54 -05:00
Shelby Pace 976a3464e1 added phpmyadmin login scanner and aux module 2018-07-24 09:47:01 -05:00
James Barnett 2242cb590d Fix name in credential_data_service 2018-07-23 17:26:12 -05:00
James Barnett e3da0a6828 Merge branch 'master' into remote_creds_data 2018-07-23 16:39:13 -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
James Barnett 862f918d49 Fix bug when updating Core subobjects 2018-07-23 16:21:30 -05:00
William Vu 87f9d3bd23 Land #10345, OptionParser for console grep 2018-07-23 16:00:18 -05:00
James Barnett 351c2319a8 Fix issues with creds filter by IP 2018-07-23 14:53:09 -05:00
Wei Chen dc43cc78b0 Land #10341, Add check method Boolean to module cache and info and search commands 2018-07-23 14:45:28 -05:00
William Vu 654cbd198a Fix missing method when check is run
Oops, lost the "mod" when I refactored into ternary. Caught during
verification with @wchen-r7. :D
2018-07-23 14:19:48 -05:00
James Barnett 08c0463e41 Cleanup creds options 2018-07-20 16:35:55 -05:00
James Barnett b250c4e3f4 Honor realm in creds -S 2018-07-20 16:30:17 -05:00
James Barnett 08e1941e9b Remove unsupported syntax from creds help 2018-07-20 15:54:57 -05:00
William Vu 58ad718a7d Display check support in module search 2018-07-20 14:10:44 -05:00
James Barnett c7ea24e856 Pass symbols for credential types 2018-07-20 13:17:57 -05:00
Erin Bleiweiss 6c7650eec3 add call to warden.authenticate! 2018-07-20 10:34:07 -05:00
Shelby Pace c11d404ae0 successfully works on v4.8.1 2018-07-20 09:13:51 -05:00
bwatters-r7 658267849b deconflict the method names in mix-ins 2018-07-19 17:01:40 -05:00
James Barnett 65d42380d3 Merge branch 'master' into remote_creds_data 2018-07-19 16:25:06 -05:00
James Barnett a8e5308fd3 WIP: Convert each endpoint to use the correct JSON format 2018-07-19 16:20:35 -05:00
Erin Bleiweiss 2cd5c11342 remove unnecessary whitespace 2018-07-19 15:56:04 -05:00
Jacob Robles 9327d75ceb Land #10343, Add decryption and decoding support for Metasploit C compiler 2018-07-19 14:57:43 -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
Adam Cammack ef264e78f0 Refactor grep command to use optparse
This is an experiment to see what it would take to convert *all* option
assignment, parsing, and validation to use Ruby's builtin optparse. Our
current situation in the command dispatchers is a mishmash of bespoke
and Rex code, both with odd behaviors. Modules use a more formalized
system, but it is also a bit janky and unlike most other tools a
pentester might use.

The first step is to refactor the console commands to use Ruby's builtin
option parsing to reduce code and increase homogeneity among the various
functions. Next we plan to explore what it would take to invoke modules
from within Metasploit this way (this would be Metasploit 5+ only).

Refactoring `grep` seems to have been a success. There is now less code;
the code that declares and handles the options are now in the same
place; long options are now supported; adjacent, argument-less short
opts now work as expected; patterns can now begin with a `-`; and option
arguments are now validated. Additionally, optparse's argument
coercion/validation code can be extended for custom types/validations to
support more specialized commands.
2018-07-19 12:11:09 -05:00
James Barnett 59962c5273 Merge branch 'master' into conform_to_api_standards 2018-07-19 09:26:17 -05:00