Commit Graph

209 Commits

Author SHA1 Message Date
Adam Cammack 9aafb3b306 Fix copy-pasta 2020-03-24 09:56:30 -05:00
dwelch-r7 682653e9d9 PR comments 2020-03-13 13:32:59 +00:00
dwelch-r7 754b42f9f2 run rubocop -a on new files 2020-03-13 13:32:58 +00:00
dwelch-r7 6762a7b147 Fix all the tests 2020-03-13 13:32:58 +00:00
dwelch-r7 e6aa840e64 Store results as json to prevent keeping references around 2020-03-13 13:32:58 +00:00
dwelch-r7 9f76f3ef08 Use rpc specific job status tracker and add default no op tracker 2020-03-13 13:32:57 +00:00
Alan Foster 12958326b9 Track job status earlier 2020-03-13 13:32:57 +00:00
dwelch-r7 34fc7528dd Re-add original job state tracker code
This reverts commit 908ce3d3
2020-03-13 13:32:57 +00:00
Jeffrey Martin 908ce3d36b Revert "Land #12960, add ttl to job results instantiated from an RPC request"
This reverts commit ff8bb2e16f, reversing
changes made to ae28463ec6.
2020-03-02 15:58:13 -06:00
dwelch-r7 89bea26763 Replace results count with something that works and added tests 2020-02-26 11:52:45 +00:00
dwelch-r7 fdf0447ecf Track results size 2020-02-25 15:39:41 +00:00
dwelch-r7 5c94910998 Add a cache to handle the ttl of job results
Remove accidental addition of gem

Remove commented out code

Remove commented out code

Remove commented out code

Refactor job tracking code, remove simple framework tests

finish renaming service to job_state_tracker

add missing require and move alias definition

fix private attr declaration

Add rspec tests

Address PR comments

Use let syntax in tests

