Commit Graph

14487 Commits (92c163cb0da9f3372e950b2d2d87bece85ccace1)

Author SHA1 Message Date
Brent Cook 9bdba7e234 s/clone/ds/g 2018-04-25 18:35:45 -05:00
Auxilus 1ecd9b822e fix whitespaces.. 2018-04-26 03:05:53 +05:30
Auxilus fa11657b8f fix whitespaces 2018-04-26 02:58:27 +05:30
Auxilus d59e997628 make some methods private 2018-04-26 02:55:21 +05:30
Jeffrey Martin 2487314821
Land #9869, Add support for shellcode encryption for msfvenom 2018-04-25 15:51:05 -05:00
James Barnett 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
christopher lee 071a191055 Merge master + workspace removal from http remote data service 2018-04-25 13:39:46 -05:00
James Barnett df9df01f19
First pass on swagger/blocks documentation 2018-04-25 12:58:29 -05:00
Auxilus 73494593bf updated 2018-04-25 20:19:53 +05:30
Brent Cook 3eac989fb0
Land #9886, ignore unused tags on host import 2018-04-25 03:41:55 -05:00
Auxilus 382a7f8aa3 Merge https://github.com/rapid7/metasploit-framework into psexec_cleanup 2018-04-25 09:09:48 +05:30
Auxilus cbfdaf23a0 updated for requested changes 2018-04-25 08:56:54 +05:30
Matthew Kienow 43edf46c43
Fix set data service for no database YAML case 2018-04-24 18:34:16 -04:00
Matthew Kienow 359ef27834
Narrow rescue scope to StandardError 2018-04-24 17:19:54 -04:00
Matthew Kienow f66029d129
Validate remote data service instance
Adds simple data service instance validation when registering and
setting a data service.
2018-04-24 16:54:10 -04:00
Matthew Kienow 01dd79173b
Add data proxy and service for online check 2018-04-24 15:11:16 -04:00
Matthew Kienow 0d284197cb
Add MsfServlet to host endpoint for online check 2018-04-24 15:01:17 -04:00
James Barnett e5513409db
Include :workspace in db_import opts 2018-04-24 13:53:55 -05:00
Auxilus e7ac2cd155 move report_auth to psexec module 2018-04-24 23:00:55 +05:30
Auxilus f43baa3ca9 fix exe and wbemexec dep 2018-04-24 22:07:34 +05:30
Auxilus 3353102dc1 fix opt dependencies 2018-04-24 21:55:09 +05:30
Brent Cook 08c1cd5909
Land #9851, add workaround require for non-powershell psexec 2018-04-24 08:22:58 -05:00
Brent Cook b3118193e8 add todo comment on require 2018-04-24 08:22:31 -05:00
Brent Cook 30abdfe2fd move copy up so it's clear what we call by default 2018-04-24 06:40:15 -05:00
Brent Cook 7afefe07a6 aliases was not being copied, dup it 2018-04-24 06:32:54 -05:00
Brent Cook 1d376c78e2 ensure copy exists on DataStore too 2018-04-24 06:32:38 -05:00
Brent Cook 505810ffd6 introspect the RHS since it it is not guaranteed to be a Datastore 2018-04-24 06:15:05 -05:00
Brent Cook d34119548d replace some @ with self. 2018-04-24 06:03:02 -05:00
Aaron Soto a1027d56c9
Land #9912, Fix type validation in the notes add operation 2018-04-23 16:58:13 -05:00
Brendan Coles e7b8427b53
Land #9829, add utility functions to Msf::Post::Linux::System
Merge branch 'landing-9829' into upstream-master
2018-04-23 16:46:13 +00:00
Wei Chen ec1294d3f6
Land #9858, fix error handling in cmd_route
Land #9858
2018-04-23 08:46:38 -05:00
Wei Chen b20042abbd Fix indent and add elog 2018-04-23 08:45:34 -05:00
Matthew Kienow 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
Carter Brainerd 055f9ee88b
Remove get_listening_ports() 2018-04-22 16:15:33 -04:00
James Barnett 988063d377
Dont set default workspace if theres no DB 2018-04-21 10:26:17 -05:00
Carter Brainerd 035a6a72f1
Fix undefined method error in get_listening_services 2018-04-21 11:10:01 -04:00
Carter Brainerd 4c6ae0f644
Delete gcc version method
Also rename get_mount_path_of to get_mount_path
2018-04-21 10:24:27 -04:00
William Vu 06de967b02 Pass NOP generator to exploit_simple
This also makes exploit_simple consistent with its documentation.
2018-04-20 18:27:53 -05:00
Brent Cook 4aafa7b321
Land #9898, Fix target NOP generator not passed to payload 2018-04-20 18:11:49 -05:00
William Vu d17cc757e7 Fix typo 2018-04-20 18:03:39 -05:00
Matthew Kienow fcf42c7626
Landing #9859, add workspace remote datastore
Adds support for create, read, update and delete operations for the
workspace command and data model when using a remote data service.
2018-04-20 18:14:55 -04:00
William Vu 1f5ece9c46 Fix target NOP generator not passed to payload 2018-04-20 17:12:55 -05:00
James Barnett ea79c65b8e
Handle workspace delete if target does not exist 2018-04-20 11:33:35 -05:00
James Barnett 8d09f23b91
Fixes around workspace messaging 2018-04-20 11:25:24 -05:00
James Barnett f4a949e649
Fix bug creating sessions when connected to remote data service 2018-04-19 16:19:39 -05:00
James Barnett 7e971721f0
Adjust messaging when renaming workspaces 2018-04-19 11:52:30 -05:00
James Barnett 31be847213
Add workspace when reporting vuln_attempt 2018-04-19 11:09:13 -05:00
William Vu 33bde31eec Fix target encoder not being passed to payload
Datastore functionality has been preserved as an override.
2018-04-19 02:25:18 -05:00
James Barnett aa40ef1789
Grab session_dto workspace from host 2018-04-18 17:38:42 -05:00
James Barnett 348eb293d0
Handle case when renaming nonexistant workspace 2018-04-18 13:02:31 -05:00
James Barnett 81d00fa5b7
Fix edge cases in workspace update 2018-04-18 12:56:38 -05:00
Wei Chen 3611a1dfe4 Update rex-text version 2018-04-18 10:40:11 -05:00
James Barnett d4a2703ff1
Dont stop host parsing if id tag found
Also make clarify 'bl' variable name.
2018-04-18 10:12:12 -05:00
Brent Cook 00d0beb188 use deep copy 2018-04-18 02:34:48 -10:00
Brent Cook 09e86bfbd0 define merge and merge! on datastore to also merge aliases 2018-04-18 02:27:57 -10:00
Brendan Coles c9fd5a7d2d Add yama_installed?, yama_enabled? and selinux_enforcing? 2018-04-18 07:22:20 +00:00
Brent Cook a5588ec174 use same datastore retry option for x86 and x64 linux stagers 2018-04-17 15:57:54 -10:00
Wei Chen ff9c55207e Move crypto methods to Rex::Crypto namespace 2018-04-17 20:12:26 -05:00
James Barnett 77558cd2d7
Remove unused code 2018-04-17 14:28:28 -05:00
Carter Brainerd 3da48dbb10
Fix bug caused by last commit 2018-04-17 13:38:38 -04:00
Carter Brainerd 7bfaae0919
Update system.rb
Fix get_listening_ports bug
2018-04-17 13:35:25 -04:00
James Barnett 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
Carter Brainerd 85b09a162a
Add some efficiency improvements 2018-04-17 12:09:46 -04:00
James Barnett b569498250
Address more code review comments 2018-04-17 10:52:56 -05:00
James Barnett a8a95a03a3
Implement remote workspace delete 2018-04-17 10:19:40 -05:00
Carter Brainerd d91ef7c9dc
Add strip to protected_* methods 2018-04-17 11:04:08 -04:00
James Barnett f27490dc61
Address PR suggestions and add comments 2018-04-16 16:45:23 -05:00
James Barnett 68ad91763a Merge branch 'rapid7/master' into MS-3062_workspaces 2018-04-16 15:33:59 -05:00
James Barnett 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
Matthew Kienow e283f109a7
Remove commented out code 2018-04-16 14:14:46 -04:00
Matthew Kienow 74cb9c38b2
Change source for host address value in output 2018-04-16 14:09:19 -04:00
Brendan Coles f3ee870d72 Remove selinux_enforcing? method 2018-04-16 12:16:00 +00:00
Brendan Coles 5bc24d048c Remove kaslr_enabled? method 2018-04-16 11:51:15 +00:00
Brendan Coles a1a4c636fb strip 2018-04-16 10:22:41 +00:00
Auxilus 4de9f84dd4
fix no method error for Failure::Unknown 2018-04-16 13:51:32 +05:30
Auxilus f0b9ea635a cleanup psexec code 2018-04-16 09:04:36 +05:30
Brendan Coles b5c8b2ed19 Add kaiser_enabled? and kaslr_enabled? methods 2018-04-15 06:53:00 +00:00
Brendan Coles 78daa283c7 Add new methods to Msf::Post::Linux::Kernel lib 2018-04-14 07:33:29 +00:00
Adam Cammack 47a324815d
Land #9872, Fix JSONRPC fields in external modules 2018-04-13 15:00:26 -05:00
Matthew Kienow daf67999d6
Raise NotImplementedError in NoteDataService stubs 2018-04-13 12:07:35 -04:00
Adam Cammack e65de2b56f
Conform to JSONRPC 2.0 spec in external modules
Responses to queries had a `response` field instead of the required
`result` field.
2018-04-12 16:55:27 -05:00
Matthew Kienow 37479d8fd4
Modify notes search to handle serialized data
Initial Goliath notes search implementation attempted to use Arel and
decode base64 serialized data column, however, this was not without
issue. Updated implementation retrieves all records that match
conditions, thus data has been deserialized and then filters using
specified search term.
2018-04-12 17:37:16 -04:00
William Vu d2a683d2df Add whitespace and update help 2018-04-12 15:39:04 -05:00
Auxilus 0b3f50ea80
show help when no arguments provided to `search` 2018-04-13 01:27:22 +05:30
Matthew Kienow 4e49b99783
Add cmd notes option to sort by column number 2018-04-12 15:56:42 -04:00
Matthew Kienow f60bbdd831
Remove cmd notes make_sortable helper method 2018-04-12 10:51:03 -04:00
cbrnrd bf8c62f27c change `if !` to `unless` 2018-04-12 09:54:57 -04:00
cbrnrd 5923845f68 Merge branch 'post_linux_system_dev' of https://github.com/cbrnrd/metasploit-framework into post_linux_system_dev 2018-04-12 09:16:31 -04:00
cbrnrd 5f725e09db Make nosuid? and noexec? take a filepath as param 2018-04-12 09:15:44 -04:00
thecarterb 0abeb4fee6 Add new functions and fix return bugs attempt 2 2018-04-11 21:52:53 -04:00
thecarterb 892fb70fc6 Revert "Add new functions and fix return bugs"
This reverts commit 1e34a6d3c6.
2018-04-11 21:46:34 -04:00
Adam Cammack 8c7f929636
Land #9865, Update Meterpreter `ls`/`dir` help 2018-04-11 17:05:18 -05:00
Matthew Kienow 087ae447c5
Remove cmd notes sort operation 2018-04-11 17:46:13 -04:00
James Barnett 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
Adam Cammack f1d426d257
Land #9833, Remove broken feature detection 2018-04-11 15:02:53 -05:00
Aaron Soto b9d71b7147
Renamed 'mask' to 'glob' 2018-04-11 14:50:27 -05:00
Aaron Soto 21467d7938
Update stdapi/fs help output to match searching/masking parameters 2018-04-11 14:19:33 -05:00
James Barnett 4e5e0f2c40 Merge branch 'master' of github.com:rapid7/metasploit-framework 2018-04-11 13:59:43 -05:00
William Vu 6c6aa8db82 Print generated CmdStager with inspect, not join
I dun goofed. I knew I should have just printed it verbatim.

