Commit Graph

15309 Commits (a683cedcce4bb6f96c77e9f87734e17c3a481155)

Author SHA1 Message Date
Matthew Kienow 06700efbc4
Skip payload generate to reduce processing time 2018-10-04 22:06:32 -04:00
William Vu 9e512b0246 Clarify {SCREEN,AUDIO,PHYSICAL}_EFFECTS 2018-10-04 14:20:26 -05:00
William Vu 566d540b87 Add AUDIO_EFFECTS to distinguish from others 2018-10-04 14:06:50 -05:00
William Vu 9f30512532
Land #10707, module traits to augment module rank 2018-10-04 13:26:14 -05:00
Wei Chen f5190525fc support for multiple module types 2018-10-04 13:20:47 -05:00
Brent Cook a4509c1757
Land #10739, Remove unneeded UserServlet from JSON-RPC App 2018-10-04 08:28:35 -05:00
Brent Cook e9ef18bff6
Land #10735, Enhance RPC module information retrieval 2018-10-04 08:21:58 -05:00
Brent Cook ff0ee51da1
Land #10686, ARGS, TIMEOUT, and output to upload_exec module
Merge remote-tracking branch 'upstream/pr/10686' into upstream-master
2018-10-04 04:28:02 -05:00
sinn3r 5e5e663812
Merge pull request #44 from wvu-r7/pr/10707
Add PHYSICAL_EFFECTS constant from Will.
2018-10-03 23:37:34 -05:00
Wei Chen 92ac5635b1 Support module documentation 2018-10-03 23:35:30 -05:00
William Vu 97ebc832f0 Clarify target of PHYSICAL_EFFECTS 2018-10-03 20:34:24 -05:00
William Vu fa92808cc6 Add PHYSICAL_EFFECTS constant 2018-10-03 20:32:00 -05:00
Matthew Kienow d69ae54835
Remove unneeded UserServlet 2018-10-03 16:40:37 -04:00
Wei Chen 18d6cc0ee0 Add support for info command 2018-10-03 15:19:08 -05:00
Matthew Kienow ccad78d567
Fix spelling mistake 2018-10-02 14:11:02 -04:00
Matthew Kienow d807600ebe
Enhance RPC information retrieval
Add the ability to retrieve additional module information for payloads,
encoders and nops. Add ability to filter these modules by architectures.
2018-10-02 13:38:07 -04:00
Brent Cook 9c120ef123
Land #10699, Avoid double-closing meterpreter channels 2018-10-02 09:46:43 -05:00
Brent Cook b3dca6081d
Land #10720, better handle errors with multi-host exploits 2018-10-02 05:28:57 -05:00
Brent Cook 304acd42f0 minor comment tweaks 2018-10-02 05:23:13 -05:00
Brent Cook 2c0d4de70b
Land #10732, add api key for android wlan_geolocate 2018-10-02 05:09:10 -05:00
Tim W b993d74f6c minor tweak 2018-10-02 11:41:58 +08:00
Tim W 4d51bace42 fix android wlan_geolocate 2018-10-02 11:26:46 +08:00
William Vu 46e7b8ac98 Namespace modules using full name instead of hex 2018-10-01 18:32:23 -05:00
William Vu 7842174d8b Fix loading external modules without notes 2018-10-01 12:41:39 -05:00
Green-m 1b93363588
Change the error message when interrupt exploit. 2018-09-30 16:09:00 +08:00
Green-m 90b98a193c
Refactor the rhosts for exploit modules. 2018-09-30 16:08:49 +08:00
jgor 5dcb6ab321 fix typo in route command examples 2018-09-28 16:53:12 -05:00
Brent Cook 572d430429
Land #10682, add JSON RPC framework and msfrpc v1.0 API endpoints 2018-09-28 15:21:02 -05:00
bwatters-r7 c22ec85d9c
Land #10703, Update payloads to include the new Kiwi release 2018-09-28 14:43:51 -05:00
Matthew Kienow 5f5b334493
Call keyword argument methods with params hash 2018-09-28 11:11:18 -04:00
Matthew Kienow 60bd00ee5b
Move prepare_params method to v1.0 RpcCommand
The method was created to support RPC v1.0 (v10) processing and should
not be necessary for future RPC versions.
2018-09-28 10:51:10 -04:00
William Vu 0686c76cd5 Restore help on empty args for reload_lib 2018-09-27 23:21:43 -05:00
William Vu 11538bcd4f Remove pathspec due to vague errors
"error: Could not access '*.rb'" is printed when not a repo. We fall
back on reload_file's checks, once again. :(
2018-09-27 22:12:56 -05:00
William Vu ab56ac6655 Refactor and clean up reload_lib -a and others 2018-09-27 22:11:22 -05:00
Erin Bleiweiss 3ca95933a1
Update help text. 2018-09-27 13:13:25 -05:00
Erin Bleiweiss 64c86ef4de
Add support for working outside install directory 2018-09-27 13:05:23 -05:00
Wei Chen a2694555d0 Change typo 2018-09-27 12:45:17 -05:00
Wei Chen 974a727862 Update comment 2018-09-27 12:32:43 -05:00
Wei Chen 086e2b311b Update constants 2018-09-27 12:31:04 -05:00
Erin Bleiweiss 7ba73ef658
Check for valid files in git command 2018-09-27 12:01:04 -05:00
Erin Bleiweiss c5c1706636
Acutally, get rid of git? check 2018-09-27 11:14:01 -05:00
Erin Bleiweiss 7f9b9be78b
Allow git? to return true 2018-09-27 11:12:10 -05:00
Wei Chen 31e9b831d8 Change constant name 2018-09-26 21:42:00 -05:00
Wei Chen e34371c7d3 Add a newline 2018-09-26 21:19:49 -05:00
Wei Chen c0ddbba049 rm junk code 2018-09-26 21:19:16 -05:00
Wei Chen 9064fac1ff Fix code based on Will's feedback 2018-09-26 21:13:37 -05:00
Wei Chen 583874d370 Update use of reliability/side-effects/stability metadata 2018-09-26 18:54:08 -05:00
Erin Bleiweiss 0e2361d675
Use friendly error messages and also Open3.capture2e 2018-09-26 18:49:07 -05:00
William Vu bbfac2af1c Fix copypasta typo 2018-09-26 18:46:43 -05:00
William Vu 5444d7a1a5 Update chmod_x_file to chmod 2018-09-26 18:46:42 -05:00
Tim W 896dd13bbe && instead of and 2018-09-26 18:46:42 -05:00
Tim W 4adca52103 create chmod helper function 2018-09-26 18:46:42 -05:00
Erin Bleiweiss 79c26bce08
Add a more comprehensive git check 2018-09-26 18:32:52 -05:00
Erin Bleiweiss 173f570812
Check for presence of git directory 2018-09-26 18:29:49 -05:00
Erin Bleiweiss 71cb3e8e94
Use OptionParser 2018-09-26 18:08:46 -05:00
Erin Bleiweiss f8984c4f9b
Rename function, change args from to 2018-09-26 17:55:43 -05:00
Wei Chen 04ff0931d7 Add metadata place holders for reliability/side-effects/stability 2018-09-26 17:42:54 -05:00
Erin Bleiweiss 0b48d2371d
Add error handling for non-git situations 2018-09-26 17:32:40 -05:00
Erin Bleiweiss b3053020d1
Update help docs 2018-09-26 17:23:46 -05:00
Erin Bleiweiss eeee289e2f
Add command to reload all files changed as per git diff 2018-09-26 17:16:46 -05:00
OJ 736b60f63c
Update payloads to include the new Kiwi release 2018-09-26 14:26:31 +10:00
William Vu 0269110faf
Land #10696, autofilter_{ports,services} in cache 2018-09-25 17:12:54 -05:00
Jeffrey Martin 2db3279956
use symbols and match filter keys to code 2018-09-25 15:04:26 -05:00
Brent Cook 94988e26e0 add mutex on closes 2018-09-25 09:57:45 -05:00
Brent Cook 1a493c4508 Only send a close channel message once, avoid if Meterpreter told us
Don't send a close message for a nil channel ID, and if we do send a close
message, only do it once. I could have added a mutex somewher in _close(), but
because it's a class method, it's a little awkward and would require all of the
callers to instead have voluntary lock. As an alternative, I just made the
finalizer close the channel instead.

