dnrops
/
metasploit-framework
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly handle cancelling certain GUI commands, and issuing them multiple times, etc. 

git-svn-id: file:///home/svn/framework3/trunk@11044 4d416f70-5f16-0410-b530-b9f4589650da
This commit is contained in:
Matt Weeks 2010-11-14 20:39:14 +00:00
parent 7f53f36150
commit 2a333d8106
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/gui/msfgui.jar
View File

Binary file not shown.

27
external/source/gui/msfguijava/src/msfgui/MainFrame.java vendored
View File

@ -1518,10 +1518,13 @@ nameloop: for (int i = 0; i < names.length; i++) {
addSessionItem("Interact",shellPopupMenu,null);
addSessionItem("Upgrade",shellPopupMenu,new RpcAction(this) {
String[] vals = null;
public void action(Map session) throws Exception {
public void prepare() throws Exception {
vals = JOptionPane.showInputDialog(getFrame(), "Select host/port for connect back.",
MsfguiApp.getLocalIp()+":4444").split(":");
if(vals == null)
vals = JOptionPane.showInputDialog(getFrame(), "Select host/port for connect back.",
session.get("tunnel_local").toString().split(":")[0]+":4444").split(":");
throw new MsfException("cancelled");
}
public void action(Map session) throws Exception {
rpcConn.execute("session.shell_upgrade", session.get("id"), vals[0], vals[1]);
}
});
@ -1556,8 +1559,11 @@ nameloop: for (int i = 0; i < names.length; i++) {
addSessionItem("Ping/DNS sweep",meterpreterPopupMenu,new NetenumOptionsDialog(getFrame()));
addScript("ARP sweep",meterpreterPopupMenu,new Object(){
public String toString(){
return "arp_scanner.rb -r "+JOptionPane.showInputDialog(getFrame(),
"Enter Target list as address or CIDR","Enter Target", JOptionPane.QUESTION_MESSAGE);
String target = JOptionPane.showInputDialog(getFrame(),
"Enter Target list as address or CIDR","Enter Target", JOptionPane.QUESTION_MESSAGE);
if(target == null)
throw new RuntimeException("cancelled");
return "arp_scanner.rb -r "+ target;
}
});
addScript("Run shell commands",meterpreterPopupMenu,new MulticommandOptionsDialog(getFrame()));
@ -1635,11 +1641,14 @@ nameloop: for (int i = 0; i < names.length; i++) {
addSessionItem("Other",meterpreterPopupMenu,new RpcAction(this) {
String command = null;
public void action(Map session) throws Exception {
public void prepare() throws Exception {
command = JOptionPane.showInputDialog(getFrame(),
"Enter a command","Run command on selected meterpreter sessions", JOptionPane.QUESTION_MESSAGE);
if(command == null)
command = JOptionPane.showInputDialog(getFrame(),
"Enter a command","Run command on selected meterpreter sessions", JOptionPane.QUESTION_MESSAGE);
rpcConn.execute("session.meterpreter_write", session.get("id"),Base64.encode(command.getBytes()));
throw new MsfException("cancelled");
}
public void action(Map session) throws Exception {
rpcConn.execute("session.meterpreter_run_single", session.get("id"),command);
}
});
addSessionKillItem(meterpreterPopupMenu);

5
external/source/gui/msfguijava/src/msfgui/RpcAction.java vendored
View File

@ -26,6 +26,7 @@ public class RpcAction implements ActionListener {
}
public void actionPerformed(ActionEvent e){
try{
prepare();
if(parent == null)
action();
else
@ -36,6 +37,10 @@ public class RpcAction implements ActionListener {
JOptionPane.showMessageDialog(null, "Error in RPC call: "+ex);
}
}
/** prepare() is provided to prepare state of action handler
* such as preparing a command that will be run on all selected sessions. */
public void prepare() throws Exception{
}
/** action() with no args provided as an exception-handling action listener. */
public void action() throws Exception{
if (parent == null)