From e34555dc228cf711bb6017b8c6324f2c260fe009 Mon Sep 17 00:00:00 2001 From: scriptjunkie Date: Sun, 11 Dec 2011 14:44:12 -0600 Subject: [PATCH] Remove XML RPC option for msfgui. --- data/gui/msfgui.jar | Bin 808639 -> 798441 bytes .../gui/msfguijava/src/msfgui/MsfTable.java | 12 +--- .../src/msfgui/OpenConnectionDialog.form | 61 ++++-------------- .../src/msfgui/OpenConnectionDialog.java | 60 +++++------------ .../msfguijava/src/msfgui/PayloadPopup.form | 15 ++--- .../msfguijava/src/msfgui/PayloadPopup.java | 18 +----- .../msfguijava/src/msfgui/RpcConnection.java | 19 ++---- .../gui/msfguijava/src/msfgui/XmlRpc.java | 1 - .../resources/OpenConnectionDialog.properties | 2 - 9 files changed, 47 insertions(+), 141 deletions(-) diff --git a/data/gui/msfgui.jar b/data/gui/msfgui.jar index 1db5f647e52ea13e1d4bacb0964914d4880924b4..8d83e692bb1c14fa4e81ae4d458037dea8c4fb62 100755 GIT binary patch delta 36366 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 diff --git a/external/source/gui/msfguijava/src/msfgui/MsfTable.java b/external/source/gui/msfguijava/src/msfgui/MsfTable.java index 6c85a04b70..ee877f602b 100644 --- a/external/source/gui/msfguijava/src/msfgui/MsfTable.java +++ b/external/source/gui/msfguijava/src/msfgui/MsfTable.java @@ -97,15 +97,9 @@ public class MsfTable extends javax.swing.JTable { if(!force && !DraggableTabbedPane.isVisible(this)) return; //Don't re-add if not visible try { - Object arg; - if(rpcConn.type.equals("XML") && (dbTable.equals("events") || dbTable.equals("loots"))){ - arg = MsfguiApp.workspace; - } else { - HashMap argM = new HashMap(10); - argM.put("workspace", MsfguiApp.workspace); - argM.put("offset", offset); - arg = argM; - } + HashMap arg = new HashMap(10); + arg.put("workspace", MsfguiApp.workspace); + arg.put("offset", offset); List data = (List) ((Map)rpcConn.execute("db."+dbTable, arg)).get(dbTable); if(data == null) return; diff --git a/external/source/gui/msfguijava/src/msfgui/OpenConnectionDialog.form b/external/source/gui/msfguijava/src/msfgui/OpenConnectionDialog.form index af8db630ae..e123711ed3 100644 --- a/external/source/gui/msfguijava/src/msfgui/OpenConnectionDialog.form +++ b/external/source/gui/msfguijava/src/msfgui/OpenConnectionDialog.form @@ -44,24 +44,18 @@ - - - - - - - - - - - + + + + + - + @@ -97,22 +91,14 @@ - - - - - - - - - - - - - - - - + + + + + + + + @@ -268,24 +254,5 @@ - - - - - - - - - - - - - - - - - - - diff --git a/external/source/gui/msfguijava/src/msfgui/OpenConnectionDialog.java b/external/source/gui/msfguijava/src/msfgui/OpenConnectionDialog.java index 1267e3aa68..d36c7e30ac 100644 --- a/external/source/gui/msfguijava/src/msfgui/OpenConnectionDialog.java +++ b/external/source/gui/msfguijava/src/msfgui/OpenConnectionDialog.java @@ -104,7 +104,7 @@ public class OpenConnectionDialog extends javax.swing.JDialog { int port = Integer.parseInt(info.get("port").toString()); boolean ssl = Boolean.parseBoolean(info.get("ssl").toString()); String type = info.get("type").toString(); - RpcConnection rpc = RpcConnection.getConn(type, username, password.toCharArray(), host, port, ssl); + RpcConnection rpc = RpcConnection.getConn(username, password.toCharArray(), host, port, ssl); if(javax.swing.JOptionPane.showConfirmDialog(null, "Connect to last remembered rpcd?") == javax.swing.JOptionPane.YES_OPTION) return rpc; rpc.execute("auth.logout"); @@ -154,8 +154,6 @@ public class OpenConnectionDialog extends javax.swing.JDialog { sslLabel = new javax.swing.JLabel(); disableDbLabel = new javax.swing.JLabel(); disableDbButton = new javax.swing.JCheckBox(); - xmlButton = new javax.swing.JRadioButton(); - msgpackButton = new javax.swing.JRadioButton(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); org.jdesktop.application.ResourceMap resourceMap = org.jdesktop.application.Application.getInstance(msfgui.MsfguiApp.class).getContext().getResourceMap(OpenConnectionDialog.class); @@ -255,15 +253,6 @@ public class OpenConnectionDialog extends javax.swing.JDialog { disableDbButton.setText(resourceMap.getString("disableDbButton.text")); // NOI18N disableDbButton.setName("disableDbButton"); // NOI18N - buttonGroup1.add(xmlButton); - xmlButton.setSelected(true); - xmlButton.setText(resourceMap.getString("xmlButton.text")); // NOI18N - xmlButton.setName("xmlButton"); // NOI18N - - buttonGroup1.add(msgpackButton); - msgpackButton.setText(resourceMap.getString("msgpackButton.text")); // NOI18N - msgpackButton.setName("msgpackButton"); // NOI18N - javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( @@ -284,21 +273,16 @@ public class OpenConnectionDialog extends javax.swing.JDialog { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(disableDbButton) - .addComponent(usernameField, javax.swing.GroupLayout.DEFAULT_SIZE, 427, Short.MAX_VALUE) - .addComponent(hostField, javax.swing.GroupLayout.DEFAULT_SIZE, 427, Short.MAX_VALUE) - .addComponent(passwordField, javax.swing.GroupLayout.DEFAULT_SIZE, 427, Short.MAX_VALUE) - .addComponent(portField, javax.swing.GroupLayout.DEFAULT_SIZE, 427, Short.MAX_VALUE) - .addGroup(layout.createSequentialGroup() - .addComponent(sslBox) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 250, Short.MAX_VALUE) - .addComponent(xmlButton) - .addGap(18, 18, 18) - .addComponent(msgpackButton)))) + .addComponent(usernameField, javax.swing.GroupLayout.DEFAULT_SIZE, 433, Short.MAX_VALUE) + .addComponent(hostField, javax.swing.GroupLayout.DEFAULT_SIZE, 433, Short.MAX_VALUE) + .addComponent(passwordField, javax.swing.GroupLayout.DEFAULT_SIZE, 433, Short.MAX_VALUE) + .addComponent(portField, javax.swing.GroupLayout.DEFAULT_SIZE, 433, Short.MAX_VALUE) + .addComponent(sslBox))) .addGroup(layout.createSequentialGroup() .addComponent(startNewButton) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(pathButton) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 126, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 132, Short.MAX_VALUE) .addComponent(cancelButton) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(connectButton))) @@ -326,18 +310,13 @@ public class OpenConnectionDialog extends javax.swing.JDialog { .addComponent(portField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(portLabel)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) - .addComponent(sslBox, javax.swing.GroupLayout.Alignment.LEADING, 0, 0, Short.MAX_VALUE) - .addComponent(sslLabel, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(disableDbLabel) - .addComponent(disableDbButton, javax.swing.GroupLayout.PREFERRED_SIZE, 18, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(msgpackButton) - .addComponent(xmlButton))) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) + .addComponent(sslBox, javax.swing.GroupLayout.Alignment.LEADING, 0, 0, Short.MAX_VALUE) + .addComponent(sslLabel, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(disableDbLabel) + .addComponent(disableDbButton, javax.swing.GroupLayout.PREFERRED_SIZE, 18, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(connectButton, javax.swing.GroupLayout.DEFAULT_SIZE, 37, Short.MAX_VALUE) @@ -356,11 +335,8 @@ public class OpenConnectionDialog extends javax.swing.JDialog { String host = hostField.getText(); int port = Integer.parseInt(portField.getText()); boolean ssl = checkCrypto(sslBox.isSelected()); - String type = "xml"; - if(msgpackButton.isSelected()) - type = "msg"; try { - rpcConn = RpcConnection.getConn(type, username, password, host, port, ssl); + rpcConn = RpcConnection.getConn(username, password, host, port, ssl); } catch (MsfException mex) { rpcConn = null; } @@ -390,10 +366,6 @@ public class OpenConnectionDialog extends javax.swing.JDialog { private void startNewButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_startNewButtonActionPerformed //Setup defaults - if(msgpackButton.isSelected()) - RpcConnection.defaultType = "msg"; - else - RpcConnection.defaultType = "xml"; RpcConnection.defaultUser = usernameField.getText(); if(passwordField.getPassword().length > 0) RpcConnection.defaultPass = new String(passwordField.getPassword()); @@ -434,7 +406,6 @@ public class OpenConnectionDialog extends javax.swing.JDialog { private javax.swing.JLabel disableDbLabel; private javax.swing.JTextField hostField; private javax.swing.JLabel hostLabel; - private javax.swing.JRadioButton msgpackButton; private javax.swing.JPasswordField passwordField; private javax.swing.JLabel passwordLabel; private javax.swing.JButton pathButton; @@ -446,6 +417,5 @@ public class OpenConnectionDialog extends javax.swing.JDialog { private javax.swing.JLabel titleLabel; private javax.swing.JTextField usernameField; private javax.swing.JLabel usernameLabel; - private javax.swing.JRadioButton xmlButton; // End of variables declaration//GEN-END:variables } diff --git a/external/source/gui/msfguijava/src/msfgui/PayloadPopup.form b/external/source/gui/msfguijava/src/msfgui/PayloadPopup.form index a17a7d160e..d329999741 100644 --- a/external/source/gui/msfguijava/src/msfgui/PayloadPopup.form +++ b/external/source/gui/msfguijava/src/msfgui/PayloadPopup.form @@ -73,14 +73,14 @@ - + - - - - + + + + @@ -89,8 +89,8 @@ - - + + @@ -112,7 +112,6 @@ - diff --git a/external/source/gui/msfguijava/src/msfgui/PayloadPopup.java b/external/source/gui/msfguijava/src/msfgui/PayloadPopup.java index 9ac0f9a9a3..847afc9bf1 100644 --- a/external/source/gui/msfguijava/src/msfgui/PayloadPopup.java +++ b/external/source/gui/msfguijava/src/msfgui/PayloadPopup.java @@ -540,23 +540,14 @@ public class PayloadPopup extends ModuleInfoWindow { hash.put("Encoder", "generic/none"); Map data = (Map) rpcConn.execute("module.execute", "payload", fullName,hash); //Basic info - byte[] buffer; - String rawHex; - if(rpcConn.type.equals("msg")){ - buffer = (byte[])data.get("payload"); - }else{ - rawHex = data.get("payload").toString(); - buffer = new byte[rawHex.length() / 2]; - for (int i = 0; i < rawHex.length(); i += 2) - buffer[i/2] = (byte)Integer.parseInt(rawHex.substring(i, i + 2),16); - } + byte[] buffer = (byte[])data.get("payload"); if(saveButton.isSelected()){ //Encode and output hash.put("format", outputCombo.getSelectedItem().toString()); if(timesField.getText().length() > 0) hash.put("ecount", timesField.getText()); if(badcharsField.getText().length() > 0){ - StringBuffer badbinary = new StringBuffer(); + StringBuilder badbinary = new StringBuilder(); for(String s : badcharsField.getText().split("\\\\x")) if(s.length() > 0) badbinary.append((char)Integer.parseInt(s, 16)); @@ -574,10 +565,7 @@ public class PayloadPopup extends ModuleInfoWindow { if(!outputCombo.getSelectedItem().toString().equals("jar")){ //jars don't get encoded Map encoded = (Map) rpcConn.execute("module.encode", buffer, encoderCombo.getSelectedItem().toString(),hash); - if(rpcConn.type.equals("msg")) - buffer = (byte[])encoded.get("encoded"); - else - buffer = Base64.decode(encoded.get("encoded").toString()); + buffer = (byte[])encoded.get("encoded"); } FileOutputStream fout = new FileOutputStream(outputPathField.getText()); fout.write(buffer); diff --git a/external/source/gui/msfguijava/src/msfgui/RpcConnection.java b/external/source/gui/msfguijava/src/msfgui/RpcConnection.java index 858c0a6840..5314c9e295 100644 --- a/external/source/gui/msfguijava/src/msfgui/RpcConnection.java +++ b/external/source/gui/msfguijava/src/msfgui/RpcConnection.java @@ -27,10 +27,9 @@ import org.jdesktop.application.Task; * @author scriptjunkie */ public abstract class RpcConnection { - public String type = "msg"; protected String rpcToken; protected Map callCache = new HashMap(); - public static String defaultUser = "msf",defaultPass = null, defaultHost = "127.0.0.1", defaultType = "msg"; + public static String defaultUser = "msf",defaultPass = null, defaultHost = "127.0.0.1"; public static int defaultPort = 55553; public static boolean defaultSsl = false; public static boolean disableDb = false; @@ -56,12 +55,8 @@ public abstract class RpcConnection { * @return A new RPC connection * @throws MsfException */ - public static RpcConnection getConn(String type, String username, char[] password, String host, int port, boolean ssl) throws MsfException{ - RpcConnection conn; - if(type.toLowerCase().equals("xml")) - conn = new XmlRpc(); - else - conn = new MsgRpc(); + public static RpcConnection getConn(String username, char[] password, String host, int port, boolean ssl) throws MsfException{ + RpcConnection conn = new MsgRpc(); conn.setup(username, password, host, port, ssl); return conn; } @@ -109,7 +104,6 @@ public abstract class RpcConnection { root.put("port", port); root.put("ssl", ssl); root.put("disableDb", disableDb); - root.put("type", type); MsfguiApp.savePreferences(); } @@ -169,7 +163,6 @@ public abstract class RpcConnection { public String toString(){ return "RPC connection " - + "\ntype: "+type + "\nusername: "+username + "\npassword: " + password + "\nhost: " + host @@ -265,10 +258,8 @@ public abstract class RpcConnection { // Don't fork cause we'll check if it dies String rpcType = "Basic"; - if(defaultType.toLowerCase().equals("msg")) - rpcType = "Msg"; java.util.List args = new java.util.ArrayList(java.util.Arrays.asList(new String[]{ - "msfrpcd","-f","-P",defaultPass,"-t",rpcType,"-U",defaultUser,"-a","127.0.0.1"})); + "msfrpcd","-f","-P",defaultPass,"-t","Msg","-U",defaultUser,"-a","127.0.0.1"})); if(!defaultSsl) args.add("-S"); if(disableDb) @@ -296,7 +287,7 @@ public abstract class RpcConnection { } //Nope. We're good. try { - myRpcConn = RpcConnection.getConn(defaultType, defaultUser, defaultPass.toCharArray(), "127.0.0.1", defaultPort, defaultSsl); + myRpcConn = RpcConnection.getConn(defaultUser, defaultPass.toCharArray(), "127.0.0.1", defaultPort, defaultSsl); connected = true; break; } catch (MsfException mex) { diff --git a/external/source/gui/msfguijava/src/msfgui/XmlRpc.java b/external/source/gui/msfguijava/src/msfgui/XmlRpc.java index ce0324f3f7..016bb681c9 100644 --- a/external/source/gui/msfguijava/src/msfgui/XmlRpc.java +++ b/external/source/gui/msfguijava/src/msfgui/XmlRpc.java @@ -33,7 +33,6 @@ public class XmlRpc extends RpcConnection { */ public XmlRpc(){ super(); - type = "XML"; } /** Creates an XMLRPC call from the given method name and parameters and sends it */ protected void writeCall(String methname, Object[] params) throws Exception{ diff --git a/external/source/gui/msfguijava/src/msfgui/resources/OpenConnectionDialog.properties b/external/source/gui/msfguijava/src/msfgui/resources/OpenConnectionDialog.properties index 770dcae3f2..a5842c9847 100644 --- a/external/source/gui/msfguijava/src/msfgui/resources/OpenConnectionDialog.properties +++ b/external/source/gui/msfguijava/src/msfgui/resources/OpenConnectionDialog.properties @@ -17,5 +17,3 @@ sslBox.text= sslLabel.text=SSL disableDbButton.text= disableDbLabel.text=Disable DB -xmlButton.text=XML -msgpackButton.text=MsgPack