Finish refactor moving job state tracker
2020-02-25 13:31:28 +00:00
Adam Galway 6f33c9ad99 Land #12953 fix rpc module check & adds unit tests 2020-02-24 11:26:38 +00:00
Alan Foster 9c987b8271 Add json rpc tests for module checks 2020-02-18 21:43:15 +00:00
William Vu 7e9bd506d6 Add generate -v to optionally show payload stage 2020-02-13 16:33:48 -06:00
Adam Galway f8b8dc1c80 improve dertermining module check support 2019-12-13 11:02:21 +00:00
Adam Cammack 9d41818899 Always trigger the Simple interface 2019-11-19 00:28:17 -06:00
Adam Cammack de845214d1 Add module check result tracking to RPC API
This adds a few sets and a hash to the Msf::Simple::Framework that help
keep track of running checks and their eventual results.
2019-10-29 12:45:09 -05:00
James Lee 440c82b3e2 Fix broken ps1 and powershell transform 2019-09-18 12:20:16 -05:00
William Vu fb6d5d603d Update generate splat from http:// to https:// 2019-08-15 18:11:39 -05:00
Brent Cook 1c1103f9da Land #11400, Add --sec-name to msfvenom, update generate command 2019-02-19 21:11:01 -06:00
Green-m d3745e9a39 Enable cancel auxiliary mod for multiple targets. 2019-02-14 11:16:37 +08:00
Patrick 5151473e09 Implement sec-name and pad-nops for command dispatcher 2019-02-13 13:35:42 -06:00
Kevin Kirsche ad58930e9b Dump formats when invalid format is selected 2018-11-04 09:25:37 -05:00
Kevin Kirsche 9f77966ec9 Revert downcase throughout, instead use single downcase within option parsing 2018-11-04 08:57:45 -05:00
Kevin Kirsche aadefdbc82 Update msfvenom formatter to be case insensitive 2018-10-12 11:11:52 -04:00
Wei Chen c7efd57144 Sync up with master 2018-10-06 08:27:01 -05:00
Green-m 90b98a193c Refactor the rhosts for exploit modules. 2018-09-30 16:08:49 +08:00
Wei Chen bcaa6e90f6 Fix targeting 2018-08-31 13:37:23 -05:00
Wei Chen f7e49d3f7e Able to successfully run a module 2018-08-06 11:46:19 -05:00
Wei Chen 37f70343e3 Get payload options to work (show, set, etc) 2018-08-03 11:47:43 -05:00
Wei Chen f176dd03b5 Add a new module type to support evasion (WIP) 2018-08-02 11:54:38 -05:00
William Vu 654cbd198a Fix missing method when check is run
Oops, lost the "mod" when I refactored into ternary. Caught during
verification with @wchen-r7. :D
2018-07-23 14:19:48 -05:00
William Vu 5fa1ddf4eb Remove default check method 2018-07-18 16:25:46 -05:00
William Vu 2e002b24a0 Update Msf::Simple::Exploit for targeting by name
And accidentally add error checking.
2018-05-16 10:35:17 -05:00
Jeffrey Martin 2487314821 Land #9869, Add support for shellcode encryption for msfvenom 2018-04-25 15:51:05 -05:00
William Vu 06de967b02 Pass NOP generator to exploit_simple
This also makes exploit_simple consistent with its documentation.
2018-04-20 18:27:53 -05:00
Wei Chen ff9c55207e Move crypto methods to Rex::Crypto namespace 2018-04-17 20:12:26 -05:00
Wei Chen 19e76329dc Add some checks in buffer.rb and fix option in msfvenom 2018-04-11 13:02:35 -05:00
Wei Chen b630d5c327 Add encryption support for shellcode 2018-04-10 11:14:14 -05:00
William Vu c1f2fc1838 Add Msf::{Auxiliary,Post}::Complete
Not sure yet why we're doubling up on cleanup.
2017-07-03 00:26:49 -05:00
William Vu 48dddd1e46 Pretty-print fail_with for aux and post modules 2017-07-03 00:07:32 -05:00
David Maloney 69e2d05a5d rip out old rex code and replace with gems
rex-text, rex-random_identifier, rex-powershell, rex-zip, and rex-registry
are now being pulled in as gems instead of part of the spgehtti code that is lib/rex
2016-06-21 13:56:36 -05:00
David Maloney a27d10c200 fixes the exception handling in #exploit_simple
The exception handling in the #exploit_simple method tries to set
error on exploit but exploit is defined within the begin block
causing a noMethodError on nilClass

MS-1608
2016-05-31 11:46:05 -05:00
Brent Cook 57ab974737 File.exists? must die 2016-04-21 00:47:07 -04:00
Christian Mehlmauer 3b280d45a4 fix some yardoc issues 2016-04-18 21:00:21 +02:00
Gregory Mikeska cbc5b296e4 implement engines method locally instead of adding refinement 2016-02-25 11:05:17 -06:00
wchen-r7 a16a10aaf6 Fix #6371, being able to report an exception in #job_run_proc
Fix #6371

When a browser fails to bind (probably due to an invalid port or
server IP), the module actually fails to report this exception from
exception, the method calls exploit.handle_exception(e). But since
handle_exception is not a valid method for that object, it is unable
to do so, and as a result the module fails to properly terminate
the module, or show any error on the console. For the user, this will
make it look like the module has started, the payload listener is up,
but there is no exploit job.

Rex::BindFailed actually isn't the only error that could be raised
by #job_run_proc. As far as I can tell registering the same resource
again could, too. With this patch, the user should be able to see this
error too.

Since the exploit object does not have access to the methods in
Msf::Simple::Exploit, plus there is no other code using
handle_exception and setup_fail_detail_from_exception, I decided
to move these to lib/msf/core/exploit.rb so they are actually
callable.
2015-12-22 16:35:29 -06:00
Brent Cook 6482083b6b revert WfsDelay short-circuit on exploit failure
Some exploits currently succeed, but can fail during cleanup, leading to a
false-negative. Reverting this so that the affected exploits can be fixed
first.

This reverts commits b0858e9d46 and
b3f754136e.
2015-09-22 14:43:03 -05:00
HD Moore b3f754136e Skip WfsDelay when the exploit has clearly failed 2015-09-15 08:04:23 -07:00