mirror of
https://github.com/rapid7/metasploit-framework
synced 2024-11-12 11:52:01 +01:00
This patch changes the exploits/auxiliary pages to be a bit cleaner. The fact that an action or target must be selected is much more obvious do to a dark background and white bold text
git-svn-id: file:///home/svn/framework3/trunk@4563 4d416f70-5f16-0410-b530-b9f4589650da
This commit is contained in:
HD Moore
parent
d446bd2520
commit
5dc41008dd
@ -56,22 +56,26 @@
|
||||
|
||||
<% end %>
|
||||
|
||||
<p>Configuration:</p>
|
||||
<p>Please enter all required options and press 'Launch Auxiliary' to continue.</p>
|
||||
|
||||
<tr>
|
||||
<th colspan="2" class="moduleOptionsHeader">
|
||||
CURRENT CONFIGURATION -
|
||||
<%= link_to "change action", :action => "view", :refname => h(params[:refname]) %>
|
||||
</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Auxiliary:</td>
|
||||
<td class="opt_name">AUXILIARY</td>
|
||||
<td><%= @tmod.refname %></td>
|
||||
</tr>
|
||||
|
||||
<% if @act %>
|
||||
<tr>
|
||||
<td>Action:</td>
|
||||
<td><%= @act.name %></td>
|
||||
<td class="opt_name">ACTION</td>
|
||||
<td><%= h(@act ? @act.name : 'Default Action') %></td>
|
||||
</tr>
|
||||
<% end %>
|
||||
|
||||
<tr>
|
||||
<th colspan="2" class="moduleOptionsHeader">OPTIONS</th>
|
||||
<th colspan="2" class="moduleOptionsHeader">STANDARD OPTIONS</th>
|
||||
</tr>
|
||||
|
||||
<form action="/auxiliaries/config" method="post">
|
||||
@ -83,8 +87,8 @@
|
||||
next if (option.advanced?)
|
||||
next if (option.evasion?) %>
|
||||
<tr>
|
||||
<td><strong><%= name %></strong></td>
|
||||
<td><strong><%= (option.required?) ? "Required" : "Optional" %></strong></td>
|
||||
<td class="opt_name"><%= name %></td>
|
||||
<td class="opt_required"><%= (option.required?) ? "Required" : "" %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= html_escape(option.desc) %> (type: <%= option.type %>)</td>
|
||||
@ -105,8 +109,8 @@
|
||||
<% @tmod.options.sort.each { |name, option|
|
||||
next if not option.advanced? %>
|
||||
<tr>
|
||||
<td><strong><%= name %></strong></td>
|
||||
<td><strong><%= (option.required?) ? "Required" : "Optional" %></strong></td>
|
||||
<td class="opt_name"><%= name %></td>
|
||||
<td class="opt_required"><%= (option.required?) ? "Required" : "" %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= html_escape(option.desc) %> (type: <%= option.type %>)</td>
|
||||
@ -127,8 +131,8 @@
|
||||
<% @tmod.options.sort.each { |name, option|
|
||||
next if not option.evasion? %>
|
||||
<tr>
|
||||
<td><strong><%= name %></strong></td>
|
||||
<td><strong><%= (option.required?) ? "Required" : "Optional" %></strong></td>
|
||||
<td class="opt_name"><%= name %></td>
|
||||
<td class="opt_required"><%= (option.required?) ? "Required" : "" %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= html_escape(option.desc) %> (type: <%= option.type %>)</td>
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<tr width="100%" align="center">
|
||||
<blockquote>
|
||||
<p class="moduleDescription">
|
||||
<%= h(@tmod.description) %>
|
||||
<%= @tmod.description.split("\n\n").map{ |t| h(t) }.join("<br/><br/>") %>
|
||||
</p>
|
||||
</blockquote>
|
||||
</tr>
|
||||
@ -25,7 +25,26 @@
|
||||
</p>
|
||||
</blockquote>
|
||||
</tr>
|
||||
|
||||
|
||||
<tr width="100%" align="center">
|
||||
<blockquote>
|
||||
<p class="moduleTargetsText">
|
||||
Select a target to continue:
|
||||
<ul class="moduleTargets">
|
||||
|
||||
<% if @tmod.actions.length > 0 %>
|
||||
<% p @tmod.actions %>
|
||||
<% @tmod.actions.each_with_index { |act, idx| %>
|
||||
<li><%= link_to h(act.name), :action => "config", :refname => @tmod.refname.gsub('/', ':'), :act => idx %></a></li>
|
||||
<% } %>
|
||||
<% else %>
|
||||
<li><%= link_to 'Default Action', :action => "config", :refname => @tmod.refname.gsub('/', ':')%></a></li>
|
||||
<% end %>
|
||||
</ul>
|
||||
</p>
|
||||
</blockquote>
|
||||
</tr>
|
||||
|
||||
<% if (@tmod.references.length > 0) %>
|
||||
<tr width="100%" align="center">
|
||||
<blockquote>
|
||||
@ -46,22 +65,5 @@
|
||||
</tr>
|
||||
<% end %>
|
||||
|
||||
<tr width="100%" align="center">
|
||||
<blockquote>
|
||||
<p class="moduleDescription">
|
||||
Please select an action:
|
||||
<ul class="moduleTargets">
|
||||
|
||||
<% if @tmod.actions.length > 0 %>
|
||||
<% p @tmod.actions %>
|
||||
<% @tmod.actions.each_with_index { |act, idx| %>
|
||||
<li><%= link_to h(act.name), :action => "config", :refname => @tmod.refname.gsub('/', ':'), :act => idx %></a></li>
|
||||
<% } %>
|
||||
<% else %>
|
||||
<li><%= link_to 'Default Action', :action => "config", :refname => @tmod.refname.gsub('/', ':')%></a></li>
|
||||
<% end %>
|
||||
</ul>
|
||||
</p>
|
||||
</blockquote>
|
||||
</tr>
|
||||
|
||||
</table>
|
||||
|
||||
@ -58,7 +58,23 @@
|
||||
|
||||
<% if @cur_step == nil %>
|
||||
|
||||
<p>Select payload for <strong><%= h(@target.name) %></strong>:</p>
|
||||
<p>Select payload for target <strong><%= h(@target.name) %></strong>:</p>
|
||||
|
||||
<tr>
|
||||
<th colspan="2" class="moduleOptionsHeader">
|
||||
CURRENT CONFIGURATION -
|
||||
<%= link_to "change target", :action => "view", :refname => h(params[:refname]) %>
|
||||
</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="opt_name">EXPLOIT</td>
|
||||
<td><%= @tmod.refname %></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="opt_name">TARGET</td>
|
||||
<td><%= @target.name %></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th class="moduleOptionsHeader">Name</th>
|
||||
@ -82,31 +98,31 @@
|
||||
|
||||
<% elsif @cur_step == "config" %>
|
||||
|
||||
<p>Exploit and payload configuration:</p>
|
||||
<p>Please enter all required options and press 'Launch Exploit' to continue.</p>
|
||||
|
||||
<tr>
|
||||
<th colspan="2" class="moduleOptionsHeader">
|
||||
CURRENT CONFIGURATION -
|
||||
<%= link_to "change", :action => "config", :refname => h(params[:refname]) %>
|
||||
<%= link_to "change payload", :action => "config", :refname => h(params[:refname]) %>
|
||||
</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Exploit:</td>
|
||||
<td class="opt_name">EXPLOIT</td>
|
||||
<td><%= @tmod.refname %></td>
|
||||
</tr>
|
||||
|
||||
|
||||
<tr>
|
||||
<td class="opt_name">TARGET</td>
|
||||
<td><%= @target.name %></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>Payload:</td>
|
||||
<td class="opt_name">PAYLOAD</td>
|
||||
<td><%= @payload_name %></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>Target:</td>
|
||||
<td><%= @target.name %></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th colspan="2" class="moduleOptionsHeader">OPTIONS</th>
|
||||
<th colspan="2" class="moduleOptionsHeader">STANDARD OPTIONS</th>
|
||||
</tr>
|
||||
|
||||
<form action="/exploits/config" method="post">
|
||||
@ -119,8 +135,8 @@
|
||||
next if (option.advanced?)
|
||||
next if (option.evasion?) %>
|
||||
<tr>
|
||||
<td><strong><%= name %></strong></td>
|
||||
<td><strong><%= (option.required?) ? "Required" : "Optional" %></strong></td>
|
||||
<td class="opt_name"><%= name %></td>
|
||||
<td class="opt_required"><%= (option.required?) ? "Required" : "" %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= html_escape(option.desc) %> (type: <%= option.type %>)</td>
|
||||
@ -133,8 +149,8 @@
|
||||
next if (option.advanced?)
|
||||
next if (option.evasion?) %>
|
||||
<tr>
|
||||
<td><strong><%= name %></strong></td>
|
||||
<td><strong><%= (option.required?) ? "Required" : "Optional" %></strong></td>
|
||||
<td class="opt_name"><%= name %></td>
|
||||
<td class="opt_required"><%= (option.required?) ? "Required" : "" %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= html_escape(option.desc) %> (type: <%= option.type %>)</td>
|
||||
@ -155,8 +171,8 @@
|
||||
<% @tmod.options.sort.each { |name, option|
|
||||
next if not option.advanced? %>
|
||||
<tr>
|
||||
<td><strong><%= name %></strong></td>
|
||||
<td><strong><%= (option.required?) ? "Required" : "Optional" %></strong></td>
|
||||
<td class="opt_name"><%= name %></td>
|
||||
<td class="opt_required"><%= (option.required?) ? "Required" : "" %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= html_escape(option.desc) %> (type: <%= option.type %>)</td>
|
||||
@ -168,8 +184,8 @@
|
||||
<% @payload_inst.options.sort.each { |name, option|
|
||||
next if not option.advanced? %>
|
||||
<tr>
|
||||
<td><strong><%= name %></strong></td>
|
||||
<td><strong><%= (option.required?) ? "Required" : "Optional" %></strong></td>
|
||||
<td class="opt_name"><%= name %></td>
|
||||
<td class="opt_required"><%= (option.required?) ? "Required" : "" %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= html_escape(option.desc) %> (type: <%= option.type %>)</td>
|
||||
@ -190,8 +206,8 @@
|
||||
<% @tmod.options.sort.each { |name, option|
|
||||
next if not option.evasion? %>
|
||||
<tr>
|
||||
<td><strong><%= name %></strong></td>
|
||||
<td><strong><%= (option.required?) ? "Required" : "Optional" %></strong></td>
|
||||
<td class="opt_name"><%= name %></td>
|
||||
<td class="opt_required"><%= (option.required?) ? "Required" : "" %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= html_escape(option.desc) %> (type: <%= option.type %>)</td>
|
||||
@ -203,8 +219,8 @@
|
||||
<% @payload_inst.options.sort.each { |name, option|
|
||||
next if not option.evasion? %>
|
||||
<tr>
|
||||
<td><strong><%= name %></strong></td>
|
||||
<td><strong><%= (option.required?) ? "Required" : "Optional" %></strong></td>
|
||||
<td class="opt_name"><%= name %></td>
|
||||
<td class="opt_required"><%= (option.required?) ? "Required" : "" %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><%= html_escape(option.desc) %> (type: <%= option.type %>)</td>
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<tr width="100%" align="center">
|
||||
<blockquote>
|
||||
<p class="moduleDescription">
|
||||
<%= h(@tmod.description) %>
|
||||
<%= @tmod.description.split("\n\n").map{ |t| h(t) }.join("<br/><br/>") %>
|
||||
</p>
|
||||
</blockquote>
|
||||
</tr>
|
||||
@ -25,7 +25,21 @@
|
||||
</p>
|
||||
</blockquote>
|
||||
</tr>
|
||||
|
||||
|
||||
<tr width="100%" align="center">
|
||||
<blockquote>
|
||||
<p class="moduleTargetsText">
|
||||
Select a target to continue:
|
||||
<ul class="moduleTargets">
|
||||
<% @tmod.targets.each_with_index { |tgt, idx| %>
|
||||
<li><%= link_to h(tgt.name), :action => "config", :refname => @tmod.refname.gsub('/', ':'), :target => idx %></a></li>
|
||||
<% } %>
|
||||
</ul>
|
||||
|
||||
</p>
|
||||
</blockquote>
|
||||
</tr>
|
||||
|
||||
<% if (@tmod.references.length > 0) %>
|
||||
<tr width="100%" align="center">
|
||||
<blockquote>
|
||||
@ -46,17 +60,5 @@
|
||||
</tr>
|
||||
<% end %>
|
||||
|
||||
<tr width="100%" align="center">
|
||||
<blockquote>
|
||||
<p class="moduleDescription">
|
||||
Please select a target:
|
||||
<ul class="moduleTargets">
|
||||
<% @tmod.targets.each_with_index { |tgt, idx| %>
|
||||
<li><%= link_to h(tgt.name), :action => "config", :refname => @tmod.refname.gsub('/', ':'), :target => idx %></a></li>
|
||||
<% } %>
|
||||
</ul>
|
||||
|
||||
</p>
|
||||
</blockquote>
|
||||
</tr>
|
||||
|
||||
</table>
|
||||
|
||||
@ -160,8 +160,18 @@ p.moduleDescription {
|
||||
.moduleReferences {
|
||||
list-style: circle;
|
||||
}
|
||||
|
||||
.moduleTargetsText {
|
||||
list-style: circle;
|
||||
font-weight: bold;
|
||||
background: #333333;
|
||||
color: white;
|
||||
padding: 0.25em;
|
||||
}
|
||||
|
||||
.moduleTargets {
|
||||
list-style: circle;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.moduleIcons {
|
||||
@ -185,3 +195,11 @@ th.moduleOptionsHeader {
|
||||
background: #eeeeee;
|
||||
padding: 0.25em;
|
||||
}
|
||||
|
||||
.opt_name {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.opt_required {
|
||||
color: red;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user