Fixes #10177
2018-09-25 02:30:38 -05:00
Brent Cook f08cb18afd
Land #10594, Fix hashdump and user enumeration on new macOS versions 2018-09-24 22:18:24 -05:00
Brent Cook c89d8f8fb7 fix user enumeration methods, be more robust 2018-09-24 22:17:32 -05:00
Matthew Kienow ea888eaa7c
Add method comments for raise 2018-09-24 17:22:25 -04:00
Jeffrey Martin cb2f4ae419
Add filter_ports and filter_services to cache
When caching metadata about module include `filters` when available.
2018-09-24 14:11:52 -05:00
Wei Chen 02ef565730
Update evasion_module_type branch 2018-09-24 08:20:32 -05:00
William Vu fb032745a1 Print nicely about what object you're in 2018-09-21 16:03:48 -05:00
William Vu 7c000c6692 Add pry -h 2018-09-21 16:03:37 -05:00
William Vu 094cc527de Add pry command to Meterpreter 2018-09-21 16:03:24 -05:00
Matthew Kienow 5280cf0c50
Move required members and types to constants 2018-09-21 11:19:38 -04:00
William Vu a38080528b
Land #10684, stray quote fix for writable? raise 2018-09-20 22:55:11 -05:00
William Vu 3bc0a821d5 Prefer ye olde TeX-style quotes
This was @bcoles' initial commit. I agree. Looks good with the raise.
2018-09-20 22:54:17 -05:00
William Vu fdbb085f0b Fix NameError in cmd_shell due to renamed variable
I missed this while refactoring. I didn't use the var after all. :'(
2018-09-20 22:27:28 -05:00
William Vu 95e2c388c4 Remove stray quote from raise in writable? method
Didn't break the string but looked funny.
2018-09-20 22:19:18 -05:00
Matthew Kienow 7d30f781f6
Add missing raise 2018-09-20 20:09:42 -04:00
Matthew Kienow c7badd5c37
Add method comments 2018-09-20 20:07:45 -04:00
Matthew Kienow 9d3d9c3ad6
Change parameter version to Symbol 2018-09-20 19:58:04 -04:00
Matthew Kienow 4acf695de9
Remove debug output and unused code 2018-09-20 18:05:36 -04:00
Matthew Kienow 8bd9faad22
Initial JSON-RPC servlet and support architecture 2018-09-20 17:39:33 -04:00
Matthew Kienow 0fd98d5eaa
Add set_raw_response method 2018-09-20 17:31:06 -04:00
bwatters-r7 768e3b4971
Land #10575, add meterpreter chmod command
Merge branch 'land-10575' into upstream-master
2018-09-20 16:05:30 -05:00
William Vu 185931ca91
Land #10625, repeat command to repeat commands 2018-09-20 15:24:03 -05:00
William Vu 6f72a0516f Fix remaining typos 2018-09-20 15:23:15 -05:00
Adam Cammack dbb75fd2af
Land #10659, Minor code cleanups 2018-09-19 14:55:47 -05:00
Kent 'picat' Gruber f4b7584b6c use max_by &:size instead of max
this should fix the issue in the PR
2018-09-19 10:26:21 -04:00
William Vu c7ee3bdf45
Land #10666, compatible_sessions NoMethodError fix 2018-09-19 03:44:04 -05:00
Green-m 85c40a122a
Fix crash issue when auto complete the session option. 2018-09-18 18:49:56 +08:00
Green-m d24eb2dbac
Add a comment 2018-09-18 15:58:09 +08:00
Green-m 862a8c921c
Fix issue when kill a job with non-integer jobid 2018-09-18 15:50:00 +08:00
Green-m d4cdaf56ae
Fix issue when kill a non-existent job. 2018-09-18 15:48:30 +08:00
h00die a462a84b61
Land #10653 additional gcc paths for solaris libs 2018-09-17 18:23:21 -04:00
Brent Cook 86f5b25d8f
Land #10563, Add 'Notes' metadata section 2018-09-17 11:18:08 -05:00
Kent 'picat' Gruber 781d808056 use tr insteas of gsub 2018-09-17 09:54:07 -04:00
Kent 'picat' Gruber c3ca1a6cb8 use tr instead of gsub 2018-09-17 09:53:59 -04:00
Kent 'picat' Gruber c97a2ce626 use delete! insteas of gsub 2018-09-17 09:50:21 -04:00
Kent 'picat' Gruber bcf78e6067 use tr instead of gsub 2018-09-17 09:45:52 -04:00
Kent 'picat' Gruber 31a2afb586 use max instead of sort[-1] 2018-09-17 09:45:20 -04:00
Tim W b10671a331 Fix #10601, add api key for android wlan_geolocate 2018-09-17 06:04:11 +08:00
Brendan Coles 28f23a842a Update gcc path for Solaris 2018-09-16 17:22:38 +00:00
Brendan Coles b76849d64e Update gcc path for Solaris 2018-09-16 07:39:07 +00:00
William Vu bcb7348648
Land #10645, writable? method for Msf::Post::File 2018-09-15 17:27:42 -05:00
Brendan Coles ea47b6de04 Add writable? method to Msf::Post::File - Fix #10644 2018-09-15 06:29:24 +00:00
Brendan Coles d49d7a1214
Land #10638, Warn when listing inactive sessions without DB connection
Replaces confusing message and stack trace with a warning message,
when the `sessions -d` command is used to list inactive sessions
when no database is connected.
2018-09-15 05:36:37 +00:00
Erin Bleiweiss 6fae6065d6
Upcase all the things 2018-09-14 16:05:43 -05:00
Erin Bleiweiss e590b7c01f
Consolidate notes reference in erb templates 2018-09-14 12:08:22 -05:00
Erin Bleiweiss 184d1d5954
Leave notes type as a plain hash 2018-09-14 11:17:37 -05:00
Kent 'picat' Gruber c71078a381 use max instead of sort_by { |p| p.size }.last
`sort_by { |p| p.size }.last` is less readable compared to just using the `max` method

I believe this does basicall the exact same thing, ontop of being much faster in my micro benchmark.

The old method was, something like, 8 times slower.
2018-09-14 11:19:16 -04:00
Kent 'picat' Gruber 2dcfdcbdc4 remove redundant hash merge
https://github.com/JuanitoFatas/fast-ruby#hashmerge-vs-hash-code
2018-09-14 11:04:39 -04:00
Kent 'picat' Gruber ed338bbeec use tr instead of gsub
https://github.com/rails/rails/pull/17257

https://github.com/JuanitoFatas/fast-ruby#stringgsub-vs-stringtr-code
2018-09-14 10:51:51 -04:00
William Vu 4a759fd048 Refactor cmd_shell and add cmd_shell_{help,tabs} 2018-09-13 19:44:24 -05:00
William Vu cfbd259e80 Merge remote-tracking branch 'upstream/master' into pr/10389 2018-09-13 16:08:07 -05:00
Adam Cammack 7c6c621a8f
Remember to assign `self.prompt` in shell.rb
Not everything updates the prompt all the time, make them feel welcome.
2018-09-13 15:51:07 -05:00
Matthew Kienow c2230f98d5
Warn user about inactive sessions without DB 2018-09-13 15:13:41 -04:00
Matthew Kienow 6a6d92abc1
Check DB is active before querying sessions 2018-09-13 15:06:53 -04:00
William Vu b3e9856851 Revert doc changes to exploit.rb autofilter
I think the changes might have been accidental.

3cf4329335
2018-09-13 13:27:52 -05:00
h00die 8025a49c44
Land #10633 fix for solaris pidof for more versions 2018-09-13 13:10:28 -04:00
Adam Cammack 175dec7ade
Print help when `repeat` is run with no commands 2018-09-13 11:27:05 -05:00
Adam Cammack 04cc7843a4
Typo fixes 2018-09-13 11:19:13 -05:00
Brendan Coles 53a326c743 Cleanup is_root? method for Linux::Priv / Solaris::Priv 2018-09-13 08:54:31 +00:00
Brendan Coles bba818a323 Fix Msf::Post::Solaris::System pidof method 2018-09-13 08:29:56 +00:00
William Vu 68a51da27b
Land #10477, console prompt fixes and refactor 2018-09-12 18:00:48 -05:00
OJ 84e87b10af
Update warning message when loading mimikatz on new OSes 2018-09-13 08:31:08 +10:00
William Vu b70960bddb
Land #10619, mimikatz/kiwi warning per OS version 2018-09-12 17:11:11 -05:00
Tim W 5c65f23847 add chmod tab completion 2018-09-12 19:04:51 +08:00
Adam Cammack d017f420bf
Fix missing exception capture 2018-09-11 17:58:41 -05:00
OJ e2c6748759
Replace 'and' with '&&' 2018-09-12 08:27:27 +10:00
Adam Cammack 8fa71ade44
Add `repeat` command to loop msfconsole commands 2018-09-11 17:25:33 -05:00
Adam Cammack de0f0a97fb
Add mode to Shell#run_single to re-raise errors 2018-09-11 17:23:56 -05:00
Adam Cammack da25391426
Relocate option parsing error handling up a level 2018-09-11 17:22:05 -05:00
Adam Cammack 74ae89ac96
Minor fixups for `grep`
Use Shellwords to join words that have been shellsplit and will be
shellsplit again, and correctly reference a missing command name.
2018-09-11 17:20:34 -05:00
h00die a7105b45a6 add gcc path for solaris 2018-09-11 05:18:26 -04:00
William Vu 117121b058
Land #10617, sessions -x fix for when LURI is used 2018-09-11 03:00:34 -05:00
Brendan Coles 7c1ae843b1 Fix Msf::Post::Solaris::Kernel class name 2018-09-11 07:15:19 +00:00
OJ 8d6fcefccc
Fix crash when using sessions -x 2018-09-11 13:28:33 +10:00
Brent Cook a3d74d926c
Land #9897, Fix #8404 ListenerComm Support For Exploit::Remote::TcpServer 2018-09-10 16:25:55 -05:00
Brent Cook ea2fcb6fc4
Land #10593, Refactor SSH mixins and update modules 2018-09-10 15:38:53 -05:00
Brent Cook 55ae02ba4e DRY up doc generator 2018-09-07 11:47:29 -05:00
Erin Bleiweiss 1eb703b1b5
Refactor initialization of module's notes attribute 2018-09-06 16:15:52 -05:00
Erin Bleiweiss b7ee406203
Use a 'reduce' to transform notes 2018-09-06 15:50:23 -05:00
Erin Bleiweiss 876240d18c Condense note transformation inside mod_meta_common 2018-09-06 15:48:22 -05:00
Brent Cook dd476066cf
Land #10584, fix session upgrade HANDLE_TIMEOUT and upgrading osx shells 2018-09-06 05:52:40 -05:00
William Vu 35fb0d19ab Refactor SSH mixins and update modules 2018-09-05 23:53:11 -05:00
William Vu e2428b5c20 Fix target DisableNops not being passed to payload 2018-09-05 18:07:54 -05:00
Wei Chen 1f16052988 Make key random and fix RPC 2018-09-05 15:09:47 -05:00
OJ 635d92901f
Add warning for mimikatz and kiwi if OS versions are wrong 2018-09-05 09:34:34 +10:00
Tim W c38a7e97fd fix session.type for osx shells 2018-09-04 22:59:03 +08:00
Wei Chen a3df5bb5d9 Fix rpc_info 2018-09-04 08:35:39 -05:00
Jacob Robles 0a2b0f8cec
Remove trailing comma
Fix issue causes target.ret to be an array
2018-09-04 07:43:43 -05:00
Wei Chen d89b971d83 Add API doc for rpc_compatible_evasion_payloads 2018-09-03 22:25:51 -05:00
Wei Chen e9c4698291 Support RPC 2018-09-03 22:15:23 -05:00
Tim W d5e78ab66f
Land #10437, sync some linux local libraries to solaris 2018-09-03 22:46:50 +08:00
Matthew Kienow 34f87efb2b
Land #10532, enhance db_connect for data services 2018-09-03 09:43:34 -04:00
James Barnett 1c8a2f3ee1
Raise an error when http service fails to connect
Also fix a bug where failed Postgres connections werent being raised
2018-09-02 15:51:13 -05:00
Tim W c4ebf7b4f3
add meterpreter chmod command 2018-09-01 23:52:31 +08:00
stefano118 1ddd22d073
bug fix and improvements 2018-09-01 03:17:18 +02:00
stefano118 6c1a83d464
refactor: snake case 2018-09-01 03:17:17 +02:00
stefano118 27d7d17deb
refactor: beautify stub
refactor: beautify stub

refactor: beautify stub

refactor: beautify stub
2018-09-01 03:17:16 +02:00
James Barnett b4c731d4ca
Check name validity at a higher level 2018-08-31 18:16:32 -05:00
Erin Bleiweiss 5c7f59e2f9
Remove AKA formatters from references 2018-08-31 16:54:16 -05:00
Erin Bleiweiss 420041f287
Don't refer to AKA as 'alias' in order to not overlap nomenclature with upcoming 'alias' feature 2018-08-31 16:54:07 -05:00
Erin Bleiweiss e5106b54db
Add AKA info to module info 2018-08-31 16:52:26 -05:00
Erin Bleiweiss e10d9c5d67
Update module search to search aka names 2018-08-31 16:52:17 -05:00
Erin Bleiweiss 3f9e19c6af
Restructure Notes into NotesContainer object 2018-08-31 16:51:59 -05:00
Erin Bleiweiss f61ed95ebe
Add default value for notes 2018-08-31 16:50:23 -05:00
Erin Bleiweiss 3c115f1bfc
Update json parsing rules for external modules 2018-08-31 16:48:56 -05:00
James Barnett 084607b955
Set current_data_service when disconnecting from http 2018-08-31 16:48:33 -05:00
Erin Bleiweiss 659e4f2b34
Build json correctly for new notes field 2018-08-31 16:47:00 -05:00
James Barnett 185fe56e82
Add message when connecting via yaml 2018-08-31 16:13:17 -05:00
James Barnett a413b27e57
Fix bug connecting to https servers 2018-08-31 15:49:29 -05:00
Wei Chen b976ccd3fe Fix typos 2018-08-31 14:53:52 -05:00
Wei Chen bcaa6e90f6 Fix targeting 2018-08-31 13:37:23 -05:00
James Barnett 1e6f19e1de
Update db_save message when no valid service connected
Also add the current data service name to db_status
2018-08-31 12:54:08 -05:00
Wei Chen f296c204cb Add some comments 2018-08-31 11:55:50 -05:00
Wei Chen 5c6b33bcf4 Add support for evasion targets, also module doc 2018-08-31 11:45:29 -05:00
James Barnett bc4a0345dc
Fix bug preventing yaml connections 2018-08-31 11:26:08 -05:00
OJ 41b0dc1dfe
Update label for the kiwi extention to match latest ver
I'll also update this PR with the udpated binaries when the paylaods
repo has landed https://github.com/rapid7/metasploit-payloads/pull/298
2018-08-31 09:31:57 +10:00
James Barnett 6ddf4f4c22
Refactor db_connect for updated usage
db_connect will now automatically save the data service it connects to
db_save will be used to set the current data service as default
add a db_remove command to delete a saved data service
2018-08-30 18:19:14 -05:00
Wang Yihang a83e63516e [+] Modify script permission in case of TOCTOU 2018-08-30 10:25:27 -04:00
Wang Yihang e6140bc78c Merge branch 'upstream-master' into add-source-meta-command 2018-08-30 10:17:29 -04:00
Wei Chen ea41127c6e Support info command 2018-08-29 16:24:23 -05:00
Josh Hale 71a7ca4d7d Use env(1) instead of export 2018-08-29 14:51:20 -05:00
James Barnett d6d9f9c675
Handle case for no connection for save and disconnect 2018-08-29 13:54:20 -05:00
Wei Chen b085633e49 Style change and move option to evasion.rb 2018-08-29 13:39:29 -05:00
James Barnett 133892629e
Dont allow invalid config file characters
Also only save cert when it is present
2018-08-29 12:49:03 -05:00
James Barnett f7ecd4436d
Even more messaging changes 2018-08-29 11:32:01 -05:00
James Barnett 65f38d6051
More messaging changes 2018-08-29 11:19:37 -05:00
Adam Cammack 7414b18f20
Move prompt_char space to correct place 2018-08-29 10:38:28 -05:00
Josh Hale 09926bd184 Better help description and comments 2018-08-28 22:11:32 -05:00
James Barnett 28954dbc1d
More messaging improvements 2018-08-28 17:14:59 -05:00
James Barnett cc5d96a441
Update messaging 2018-08-28 17:00:58 -05:00
James Barnett 161fb52ae3
Dont build connect string manually during loadup 2018-08-28 16:37:14 -05:00
James Barnett 52cc140cd2
Handle case where no default db is set 2018-08-28 15:52:26 -05:00
bwatters-r7 1be7f55cae
Land #8983, Add peinjector post module
Merge branch 'land-8983' into upstream-master
2018-08-28 15:25:56 -05:00
William Vu 4803c889f9
Land #10507, GPP creds for db_import 2018-08-28 11:45:51 -05:00
James Barnett 5e45e2f1e9
Add help text for -l and -n options 2018-08-28 11:42:10 -05:00
James Barnett 3c1086741b
Use correct variable name for api_token 2018-08-28 10:49:50 -05:00
alpiste 562fc09d5d add new line to the end of the file 2018-08-28 09:02:21 -05:00
alpiste 3a6d72b8b6 some executable files need stack preserve and stack restore, functionality restored 2018-08-28 09:02:21 -05:00
alpiste ff7baaca13 remove stack preserve and stack restore in x86 shellcode and delete duplicated stack preserve variable in x64 shellcode 2018-08-28 09:02:21 -05:00
bwatters-r7 5a28863b12 Fix Whitespace for Rubocop 2018-08-28 09:02:21 -05:00
bwatters-r7 3ac24abfb2 Remove Extra stackpreserve variable 2018-08-28 09:02:21 -05:00
bwatters-r7 f9148f7864 Update/Add Human-Readable ASM 2018-08-28 09:02:21 -05:00
alpiste f1e4079641 move add_thread code to lib/rex/post/meterpreter/extensions/peinjector/peinjector.rb 2018-08-28 09:02:21 -05:00
alpiste 55299561b1 Peinjector meterpreter extension interface added 2018-08-28 09:02:21 -05:00
alpiste ced4ae6f49 MSFTidy module 2018-08-28 09:02:21 -05:00
alpiste 2251c4a712 Add peinjector post module 2018-08-28 09:02:21 -05:00
James Barnett 5b7127c826
Use Rex::Text::Table for outputting data services 2018-08-27 13:18:41 -05:00
James Barnett 24cf99f59c
Enable deletion of saved data services 2018-08-27 11:32:19 -05:00
Josh Hale 419738a746 Add expect method, -s, and -l 2018-08-26 19:38:19 -05:00
Brent Cook cb07ba2b6c
Land #10516, Add brace expansion encoder and update ${IFS} encoder 2018-08-25 22:23:07 -05:00
Brent Cook 969170096a
Land #10520, Only allow setting persistence on payload jobs 2018-08-25 22:21:46 -05:00
William Vu 6df235062b
Land #10505, post-auth and default creds info 2018-08-24 18:08:15 -05:00
William Vu cde82b18ab
Land #10379, tab completion for multiple commands 2018-08-24 18:06:14 -05:00
William Vu e955e8dc15 Clean up code
And hope I didn't break anything.
2018-08-24 18:05:52 -05:00
James Barnett bb0ec0472b
Enable saving local data services 2018-08-24 12:51:50 -05:00
Green-m 1dd91434f4
Fix #10518, bug fix when add persistent to non-payload job. 2018-08-24 03:39:18 -04:00
Green-m 6d84d3bfec
Add tabs auto completion for irb. 2018-08-23 23:29:12 -04:00
Green-m 418b574161
Merge branch 'master' and resolve conflict. 2018-08-23 23:24:23 -04:00
William Vu 7c0dd2a0fe Add CmdUnixBrace and update CmdUnixIfs
Acronyms can be capitalized as per the Ruby style guide.
2018-08-23 21:18:09 -05:00
Matthew Kienow df18e354e1
Add bind_busybox_telnetd payload, misc cleanup 2018-08-23 15:23:39 -04:00
Matthew Kienow c0c3e12c74
WIP - hp officejet pro exploit, enhance PJL lib 2018-08-23 14:53:54 -04:00
James Barnett 724e0dcaf3
Add ability to connect to saved data services 2018-08-22 17:16:27 -05:00
William Vu 9b3e0d8306 Add additional root tags for GPP XML
Finally ran through all the samples and cross-referenced with MS14-025.

https://msdn.microsoft.com/en-us/library/cc232650.aspx
https://support.microsoft.com/en-us/help/2962486/ms14-025-vulnerability-in-group-policy-preferences-could-allow-elevati
2018-08-22 16:48:33 -05:00
William Vu 2891255549 Clarify what is being imported currently
Since the parser is focused on creds.
2018-08-22 15:53:19 -05:00
William Vu 1e4eb0eae0 Revert report_note, since it added nothing
A bit of misunderstanding. We're in agreement that loot was enough.
2018-08-22 14:34:09 -05:00
William Vu 6fa04950ee Store parsed GPP data as a note
And refactor slightly.
2018-08-22 14:19:50 -05:00
Wang Yihang 29ff1ea952 [+] Add source meta command to execute script remotely 2018-08-22 21:50:40 +08:00
Wang Yihang 8f0a37add6 Merge remote-tracking branch 'upstream/master' into add-resource-meta-shell-command 2018-08-22 21:08:28 +08:00
王一航 e29135d0f5
Merge branch 'master' into impl-of-ctrl-z 2018-08-22 17:31:00 +08:00
William Vu b1c633faf6 Add Group Policy Preferences support to db_import
And take the Jaden Smith approach, as @busterb quipped to me. :)