tl;dr I thought I had accounted for command compression. I was wrong.
This should also give us more information about what exactly is being
run and how many times.
2018-04-11 13:49:00 -05:00
Wei Chen 19e76329dc Add some checks in buffer.rb and fix option in msfvenom 2018-04-11 13:02:35 -05:00
Matthew Kienow 3db19fe4f2
Fix DBManager::Service use of services method
services method was previously modified to use a hash as the parameter,
but each_service was passing a workspace. Make each_service method
consistent with other DBManager modules.
2018-04-11 11:43:12 -04:00
cbrnrd 1e34a6d3c6 Add new functions and fix return bugs 2018-04-11 10:47:21 -04:00
Matthew Kienow e639fda53c
Fix DB initialization with no database YAML 2018-04-11 09:15:38 -04:00
thecarterb 57e243ac49 Read from /proc/mounts instead of the mount command 2018-04-10 23:20:00 -04:00
scriptjunkie bc07ba3769 load only at use to break require loop 2018-04-10 21:05:41 -05:00
Wei Chen 13edf66fa3 Fix options 2018-04-10 18:57:02 -05:00
Brent Cook 41a21def80
Land #9857, Restore services search semantics 2018-04-10 17:25:48 -05:00
James Barnett cd48b47760 Fix failing tests.
-Was accidentally deleting opts[:workspace] instead of processing
-Update notes help text expectations
2018-04-10 17:10:32 -05:00
James Barnett e51f41fa34
Merge remote-tracking branch 'msf_jbarnett/fix_services_bugs' into MS-3062_workspaces 2018-04-10 13:35:33 -05:00
Auxilus f1240b0454
resolves #9855 2018-04-10 22:20:27 +05:30
Wei Chen b630d5c327 Add encryption support for shellcode 2018-04-10 11:14:14 -05:00
James Barnett 462db05f4c
Re-enable port search functionality 2018-04-10 11:10:32 -05:00
Adam Cammack 4495eea1ca
Land #9836, Force #! for external modules 2018-04-10 11:08:15 -05:00
Adam Cammack 81ec33b0e4
Refactor script path check into base module loader 2018-04-10 11:07:21 -05:00
James Barnett 48c0bbfa7a
Only display the services for a given workspace 2018-04-10 10:28:02 -05:00
cbrnrd 07b3b576f5 Fix parsing in get_cpu_info 2018-04-10 06:03:16 -04:00
cbrnrd 1276960d88 Fix typo in raise call 2018-04-10 05:54:35 -04:00
cbrnrd 0a79c5a15b Add docs to nosuid? 2018-04-10 05:53:19 -04:00
cbrnrd 6e6bc9bc6b Add noexec and nosuid
Also fix some regex bugs
2018-04-10 05:51:57 -04:00
Brent Cook c525bc3c0a
Land #9848, handle 'check' command on modules that do not implement it 2018-04-09 22:27:21 -05:00
scriptjunkie 2ea875d304 Fix issue preventing psexec against non-powershell targets 2018-04-09 22:01:49 -05:00
James Barnett 90542779ff
Audit models to ensure :workspace is passed only when needed 2018-04-09 14:50:37 -05:00
William Vu e17a788ab5 Remove stray dlog filling framework.log 2018-04-09 13:58:10 -05:00
William Vu 924a336287 Fix unsupported check_simple method for modules 2018-04-09 13:43:22 -05:00
Brent Cook 7b85edfde5
Land #9822, Fix backgrounded aggressive exploits 2018-04-09 09:36:12 -05:00
h00die a473dd04a8
Land #9813, Add etcd library and version scanner 2018-04-08 07:05:31 -04:00
Brent Cook 07c9be5130
Land #9812, Add Msf::Post::Linux::Kernel lib 2018-04-08 00:40:03 -05:00
Brent Cook 6c8ea2d883 also be sure to load executable modules if they don't have #! 2018-04-07 21:15:51 -05:00
Brent Cook 28ebe9d102 sanity check that external modules start with #! before executing 2018-04-07 16:31:34 -05:00
Brent Cook 6fb6570f99 delete old feature detection code from exploit base
This deletes some old code that apparently has been broken and somewhat unused for many years.

