028799299c
Update for style requirements.
2018-08-15 22:23:04 -04:00
c045f70e80
Emulate `prompt_yesno` semantics for UI drivers
2018-08-15 17:30:37 -05:00
a4fb33d53a
Prompt to use module when given plain module name
2018-08-15 15:58:19 -05:00
f05844d8f4
Refactor options handling and help printing
2018-08-15 11:48:03 -05:00
13326ea94b
Land #10451 , Add 'payload' to module search command help documentation
2018-08-15 11:20:13 -05:00
1a4c04cae6
Merge branch 'master' into consolidate_db_connect_data_services
2018-08-14 15:20:56 -05:00
97b6425315
Make persist list go all in on the JSON format.
2018-08-14 06:39:56 -04:00
2394e92c1c
Go all in with JSON format, rename var to get more readable.
2018-08-14 06:37:08 -04:00
b1041093f2
Add payload to cmd_search_help type
2018-08-13 11:55:56 +05:30
f6c28106b9
Merge remote-tracking branch 'upstream/master' into add-resource-meta-shell-command
2018-08-09 16:20:26 +08:00
c8dc5967d2
Remove data_services commands
...
db_connect is now the preferred method of connecting
2018-08-08 17:47:17 -05:00
d7dcdce7a8
Add more information when already connected to a db
2018-08-08 13:32:25 -05:00
cfe1ea86fb
Only allow one http connection at a time
2018-08-08 13:20:46 -05:00
89a3a265d2
Move the built-in irb command while we're at it
2018-08-07 21:32:30 -05:00
68a7761f68
Move built-in pry command to developer dispatcher
...
We also fall back on prying Framework if a module isn't active.
This fixes the following bad behavior:
msf5 > pry
[*] exec: pry
And then your input gets stolen.
2018-08-07 21:17:22 -05:00
298d5c3b30
Refactor history clearing
2018-08-07 16:53:17 -05:00
6eda1b2dfa
Revert deletion of history clearing
...
ef487f6be5
2018-08-07 14:06:52 -05:00
387d784ddc
Implement db_disconnect for remote data service
...
And a couple of fixes for db_connect for remote data services
2018-08-07 14:03:38 -05:00
3caa3057d8
Process persistent job when msf start.
2018-08-07 05:41:47 -04:00
2dee2cf038
Update command job to support for persistent job when msf restart.
2018-08-07 05:40:35 -04:00
f6d9cde7c4
Revert history -u deduplication on print
2018-08-05 14:28:15 -05:00
ef6be1980f
Fix use -h to call cmd_use_help
...
It really shouldn't try to load it as a module.
2018-08-04 15:34:26 -05:00
df607ddd16
Enable connecting to remote data services with db_connect
2018-08-03 13:38:02 -05:00
37f70343e3
Get payload options to work (show, set, etc)
2018-08-03 11:47:43 -05:00
f176dd03b5
Add a new module type to support evasion (WIP)
2018-08-02 11:54:38 -05:00
3e8efea57a
Merge branch 'conform_to_api_standards' into exploit-query
...
Prepare for new JSON format.
2018-07-31 14:48:37 -05:00
9d1a2e20ee
Add better error handling.
2018-07-31 13:25:49 -05:00
1d3761c9d6
Add support for 'check' metadata value
2018-07-31 12:18:09 -05:00
3291931955
Merge branch 'upstream-master' into exploit-query
2018-07-31 11:51:14 -05:00
db91c7f075
Add error message to console if invalid params are supplied
2018-07-31 11:49:09 -05:00
21afd0572c
use %w to replace [] for string arrays, more readable.
2018-07-30 22:47:59 -04:00
d1f09ca81c
Add path selection for GET requests
...
Also remove instances where workspace is passed for
single object lookups since it is no longer required
2018-07-30 13:56:34 -05:00
c90b03808a
Merge remote-tracking branch 'upstream/master' into add-resource-meta-shell-command
2018-07-30 13:25:26 +08:00
3e41db6994
refactor for more dry, more compartmentalized code
2018-07-27 16:00:19 -05:00
4e46ebdb9c
Call check_simple when RHOSTS is a single host
2018-07-25 21:27:20 -05:00
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
9205159e7d
update console help documentation
2018-07-24 16:43:30 -05:00
e3da0a6828
Merge branch 'master' into remote_creds_data
2018-07-23 16:39:13 -05:00
87f9d3bd23
Land #10345 , OptionParser for console grep
2018-07-23 16:00:18 -05:00
351c2319a8
Fix issues with creds filter by IP
2018-07-23 14:53:09 -05:00
dc43cc78b0
Land #10341 , Add check method Boolean to module cache and info and search commands
2018-07-23 14:45:28 -05:00
08c0463e41
Cleanup creds options
2018-07-20 16:35:55 -05:00
b250c4e3f4
Honor realm in creds -S
2018-07-20 16:30:17 -05:00
08e1941e9b
Remove unsupported syntax from creds help
2018-07-20 15:54:57 -05:00
58ad718a7d
Display check support in module search
2018-07-20 14:10:44 -05:00
65d42380d3
Merge branch 'master' into remote_creds_data
2018-07-19 16:25:06 -05:00
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
612959d9ab
Land #10323 , add authentication to REST API
2018-07-18 17:29:22 -05:00
257a05d5d7
Add long port option for data_services cmd
2018-07-18 14:29:32 -04:00
9d2bed2596
Fix grep's prompt rewriting
...
Missed in #9261 .
2018-07-17 21:08:21 -05:00
94297de256
Add grep -C to msfconsole
2018-07-17 20:52:46 -05:00
39e381049a
Remove unnecessary include
2018-07-17 15:36:23 -05:00
59278aef99
Add command dispatcher for developer commands
2018-07-17 15:07:50 -05:00
dc4e438c04
Add multiple commands' tabs
2018-07-17 06:27:51 -04:00
65c290fa39
Make API token optional on data_services cmd
2018-07-16 16:44:44 -04:00
2c9d85606c
Refactor and add error messages
2018-07-13 16:29:09 -05:00
3cec9026ae
Add janky console command to display framework.log
...
Works best with alternate screen enabled...
2018-07-13 06:11:32 -05:00
bbc16e1873
Merge branch 'master' into remote_creds_data
2018-07-09 09:49:14 -05:00
85bfca95fd
[+] Fixed meterpreter resource bug
2018-07-09 11:27:30 +08:00
ef78d70a00
Land #9356 . Remove ring buffers from command dispatcher.
2018-07-06 13:12:13 -05:00
77a0b74f76
Add delete option to data_services cmd
2018-07-05 16:40:55 -04:00
514c0c76d5
Add API token to RemoteHTTPDataService
2018-07-02 18:34:35 -04:00
bd7974df98
Land #8999 , make generate and msfvenom great again
2018-06-27 15:10:52 -05:00
9806ee327a
Fix error when load options from persist file.
2018-06-25 05:50:06 -04:00
0145744255
Process persistent job when msf start.
2018-06-25 05:32:17 -04:00
2802f17cd5
Add command persist to make job persistent after msf restart.
2018-06-25 05:30:49 -04:00
2ded48a510
Merge branch 'master' into remote_creds_data
2018-06-15 10:26:10 -05:00
df9ddebde6
Land #10124 , Add tab completion of values in `set` command
2018-06-14 16:16:24 -05:00
f26d3ffff5
Fix bugs with adding remote creds
2018-06-12 12:00:51 -05:00
1710957d6e
Only add ports when they were specified
2018-06-08 17:16:24 -05:00
83e9af5fb5
Dont skip origin filtering if there are no login entries
2018-06-07 11:41:40 -05:00
3f5373869d
Include ports in creds opts
2018-06-07 11:12:49 -05:00
2114dfa4ff
Retrieve the service manually instead of using AR
2018-06-05 16:35:56 -05:00
64cb7dfb3c
Include origin in remote requests and display it
2018-06-05 14:59:11 -05:00
ea6540358c
Look up related service manually
2018-06-04 14:10:26 -05:00
d6eaa4a7c7
Search for creds at the query level
2018-06-01 17:00:56 -05:00
4c019062a5
Land #10095 , tilde expansion for resource command
2018-06-01 12:27:01 -05:00
71a1e2ad9c
Fix bug in function tab_complete_option
2018-06-01 04:10:32 -04:00
41de44bfdc
Make resource file checks more robust
...
Correct code style
2018-05-31 21:26:24 -04:00
706d8e5472
Add tilde expansion to resource tab completion
2018-05-31 21:09:57 -04:00
62e56ce844
Change condition-less elsif to else
2018-05-31 17:42:50 -04:00
224122f805
Land #10094 , Improve network interface support for LHOST
2018-05-29 23:07:55 -05:00
7bcf28440f
Merge branch 'local_api_docs' into remote_creds_data
2018-05-29 12:52:15 -05:00
d24607e1ea
add port to keywords
2018-05-27 22:41:34 +05:30
a595dff6a8
Add remote creds update
2018-05-25 16:02:25 -05:00
835281c7cc
Land #9979 , Add inactive list option to sessions command
2018-05-25 03:28:22 -05:00
3d6d55e087
Expand tilde in resource file pathname
2018-05-24 21:06:57 -04:00
6f1e75e097
Remove loopback restriction
...
It's occasionally useful, and we already warn when setting it.
2018-05-24 15:44:32 -05:00
a370270e19
Add tab completion for network interfaces
2018-05-24 15:30:16 -05:00
a107336ad5
Move cred delete to DBManager
2018-05-23 16:47:56 -05:00
f32020f255
include some training wheels for users
2018-05-23 13:37:53 -05:00
c9dad7d7c4
unify api usage
2018-05-23 12:12:27 -05:00
c8b54cef22
add inline datastore parsing to aux/post modules
2018-05-23 12:12:27 -05:00
fbbfa0e0c3
teach exploit how to parse datastore options too
2018-05-23 12:12:27 -05:00
d8e5cc60bb
add inline datastore setting for msfvenom/generate commands
2018-05-23 11:48:11 -05:00
c52e96bfa7
swizzle parameters in generate to match msfvenom
2018-05-23 11:48:11 -05:00
0472b9df3f
Land #10024 , Fix find_or_create_* methods for remote data service
...
This PR updates the find_or_create_* methods associated with each model to
no longer just proxy to the report_* model. It now performs a lookup through
the DataProxy and returns the found object if it exists, or creates a new
record if needed.
2018-05-22 17:08:46 -05:00
4ecc1ff551
Modify loots, notes and services search methods
...
Modify loots and services method signatures. Remove workspace as a
positional argument, move into opts hash argument and update callers.
Made host search for these models more uniform. Update find_or_create
methods to handle difference in opts between find and report
operations.
2018-05-21 17:37:51 -04:00
7e34f27004
Land #9246 , Support RHOSTS for exploit modules
2018-05-16 14:40:25 -05:00
30dcb78eb5
Land #10042 , reload_lib improvements
2018-05-16 12:53:39 -05:00
365289b19e
Add janky regex check if we're reloading a module
2018-05-16 12:03:54 -05:00
5addc54b4b
Refactor reload_lib and add multiple file support
2018-05-16 11:23:16 -05:00
54908021aa
Update CommandDispatcher for target names, too
2018-05-16 10:39:22 -05:00
b79b53c438
Land #9962 , tab-complete target options
2018-05-15 16:41:55 -05:00
b3a1f2531b
Update to use new hosts DataProxy method signature
2018-05-14 17:38:49 -04:00
cd38f56924
Add sessions cmd option to list inactive sessions
2018-05-05 00:42:22 -04:00
8881d32a45
Add target selection and tab completion by name
2018-05-03 21:03:05 -05:00
038fe03777
Merge branch 'master' into ms-2962
2018-05-02 15:31:57 -05:00
cb8131ab22
Validate search cmd arguments
2018-04-30 00:02:03 -04:00
89d86b1f48
Remove code related to unused search cmd options
2018-04-29 23:16:30 -04:00
ca7b10af39
Add search cmd option to write CSV output file
2018-04-29 23:08:24 -04:00
516b61ebaa
Merged master
2018-04-26 16:02:56 -05:00
c79e39377e
Narrow rescue scope to StandardError
2018-04-26 14:55:41 -04:00
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
071a191055
Merge master + workspace removal from http remote data service
2018-04-25 13:39:46 -05:00
359ef27834
Narrow rescue scope to StandardError
2018-04-24 17:19:54 -04:00
a1027d56c9
Land #9912 , Fix type validation in the notes add operation
2018-04-23 16:58:13 -05:00
ec1294d3f6
Land #9858 , fix error handling in cmd_route
...
Land #9858
2018-04-23 08:46:38 -05:00
b20042abbd
Fix indent and add elog
2018-04-23 08:45:34 -05:00
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
988063d377
Dont set default workspace if theres no DB
2018-04-21 10:26:17 -05:00
ea79c65b8e
Handle workspace delete if target does not exist
2018-04-20 11:33:35 -05:00
8d09f23b91
Fixes around workspace messaging
2018-04-20 11:25:24 -05:00
7e971721f0
Adjust messaging when renaming workspaces
2018-04-19 11:52:30 -05:00
348eb293d0
Handle case when renaming nonexistant workspace
2018-04-18 13:02:31 -05:00
81d00fa5b7
Fix edge cases in workspace update
2018-04-18 12:56:38 -05:00
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
b569498250
Address more code review comments
2018-04-17 10:52:56 -05:00
a8a95a03a3
Implement remote workspace delete
2018-04-17 10:19:40 -05:00
f27490dc61
Address PR suggestions and add comments
2018-04-16 16:45:23 -05:00
68ad91763a
Merge branch 'rapid7/master' into MS-3062_workspaces
2018-04-16 15:33:59 -05:00
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
74cb9c38b2
Change source for host address value in output
2018-04-16 14:09:19 -04:00
d2a683d2df
Add whitespace and update help
2018-04-12 15:39:04 -05:00
0b3f50ea80
show help when no arguments provided to `search`
2018-04-13 01:27:22 +05:30
4e49b99783
Add cmd notes option to sort by column number
2018-04-12 15:56:42 -04:00
f60bbdd831
Remove cmd notes make_sortable helper method
2018-04-12 10:51:03 -04:00
087ae447c5
Remove cmd notes sort operation
2018-04-11 17:46:13 -04:00
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
e639fda53c
Fix DB initialization with no database YAML
2018-04-11 09:15:38 -04:00
e51f41fa34
Merge remote-tracking branch 'msf_jbarnett/fix_services_bugs' into MS-3062_workspaces
2018-04-10 13:35:33 -05:00
f1240b0454
resolves #9855
2018-04-10 22:20:27 +05:30
462db05f4c
Re-enable port search functionality
2018-04-10 11:10:32 -05:00
924a336287
Fix unsupported check_simple method for modules
2018-04-09 13:43:22 -05:00
730010aa06
remove RingBuffer from interactive command shells, fix token handling
2018-04-06 13:49:13 -05:00
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
b0123b2095
Land #9787 , Fix adding IPv6 routes with subnets or CIDR masks
2018-04-02 22:57:15 -05:00
e892911fbe
Use a constant for default workspace name
2018-04-02 17:02:14 -05:00
f386ae0ba3
Land #9731 , tool updates
2018-04-01 23:26:42 -05:00
7d58b0a5f4
Merge branch 'goliath' into MS-3062_workspaces
2018-03-30 16:35:26 -05:00
c8033d69c5
Use the new keyword style for v6
2018-03-30 13:56:15 -04:00
bb17bdb6dd
Fix adding IPv6 routes with subnets or cidr masks
2018-03-30 13:18:03 -04:00
f10924a5c0
Update cmd note operations, validation and output
2018-03-29 23:15:10 -04:00
d23e33a7bc
Make workspace -v work with updates
2018-03-28 13:31:49 -05:00
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
e761d211b9
Land #9708 , reload_lib command for msfconsole
2018-03-26 17:10:11 -05:00
cfa03a999c
Finish moving current_workspace tracking to client
2018-03-26 15:58:47 -05:00
991f4e35ea
Remove added regex options from search_term
2018-03-26 14:07:21 -04:00
d0ef5617fa
Merge master and resolve conflict
2018-03-23 14:25:21 -07:00
def0e4d93b
Merge branch 'goliath' into MS-3062_workspaces
2018-03-23 11:37:01 -05:00
6c5a7a663a
Merge branch 'goliath' into MS-2879_db_export
2018-03-22 21:22:23 -05:00
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
a1287a0776
Remove blank before services output
2018-03-22 18:26:50 -07:00
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
975948439d
Make vulns cmd option string literals consistent
2018-03-21 16:35:06 -04:00
09bea3ec39
Remove vulns cmd help short-circuit
2018-03-21 16:34:11 -04:00
553789557b
Merge branch 'goliath' into MS-2910-remote-vuln-read-update-delete
2018-03-21 01:45:58 -04:00
973d00aca0
Add a message about DisablePayloadHandler
...
Based on 26bf96b3ce/lib/msf/core/exploit/exe.rb (L43)
2018-03-20 13:04:41 +00:00
8463ed99b0
Add standardised header comments
2018-03-20 11:33:34 +00:00
90bebc2096
Convert workspace update to new api
2018-03-19 14:24:16 -05:00
cd7ecc4b74
Display vulns information column based on option
2018-03-19 14:29:38 -04:00
35bc8e905e
Refactor workspace delete to be consistent with other commands
2018-03-16 16:11:09 -05:00
ac5669388a
Merge branch 'goliath' into MS-2879_db_export
2018-03-14 11:37:08 -05:00
6811097bed
Create reload_file method for edit and reload_lib cms
2018-03-14 11:47:23 +03:00
e4cc2a565a
Correct services cmd help message for protocol
2018-03-13 16:09:35 -04:00
9b84477ddc
Changing cmd name to reload_lib
2018-03-13 22:17:59 +03:00
b7f95b9cbe
Add a loadlib command
2018-03-13 14:03:44 +03:00
2e287135c4
Fix bug in services search
2018-03-12 16:37:16 -05:00
3f3ed4aa70
change replicant to clone module objects to copy singleton methods
...
Without this, we are missing methods like exploit_simple.
https://coderwall.com/p/1zflyg/ruby-the-differences-between-dup-clone
2018-03-12 15:46:03 -05:00
db6377134e
restore original module RHOST on abort
2018-03-12 15:46:03 -05:00
5d9f2266da
handle passive exploits without RHOST
2018-03-12 15:46:03 -05:00
4f824af696
add support for '-J' which is the opposite of '-j'
2018-03-12 15:46:03 -05:00
17c8f7c4c7
support iterating across RHOSTS for exploits
2018-03-12 15:46:03 -05:00
4ab36bc713
factor out exploit runner from command parsing
2018-03-12 15:46:02 -05:00
b456cd2c8c
use RHOSTS in many places where we used RHOST
2018-03-12 15:46:02 -05:00
b18ed03407
Merge branch 'goliath' into MS-2909
2018-03-07 14:55:50 -06:00
c670748fe3
Update services signature
2018-03-07 13:59:09 -06:00
c058d0fba0
WIP: port db_export command
2018-03-06 15:15:27 -06:00
68d72cbfa7
Goliath Cleanup in preparation for merge to master
2018-03-06 10:21:22 -06:00
fd4032928e
Add services search
2018-03-02 10:57:35 -06:00
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
dffbc67e71
Implement service delete
...
Also fix bug searching for services by host address
2018-02-27 17:17:07 -06:00
c90fabee60
Implement remote service create
2018-02-27 14:20:43 -06:00
ecad74cf99
Add cmd_vulns search and delete operations
2018-02-22 19:05:18 -05:00
d4440d049d
Merge branch 'goliath' of github.com:clee-r7/metasploit-framework into goliath
2018-02-21 11:16:31 -06:00
3005a8b7ce
Merge branch 'rapid7/master' into goliath
2018-02-21 11:16:05 -06:00
6734e532f5
Land #9562 , avoid an error with aux module command dispatcher
2018-02-15 17:46:58 -06:00
a197997aca
avoid chinese finger trap logic, put it all on one side
2018-02-15 17:45:09 -06:00
177e1321ae
Aux command dispatcher in exploit ctx with action
...
The Auxiliary command dispatcher checks modules for passive actions
expecting them to have included Msf::Module::HasActions mixin. The
mixin is included in post and aux modules already, but not in
exploits. When the aux dispatcher handles an exploit module, it
may get upset along the lines of:
```
[-] Error while running command exploit: undefined method 'passive'
for #<Msf::Modules::M...3::MetasploitModule:0x0000000d83de0428>
Did you mean? passive?
Call stack:
/opt/metasploit4/msf4/lib/msf/ui/console/command_dispatcher/
auxiliary.rb:106:in `cmd_run'
```
Avoid this mess by having the conditional which checks the methods
included by that mixin depend on the module having included the
mixin in the first place.
Testing:
In local fork (hence the lineno) it seems to fix the problem.
The problem condition and fix should be independently tested
upstream.
2018-02-15 04:20:09 -05:00
b9faa9e92b
Fix a typo
2018-02-09 20:28:55 -06:00
Green-m
Adam Cammack
James Barnett
Erin Bleiweiss
Auxilus
Wang Yihang
William Vu
Wei Chen
Matthew Kienow
WangYihang
asoto-r7
Brent Cook
Brent Cook
bwatters-r7
christopher lee
Spencer McIntyre
Jon Hart
g0tmi1k
Mehmet İnce
RageLtMan