Commit Graph

883 Commits

Author SHA1 Message Date
Reelix f5a85890fd Update command_shell.rb
- Implement changes suggested by @smcintyre-r7
2020-08-31 21:16:33 +02:00
Reelix b9db589105 Update command_shell.rb
- Converted a missed tab to spaces
2020-08-30 09:48:19 +02:00
Reelix b61a5e5f75 Update command_shell.rb
- Fixed spacing (Tabs VS Spaces)
2020-08-30 09:45:38 +02:00
Reelix e2a008eade Update command_shell.rb
- Improved path detection
- Check for bash with python / python3 and use it if it exists
- Minor grammatical improvements
2020-08-30 09:22:25 +02:00
Spencer McIntyre e21cf15854 Land #13778, [GSOC 2020] - EV1 - Conditionality system for module options 2020-08-11 13:31:12 -04:00
Spencer McIntyre b55f5f12aa Adjust some whitespace and comments for option conditions 2020-08-11 13:30:27 -04:00
María Belén Tualombo Chimbo 11913f3b1e Old file deleted and reference updated 2020-08-09 12:37:42 -04:00
Jeffrey Martin 35017886b8 Land #13935, Preliminary Version 6 2020-08-06 10:19:34 -05:00
Jeffrey Martin 9aa26d1208 Merge upstream into 6.x 2020-08-03 11:43:47 -05:00
Jeffrey Martin 07cbe426e2 Rails 5, all models inherit from ApplicationRecord
ApplicationRecord is a new superclass for all app models, analogous to app controllers subclassing ApplicationController instead of ActionController::Base. This gives apps a single spot to configure app-wide model behavior.
https://edgeguides.rubyonrails.org/upgrading_ruby_on_rails.html#active-record-models-now-inherit-from-applicationrecord-by-default

Deprecated Relation#uniq use Relation#distinct instead.
https://edgeguides.rubyonrails.org/5_0_release_notes.html#active-record-deprecations
2020-07-31 11:56:49 -05:00
María Belén Tualombo Chimbo 372a0be0e1 minor changes 2020-07-31 10:47:37 -04:00
María Belén Tualombo Chimbo 091481b783 changes requested for the conditionality system for module OPTIONS/ACTIONS/TARGETS 2020-07-31 10:44:12 -04:00
María Belén Tualombo Chimbo 938173feb3 [GSoC] Ev1 - Conditionality system for module OPTIONS/ACTIONS/TARGETS 2020-07-31 10:28:21 -04:00
Alan Foster 632f1a1205 Update json rpc process request error handling 2020-07-21 18:39:02 +01:00
William Vu d494eb046d Fix RPC support by raising instead of returning 2020-07-20 14:04:38 -05:00
Brent Cook f70043bf4e check if a module has a check method first
Currently, if you run 'check' on a module that does not have a check
method, it will first complain that you have not set the 'RHOSTS'
option, whether it's an exploit module or a scanner. Then, once you set
RHOSTS (or whatever else it needs), it will then say 'Psych! I didn't
have a method in the first place!'.

This switches that logic around so that it first alerts you that the
module doesn't have support in the first place. It also similarizes more
logic between aux and exploit for some future convergence possibility.
2020-07-20 11:09:46 -05:00
Jeffrey Martin 65039a5091 Merge upstream into 6.x 2020-07-15 09:58:07 -05:00
Spencer McIntyre 5f5f42aa20 Readd the check that the key is set 2020-06-29 17:56:37 -04:00
Spencer McIntyre e72035f1a3 Support AES-128-CBC as an additional option for TLV encryption 2020-06-29 14:19:43 -04:00
Adam Galway 1a2bf98222 creates standard elog & updates exisiting usages 2020-06-22 12:48:39 +01:00
dwelch-r7 8ac04d5312 Land #13367, Surface helpful error messages to users 2020-05-06 14:40:21 +01:00
Alan Foster 2c8b5c2647 Fix edge cases in raising metasploit exceptions 2020-05-05 20:18:04 +01:00
Spencer McIntyre 197365b610 Finish up the .NET deserialization tool 2020-04-29 17:50:07 -04:00
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
bwatters-r7 2db93c9051 Land #12002, Feature/reverse ssh
Merge branch 'land-12002' into upstream-master
2020-02-21 09:17:51 -06: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 Galway debded62e3 add has_check? to Module & Scanner classes 2019-12-11 13:26:32 +00:00
Adam Galway 104710ca41 Land #12627, alter scanner info method for check 2019-12-04 15:04:11 +00:00
William Vu 26f7c8f599 Suggest exploit/windows/local/persistence
The persistence and metsvc Meterpreter scripts use a built-in payload,
so the local exploit is a more appropriate match.
2019-12-03 11:08:23 -06:00
Brent Cook d3a636eb6a Land #12509, add check result to RPC API 2019-12-02 11:37:43 -06:00
dwelch-r7 47b31a152e Alter scanners info method to show check supported properly 2019-11-26 04:21:06 +00:00
Brent Cook f8c84c9928 Land #12530, add encrypted, compilable shell payloads 2019-11-21 08:59:46 -06:00
Shelby Pace 0f5a3a3d64 use one cipher object
The c code was modified in order to keep
track of the context.
2019-11-20 11:24:23 -06:00
Adam Cammack 9d41818899 Always trigger the Simple interface 2019-11-19 00:28:17 -06:00
Shelby Pace 140eecac1f use new chacha implementation 2019-11-18 14:42:47 -06:00
Shelby Pace e5d418e913 generalize saving and retrieval of db info 2019-11-18 13:41:01 -06:00