move external module template to an ERB, allowing for more templates to be added #8346
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
acammack-r7
reviewed
May 6, 2017
| execute_cmdstager({:flavor => :wget}) | ||
| end | ||
|
|
||
| def wait_status(mod) |
There was a problem hiding this comment.
This method should be pulled out into a mixin, ERB helper, or something else where it won't be copy-pasta'd among all the templates.
There was a problem hiding this comment.
Maybe this should be inserted as
<%= extras %>
busterb
commented
May 8, 2017
| execute_cmdstager({:flavor => :wget}) | ||
| end | ||
|
|
||
| def wait_status(mod) |
There was a problem hiding this comment.
Maybe this should be inserted as
<%= extras %>
|
|
||
| register_options([ | ||
| <%= meta[:options] %> | ||
| ], self.class) |
| end | ||
| end | ||
| end | ||
| end |
wvu
reviewed
May 8, 2017
| @@ -34,12 +34,16 @@ | |||
| {'type': 'edb', 'ref': '41162'}, | |||
| {'type': 'url', 'ref': 'https://github.com/haraka/Haraka/pull/1606'}, | |||
| ], | |||
| 'type': 'remote_exploit.cmd_stager.wget', | |||
| 'type': 'remote_exploit_cmd_stager', | |||
| 'wfsdelay': 5, | |||
There was a problem hiding this comment.
I think this should be changed in the template.
acammack-r7
reviewed
May 9, 2017
| meta = mod_meta_exploit(mod, meta) | ||
| meta[:command_stager_flavor] = mod.meta['payload']['command_stager_flavor'].dump | ||
| out = render_template('remote_exploit_cmd_stager.erb', meta) | ||
| File.write("/tmp/blah.rb", out) |
acammack-r7
added a commit
that referenced
this pull request
May 10, 2017
Release NotesShims for external modules are now generated from a set of templates to allow easier management of additional module types. |
|
Thanks, @acammack-r7. |
acammack-r7
added
the
external modules
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This moves the inline external module template into an .erb file, separating the metadata parsing into common and exploit-specific chunks, which allows one to compose the specific functionality needed for a particular module type. When we add a 2nd template, this will likely shift around.
Verification steps