Commit Graph

9257 Commits

Author SHA1 Message Date
christopher lee 038fe03777 Merge branch 'master' into ms-2962 2018-05-02 15:31:57 -05:00
Brent Cook 1456bbdaec fix more whitespace issues 2018-05-01 05:23:26 -05:00
Jeffrey Martin 28173222a8 Land #9881, cleanup psexec code 2018-04-30 18:39:36 -05:00
Matthew Kienow cb8131ab22 Validate search cmd arguments 2018-04-30 00:02:03 -04:00
Matthew Kienow 89d86b1f48 Remove code related to unused search cmd options 2018-04-29 23:16:30 -04:00
Matthew Kienow ca7b10af39 Add search cmd option to write CSV output file 2018-04-29 23:08:24 -04:00
christopher lee 41307e62f8 remove puts 2018-04-27 15:50:21 -05:00
Brent Cook ee2ad8affe move super call in merge! so that it returns the proper value 2018-04-27 14:21:57 -05:00
christopher lee 0a73a5007c Removed duplicated online test 2018-04-27 09:37:17 -05:00
Auxilus 771e0df417 fix in method calls 2018-04-27 10:35:58 +05:30
Auxilus 25cf8d175a report command execution o/p 2018-04-27 08:43:30 +05:30
christopher lee 9c7db375bf Fix broken tests after latest merge with master 2018-04-26 16:39:56 -05:00
christopher lee 516b61ebaa Merged master 2018-04-26 16:02:56 -05:00
Matthew Kienow c79e39377e Narrow rescue scope to StandardError 2018-04-26 14:55:41 -04:00
Brent Cook dbdb35cf08 Land #9877, Add kernel feature post API methods 2018-04-25 22:18:28 -05:00
William Vu fc83a130f8 Land #9885, datastore fixes for stager retry code 2018-04-25 18:53:00 -05:00
Brent Cook 31563a977c use OO rather than duck typing for parameter copying 2018-04-25 18:41:14 -05:00
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
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 359ef27834 Narrow rescue scope to StandardError 2018-04-24 17:19:54 -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