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
4c92de0b55
Refactor logic for determining single object output.
...
Also add restrictions on passing id as a query string param
2018-07-30 11:42:45 -05:00
c90b03808a
Merge remote-tracking branch 'upstream/master' into add-resource-meta-shell-command
2018-07-30 13:25:26 +08:00
b2eb5edf37
[+] Fix bug in pull 10220
2018-07-30 13:21:26 +08:00
9cd99cbc17
Fix error when id param is present in GET request
2018-07-28 22:55:03 -05:00
9e08bf6ec2
Fix logic issue when processing HTTP requests
2018-07-28 15:23:56 -05:00
37706e094d
Dont wrap object in array when using ID parameter
2018-07-27 16:41:11 -05:00
829b43f743
Address minor code review comments
2018-07-27 16:19:17 -05:00
d4b5e27edc
remove whitespace
2018-07-27 16:03:16 -05:00
57c9a3544a
delete unnecessary proxy files
2018-07-27 16:01:45 -05:00
3e41db6994
refactor for more dry, more compartmentalized code
2018-07-27 16:00:19 -05:00
4ac11d4e70
parameter validation
2018-07-27 15:15:49 -05:00
3411d0bce2
Refactor error JSON responses to use a helper method
2018-07-27 13:59:17 -05:00
7cfc2b44ec
allow rank search with numeric value only
2018-07-27 13:30:29 -05:00
15fe80de06
Merge branch 'master' into conform_to_api_standards
2018-07-27 11:08:18 -05:00
df159e957d
condense logic for matching rank names to numeric value
2018-07-27 11:02:25 -05:00
c76f141a49
replace magic numbers with constants
2018-07-27 10:42:57 -05:00
06c98a0772
ignore extraneous/invalid keywords
2018-07-27 10:33:47 -05:00
44239b7005
remove debug line
2018-07-27 10:28:31 -05:00
6181253109
fix multi connect bug
2018-07-26 17:34:11 -06:00
129b3ec2b5
rename single-letter variables to be more descriptive
2018-07-26 17:35:26 -05:00
23c0f70c68
update multi-line block syntax
2018-07-26 17:24:04 -05:00
7e81e81965
call 'except' without duplicating variable
2018-07-26 17:22:15 -05:00
9f5f2ffeab
remove extraneous newlines
2018-07-26 17:19:18 -05:00
2572a297a2
clean up parameter delcarations in docs and rename doc files to module_search
2018-07-26 11:43:55 -05:00
5c9f002a72
Make hash definitions more consistent
2018-07-26 10:40:58 -05:00
3f8906596d
Fix issue 10372, match mutiple slashes better
2018-07-26 05:35:04 -04:00
63ed4b2173
Add uictl tabs
2018-07-26 05:33:40 -04:00
2dbbd0c649
Add multiple commands' tabs and help
2018-07-26 05:32:57 -04:00
4060492bfc
Add multiple commands' tabs and help
2018-07-26 05:27:47 -04:00
3852265d9f
Add multiple commands' tabs and help
2018-07-26 05:26:30 -04:00
6c1a28d2d6
Add multiple commands' tabs and help
2018-07-26 05:25:38 -04:00
6a0534de14
Update splitkey method to match better on windows
2018-07-26 05:23:27 -04:00
746b63f76a
Add method to glob the given filename.
2018-07-26 05:21:12 -04:00
8e6a1d203b
Futureproof FingerprintCheck until we delete it
2018-07-25 21:39:02 -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
e78337d59a
Land #10374 , Net::SSH::CommandStream fixes
2018-07-25 18:21:39 -05:00
8753c5bf62
Land #10303 , HttpClient Rex::ConnectionError fix
2018-07-25 18:02:44 -05:00
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
625ea87ea9
Land #10368 , PhpMyAdmin Login Scanner Module
2018-07-24 23:25:27 -05:00
9205159e7d
update console help documentation
2018-07-24 16:43:30 -05:00
e6e06fea84
update rank param to accept descriptive names
2018-07-24 16:43:16 -05:00
87434ef22d
pull changes
2018-07-24 15:42:31 -05:00
503a2276f2
Convert creds to use new format
2018-07-24 15:25:48 -05:00
ffe4dbcc19
refactor out of db_manager and into web_services
2018-07-24 15:25:23 -05:00
6d878a9bb6
Land #10367 , Pass a framework instance to external module shims
2018-07-24 15:22:47 -05:00
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
4f81fcdc87
retn versions in chk_setup, tests to reflect, doc
2018-07-24 14:51:00 -05:00
eccd223a3e
Merge branch 'master' into conform_to_api_standards
2018-07-24 12:11:14 -05:00
230e36f5f0
Pass the framework instance to exec module shims
2018-07-24 12:02:54 -05:00
976a3464e1
added phpmyadmin login scanner and aux module
2018-07-24 09:47:01 -05:00
2242cb590d
Fix name in credential_data_service
2018-07-23 17:26:12 -05:00
e3da0a6828
Merge branch 'master' into remote_creds_data
2018-07-23 16:39:13 -05:00
2215cab7df
refactor search to work with existing console search function, and expand console keyword options
2018-07-23 16:37:11 -05:00
862f918d49
Fix bug when updating Core subobjects
2018-07-23 16:21:30 -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
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
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
c7ea24e856
Pass symbols for credential types
2018-07-20 13:17:57 -05:00
6c7650eec3
add call to warden.authenticate!
2018-07-20 10:34:07 -05:00
c11d404ae0
successfully works on v4.8.1
2018-07-20 09:13:51 -05:00
658267849b
deconflict the method names in mix-ins
2018-07-19 17:01:40 -05:00
65d42380d3
Merge branch 'master' into remote_creds_data
2018-07-19 16:25:06 -05:00
a8e5308fd3
WIP: Convert each endpoint to use the correct JSON format
2018-07-19 16:20:35 -05:00
2cd5c11342
remove unnecessary whitespace
2018-07-19 15:56:04 -05:00
9327d75ceb
Land #10343 , Add decryption and decoding support for Metasploit C compiler
2018-07-19 14:57:43 -05:00
ad2bd35858
add a requirement that there must be at least one search parameter
2018-07-19 14:56:51 -05:00
04a6cf8f0a
pull latest changes and re-register module servlet in new sinatra base
2018-07-19 14:42:39 -05:00
77fbd4b443
strip whitespace from field params
2018-07-19 14:34:47 -05:00
ce7eb9f3fe
add list of valid fields to documenation and update aliases
2018-07-19 14:31:46 -05:00
7dc37c8c79
add aliases to prevent ambiguity with plurals
2018-07-19 14:24:12 -05:00
3d58ec3a53
add aliases for field keywords
2018-07-19 14:23:47 -05:00
dd4279fc2a
add more robust searching to reflect all metadata values
2018-07-19 13:07:16 -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
59962c5273
Merge branch 'master' into conform_to_api_standards
2018-07-19 09:26:17 -05:00
f2fd24780c
Add support for XOR
2018-07-18 23:13:45 -05:00
1534613cda
Add Base64 support
2018-07-18 20:07:27 -05:00
999d0e994f
Add RC4 decryption
2018-07-18 19:50:46 -05:00
08290b81c0
Land #10282 , Add support for running external modules outside of msfconsole
2018-07-18 17:38:40 -05:00
8010c58220
add module documentation to swagger (WIP)
2018-07-18 17:36:31 -05:00
612959d9ab
Land #10323 , add authentication to REST API
2018-07-18 17:29:22 -05:00
1371fc6daf
Fix regexed integer RPORT for module search
2018-07-18 17:24:05 -05:00
de23559491
Add check for check to module cache
2018-07-18 16:40:52 -05:00
ee6de3da39
Make endpoint plural and uniform with the others
2018-07-18 17:35:47 -04:00
98d6d4cbcd
Add check for check to info command
2018-07-18 16:33:30 -05:00
5fa1ddf4eb
Remove default check method
2018-07-18 16:25:46 -05:00
93ce09cbd2
indicate private methods
2018-07-18 15:55:25 -05:00
6955a9a58b
filter search result using comma delimited fields
2018-07-18 15:52:47 -05:00
4da27d2bff
Enable GET for /endpoint/ID for each model
2018-07-18 15:18:22 -05:00
389b015047
fix typo (reference -> references)
2018-07-18 15:10:11 -05:00
257a05d5d7
Add long port option for data_services cmd
2018-07-18 14:29:32 -04:00
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
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
026ddad9d8
Remove more unused code
2018-07-18 12:44:27 -05:00
08b53a1ef7
Homogenize GET requests
2018-07-18 12:43:48 -05:00
a2da40a104
refactor endpoint under /v1/modules/
2018-07-18 12:06:25 -05:00
846df018e0
Minor code cleanup. Remove unused methods
2018-07-18 11:51:43 -05:00
64fff449f8
refactor platform/target search
2018-07-18 10:59:46 -05: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
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
6a38b36a45
Land #10283 , SOUNDTRACK and LOGO refs
...
:'(
2018-07-17 19:11:52 -05:00
07203dccc6
Clean up some things
2018-07-17 19:11:26 -05:00
d5ed70417b
bind_named_pipe payload for ruby_smb
2018-07-17 17:46:10 -06:00
ad74ab7cf9
proof of concept searching with query params
2018-07-17 17:29:12 -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
7adc178345
Land #10309 , PID check for self-migrate
2018-07-17 14:33:32 -05:00
29f05339a9
Clean up code
2018-07-17 14:33:10 -05:00
00a748a92c
Add tab_complete_directory
2018-07-17 06:29:12 -04:00
dc4e438c04
Add multiple commands' tabs
2018-07-17 06:27:51 -04:00
5d048a6eb2
Use a class variable for auth initialized flag
2018-07-16 18:22:47 -04:00
65c290fa39
Make API token optional on data_services cmd
2018-07-16 16:44:44 -04:00
d5814ae9f6
Use the unpkg hosted versions of SwaggerUI
2018-07-16 15:16:27 -05:00
70104ab25e
Rename request env variables to conform with Rack
2018-07-16 15:04:05 -04:00
f7a4c577d6
Add UserServlet and admin_api scope
2018-07-16 12:56:43 -04:00
4680455041
Implement report_user and password hashing
2018-07-16 12:55:00 -04:00
67721bc616
Refactor strategies to support admin token role
2018-07-16 12:51:41 -04:00
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
4e5ad576b2
Land #10267 , defer bind payload connections until exploit has run
2018-07-13 17:35:27 -05:00
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
2c9d85606c
Refactor and add error messages
2018-07-13 16:29:09 -05:00
bf53896aa7
Rex::Compat.getenv
2018-07-14 06:24:04 +10:00
3cec9026ae
Add janky console command to display framework.log
...
Works best with alternate screen enabled...
2018-07-13 06:11:32 -05:00
f5b8b4dd7c
Update send_request_cgi/raw
2018-07-12 23:51:41 -04:00
65627e06e2
Update send_request_cgi/raw
2018-07-12 23:51:18 -04:00
104e4cee2e
Merge branch 'master' into soundtrack_logo_module_refs
2018-07-13 03:01:33 +10:00
147f59836a
Fuel the hype machine
2018-07-12 11:34:09 -05:00
f30c4e0465
Land #10226 , Add code randomization capabilities to Metasploit::Framework::Compiler
2018-07-12 11:20:04 -05:00
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
b8ae4f5d12
Update rspec tests for creds and add stubs
2018-07-11 17:42:55 -05:00
8c350cdcd7
Add protections for nil HTTP responses
2018-07-11 15:45:26 -05:00
adff986908
Land #10287 , Add advanced option to skip WP checks
2018-07-11 14:25:19 -05:00
df2f58fb08
Add WPCHECK (Bool) advanced option to Exploit::Remote::HTTP::Wordpress
2018-07-11 07:09:28 +00:00
ef55803936
[+] Update resource meta command help info
...
Signed-off-by: WangYihang <wangyihanger@gmail.com>
2018-07-11 13:07:15 +08:00
26c505e336
[+] Update resource meta command help info
...
Signed-off-by: WangYihang <wangyihanger@gmail.com>
2018-07-11 13:06:33 +08:00
e7ddb6fdf5
Add API docs for logins endpoints
2018-07-10 14:21:19 -05:00
6aa5349513
Add a link explaining the message
2018-07-10 13:25:09 -05:00
f9daabcee3
Add support for SOUNDTRACK and LOGO to module refs
2018-07-10 17:23:07 +00:00
8456c25fff
Add delete endpoint for logins
2018-07-10 11:00:08 -05:00
35f52a129c
Use create_credential when importing XML files
2018-07-10 10:37:46 -05:00
4f3cdd22f0
Allow Python modules to run independently
2018-07-10 10:24:07 -05:00
0dd89bf428
Add standalone runner for external modules
2018-07-10 10:24:07 -05:00
64c38ec6b8
Only `elog` when run inside of Framework
2018-07-10 10:24:07 -05:00
22167eba5c
Make the Python login scanner API more sane
2018-07-10 10:24:07 -05:00
1fddbdb8ef
Specify the `command` option external modules
2018-07-10 10:24:07 -05:00
95e54f497b
Be explicit when there is no CVE assigned to a vulnerability
2018-07-09 18:42:36 -05:00
d3eb71e8e5
Implement invalidate_login
2018-07-09 16:15:40 -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
8d135aec39
Implement first pass at deferred payload handling
...
This is most useful for bind payloads, and I initially did just that,
but I've migrated the code to be more generic.
2018-07-06 14:26:31 -05:00
0e75317cfe
Change a typo
2018-07-06 13:30:07 -05:00
ef78d70a00
Land #9356 . Remove ring buffers from command dispatcher.
2018-07-06 13:12:13 -05:00
a60fc3dc00
Fix code based on feedback from Jacob
2018-07-06 00:00:28 -05:00
0b9bc8c24a
Land #10241 , don't call print_error from rex context, use elog instead
2018-07-05 17:28:10 -05:00
77a0b74f76
Add delete option to data_services cmd
2018-07-05 16:40:55 -04:00
8680379875
fix logic bug in handler thread for bind_named_pipe
2018-07-05 10:39:20 -05:00
f0b9b1c113
Add more verbose printing to bind handlers
2018-07-03 19:41:08 -05:00
8a3166e198
Set a default user-agent value
2018-07-03 18:28:35 -04:00
ed34cd8898
Simplify request headers assignment
2018-07-03 17:59:57 -04:00
7dc87e1a9e
Increase read depth for smb pipes
2018-07-03 16:06:42 -05:00
514c0c76d5
Add API token to RemoteHTTPDataService
2018-07-02 18:34:35 -04:00
af43b6ca17
don't call print_error from rex context, use elog instead
2018-07-02 15:19:19 -05:00
0543dfc95c
Land #10217 , keep bind_named_pipe with SMBv1
2018-07-02 14:54:00 -05:00
85dc81a58b
Land #10185 , add SMBv1/2 support in psexec
2018-06-29 17:49:27 -05:00
3b228b0abd
avoid stack overflow on too many empty pipe reads in a row
2018-06-29 17:48:39 -05:00
2beaabb11a
Add dep for GetTickCount
2018-06-29 10:22:07 -05:00
d9b664c86a
Change option name
2018-06-29 00:07:40 -05:00
025a531f6e
Update code style
...
Signed-off-by: WangYihang <wangyihanger@gmail.com>
2018-06-29 11:15:52 +08:00
52047a6c59
Add switch_spec
2018-06-28 21:21:54 -05:00
5c86b836c4
Add rspec for outputdebugstring and correct a few things
2018-06-28 21:08:15 -05:00
5e02e7a2c8
smb_file_exist check for rubysmb
2018-06-28 18:10:39 -05:00
40ac79ced0
Land #10218 , MS17-010 Windows Embedded Standard 7
2018-06-28 16:11:56 -05:00
a8c6835c64
Handle STATUS_PIPE_EMPTY error
2018-06-28 12:15:43 -05:00
2792d5fb27
call delete implementation from ruby_smb
2018-06-28 12:15:43 -05:00
c06f13b33e
remove superfluous sleeps, simplify logic
2018-06-28 12:15:42 -05:00
4b767efd6c
remove evasion logic from dcerpc read path
2018-06-28 12:15:42 -05:00
b01bd060ee
remove unneeded slashes
2018-06-28 12:15:42 -05:00
055c90c076
fix filename randomization while debugging
2018-06-28 12:15:42 -05:00
b8094aca7a
Combine rescues
2018-06-28 07:59:40 -05:00
1699f352c1
Rescue RubySMB Error
...
Error occurs when scanning OSX SMB server.
2018-06-28 07:06:33 -05:00
9fc670f24f
Implementation of resource command
...
Signed-off-by: WangYihang <wangyihanger@gmail.com>
2018-06-28 18:11:06 +08:00
f742df028b
shitty typos
2018-06-27 20:34:01 -06:00
a5c0881c08
add Windows Embedded Standard 7 support
2018-06-27 19:17:18 -06:00
cec506421d
Add rspec fake_function_collection and update the lib
2018-06-27 18:18:05 -05:00
bbf26c66f6
bind_named_pipe fixed for simpleclient versions param
2018-06-27 16:14:53 -06:00
e17744df8d
Land #10215 , add support for payload estimation for IPv6-specific modules
2018-06-27 16:46:54 -05:00
25b9f97a32
Update cached payload size update to support IPv6
2018-06-27 16:26:41 -05:00
dbb0748c1c
Land #9998 , customizable golden ticket duration
2018-06-27 15:51:56 -05:00
bd7974df98
Land #8999 , make generate and msfvenom great again
2018-06-27 15:10:52 -05:00
dcaa623075
make random compiling work
2018-06-27 00:09:04 -05:00
823647fbe1
Add compile_random_c func && support optional func collection
2018-06-25 16:50:05 -05:00
2fd0d797ac
psexec smb2 support
2018-06-25 15:06:23 -05:00
9806ee327a
Fix error when load options from persist file.
2018-06-25 05:50:06 -04:00
James Barnett
Wang Yihang
Erin Bleiweiss
UserExistsError
Green-m
William Vu
Brent Cook
Sonny Gonzalez
Wei Chen
Jeffrey Martin
Adam Cammack
Shelby Pace
bwatters-r7
Jacob Robles
Matthew Kienow
Auxilus
Brendan Coles
WangYihang
asoto-r7
zerosum0x0