Commit Graph

7956 Commits

Author SHA1 Message Date
Brent Cook e69c51132d Land #10083, Add Msf::Post::OSX::Priv mixin 2018-05-29 23:01:36 -05:00
Brent Cook 1987dcea56 Land #10096, Re-add RHOSTS option to scanner mixin 2018-05-29 23:00:38 -05:00
James Barnett 7bcf28440f Merge branch 'local_api_docs' into remote_creds_data 2018-05-29 12:52:15 -05:00
James Barnett f8317d3ae2 Address code review comments
- Don't document unsupported session POST
- Hide unimplemented loot/id and session/id GET methods
- Fix URL for msf doc
- Add missing workspace parament to vuln-attempts
- Remove unneccessary code for hosting the doc UI
2018-05-29 12:24:53 -05:00
christopher lee 3948a0a62e Use JSON instead of PSTORE for module metadata 2018-05-29 10:50:33 -05:00
James Barnett acf4c2bd08 Merge branch 'master' into local_api_docs 2018-05-29 10:37:27 -05:00
Christian Mehlmauer f17140bdc3 fix nil error in HttpTrace 2018-05-26 10:04:26 +02:00
James Barnett a595dff6a8 Add remote creds update 2018-05-25 16:02:25 -05:00
Brent Cook 835281c7cc Land #9979, Add inactive list option to sessions command 2018-05-25 03:28:22 -05:00
Brent Cook 770b9fa209 add RHOSTS common option to nmap and scanner mixins 2018-05-24 21:31:36 -05:00
Brent Cook c18c91ebcd Add RHOSTS general option to Opt module 2018-05-24 21:31:36 -05:00
William Vu ebf20204ca Refactor return value for normalize 2018-05-24 18:49:36 -05:00
William Vu 3343bc3aeb Add note about interface to LHOST description 2018-05-24 18:39:02 -05:00
William Vu 3865858114 Support IPv6 by interface
I do believe the list is already sorted IPv4 first.
2018-05-24 18:18:03 -05:00
William Vu 51a84fbe66 Fix regression in option validation
Option validation relied on the value being false, not nil, even though
normalizing a string to a Boolean doesn't make sense. Normalizing to an
empty string seems to work fine.
2018-05-24 18:15:34 -05:00
William Vu 74669eca80 Revert nil to false because of select
Oops.
2018-05-24 16:53:46 -05:00
William Vu 9148ab4bb2 Refactor OptAddressLocal logic
@bcoles +1
2018-05-24 16:05:24 -05:00
William Vu 388d1b646b Add OptAddressLocal#interfaces 2018-05-24 15:30:09 -05:00
James Barnett 3e1a5f7b1a Merge branch 'local_api_docs' into remote_creds_data 2018-05-24 14:46:43 -05:00
James Barnett a107336ad5 Move cred delete to DBManager 2018-05-23 16:47:56 -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
g0tmi1k 4189819eaf Removing "--" 2018-05-23 18:26:01 +01:00
James Barnett b83ee106f7 Merge branch 'master' into local_api_docs 2018-05-23 10:06:12 -05:00
Brendan Coles 45481f26b6 Add Msf::Post::OSX::Priv mixin 2018-05-22 22:25:39 +00: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
James Barnett e4038af79e Merge branch 'master' into local_api_docs 2018-05-21 13:44:34 -05:00
Brent Cook 37f1e44a12 Land #10009, Add initial check support to external modules 2018-05-18 09:31:31 -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
James Barnett 84a8f2100b Merge branch 'master' into local_api_docs 2018-05-16 13:27:28 -05:00
Brent Cook b79b53c438 Land #9962, tab-complete target options 2018-05-15 16:41:55 -05:00
James Barnett fc079138fd Service API doc second pass 2018-05-15 14:34:15 -05:00
g0tmi1k 66c0610e2a Add a check to make sure there is a valid encoder, else quit 2018-05-15 15:37:27 +01:00
Matthew Kienow f482995f74 Minor changes to be similar to other servlets 2018-05-14 17:40:37 -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