The 'derived_implementor?' method for modules relies on the debug output from Ruby in order to tell of a class implements a method, but the regex it used didn't work properly with any modern Ruby version until 2.5.x. This caused a random sleep to get inserted into certain payload staging operations, which actively breaks staging in certain scenarios (I'm not trying to address that here).

This also removes some ancient module feature detection code, which also is entirely unused today.
2018-04-07 12:47:42 -05:00
cbrnrd 04d5e8a765 Switch text processing to ruby
Also add pidof() and command_exists?()
2018-04-06 23:31:11 -04:00
scriptjunkie c303859c11 Fix #9827 2018-04-06 11:06:52 -05:00
cbrnrd c97eb42eba Finish up additions and add doc 2018-04-06 12:04:35 -04:00
Jon Hart 1cc16a55a8
Add other linux kernel post helpers 2018-04-06 08:28:53 -07:00
Brendan Coles ba88118d7a Update kernel_modules method to return Array 2018-04-06 15:02:43 +00:00
thecarterb a85f118bf2 Begin adding functions to Msf::Post::Linux::System 2018-04-05 21:32:58 -04:00
William Vu 7cc82a14b6 Update exploit driver with correct method 2018-04-05 18:56:19 -05:00
William Vu 17ed88b766 Fix backgrounded aggressive exploits
Any exploit that includes an aggressive stance is aggressive, regardless
of whether or not it has passive components.

