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