diff --git a/data/gui/msfgui.jar b/data/gui/msfgui.jar index 4aa45ba6b2..bcf14703af 100644 Binary files a/data/gui/msfgui.jar and b/data/gui/msfgui.jar differ diff --git a/external/source/gui/msfguijava/src/msfgui/MsfguiLog.java b/external/source/gui/msfguijava/src/msfgui/MsfguiLog.java index f77933d6d4..2f94622aae 100644 --- a/external/source/gui/msfguijava/src/msfgui/MsfguiLog.java +++ b/external/source/gui/msfguijava/src/msfgui/MsfguiLog.java @@ -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" + "\n\n

msfgui

"); //Host summary //Add headers fout.write("

Hosts

"); 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("

None. Go exploit something next time.

"); }else{ fout.write("\n"); @@ -186,22 +200,7 @@ public class MsfguiLog { headers.add("tunnel_peer"); headers.add("tunnel_local"); headers.add("desc"); - fout.write(""); - - 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(""); fout.write("\n"); for(Object e : hosts.entrySet()){
hosttypevia_exploitvia_payloadtunnel_peertunnel_localdesctypevia exploitvia payloadtunnel peertunnel localdesc