This fix should prevent known-aggressive exploits from backgrounding.
2018-04-05 18:34:36 -05:00
James Barnett fe224f628b
Remove update_host_via_sysinfo since it is unused 2018-04-05 14:20:25 -05:00
Brendan Coles 499b0a857f Add kernel_modules method 2018-04-05 05:25:36 +00:00
James Barnett 852bc3d237
Dont inject :workspace into every HTTP request. 2018-04-04 16:30:25 -05:00
James Barnett 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
Jon Hart bc81cfad1f
Fix error handling when trying to delete non-existent workspace 2018-04-04 11:40:21 -07:00
Jon Hart 63aabc00f1
etcd rubocop style 2018-04-04 11:01:38 -07:00
Jon Hart a6c31aceb2
Refactor common etc capabilities; add separate version scanner 2018-04-04 10:48:27 -07:00
Brendan Coles 6d92c319f8 Add Msf::Post::Linux::Kernel lib 2018-04-04 17:13:49 +00:00
bwatters-r7 d9039d43ef
Land #9734, Remove unwanted 'pop RAX' from windows/x64/reverse_(win)http 2018-04-03 14:23:41 -05:00
Brent Cook 2ee7b1ec5c Fix native 'readline' (msfconsole -L) support for Ruby 2.5 onward 2018-04-03 08:00:08 -05:00
Brent Cook bd3c00dfd0
Land #9726, add simple Rex::Tar wrapper for consistency with other archive types 2018-04-02 23:35:22 -05:00
Brent Cook 226ef160ff
Land #9748, Convert the smbloris DoS into an external module
Help reliability and performance. This some Ruby-specific external module
tooling as a result as well.
2018-04-02 23:25:10 -05:00
Brent Cook 428233b82d
Land #7949, Format binary registry data nicely on display 2018-04-02 23:11:25 -05:00
Brent Cook b445583a14
Land #9774, use correct whitespace when patching python meterpreter 2018-04-02 23:07:36 -05:00
Brent Cook b0123b2095
Land #9787, Fix adding IPv6 routes with subnets or CIDR masks 2018-04-02 22:57:15 -05:00
James Barnett e892911fbe
Use a constant for default workspace name 2018-04-02 17:02:14 -05:00
Meatballs cac0587d42
Fix no-uac msi creation 2018-04-02 19:29:16 +01:00
Brent Cook fa34f3e0a4
Land #9718, Add get_user_spns 'kerberoasting' module 2018-04-02 10:04:44 -05:00
christopher lee 3aed6d6666 Initial 2018-04-02 08:08:23 -05:00
Brent Cook f386ae0ba3
Land #9731, tool updates 2018-04-01 23:26:42 -05:00
William Vu 840923d591
Land #9738, msfconsole user-friendliness changes 2018-04-01 02:12:53 -05:00
scriptjunkie 774ef22d08 Fix upts -> opts 2018-03-30 22:26:53 -05:00
Matthew Kienow cb2366d2eb
Fix regex search for serialized data column 2018-03-30 19:25:38 -04:00
Matthew Kienow 4c536a1819
Add optional parameter to skip columns 2018-03-30 19:23:41 -04:00
James Barnett 7d58b0a5f4 Merge branch 'goliath' into MS-3062_workspaces 2018-03-30 16:35:26 -05:00
James Barnett ecbbf1d940
Pass workspace when using db_nmap 2018-03-30 15:27:32 -05:00
Spencer McIntyre c8033d69c5 Use the new keyword style for v6 2018-03-30 13:56:15 -04:00
Spencer McIntyre bb17bdb6dd Fix adding IPv6 routes with subnets or cidr masks 2018-03-30 13:18:03 -04:00
Matthew Kienow f10924a5c0
Update cmd note operations, validation and output 2018-03-29 23:15:10 -04:00
Matthew Kienow 2b7c3872d4
Add proxy method for find_or_create_note 2018-03-29 18:43:34 -04:00
zerosum0x0 3a266d93b6 support for ARM 2018-03-29 15:11:27 -06:00
James Barnett 3b1e3a4256
Missed one more bug in append_workspace 2018-03-29 15:18:31 -05:00
James Barnett 19e01b4b66
Fix bug in append workspace when using :wspace 2018-03-29 15:04:00 -05:00
James Barnett f41490728b
Process workspace when importing nmap data 2018-03-29 11:46:34 -05:00
James Barnett 7f42235ad7
Create default workspace if it doesnt exist 2018-03-28 15:39:24 -05:00
James Barnett d23e33a7bc
Make workspace -v work with updates 2018-03-28 13:31:49 -05:00
James Barnett 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
Matthew Kienow 0b5d3d31f9
WIP remote note read, update, delete 2018-03-27 16:36:56 -04:00
William Vu f5025cb84e Add Rex::Tar
This just inherits from Gem::Package::Tar{Reader,Writer} at the moment.
We may want to build out higher-level methods than what the inherited
code already provides. Or don't inherit at all.
2018-03-27 14:57:57 -05:00
Jeffrey Martin b509c14851
detect the whitespace needed when patching meterpreter 2018-03-27 13:24:44 -05:00
James Barnett 9559c06c10
Land #9762, Fix OpenSSL deprecation in Ruby 2.5
This PR replaces a deprecated method in the Ruby 2.5
OpenSSL library. It also bumps the ruby-version to use 2.5.