This one's a little weird, since you normally import scans into
Metasploit, but now that creds are first-class in the database, it makes
more sense to be able to import them.

Currently, your alternatives are post/windows/gather/credentials/gpp,
which requires a session, and auxiliary/scanner/smb/smb_enum_gpp, which
requires a network scan.
2018-08-21 23:44:39 -05:00
James Barnett 68aca395a4
Remove debug logging 2018-08-21 15:06:30 -05:00
James Barnett 57243106f7
Connect to the default database on startup 2018-08-21 14:29:20 -05:00
James Barnett b6401dbe56
Add db_save command 2018-08-21 11:10:43 -05:00
Wei Chen 080ba15179 Another boo-boo 2018-08-21 08:55:14 -05:00
William Vu 321f2b8746 Improve file operations
Hmm, why did I not use File.write before? Oh well, fixed.
2018-08-20 22:25:19 -05:00
Green-m 808e2f2e25 Fix issue #10499 2018-08-21 03:08:14 +00:00
Green-m edb85614ff Make code cleaner 2018-08-21 03:05:44 +00:00
asoto-r7 bc3b317963
Land #10449, Implementation of download/upload file in reverse shell 2018-08-20 19:10:26 -05:00
asoto-r7 4aee3a4ae2
Land #10448, Implementation of CTRL+C to send SIGINT signal 2018-08-20 18:14:29 -05:00
Brent Cook 11fee8fa2c
Land #10471, Import target DefaultOptions into the datastore 2018-08-20 17:30:27 -05:00
Brent Cook fb2d3bfd4a
Land #10492, show help when no argument is provided to `show` 2018-08-20 15:46:29 -05:00
James Barnett 3fadc64fb2 Don't set the workspace to default if it is already set 2018-08-20 14:35:06 -05:00
Auxilus 8869604143
update help for show and search 2018-08-21 00:17:57 +05:30
Auxilus e8c0638092
Update modules.rb 2018-08-20 23:36:57 +05:30
Auxilus 0e594266e9
show help when no argument is provided to `show` 2018-08-20 23:32:34 +05:30
Adam Cammack 94dd67f3a5
Add public readers for prompt and prompt_char
This allows various things to inspect the state of the console before
calling `update_prompt`.
2018-08-17 14:41:48 -05:00