Merge pull request rapid7#1664 from scriptjunkie/msfguiKaliConnect

MSFGUI service autoconnect, DB fixes

Author: kernelsmith

data/gui/msfgui.jar

@@ -295,6 +295,9 @@ private void connectButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN
 	}
 	/** Tries to connect to the database with given credentials */
 	private boolean tryConnect() throws MsfException{
+		Map status = (Map) rpcConn.execute("db.status");
+		if(status.containsKey("db"))
+			return true; // already connected
 		HashMap opts = new HashMap();
 		addNonempty("host", hostField, opts);
 		addNonempty("port", portField, opts);

external/source/gui/msfguijava/src/msfgui/DbConnectDialog.java

@@ -171,7 +171,7 @@ private boolean confirmStop() {
 			MsfguiApp.shuttingDown = true;
 			if(choice == JOptionPane.YES_OPTION)
 				rpcConn.execute("core.stop");
-			else if(choice == JOptionPane.NO_OPTION)
+			else if(choice == JOptionPane.NO_OPTION && rpcConn.username.length() > 0)
 				rpcConn.execute("auth.logout");
 		} catch (Exception ex) {
 		}

external/source/gui/msfguijava/src/msfgui/MainFrame.java

@@ -3,7 +3,10 @@
 import java.awt.event.ActionListener;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
 import java.util.Map;
 import javax.swing.JFileChooser;
@@ -120,6 +123,19 @@ else if (mex.getMessage().toLowerCase().contains("timed out"))
 		} catch (NullPointerException nex) {//generated when attributes dont exist.
 		} catch (Exception ex) { //for weird msg exceptions
 		}
+		//Try service token on default 3790
+		BufferedReader fin = null;
+		try{
+			try{
+				fin = new BufferedReader(new FileReader(MsfguiApp.getMsfRoot().getParent()+"/apps/pro/engine/tmp/servicekey.txt"));
+			}catch(Exception iox2){
+				fin = new BufferedReader(new FileReader("/opt/metasploit/apps/pro/engine/tmp/servicekey.txt"));
+			}
+			RpcConnection rpc = RpcConnection.getConn("", fin.readLine().toCharArray(), "localhost", 3790, true);
+			if(javax.swing.JOptionPane.showConfirmDialog(null, "Connect to local rpcd?") == javax.swing.JOptionPane.YES_OPTION)
+				return rpc;
+		}catch(Exception iox){//file not found/unreadable/bad creds/etc. - ignore
+		}
 		//Darn. open the gui anyway
 		OpenConnectionDialog diag = new OpenConnectionDialog(true, mainframe);
 		diag.setVisible(true);

external/source/gui/msfguijava/src/msfgui/OpenConnectionDialog.java

@@ -84,9 +84,15 @@ public void setup(String username, char[] password, String host, int port, boole
 		String message = "";
 		try {
 			connect();
-			Map results = (Map)exec("auth.login",new Object[]{username, this.password});
-			rpcToken=results.get("token").toString();
-			haveRpcd=results.get("result").equals("success");
+			if(username == null || username.equals("")){
+				rpcToken = this.password;
+				execute("core.version"); //throws error if unsuccessful
+				haveRpcd = true;
+			}else{
+				Map results = (Map)exec("auth.login",new Object[]{username, this.password});
+				rpcToken=results.get("token").toString();
+				haveRpcd=results.get("result").equals("success");
+			}
 		} catch (MsfException xre) {
 			message = xre.getLocalizedMessage();
 		} catch (IOException io){