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

Msfgui log fix. Fix identification of empty host list when consoles have been opened. Also change colors. Colors were a dumb idea. 

git-svn-id: file:///home/svn/framework3/trunk@10849 4d416f70-5f16-0410-b530-b9f4589650da
unstable
Matt Weeks 2010-10-30 22:12:15 +00:00
parent 9432991951
commit 3dd35cdcd4
2 changed files with 19 additions and 20 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.

39
external/source/gui/msfguijava/src/msfgui/MsfguiLog.java vendored
View File

@ -165,17 +165,31 @@ public class MsfguiLog {
"h1.header {font-size:3em;\n" +
"margin:20px 0 30px;\n" +
"text-align:center;}\n" +
"tr.sent td {background-color: #EEFFEE; color: black;}\n" +
"tr.recv td {background-color: #EEEEFF; color: black;}\n" +
"tr.sent td {background-color: #EEEEEE; color: black;}\n" +
"tr.recv td {background-color: #FFFFFF; color: black;}\n" +
"div.session {float: left; padding-right: 10px;}\n" +
"#page{margin:0 auto; padding:30px 200px;}\n" +
"#page{margin:0 auto; padding:30px 150px;}\n" +
"</style></head>\n<body>\n<div id=\"page\"><h1 class=\"header\">msfgui</h1>");
//Host summary
//Add headers
fout.write("<h1>Hosts</h1>");
Set sessionsEntrySet = sessions.entrySet();
if(sessions.isEmpty()){
HashMap hosts = new HashMap();
//Map hosts to sessions by IP
for(Object e : sessionsEntrySet){
Map session = (Map)((Entry) e).getValue();
if(session.containsKey("tunnel_peer")){ //actual session; not console
String host = session.get("tunnel_peer").toString().split(":")[0];
Set hostSet = (Set)hosts.get(host);
if(hostSet == null){
hostSet = new HashSet();
hosts.put(host, hostSet);
}
hostSet.add(session);
}
}
if(hosts.isEmpty()){
fout.write("<p>None. Go exploit something next time.</p>");
}else{
fout.write("<table><thead><tr><td>host</td>\n");
@ -186,22 +200,7 @@ public class MsfguiLog {
headers.add("tunnel_peer");
headers.add("tunnel_local");
headers.add("desc");
fout.write("<td>type</td><td>via_exploit</td><td>via_payload</td><td>tunnel_peer</td><td>tunnel_local</td><td>desc</td>");
HashMap hosts = new HashMap();
//Map hosts to sessions by IP
for(Object e : sessionsEntrySet){
Map session = (Map)((Entry) e).getValue();
if(session.containsKey("tunnel_peer")){ //actual session; not console
String host = session.get("tunnel_peer").toString().split(":")[0];
Set hostSet = (Set)hosts.get(host);
if(hostSet == null){
hostSet = new HashSet();
hosts.put(host, hostSet);
}
hostSet.add(session);
}
}
fout.write("<td>type</td><td>via exploit</td><td>via payload</td><td>tunnel peer</td><td>tunnel local</td><td>desc</td>");
fout.write("</tr></thead><tbody>\n");
for(Object e : hosts.entrySet()){