Fixes #9576
2018-03-27 11:02:44 -05:00
christopher lee abf16a4469 fix workspace tests 2018-03-27 10:41:08 -05:00
William Vu a4ad7de4e0 Use a better error in scriptable sessions 2018-03-26 17:56:44 -05:00
William Vu e761d211b9
Land #9708, reload_lib command for msfconsole 2018-03-26 17:10:11 -05:00
William Vu 862a3ff74d
Land #9618, pipe auditing improvements 2018-03-26 17:01:48 -05:00
James Barnett 83f2052ee7
Accidentally q 2018-03-26 16:09:56 -05:00
James Barnett cfa03a999c
Finish moving current_workspace tracking to client 2018-03-26 15:58:47 -05:00
Matthew Kienow 991f4e35ea
Remove added regex options from search_term 2018-03-26 14:07:21 -04:00
Brent Cook 3fb5137c2d use Rex::Socket::SslTcp.supported_ssl_methods for SSLVersion option 2018-03-26 03:40:49 -05:00
andrea 38af667094 Support for Ruby 2.5.0 fixing OpenSSL warnings 2018-03-26 02:52:02 -05:00
Brent Cook 4194b6d991
Land #9586, fix #9112, improve android screenshot error message on failure 2018-03-25 07:36:15 -05:00
Brent Cook 1610db482a minor style nits 2018-03-25 07:34:45 -05:00
Brent Cook 7c5c5513eb Merge remote-tracking branch 'upstream/master' into land-9586- 2018-03-25 07:29:55 -05:00
Brent Cook f662049b27 clarify screenshot on android scenario 2018-03-25 07:29:39 -05:00
Jon Hart d0ef5617fa
Merge master and resolve conflict 2018-03-23 14:25:21 -07:00
b0yd 7e0c255591 Formatted reg binary type to hex when displaying query results. 2018-03-23 15:56:12 -04:00
Adam Cammack 71149e9c68
Remove executable Ruby files from classic loading 2018-03-23 14:49:06 -05:00
Adam Cammack 133f982f7c
Add external module bridge for Ruby
This runs Ruby external modules with the same Ruby that is running MSF,
so it might even work on Windows!
2018-03-23 14:46:40 -05:00
James Barnett def0e4d93b
Merge branch 'goliath' into MS-3062_workspaces 2018-03-23 11:37:01 -05:00
James Barnett 6b3a4a56dc Merge branch 'rapid7/master' into goliath 2018-03-23 11:26:31 -05:00
James Barnett ed5b22a541
Address more code review comments 2018-03-22 21:47:59 -05:00
James Barnett 6c5a7a663a
Merge branch 'goliath' into MS-2879_db_export 2018-03-22 21:22:23 -05:00
James Barnett 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
Jon Hart a1287a0776
Remove blank before services output 2018-03-22 18:26:50 -07:00
Jon Hart 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
Jeffrey Martin b9fc786d24
Land #9744, Add synchronization around public module metadata cache methods 2018-03-22 17:24:39 -05:00
William Vu 23a7444646 Add PipeAuditor mixin to Psexec_MS17_010 mixin 2018-03-22 15:37:44 -05:00
William Vu 558ecbcb49 Add PipeAuditor mixin 2018-03-22 15:37:36 -05:00
James Barnett 93d4f5cd0b
Last few review comments 2018-03-21 17:50:11 -05:00
James Barnett eee24366c9
Address code review comments and bug 2018-03-21 17:42:54 -05:00
James Barnett f6fddb3113
Fix indent 2018-03-21 17:16:44 -05:00
Matthew Kienow 8d660084fc
Omit parentheses for no argument get_db calls 2018-03-21 18:03:27 -04:00
Matthew Kienow 975948439d
Make vulns cmd option string literals consistent 2018-03-21 16:35:06 -04:00
Matthew Kienow 09bea3ec39
Remove vulns cmd help short-circuit 2018-03-21 16:34:11 -04:00
Adam Cammack bb8fd45cb2
Land #9739, Add Python logging module support 2018-03-21 14:48:49 -05:00
christopher lee 70c9a434e6 Add synchronization around public module metadata cache methods 2018-03-21 14:23:34 -05:00
Spencer McIntyre 3aa37eb266 Add a log handler for external python modules 2018-03-21 10:14:49 -04:00
Jacob Robles fc9005df8a
Add External License Support 2018-03-21 06:26:25 -05:00
Matthew Kienow 553789557b
Merge branch 'goliath' into MS-2910-remote-vuln-read-update-delete 2018-03-21 01:45:58 -04:00
Jacob Robles 86266dc636
Add batch_size option for external multi_scanner 2018-03-20 14:47:46 -05:00
Matthew Kienow ced6707ba6
Fix cmd vulns and DBManager Session spec 2018-03-20 15:25:09 -04:00
Aaron Soto 7e5214fef5
Improved CTRL-C edge case, Invalid Options edge case, help output, version output 2018-03-20 13:34:15 -05:00
Jacob Robles ca7caae622
Change External Module Type Names
Change the a couple of external module type names
to be consistent with the template files.
2018-03-20 10:19:57 -05:00
g0tmi1k 973d00aca0 Add a message about DisablePayloadHandler
Based on 26bf96b3ce/lib/msf/core/exploit/exe.rb (L43)
2018-03-20 13:04:41 +00:00
g0tmi1k 8463ed99b0 Add standardised header comments 2018-03-20 11:33:34 +00:00
Summus6 587215affc Remove unwanted 'pop RAX' from windows/x64/reverse_(win)http 2018-03-20 11:01:10 +01:00
James Barnett 90bebc2096
Convert workspace update to new api 2018-03-19 14:24:16 -05:00
Matthew Kienow cd7ecc4b74
Display vulns information column based on option 2018-03-19 14:29:38 -04:00
James Barnett 929fb041ab
Fix bug when adding workspace remotely 2018-03-19 11:01:22 -05:00
Jeffrey Martin 4801021aba
Land #9613, add bind_named_pipe x86 2018-03-17 15:53:06 -05:00
Matthew Kienow fc83220aa7
Fix report_vuln duplicate VulnRef record creation
Multiple calls to report_vuln for the same vuln results in the creation
of duplicate VulnRef records, except for the CVE refs
2018-03-16 17:53:07 -04:00
Matthew Kienow f365e6fc28
Remove stderr debug output 2018-03-16 17:50:49 -04:00
James Barnett 35bc8e905e
Refactor workspace delete to be consistent with other commands 2018-03-16 16:11:09 -05:00
Brent Cook 65ae1e33e1
Land #9694, move ssh platforms to lib 2018-03-16 12:49:57 -05:00
James Barnett 8ddaae5fe4
Remove unused code 2018-03-15 12:12:12 -05:00
christopher lee 4d04319d2a Merged master 2018-03-15 11:31:44 -05:00
Matthew Kienow 334da2477c
Get first Vuln record 2018-03-14 18:49:49 -04:00
James Barnett 730eea800c Merge branch 'MS-2879_db_export' of github.com:clee-r7/metasploit-framework into MS-2879_db_export 2018-03-14 16:47:07 -05:00
James Barnett 100a64ae6c Fix bug when saving to path that doesnt exist 2018-03-14 16:43:04 -05:00
James Barnett 0d170571da
Fix bug with file name 2018-03-14 15:59:07 -05:00
James Barnett b179603b4a
Externalize db_export command 2018-03-14 15:06:28 -05:00
Brent Cook 588993f20e remove no-op 2018-03-14 14:16:47 -05:00
James Barnett ac5669388a
Merge branch 'goliath' into MS-2879_db_export 2018-03-14 11:37:08 -05:00
Mehmet İnce 6811097bed Create reload_file method for edit and reload_lib cms 2018-03-14 11:47:23 +03:00
UserExistsError 948b07166a pipe error checks 2018-03-14 00:09:20 -06:00
Matthew Kienow e4cc2a565a
Correct services cmd help message for protocol 2018-03-13 16:09:35 -04:00
Mehmet İnce 9b84477ddc Changing cmd name to reload_lib 2018-03-13 22:17:59 +03:00
James Barnett 9099ef0bf1
Enable exec_report_job to handle includes 2018-03-13 11:34:44 -05:00
Mehmet İnce b7f95b9cbe Add a loadlib command 2018-03-13 14:03:44 +03:00
James Barnett e480b7dd2c
Only do regex search if search_term is passed 2018-03-12 17:14:44 -05:00
Brent Cook a9f340a7a7 remove run_range, nothing in MSF uses it (we don't care about Pro here) 2018-03-12 17:07:48 -05:00
James Barnett 2e287135c4
Fix bug in services search 2018-03-12 16:37:16 -05:00