Commit Graph

13785 Commits

Author SHA1 Message Date
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
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
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
Matthew Kienow 3d6d55e087 Expand tilde in resource file pathname 2018-05-24 21:06:57 -04: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 6f1e75e097 Remove loopback restriction
It's occasionally useful, and we already warn when setting it.
2018-05-24 15:44:32 -05:00
William Vu a370270e19 Add tab completion for network interfaces 2018-05-24 15:30:16 -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
Brent Cook f32020f255 include some training wheels for users 2018-05-23 13:37:53 -05:00
g0tmi1k 4189819eaf Removing "--" 2018-05-23 18:26:01 +01:00
Brent Cook c9dad7d7c4 unify api usage 2018-05-23 12:12:27 -05:00
Brent Cook c8b54cef22 add inline datastore parsing to aux/post modules 2018-05-23 12:12:27 -05:00
Brent Cook fbbfa0e0c3 teach exploit how to parse datastore options too 2018-05-23 12:12:27 -05:00
Brent Cook d8e5cc60bb add inline datastore setting for msfvenom/generate commands 2018-05-23 11:48:11 -05:00
Brent Cook c52e96bfa7 swizzle parameters in generate to match msfvenom 2018-05-23 11:48:11 -05: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
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
James Barnett 84a8f2100b Merge branch 'master' into local_api_docs 2018-05-16 13:27:28 -05:00
William Vu 30dcb78eb5 Land #10042, reload_lib improvements 2018-05-16 12:53:39 -05:00