Commit Graph

4595 Commits (master)

Author SHA1 Message Date
Shelby Pace 34ae9c38f9
added WebEx modules, arch check 2018-10-23 15:51:23 -05:00
Rich Whitcroft 854485a016 add bg command to meterpreter 2018-10-16 14:01:50 +00:00
Brent Cook 7f2aa8ca4e
Land #10770, show full path for webcam_stream file 2018-10-09 05:32:32 -05:00
h00die 71a6d802e8 show full path 2018-10-08 10:27:56 -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 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
Green-m 1b93363588
Change the error message when interrupt exploit. 2018-09-30 16:09:00 +08:00
bwatters-r7 c22ec85d9c
Land #10703, Update payloads to include the new Kiwi release 2018-09-28 14:43:51 -05:00
William Vu ab56ac6655 Refactor and clean up reload_lib -a and others 2018-09-27 22:11:22 -05:00
OJ 736b60f63c
Update payloads to include the new Kiwi release 2018-09-26 14:26:31 +10: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
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
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
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
Jeff Tang bba7bcc885
add support for ext_server_unhook 2018-09-19 16:20:26 -04:00
Tim W b10671a331 Fix #10601, add api key for android wlan_geolocate 2018-09-17 06:04:11 +08: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
Adam Cammack 04cc7843a4
Typo fixes 2018-09-13 11:19:13 -05: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 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
Brent Cook a3d74d926c
Land #9897, Fix #8404 ListenerComm Support For Exploit::Remote::TcpServer 2018-09-10 16:25:55 -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 c4ebf7b4f3
add meterpreter chmod command 2018-09-01 23:52:31 +08: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
Josh Hale 71a7ca4d7d Use env(1) instead of export 2018-08-29 14:51:20 -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
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
Josh Hale 419738a746 Add expect method, -s, and -l 2018-08-26 19:38:19 -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
Green-m 418b574161
Merge branch 'master' and resolve conflict. 2018-08-23 23:24:23 -04: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
asoto-r7 4aee3a4ae2
Land #10448, Implementation of CTRL+C to send SIGINT signal 2018-08-20 18:14:29 -05:00
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
Adam Cammack 410eee8537
Remove 'append' mode from update_prompt
Nothing used it meaningfully. Also, due to the way `init_prompt` was set
prior to b1401e2e4e, it would have been
very broken: the prompt_char would have been included in the line twice
and prompt substitutions like %T would have been cached. Even more,
trying to append the empty string to the prompt (removed in that commit)
caused us to add a number of workarounds removed in
1df442e0cf.
2018-08-17 14:32:48 -05:00
Adam Cammack b1401e2e4e
Update the prompt every shell tick
This was inadvertently done as part of the tab completion
initialization but is what we want. Also move the prompt formatting to
the prompt update and make the code more readable.
2018-08-17 14:10:28 -05:00
Adam Cammack 4375a3fbfb
Fix lurking bugs in the shell's prompt_yesno 2018-08-16 09:05:22 -05:00
Adam Cammack c045f70e80
Emulate `prompt_yesno` semantics for UI drivers 2018-08-15 17:30:37 -05:00
Josh Hale f1fd077bef Whitespace fix 2018-08-11 17:39:44 -05:00
Josh Hale 7b573fa3ca Use multiple bash methods 2018-08-11 17:38:13 -05:00
Wang Yihang 6c33854ffc [+] Exit vim opened in reverse shell via signal USR1 2018-08-12 06:07:18 +08:00
Wang Yihang 6578950533 [-] Remove debug message 2018-08-09 16:32:27 +08:00
Wang Yihang f6c28106b9 Merge remote-tracking branch 'upstream/master' into add-resource-meta-shell-command 2018-08-09 16:20:26 +08:00
William Vu 2bce8b008e Fix history deduplication for system Readline 2018-08-07 16:53:24 -05:00
William Vu 298d5c3b30 Refactor history clearing 2018-08-07 16:53:17 -05:00
William Vu 3b2c3507d1 Refactor history deduplication on save
We move the check outside the block and clean up the syntax.
2018-08-07 11:18:13 -05:00
Auxilus cb01216e0c
fix history issues as stated in #10423 2018-08-06 11:27:47 +05:30
William Vu a0962855bd Refactor history deduplication
We don't need to know the absolute index. We also fix the IndexError.
2018-08-05 14:28:10 -05:00
Auxilus fce19cf5b8
Prevent adding the same command to history 2018-08-05 22:33:00 +05:30
Brent Cook 1601e8a844
Land #10330, Add SMBv2 support to bind_named_pipe payloads 2018-08-01 12:58:44 -05:00
Green-m 21afd0572c use %w to replace [] for string arrays, more readable. 2018-07-30 22:47:59 -04:00
Wang Yihang c90b03808a Merge remote-tracking branch 'upstream/master' into add-resource-meta-shell-command 2018-07-30 13:25:26 +08:00
Josh Hale fcbfa8019f style and more python checks 2018-07-29 22:52:43 -05:00
Josh Hale 51ff09a9b6 Only try on NX 2018-07-28 19:00:33 -05:00
Josh Hale 0a6a91a1c6 Initial add of pybash option 2018-07-26 14:44:34 -05:00
Green-m 3f8906596d Fix issue 10372, match mutiple slashes better 2018-07-26 05:35:04 -04:00
Green-m 63ed4b2173 Add uictl tabs 2018-07-26 05:33:40 -04:00
Green-m 2dbbd0c649 Add multiple commands' tabs and help 2018-07-26 05:32:57 -04:00
Green-m 4060492bfc Add multiple commands' tabs and help 2018-07-26 05:27:47 -04:00
Green-m 3852265d9f Add multiple commands' tabs and help 2018-07-26 05:26:30 -04:00
Green-m 6c1a28d2d6 Add multiple commands' tabs and help 2018-07-26 05:25:38 -04:00
Green-m 6a0534de14 Update splitkey method to match better on windows 2018-07-26 05:23:27 -04:00
Green-m 746b63f76a Add method to glob the given filename. 2018-07-26 05:21:12 -04:00
Adam Cammack ef264e78f0
Refactor grep command to use optparse
This is an experiment to see what it would take to convert *all* option
assignment, parsing, and validation to use Ruby's builtin optparse. Our
current situation in the command dispatchers is a mishmash of bespoke
and Rex code, both with odd behaviors. Modules use a more formalized
system, but it is also a bit janky and unlike most other tools a
pentester might use.

