infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up error opening Events table and reading new database credentials. 

git-svn-id: file:///home/svn/framework3/trunk@14123 4d416f70-5f16-0410-b530-b9f4589650da
unstable
Matt Weeks 2011-10-30 22:24:29 +00:00
parent f64893d305
commit 11c5801895
4 changed files with 15 additions and 14 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.

20
external/source/gui/msfguijava/src/msfgui/DbConnectDialog.java vendored
View File

@ -229,6 +229,14 @@ public class DbConnectDialog extends OptionsDialog {
props.put("db"+key, val); props.put("db"+key, val);
} }
/** Remove quotes */
private String stripQuotes(String quoted){
if(quoted.startsWith("\"") && quoted.endsWith("\"")
|| quoted.startsWith("\'") && quoted.endsWith("\'"))
return quoted.substring(1, quoted.length() - 1);
return quoted;
}
/** Loads database information from the database.yml file in the default install. */ /** Loads database information from the database.yml file in the default install. */
private void reloadDefaults(){ private void reloadDefaults(){
try{ try{
@ -243,17 +251,17 @@ public class DbConnectDialog extends OptionsDialog {
token = s.next(); token = s.next();
while(s.hasNext()){ while(s.hasNext()){
if(token.equals("adapter:")) if(token.equals("adapter:"))
props.put("dbdriver", s.next()); props.put("dbdriver", stripQuotes(s.next()));
else if(token.equals("database:")) else if(token.equals("database:"))
props.put("dbdatabase", s.next()); props.put("dbdatabase", stripQuotes(s.next()));
else if(token.equals("username:")) else if(token.equals("username:"))
props.put("dbusername", s.next()); props.put("dbusername", stripQuotes(s.next()));
else if(token.equals("password:")) else if(token.equals("password:"))
props.put("dbpassword", s.next().replace("'", "")); props.put("dbpassword", stripQuotes(s.next()));
else if(token.equals("host:")) else if(token.equals("host:"))
props.put("dbhost", s.next()); props.put("dbhost", stripQuotes(s.next()));
else if(token.equals("port:")) else if(token.equals("port:"))
props.put("dbport", s.next()); props.put("dbport", stripQuotes(s.next()));
token = s.next(); token = s.next();
} }
} catch (FileNotFoundException fnfox){ } catch (FileNotFoundException fnfox){

3
external/source/gui/msfguijava/src/msfgui/MainFrame.form vendored
View File

@ -874,9 +874,6 @@
<Property name="action" type="javax.swing.Action" editor="org.netbeans.modules.swingapp.ActionEditor"> <Property name="action" type="javax.swing.Action" editor="org.netbeans.modules.swingapp.ActionEditor">
<action class="msfgui.MainFrame" id="showAboutBox" methodName="showAboutBox"/> <action class="msfgui.MainFrame" id="showAboutBox" methodName="showAboutBox"/>
</Property> </Property>
<Property name="accelerator" type="javax.swing.KeyStroke" editor="org.netbeans.modules.form.editors.KeyStrokeEditor">
<KeyStroke key="F1"/>
</Property>
<Property name="name" type="java.lang.String" value="aboutMenuItem" noResource="true"/> <Property name="name" type="java.lang.String" value="aboutMenuItem" noResource="true"/>
</Properties> </Properties>
<AuxValues> <AuxValues>

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

@ -55,6 +55,7 @@ public class MainFrame extends FrameView {
}); });
eventsTable.setName("eventsTable"); // NOI18N eventsTable.setName("eventsTable"); // NOI18N
eventsPane.setViewportView(eventsTable); eventsPane.setViewportView(eventsTable);
tabbedPane.addTab("Events", eventsPane); // NOI18N
sessionsTableModel = null; sessionsTableModel = null;
sessionWindowMap = new HashMap(); sessionWindowMap = new HashMap();
@ -1558,11 +1559,6 @@ nameloop: for (int i = 0; i < names.length; i++) {
}//GEN-LAST:event_vulnsViewItemActionPerformed }//GEN-LAST:event_vulnsViewItemActionPerformed
private void eventsViewItemActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_eventsViewItemActionPerformed private void eventsViewItemActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_eventsViewItemActionPerformed
if(eventsPane.getParent() == null)
tabbedPane.addTab("Events", eventsPane);
if(eventsTable.getRowCount() == 0)
reAdd(eventsTable,(List) ((Map)rpcConn.execute("db.events",MsfguiApp.workspace)).get("events"),
new String[]{"host","created_at","updated_at","name","critical","username","info"});
DraggableTabbedPane.show(eventsPane); DraggableTabbedPane.show(eventsPane);
}//GEN-LAST:event_eventsViewItemActionPerformed }//GEN-LAST:event_eventsViewItemActionPerformed