From e8456c5f5a8b6277b5998e4cc65522744003af30 Mon Sep 17 00:00:00 2001 From: Leonardo Nve Date: Tue, 14 Oct 2014 03:03:17 +0200 Subject: [PATCH] Bugs fixing --- sslstrip/ClientRequest.py | 6 ++++-- sslstrip/ClientRequest.pyc | Bin 8896 -> 9045 bytes sslstrip/CookieCleaner.pyc | Bin 4106 -> 4134 bytes sslstrip/DnsCache.pyc | Bin 1239 -> 1259 bytes sslstrip/SSLServerConnection.pyc | Bin 5051 -> 4971 bytes sslstrip/ServerConnection.pyc | Bin 7723 -> 7589 bytes sslstrip/ServerConnectionFactory.pyc | Bin 1509 -> 1527 bytes sslstrip/StrippingProxy.pyc | Bin 833 -> 841 bytes sslstrip/URLMonitor.py | 17 ++++------------- sslstrip/URLMonitor.pyc | Bin 4232 -> 3978 bytes sslstrip/__init__.pyc | Bin 128 -> 132 bytes 11 files changed, 8 insertions(+), 15 deletions(-) diff --git a/sslstrip/ClientRequest.py b/sslstrip/ClientRequest.py index 65dfed2..0695ae5 100644 --- a/sslstrip/ClientRequest.py +++ b/sslstrip/ClientRequest.py @@ -34,6 +34,9 @@ from URLMonitor import URLMonitor from CookieCleaner import CookieCleaner from DnsCache import DnsCache +def NUEVO_LOG(str): + return + class ClientRequest(Request): ''' This class represents incoming client requests and is essentially where @@ -52,7 +55,6 @@ class ClientRequest(Request): def cleanHeaders(self): headers = self.getAllHeaders().copy() - if 'accept-encoding' in headers: del headers['accept-encoding'] @@ -75,7 +77,7 @@ class ClientRequest(Request): host = self.urlMonitor.URLgetRealHost("%s"%headers['host']) logging.debug("Modifing HOST header: %s -> %s"%(headers['host'],host)) headers['host'] = host - headers['securelink'] = '1' + #headers['securelink'] = '1' self.setHeader('Host',host) return headers diff --git a/sslstrip/ClientRequest.pyc b/sslstrip/ClientRequest.pyc index e173b642b148fca5eedca9af53037da0fceec5e3..1503cd7f69e0a8320aa89f5d19bf240fe8184e09 100644 GIT binary patch literal 9045 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 literal 8896 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 PyIVj8_;cm>SNi?~X=oa* diff --git a/sslstrip/CookieCleaner.pyc b/sslstrip/CookieCleaner.pyc index d206e25a7f0948d954153a4ebad75292a86d1e41..835eebc7f1f83ea68b6d8c79307417306c9e4488 100644 GIT binary patch delta 821 zcmah`ze~eF6n>Y)Ytl4LaWK?sEtD2POI4_XE`p9aIaLuUja8HStJlFHMX_kDL)g`2{x{^cZJo zX0`{=OTbxO>LUwT(&WdT)$LX2nGl&$rXL^T8`LKow8b2X&%;;CV*!3x-)hmWopmxK z3z*ABG_H-}f?Z@GZrK&Z=5!99>`CHzw?j4bB2_e>rF{beyi0j`X_?+f1CMNYbRQlW z@uYdWh5+AErDSM8=TY8DfJ@FOPCIF0TXM=80Q!!~TzcLbW}Fo@&dPY7zEEr2b?XWc J&*7(={RMdh$iDyp delta 757 zcmaKoJxjx25XbM*BqpY5gG!^RF9qKbEd?h*P|(fEf`gzUjg_aqwAhYM7mJI6gZBa4 zT%4R8Ttr;`B!cMf<*}&K6Y?avyMO-oySpn~7D{g)e(%8J$Yuq)m&NZDKFuOOV!jcM z0JeX>A4)IQ%rw_p00I+5&479U$Zuw$A>sk@&CetU=oW=_D;< zC5=rO5)1{Zz${i$W*f;K7IaK#yC8em>D~R(5G`i=cng48%o(;Z05+|9<5;5uZ(j3P zM6cc~3i|Mlv?@wZI8VuzO$K>Nhogcw#Tz#uuqrsV4v7v~h06lE4n zKENV1xrb4oF>~@BMi+d_#3mat87L?K&8cBzs9|8pWMIf*W60-WV1#ghqLRUklN*@K z@tg9JN#0I?k%uW6Xc8DO0ZC^dE>;H;B|w828B%~|Gcn`~Ffao7&0x`ZMut2_Fh6s$ f3$q!1JJv8uF$*vXOg_n+hfksC5{ZO0;sQmwdmwR_Mu>^w z2KztA(L;}hgp(If-o1JBM7$Y8{LO2(7B6c*-p-phGjHbio7qp-eq5c`emdFD$EQzL zsQc0Iyo~(qcus*@AQ%=(kOsllBaRep=1~$ zB``J`?Fou>+CHREr@3eQ6d4p6;@C;&9U4oo4^)+{X`Jr72mB&9Ox)tEzC zMQWaro9BAq9^}YtPg`F^8g{k%<0?SA$-qrwAyE>hD2sw{#E2LYMUlsMKvW==WJ%bu zXODrqclJ(N=!y7#_WEC1&JY~^$9Sv6!2oK@H-luaO5;5MXY2s2LDdS2@WHAKDgdH_ z2o(ehbna!)z5c9z^+ z(nSf~oT|-aq5VQzHJJbcW+7M0Dleg*z9nJ@-u#Qi?DkncR2Y{d(uzH@{DPoUDBPlXIWF zdp);I?T>^18T@KD@bK|vS|eKM+Dr@F!4)kiZ7W(cX#GXy$=$$|hzAA*7PYW%Ya5{I z0i6zL^nj@jX!d~V4rpm(?+m|J97I2jr{kB=-}H918cx@0>$Pw@*qklj?%Mb6pO5yf zvFMdK1^+MRg+%`2(X8bs^1R-(QU96{HOfSFrhurW=~`7({Xx7!)G#Q-hN8d_0_sXA zX=p=uGN{GWFlpx{)lDidKBtC7b&GtH#@g8|l59RPUZMyO@2yZhJbUO zC~zo9QNy9SO?8J>ZK|Fi_S3QeR2o8wcAVRd+xkSjA@Pt6o=^^ptuoy~ivir?MiptF z_DM_RXLNHe(r4vVvKwY7*c);_b0QMQqS3TFIRO%h3vBZs_p?Jb7qQB7mUG<4C0GSj zU^l9yhau%k`f-BX>{gmaM<5FVVJL-o-8`hg0khR5oHz#b0khScIEqQaB1pEVR1_0Y zcxsO#_$VTzh*Y5|BMw1iEqt{B(5y7jwJXb)9Kd}%jLf#=FR#xtkm_vSN?lIX(j$;itc%^&9}m4_xC56ZvFMOSkp zQ=lf)1C3te!aEaErMx&I^Df0fA?7C9%|!{6+PB7|`Mx7fS5Lv968(qOvcggXG&>^V z4MZW5A1aU9culPuR2_i`@W6n_H;#qRmO%}sjZ*I(h|{wW@4@NT>F8JA--O)`d&jIC zrqheAc*W*!w=W#M%?S#lkGKTpE?$BXQxvHdpq_41y!E!eIkw#0Fr{zcf2q}%G04au zAQWGNx0a&s-rGdIkB!dFpxuY~)duh&9^iiE;eKh}qi^{)$?`-W29^?do-JJb2hadd A2><{9 diff --git a/sslstrip/ServerConnection.pyc b/sslstrip/ServerConnection.pyc index dc52cf8b0cbe676fe8c7ee7c3c3411685131abe9..d6df2741cc300177a2da4b155dc3357ba1a97661 100644 GIT binary patch delta 2656 zcma)8O=w(I6h7y^_h#nJPi8XtnIw}8jjbq!HVw6)*rpMSLW|O*YGAOGG%=c&WNK#K zLNH+nL1U$g@)XxyxDa;+!A0G=&_#DH-3TIXMB+*}e&@XRCNEfc3Ar=(o_p_i&iT&I zov$x``E1uZDCK|n{;wNL6#ZHFp2g^VjE`mfGp!Rfdvm5H$8tkW6VEMbTJhYbrX9~6 zYC7>eL(PoN4XtNsBS+0rj#!jfwC>Wzr}sYUdbr8-hDDx3yHJqPIfN!5%*H}1A zJ0Wyqp_35iV_^s$Dk`YZg{BaF|32>+_V!QOr+NGW$e3#1x#Lf5EVdS>I-T{7-(G$D z%v&A56a3lV2r3Ob_{5oEFL>xYlYacg%+2&ezh*9+_n5YbJVU!03Yl9fv1!H7Fc@Ny zIVuZxf@|5$bnt((PfvQd$%1_4=0$ql&^FVyA>Z_L1hb{#S_lt2UT=cLy{k1@emIm1H-{#nw#XXc0$GQF})9 zCd;OzdD|LLHUP5!Vc)?qO8P-%qFd#vsqzrJJfPntE_0QO7^5;CkT(KZ^~_V^^-^502C$mCPaNV8NBBr5Zk4oi1oH#)X~>Q4WnjFE(UF26 z&|5M~qCiHkM!vx!qH>meBn%##&}=c`0_WA~9LcUjo|KwSh0Yc{pt(@4fNAb(I|LQGbUdBOGC zP}g&5k7)%dXw&;Z!*%WQax7227E~m(gspcx+OqH(+@@`G4KRt)A=(CXpSX+eu;m=K zUwB=DbQ9(HP% zCX?@?(623Raug|k<4MWbmxEtw*V5xrX*j{g$eYK2`+H<21+LoI-yE%{HI`~4_-V{t zJpmhuGuleda@~v|DT=0_8(iZ)yUJ&|;r_q$&f`*85uGVXZOm_l5`D9!3}qXELnNdo g!Pay2*HR4+ey*3<-T$p#IEMM>Chn&I>hGcYe*sS+2mk;8 delta 2796 zcma)8OK%%h6h3EW{Fw1OPVCsOO-ezOBGK}ScqApIk%~miqLo@Ol!zpa7$>ot+6$-} zStt@EKq8g9V8aFp7Ko)08x|E?cBp@V4O@`N8pL<*_}bGH!BoA;opbM;?|k2ROul*P zySe@^e`dUm-@d-MLc@P){9eH7?&HTQ{xhu;HAj1Px+XBIDy_DjpN z>duk6`Y3jmef4wfg^2g(;_pPfc`rWujL&q7$hT-mXGQk5wm7tAQ3+zP*kalioT$0P zRz!q(*HwQcPR;mm!2+>(b&lS)Xq#!~L_u`U=rG(~@q}8|_^VVLV(b!GGxakl5BoFyPKJdD$UmrSkY3p6) z_I@}VPy5N}a0J++b~}8Y(&q?F5}YDGO@1a+vF$Un;oE6*`*0RAy1v_!BR_-JvjYNB*^|T%8EGMV|JtAd~ zMnwbaRN?7?Dus@wOlyVBh*k4bVdiudv7uBg1S4w{-P7afhN7TCEKyeS-7cUKq(tiz ztC7GO>c@%PtjCjMAp}kf@%R{O*mQa-aT`xEjnv;07bAjvQq1)|&RQcrqt^Rj4DvkO zYBKox2pJ)wzdEbB*|kb{z6i;Uu$Bw3qjSL4p^~XZK7j(*`bc%l;SXFQGXA^g&#Ve3MAs2BdzO-t- z`m)q`b)T+C)QAHO6GVOCKca@me~(&mdD=!&RjoWf6aFd%y$9^06+m1%4)sWVP<}09 zI{qqe{=d6Vr%y+6*BIE9TC_pb=s$%(KbKrTEFp88)0jO^a?Pr6g79P&xWQ%4I%0ju zT`@Ch)QZpHHDOP5{V`qbcvuQd`p*JrGW=emFyuj+0!4o5xVTdHsu!Y>Qq5Y9y+Ny% Pibm~jB)4_7TR-v-+_X9y diff --git a/sslstrip/ServerConnectionFactory.pyc b/sslstrip/ServerConnectionFactory.pyc index 09967b1356734e449952a5466c19645d42cadbd8..1eb47d026c05f44f6052e6b3e4698ce9906175f0 100644 GIT binary patch delta 420 zcmaFL{hix{`70?ucyce3>g1D*7V=pP3^fc4S&U$k2~0ABNft0U zS%E2(kU_!q)j*p{z@`A*(#*)fSi{JW#l+Cez)%Y`jF};enIVOVA)A?@C<~^J8KMrT ziG?AH6>Jw9LkbInB*-=FU_J+!~ftt8L<}(8QA3Qmc`2!(Gs!r}> f(PZUk8V>V+|uiCKE$514Av)FlL5KW`-0dhAd`=d}jtms6u9l zLZB`dhD=tlWo!&7EDVw$=dgqM9AJ_YCI>W-je#+b4`@6@7Z=C|#uSFhsm!17J8}k# aCaVA=FQeJyV=RvNl&Va2XAQ%rzzzT(8ea_n diff --git a/sslstrip/StrippingProxy.pyc b/sslstrip/StrippingProxy.pyc index 1ba28171acab4bc204f14e8a350b9e113dec8228..8213fb6233e4d5d4c4050f6c90e16f0a0dd1058a 100644 GIT binary patch delta 135 zcmX@ec9PA4`7IX|}`v8W_7C11a|IH$OzD6?SlM5c6nlG2m)nWX@>S085p diff --git a/sslstrip/URLMonitor.py b/sslstrip/URLMonitor.py index a6c167a..b380f03 100644 --- a/sslstrip/URLMonitor.py +++ b/sslstrip/URLMonitor.py @@ -17,7 +17,7 @@ class URLMonitor: real = {} # LEO: diccionario host / real patchDict = { 'https:\/\/fbstatic-a.akamaihd.net':'http:\/\/webfbstatic-a.akamaihd.net', - 'https:\/\/www.facebook.com':'http:\/\/social.facebook.com', + 'https:\/\/www.facebook.com':'http:\/\/wwww.facebook.com', 'return"https:"':'return"http:"' } @@ -26,23 +26,14 @@ class URLMonitor: self.strippedURLPorts = {} self.faviconReplacement = False - self.sustitucion["mail.google.com"] = "gmail.google.com" - self.real["gmail.google.com"] = "mail.google.com" - - self.sustitucion["www.facebook.com"] = "social.facebook.com" - self.real["social.facebook.com"] = "www.facebook.com" - - self.sustitucion["accounts.google.com"] = "cuentas.google.com" - self.real["cuentas.google.com"] = "accounts.google.com" - - self.sustitucion["accounts.google.es"] = "cuentas.google.es" - self.real["cuentas.google.es"] = "accounts.google.es" - def isSecureLink(self, client, url): for expression in URLMonitor.javascriptTrickery: if (re.match(expression, url)): + logging.debug("JavaScript trickery!") return True + if (client, url) in self.strippedURLs: + logging.debug("(%s, %s) in strippedURLs" % (client, url)) return (client,url) in self.strippedURLs def getSecurePort(self, client, url): diff --git a/sslstrip/URLMonitor.pyc b/sslstrip/URLMonitor.pyc index 34b458d37b3e57214b89d177bef7e76f8c3e9d2e..7b107ea9f521748b2a2bfdf600272c7ad630b02a 100644 GIT binary patch literal 3978 zcmcIn-)|eo5uPP2ilp_!lIo~e@^j#MrR=y!qC^m*5w2uja(Qx#vx0RY{i zh9t}K=|NkPCUrTuElEp>6-nAktV(iQi8V=9lvtN!Rf#*2tSPY}$+{AolH5_^uGo8G z?^2nAyAlpMo7DL)=-L53&qp?Zaly2-E|^AX=Fwab1y+}a#2$9z zeA+vSUPUf0(wXn&)65q=9}j(099tfG*d6)l#QmV!e%L$go!S>iFPx8j8t+EkXdJ=( zQPRz`;dDdc~qSFyXWeqLldYSE5cyUuZY zJFx+at%mjsG`EA!D_YM)hK7hDQ4?QR0)P@An0xw)WAL%fdcVS75C6<;f=hS)&UMC@ zdEuQW^q=5PtS3|!HxSy{1eQ$!1eNS>ajTsib?__NX`J?(16H{#-!={$M0rC3BH2%cMXTN_W=XLQlIf32y ztI0)8inc(t6U3axpYaVDyll&F&I}hE)##yCL$+w z0}aY&X*T{I#tK$3cg&_)HO<<6^FeuK^b?z2Sr^1LXNvm%BfSSWx$^Ua0n=_m;L@~y z`d8prNi{X3K)nIAH)NcI>*S%`0Dg=>q=(Wl!vAA178ty5HfoB&+u-qH)Sy2>FCghe z>j}_;0eiM9v$^T9OaXmzn?1n{w7rp$%s0 z^Ol^oSP;f_Dc*95!dnoIefYy%Q?@?DE&%7O$t_qg2K?VHq`iDAgfYOb)d-ug#{I-l zR7-;Mww$5Vv~|zFSXeNzRW1j$kH!JQsGQl)c35=2Zc#b24;Ui0P?Hwhp>snXAn2;F zLX}bx%kWtlicL9ztrZHOqXBSBi>Lrjujcl-S?!_Ftux3NbO?dIBVu~Jls`y@2nXiA zoM%GoGLOuA*tEz>8I^-s#jNp;2-5UfxX z6H||>slvny(R)>yIUTApN>R5PsY%HpTJ3;QYK2HZ`pCC6cj+6L zIi1v?1j6gk1lBNZGvIsuV43{R*tg#tJ5cyV?kV zEM5$#Fu;uFA{t#j9Q2t`JgJtHSqZ(72k)%pa8SNG;FL=#Rmq}L`;M=vFQdZoh0FNa z!&AU9r2F>tl2I1zt7!i&=ELuxdk3PtmK$P$1rjeU)V2`Wu5@0;6* zu^3GK&~56jhaeV)qEw@ze4oP$W#X}kqEgOQ5l7R@mkrYmUUGO&XR+1f($6z{WrtGV z=#fZo!IGy7*%5||8oiF}(eK;`WAT#AqNyDY_3<+tPV;0w;gHcc942`@9EMa=8F--2 z(uob5V1!+EOi&@;>>+QZ%AfJ*vo!W0WrPf|kl`PG%fZ|F0-> z@weawbuzPrmZ`>41Ie!ZPkJT%p*=3Od@eaDa`K{1z R`=yJ2$|JO@u9%hDe*j}9P8$FK literal 4232 zcmcIn&2l425zdlEvZb*-{$a;Eu)+3t*hRzcNF0bcI2`;A8%)F?Hd@1;_G04AI<#*orPcsLthhHmlPt6To@VQkcK21vcDu_%r0x+l5t&6uFGSd z-oQ^&k|lY(-vBeiFHZVl-Q8ujuM-atShl4 z_Df>7sLcMBgoDl|b^aT=c7V_Gu?=8cFfFYMrcs)CG#5mHvp&d=f=)b1ZRS4?=EdY; z;ODc6b%7s8K8W+8ux^%TN#OIKurKD;c^90H(|C*(R!?xYcxj6ub%A{~v$0RJQIL}} z7(D9+!BZbZ6PE`k*3KZdh~g6->TEnOY;Y94OyfM`(XLyH+lA_5?`ONcUiYJeuEmzb z9(3b;+B=S3MlLSWneXM(%ojZ$4}DaOEDt^Cj{S7v9#q>8dI!Bzdw6u{eB{&kQPho2 zBA7o;x|#Lv{$icm<-*Tf_1;x!E|1e_(mje|dzj}ZRLOn$nwZnm)9cf#m@cfJ7uk;5 zwBy#UbKLGuY`|h;#Qgxx{Slqlcs&yt8paffn)tdB8hzlT2)&x@p>co+GZ^R+&fLP_ zRy9+{prHfIG%;vaGYt%us+naBmaCa13XB@<6jpqoz$X%678BrYP^UPo4Z+v#Sb&f*bUTs}x32b-_+F0*b`0EinGn*hG zoToZh7@y{acb>5D3F6gy%3MTeXlE1L`4n3E+uSvGKK1iB%`<-sIW6TcCPHp8KA26Fu*HPkweu4-X$-(!Dnz)SbQd%h)&^rU0ek@LkaEE;=zQre#{S zRkM1f#Wa$duxSK+2gIv~45HM?lV5*T&gzOH+@ms( z8gkskwbP=0r-?p96ZOcO418Xs@rf;7L#l>2JvWVfJXR+>FXlGnOou9kw8c|W2{n2t zNO^@`paww3!I?MVHC}V-28u4v((L3R#*PRtrY%jg1>dQ+=rK0+);B?1^MKF;`KB1= z6VW%dCO!kmDaucQzO8|AHZ46hc?dVl8cg<#L z7vqyn?fMgx!?mVb8&Mzt6x#>{u!s_Mxql9PDCa@c85QRM2}A*=8*(3}Ux=IoD!^*U z`{zrnW#<5hrV4Gc>YTUati|GXT$g+gE&~o>dkfOB5r3FmmhJbk4Y6{z%sp6ej0kLt zDdoNRtC-A`?$+vxeONa8T`8_5!FgNGP&?bY??ddnP1)PL9~=fi<4G6*-O8E0>;YD- zeD11pW)D%B!m3r(v=Vj?iEtO^t4^rAdeRbnSLVmEq_DY)39dsRmxfUVoL|lDar33r z?K8+2bQlkP$MEU(QvTq6kRD98p2m}syZSo84Pc%*d5(J-mB2#q3~Aa; zn8&h)>h?+b?y3&@1-VpJOiX2}rdspT8N>uVPV}`eHR4z=_$G8?aZlY_s{IPgO0_y@ zHfpM>JpfUvhO8i>YymI;X!^)UVgm4hN&`jYzT3v?g@+%#dUQ#3@dDLkD}kGqguJPc z>;GS1&fBi))WYK5fK^#qg$;8+Esa2w)f@!~F{JQB)61f+|BU2c0}_Fyc9(NldGE?n z4hL7(RC21CM(36i++6_K%j)2j(rUauVb+A2ueEQV_iLTpF1e!V~$e)`}2;_2!oz34mieeQOnoOdad7i2aLrVFpH*k zIMm0|a5&AA`Gi9{d^k+WR^~B$QMu8W%r03(Y!?P1;obVCu!_MjzXqg zNL&c%uJ9qdZ?OA_-N)>D=oT+%{x4O+^-Z}#-AxU(mNgsA`le~>w{Dj3ZP!~Ht)*78 pwbQEWx7BKvXX|BYjnO!Sh%4dt1@C7W!uCpMf1BrM{arzv{RgAHk*xp# diff --git a/sslstrip/__init__.pyc b/sslstrip/__init__.pyc index 918c4412c6617ad5e47a0881a12ca615e641e3d7..ce51fc1d84ede3bf80c702a95443342e62521572 100644 GIT binary patch delta 48 zcmZo*Y+>YJ{>;mDZ12b5i5#Xfx(o~q`bGKqCHlFEd5QYP#W}?#MVSS<8O0^V6GOED Ddyf!o delta 44 zcmZo+Y+&TL_=%TGWVdY4L=IC4O$G)A{p9@Ig2bYd%#?in;^Lg*lA_FliILg>Dp?L+