Commit Graph

9327 Commits

Author SHA1 Message Date
Auxilus d24607e1ea add port to keywords 2018-05-27 22:41:34 +05:30
Christian Mehlmauer f17140bdc3 fix nil error in HttpTrace 2018-05-26 10:04:26 +02:00
Brent Cook 835281c7cc Land #9979, Add inactive list option to sessions command 2018-05-25 03:28:22 -05:00
Matthew Kienow 7ec5c06738 Change kind_of? to is_a? 2018-05-23 17:40:52 -04:00
Matthew Kienow 2c92e85494 Fix report_session_event with remote data service
Modify DBManager method to allow session ID retrieval from a Hash
2018-05-23 15:05:22 -04:00
James Barnett 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
Brendan Coles b14e354b25 Land #10048, Make shell and meterpreter sessions consistent with cmd_exec 2018-05-22 21:26:47 +00:00
Jeffrey Martin 07fbbca9f4 Land #10074, Fixed bug in module cache 2018-05-21 18:01:46 -05:00
Matthew Kienow 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
bwatters-r7 75562e2bbc Land #10044, Fix is_system? in Msf::Post::Windows::Priv for non-English
Merge branch 'land-10044' into upstream-master
2018-05-21 14:24:26 -05:00
christopher lee 1b7e613080 Fixed bug in module cache 2018-05-21 14:18:43 -05:00
Brent Cook 37f1e44a12 Land #10009, Add initial check support to external modules 2018-05-18 09:31:31 -05:00
William Vu 9ad31bf70f Land #10037, warning for Mettle stage encoding 2018-05-17 11:01:01 -05:00
William Vu 1d6fae5db6 Drop "currently," since we're including stageless 2018-05-17 10:30:43 -05:00
William Vu 0cd085fb8b Try a better way with MettleConfig
This will obviously affect stageless payloads, but that's okay, since
there's no stage! Thanks to @mkienow-r7 for the nudge. <3
2018-05-17 10:14:52 -05:00
Aaron Soto 0b6c307c34 Land #10002, Add password reporting API to external modules 2018-05-17 09:04:05 -05:00
Brent Cook 9eb5700fcb Make shell and meterpreter sessions consistent with cmd_exec
There's no need for different calls in modules, let's remove the need
for cargo culting (if there was one to begin with).
2018-05-17 08:02:34 -05:00
Clément Notin 79527809e2 Fix is_system? in Msf::Post::Windows::Priv for non-English systems
Switch to comparing the SID string, instead of comparing the resolved user name
2018-05-17 10:08:56 +02:00
bwatters-r7 7e34f27004 Land #9246, Support RHOSTS for exploit modules 2018-05-16 14:40:25 -05:00
William Vu 30dcb78eb5 Land #10042, reload_lib improvements 2018-05-16 12:53:39 -05:00
William Vu 365289b19e Add janky regex check if we're reloading a module 2018-05-16 12:03:54 -05:00
William Vu 5addc54b4b Refactor reload_lib and add multiple file support 2018-05-16 11:23:16 -05:00
William Vu 54908021aa Update CommandDispatcher for target names, too 2018-05-16 10:39:22 -05:00
William Vu 2e002b24a0 Update Msf::Simple::Exploit for targeting by name
And accidentally add error checking.
2018-05-16 10:35:17 -05:00
Brent Cook b79b53c438 Land #9962, tab-complete target options 2018-05-15 16:41:55 -05:00
Matthew Kienow f482995f74 Minor changes to be similar to other servlets 2018-05-14 17:40:37 -04:00
Matthew Kienow b3a1f2531b Update to use new hosts DataProxy method signature 2018-05-14 17:38:49 -04:00
Matthew Kienow 4b13fbb5a3 Add workaround for race condition in report_host
Modify to use DBManager methods rather than DataProxy
2018-05-14 17:36:33 -04:00
Matthew Kienow 262e791dcc Make find_or_create_host opts more consistent
Modify to use DBManager methods rather than DataProxy
2018-05-14 17:35:18 -04:00
Matthew Kienow 25fdc02902 Modify to use find_or_create_host 2018-05-14 17:29:57 -04:00
Adam Cammack ac03a0723a Factor external check shim into common template 2018-05-14 11:32:22 -05:00
Adam Cammack 1d168a84e5 Add 'unknown' fallback check status
`check` is not a fan of `fail_with`, so fallback when the external
module exits unsuccessfully.
2018-05-14 11:00:40 -05:00
Adam Cammack e0fb1365e6 Add soft_check capability to external modules
A `soft_check` is something designed to evaluate the vulnerability of a
remote system without exploiting it (ex. banner checks, non-intrusive
fingerprinting).
2018-05-11 12:42:31 -05:00
Adam Cammack 780b956dd1 Return results of external module runs
This will allow us to grab check results or more interesting things in
the future, if we decide that modules can have return values for more
types of things. Or this may go away and checks will use the reporting
interface like everything else.
2018-05-10 18:29:14 -05:00
Adam Cammack 147471fb79 Add constant for reverse check code lookup 2018-05-10 18:24:57 -05:00
Adam Cammack 271a2344db Refactor external module API to be more reliable
Also:
  Grabs exit status
  Less boilerplate required for modules
2018-05-09 13:30:13 -05:00
Brent Cook 4cf834d670 restore a few more mixin aliases for now 2018-05-08 17:10:01 -05:00
Brent Cook 25177ef9dc add local CONST definition 2018-05-08 17:08:05 -05:00
Aaron Soto 40f1bb223d Revert deleted code from #9986. See issue #9993 2018-05-08 16:40:49 -05:00
Adam Cammack a72ab10777 Add initial Python library for login scanners 2018-05-07 17:42:41 -05:00
Matthew Kienow 70be536b36 Land #9939, add remote data service rspec support 2018-05-07 18:07:02 -04:00
Adam Cammack ee9da87f1e Add shim for external login scanner modules 2018-05-07 15:05:44 -05:00
Adam Cammack ee1059312f Allow access to userpass_interval in AuthBrute 2018-05-07 14:41:48 -05:00
Adam Cammack 524661617c Allow DataStore to nest Arrays arbitrarily deep 2018-05-07 09:51:40 -05:00
Brent Cook 8463d94891 remove mostly unused shortcuts 2018-05-07 00:24:38 -05:00
Jacob Robles 534d05ff44 simpleclient versions option 2018-05-07 00:24:38 -05:00
Jacob Robles ff202a5f5b Simpleclient/SMB2 support 2018-05-07 00:24:38 -05:00
Jacob Robles d54992674f Response code, Write fix 2018-05-07 00:24:38 -05:00
Tim W 5f01b6abc9 Land #9977, fix crash during x64 linux reverse_tcp stager retry 2018-05-05 17:13:00 +08:00
Tim W 4216d06ffb fix #9963, update x64 linux reverse_tcp stager cached size 2018-05-05 16:30:45 +08:00