The first step is to refactor the console commands to use Ruby's builtin
option parsing to reduce code and increase homogeneity among the various
functions. Next we plan to explore what it would take to invoke modules
from within Metasploit this way (this would be Metasploit 5+ only).

Refactoring `grep` seems to have been a success. There is now less code;
the code that declares and handles the options are now in the same
place; long options are now supported; adjacent, argument-less short
opts now work as expected; patterns can now begin with a `-`; and option
arguments are now validated. Additionally, optparse's argument
coercion/validation code can be extended for custom types/validations to
support more specialized commands.
2018-07-19 12:11:09 -05:00
UserExistsError d5ed70417b bind_named_pipe payload for ruby_smb 2018-07-17 17:46:10 -06:00
William Vu 29f05339a9 Clean up code 2018-07-17 14:33:10 -05:00
Green-m 00a748a92c Add tab_complete_directory 2018-07-17 06:29:12 -04:00
Auxilus 71e25f1494
show error if server.pid == pid
This PR adds changes to catch error when `server.pid` and `pid` are the same
2018-07-14 16:32:38 +05:30
WangYihang ef55803936
[+] Update resource meta command help info
Signed-off-by: WangYihang <wangyihanger@gmail.com>
2018-07-11 13:07:15 +08:00
WangYihang 85bfca95fd [+] Fixed meterpreter resource bug 2018-07-09 11:27:30 +08:00
asoto-r7 ef78d70a00
Land #9356. Remove ring buffers from command dispatcher. 2018-07-06 13:12:13 -05:00
Brent Cook 0b9bc8c24a
Land #10241, don't call print_error from rex context, use elog instead 2018-07-05 17:28:10 -05:00
Jacob Robles 7dc87e1a9e
Increase read depth for smb pipes 2018-07-03 16:06:42 -05:00