Jon Cave
c03ff13377
Don't wait if the response has already been set
...
Fixes a race condition which could leave the waiter sitting indefinitely
if notify() is called before wait().
2015-11-21 14:21:42 +00:00
Jon Cave
12b24fecee
Return true/false if a waiter was/wasn't notified
...
The method is used as follows:
if notify_response_waiter(response)
# Proceed as if a waiter was notified
end
Previously the return value would be `nil` whenever the loop broke early
due to a waiter being found. This meant that the dispatcher thread often
believed that a packet was not being handled. As a result the
backlog == incomplete sleep kicked in unnecessarily.
2015-11-21 14:20:51 +00:00
Jon Cave
6509696eb1
Switch back to Mutex/CV for response waiters
...
Makes use of the wait() method's timeout parameter instead of using the
Timeout class.
2015-11-21 14:20:51 +00:00
Jon Cave
640a302b78
Switch to a Queue for the dispatcher's packet queue
...
The select() based sleep can be replaced by a blocking pop(). The thread
will be suspended until data is pushed onto the queue.
2015-11-21 14:20:51 +00:00
wchen-r7
038d367d58
Fix #6247 , Update Meterpreter Usage on "Interact"
...
The "interact" command does not actually exist. Instead, users
should do "channel -i" to interact with a channel.
Fix #6247
2015-11-16 17:58:39 -06:00
Brent Cook
7f19d95ad8
Land #6146 , add show_mount command (initially for windows meterpreter sessions)
2015-10-30 17:37:30 -05:00
Brent Cook
cb403b8a36
Land #6077 , initial python meterpreter module support
2015-10-30 17:29:05 -05:00
OJ
c5643e52ff
Add support for the show_mount command (windows)
2015-10-29 07:28:33 +10:00
jvazquez-r7
d5a010c230
Add support for registry_key_exist?
2015-10-22 16:07:38 -05:00
Brent Cook
4b271425c9
s/datstore/datastore/g
2015-10-20 13:05:49 -05:00
OJ
9adb2ee267
Fix silly typo
2015-10-12 14:58:30 +10:00
OJ
dbfee51ad3
Add support for folder importing
2015-10-12 11:52:55 +10:00
OJ
6849adad58
Adjusted to include import
2015-10-07 23:36:24 +10:00
OJ
8861d61ad4
Add stderr/stdout capture and var extraction
2015-10-01 08:17:17 +10:00
OJ
fb0d766958
First pass of the python extension for windows meterpreter
...
This includes the basic construct for the python extension, and allows
for single-shot commands to be run.
2015-09-29 20:48:29 +10:00
Brent Cook
f3451eef75
Land #5380 , pageantjacker, an SSH agent proxy
2015-09-26 10:52:44 -04:00
Brent Cook
d9a76bbe0a
Land #5911 , add adsi enumerate to a file via -o
2015-09-23 21:40:01 -05:00
Stuart
853d822992
Merge pull request #1 from bcook-r7/land-5380-pageantjacker
...
update pageantjacker to run as part of extapi
2015-09-23 09:45:53 +01:00
Stuart Morgan
cdd39f52b1
Merge branch 'master' of https://github.com/rapid7/metasploit-framework into pageant_extension
2015-09-21 14:34:56 +02:00
Stuart Morgan
e8e4f66aaa
Merge branch 'master' of ssh://github.com/stufus/metasploit-framework into pageant_extension
2015-09-21 14:34:38 +02:00
Brent Cook
61e7e1d094
update pageantjacker to run as part of extapi
2015-09-20 20:25:00 -05:00
HD Moore
24dd454127
Land #5912 , adds timeout option to migrate
2015-09-02 13:08:22 -05:00
HD Moore
54f79e72bb
Initialize writable_dir in the main block
2015-09-02 13:08:07 -05:00
OJ
cefb7c83f3
Fix call to migrate
2015-09-02 15:37:34 +10:00
OJ
0d2df33900
Fix two typos, add help detail
2015-09-02 09:35:51 +10:00
Joshua Smith
21ab4531d2
Land #5910 , move help fxn for ps
2015-09-01 14:23:25 -05:00
Brent Cook
b8458d6ec7
Land #5705 , allow removing transports by index
2015-09-01 14:08:48 -05:00
Brent Cook
b273893947
use URI.parse over a custom regex
2015-09-01 14:07:05 -05:00
OJ
299ceb7087
Add timeout option for migration
...
This commit changes the migrate function so that an optional timeout parameter can be given. This means that people in high-latency scenarios can extend the timeout when migration in order to increase the chances that things will work.
2015-09-01 22:53:30 +10:00
OJ
696bc95838
Merge branch 'upstream/master' into adsi-file-output
2015-09-01 17:25:13 +10:00
OJ
ef73f56201
Add -o parameter to adsi query functions
...
This allows for the output of the query to be written to a file.
2015-09-01 17:03:41 +10:00
OJ
abfeb204b3
Move help functionality for ps command
2015-09-01 16:45:35 +10:00
HD Moore
ff6fbfa738
Land #5895 , rework of ADSI modules
2015-08-31 14:10:41 -07:00
Brent Cook
30830ad9e5
Land #5262 , fix webcam_chat and tidy adjacent code
2015-08-31 14:21:24 -05:00
Brent Cook
fe69fc84de
expand the path environment variables before executing
2015-08-31 13:38:08 -05:00
Stuart Morgan
3a5ce02e8e
Changed the other print\n lines to print_line() for consistency
2015-08-28 14:05:44 +01:00
Stuart Morgan
266a6e7dc4
Changed to print_line() at the request of hdm
2015-08-28 11:35:51 +01:00
Stuart Morgan
5cdf1aeef4
Added examples to the usage-help and run through msftidy
2015-08-26 19:33:09 +01:00
Stuart Morgan
4bac21b7b9
Added command to list the domain controllers
...
Also added more information relating to the computers from LDAP
2015-08-26 15:33:54 +01:00
Stuart Morgan
59cf75c5a8
Updated description to make it more obvious & added specific DC enumeration
2015-08-26 15:03:28 +01:00
Stuart Morgan
7cee4d0ad1
Added the following commands:
...
adsi_group_enum - Lists all groups on the specified domain
adsi_nested_group_user_enum - Lists all users on the specified domain who are members of a given group DN (taking into account recursive/nested groups)
2015-08-26 14:14:15 +01:00
Brent Cook
6c89d0997c
Land #5855 , android offline collection support
2015-08-25 17:44:51 -05:00
Mo Sadek
1181600a69
Land #5575 , interactive channel logging
2015-08-25 16:23:51 -05:00
Brent Cook
54dcd312f6
more style issues resolved
2015-08-24 18:07:31 -05:00
Brent Cook
90a46fbcd0
update style issues
2015-08-24 17:58:24 -05:00
Brent Cook
573f2b51a5
fix some crashes running webcam commands on webcamless machines
2015-08-24 16:51:43 -05:00
Brent Cook
dfd00ad50b
prefer catching RuntimeError
2015-08-24 16:42:33 -05:00
Brent Cook
6977a12dd8
whitespace fixups
2015-08-24 16:39:17 -05:00
Brent Cook
f96236d61f
remove redundant to_s and RuntimeError
2015-08-24 16:21:34 -05:00
Brent Cook
4e8cc47299
remove superfluous SYSTEMDRIVE path
2015-08-24 16:19:16 -05:00