From 3dd35cdcd44bb331d8805c330ff172464e09400a Mon Sep 17 00:00:00 2001 From: Matt Weeks Date: Sat, 30 Oct 2010 22:12:15 +0000 Subject: [PATCH] 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 --- data/gui/msfgui.jar | Bin 685477 -> 685473 bytes .../gui/msfguijava/src/msfgui/MsfguiLog.java | 39 +++++++++--------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/data/gui/msfgui.jar b/data/gui/msfgui.jar index 4aa45ba6b2bc7a080e0f92a5d02cb0c18f3c4fcb..bcf14703af0209cd5adfd25294abeb8862d0d35c 100644 GIT binary patch delta 3459 zcmZ8k3shBA8vge_`f?lDsU~v=K@}?wf@tQku@VV73pLq1b?>LX=G$1Qjg{Hh z0vjv0v4u8PVPlmx=C!dZWuHsS+YXNwe-zk!k64FK-yePkanzpkK zh`vE~00Dgfv>nLO#rV1o(DU2CNEWf}a3_Og-KDp~T?{tCLiIF?D8prRLRC8~V$ccE z$)?M6j%bH!PCiqt=SU7dxZ7FdgWI*lWSdL4Y(7}r3AM>~m;E4wcR&y&aS$Sl%kG26 zb6s|q*$xqP9CBN3t#t_>Jh2HJG0r7EsAyqPG0rFHp#yBR&aR4bF7-ipF5RCB+@B8I zM+EN60{1#~k8#%1@)+lG`c|=5Sj|xwcFL8!~X*h~>s*W<|U>v8m}r&Q}!kVJH5wgZVqQrQlI z(Q@m<->k{@p2%xeWLowNBYB5A*AetVm}<%1vjf9=yc>P+NT_A;@5gYw0p@8mm@^_pupwu!Hi;;1BYaZuqXnd&KIoA%Eh_S2Thw` zcu!hXMLMt`OAKKST$&{^>ZZV(FbCcOFO~fiv_T{6gRRgGFTvaJI&_fb&+sn&?WcJ< z1b=}~-~b$j_uv$~58uIG;XiN?uEPh6!{3;ML(B;uvH|dS76Biz@o<%nu$Jh-x&RuYVr@%@60DQxz!fEb? zGrSDW@_P7|uYz;D0lwoeKo|GHdA=Vm@RM+npM^`BfXiACe6J0IAGGoCqm~9&wR!Nf zwi2#stKqt~27b}j!LM2q+|V||O>G<0-GV&;EDj>5^Efy`YS^g%VQ><5f}K>!px(EG zNg5SV&-=lEbf_VH4$yJ35AJ}kiMx&Mgk(P#O#P+#S2(EKbkb`-1hJJ+?6*o%<0be; zTwC2r7#Zam^4vI z_!VfflJGJ%9L~XcFnK)-h6`l1ky_XMW!br#viKX}nQRh_^>?C<7}yK10e$G{B86rU zr7eL=a2Ys^*W7T0^w406HiLHjdk}adTTEaAQ*y-M;4WGwX+;%8!*{Doas*vET?Sny zUADH89Q)xfG&=k-DOM(_VL`GqQ&mD(YAll;UVR#2)v zPR)g5@@2gCr`0-UwdkR^G+!oa70(6G0fnAz3ZS4FgtW~8l&#RntpU`m(1SYy=;<9) zRM!kDKlqgZ6w16urI3Q$C$MTJ4Ww5XCcc(H8>u0$s%zlQ4 z-PG*69*UK#o4uP&#gE)FTYO+M0q+-Pgw!DZWP?`lOT>=|{S3EME)#IcRna=-}rA)W0B=P*V zN}S`Rv*2=xe3+jOfXsPvGB2&NEL*C~{@6K>_RF@&Vs6cozvC?d@Z};hSIj5#%>c7| zzMR0b>ixb=rE&_#<<`2HNxpTF}6qHf9;~OmC zZ7_#mT^ViPxiT5SBU@7OrN-3%;aif9!u%PG%Kd*p`#`p_sf_-pl@tRf}buF(Q`!=YszNM;`A4 delta 3641 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\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