diff --git a/app/models/channel/email_parser.rb b/app/models/channel/email_parser.rb index 30452fa60..c00eed212 100644 --- a/app/models/channel/email_parser.rb +++ b/app/models/channel/email_parser.rb @@ -480,6 +480,13 @@ class Channel::EmailParser def html2ascii(string) + # in case of invalid encodeing, strip invalid chars + # see also test/fixtures/mail21.box + # note: string.encode!('UTF-8', 'UTF-8', :invalid => :replace, :replace => '?') was not detecting invalid chars + if !string.valid_encoding? + string = string.chars.select { |c| c.valid_encoding? }.join + end + # find and replace it with [x] link_list = '' counter = 0 diff --git a/test/fixtures/mail21.box b/test/fixtures/mail21.box new file mode 100644 index 000000000..853784d91 --- /dev/null +++ b/test/fixtures/mail21.box @@ -0,0 +1,801 @@ +From pharmacy_affordable1@ertelecom.ru Mon Jun 2 20:00:59 2014 +Return-Path: +Received: from 5x164x97x33.dynamic.spb.ertelecom.ru (unknown [5.164.97.33]) + by arber.znuny.nix (Postfix) with ESMTP id C96D2602D6 + for ; Mon, 2 Jun 2014 20:00:58 +0200 (CEST) +From: Viagra Super Force Online +To: +Subject: World Best DRUGS Mall For a Reasonable Price. +Date: Mon, 2 Jun 2014 22:00:57 +0400 +MIME-Version: 1.0 +Content-Type: text/html; charset="UTF-8" +Content-Transfer-Encoding: quoted-printable +X-Antivirus: avast! (VPS 140602-0, 02.06.2014), Outbound message +X-Antivirus-Status: Clean +X-UID: 1111 +Status: RO +Content-Length: 54184 +Lines: 781 + +_____________________________= +____________________________________________________Please beth saw his hea= +d +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
9õhH3ÿoIÚ&#= +245;´GÃ&ique= +st;iH±6u-û◊NQ4ùäU¹awAq¹JLZμÒIicgT1ζ2Y7⊆t 63‘Mñ36E&#= +223;Ý→DA&#= +229;†I048CvJ9A↑3iTc4ÉI<= +/span>ΥvXO50&#= +241;NÁFJSð­r 154F1HPO= +À£CRxZp tLîT9öXH1b3E<= +/span>s±W mNà= +;Bg3õEbPŒSúfτTóY4 sUÖP&= +#210;ζΔRFkc= +IÕ1™CÓZ3EΛRq!Cass is good to ask what that
86ËÏuÕC L I C= +60;K   H E R E28MLuke had been thinking about that.
Shannon = +said nothing in fact they. Matt placed the sofa with amy smiled. Since the = +past him with more. Maybe he checked the phone. Neither did her name only. = +Ryan then went inside matt.
Maybe we can have anything you sure.
á•XMYÍÅEE£ÓN&de= +g;kP'dÄÅS4⌉d √p¨HΣ>jE4y4ACüûLì= +;“vT∧4tHXÆX:
x5VV"¹t<= +span style=3D"color:#18136C; font-size:12pt">içÂaaΦ3fg¦zèr«°haeJw n&= +#167;Va879sÆ3j f¶ïlÞ9lo5F¾w&nu= +;¶1 κψ&= +rsaquo;a9f4sLsL ùVo$v3x1¸= +;nz.uȦ1H4s35Ô7yoQCÄFMiMzda¯ZεlÝHNi¬cÚs<= +/span>ù–ϖ DYhaã7Ns4Ö· n3dl1XÆo¯µ¶wpN↑ YQ7<= +span style=3D"color:#18136C; font-size:12pt">aé39s1qÓ QyL$fcÕ1Ν= +S5.5Wy62­d5ĶH
³7<V401i4æÂaθÀTg÷ÄGr9EûaΡBw →ÌÖSRSL= +u72lpL6Veº9Ær<= +/span>¾HL FEpAÕø9cP¬ltÒcDibäXvTt= +Fel3®+bVM ø5ôaXWas4&ord= +m;ä μÕKl∏7mo√þ3wSg1 ι£Ca= +´´Xso= +18 ÅL2$…4¾2Jo↑.0Λa53iè55WÕî3IV4◊9iFÊVaßÕóg8³9r℘buaf®2 fc7Pg3⊆rzç8oÜ−⋅fÿ≥ZeaPÑs= +5⇐TsiΨ&= +ni;i9ÌuoU8RnΨ⌉•aw1fl= +fùë TQNaU›ésvDu BÇIl6Θlo∠HfwNX8 36Xa∼α»sT½d ŠHG$= +Îõ¬3Q= +WÀ.‰&rsaqu= +o;Y5Ôg80¦ao
LKNV0ÄwiM4xafsJgFJär2= +7”a⇐MÔ= + ∠O5SQØMuté«p÷ÅÃe¨ûHrZ4Ä 1U&Lambda= +;F¨TsoûwXrú4Ickyçe= +89;qY 074aÙl⌊sÐH1 4Ùplø4Xob0= +aw4FÔ 28∴a70lsA30 &szl= +ig;WF$Z¸v4AEG.Î6¨2t9p5¶¼QM9¯Cε= +92i0qPa¹AölW5Pi5Vusi8&eum= +l; ðO0SE2Euù∈èpòY3eTs6r6ý2 lªÌAyîjcQpet½3õiiq= +XvPVOe8­V+«“G ¤ó6a<= +/span>®Π7sJ= +13;g ¡JÈl♥Š¾oÐolwBVà →AmaηÒ¯= +saÑÚ = +Häð$2Ef2∈n5.Œ8H95¨19⊃ƒõ
Up dylan in love and found herself. Sorry for beth smiled at some time<= +/td> +Whatever you on one who looked. Except for another man and ready.
ÚúeACíøN<= +/span>˵UT3L= +♠ICë9-BŒfAoÓCL5ΒÉLHοN= +E5∂7RScdGX­ªIpΣuCCw∨/D¤6A´vâS0d&s= +ub;TÇ'BHfóΔMåß7A63B:
2UýV5¦U<= +span style=3D"color:#18136C; font-size:12pt">eý¿×nRm2tæÓOoγ1øly¼Wi<= +/span>6pxnÀZ= +71; câSa8ï¤sGï⊂ ΜJll1£„o<= +/span>nbéw⌉= +ö1 vY8aΘmgs0Ú4 å¥G$·592KkU= +1®b0.½Âℜ54Èh0º´hZf­A0j¸= +dc1ξv™Xpagl×ib8YrSf0<= +span style=3D"color:#18136C; font-size:12pt"> ¨WiaÀ4»sÁ×7 TAwl= +l¨dom1Gw2¿z ΒÿÀaˆyÎsN8η 3oo$D01= +2Λp³4cìz.PA∅9ϒ7354ú9
RãíNn&= +uml;2aYRøs≅←ÍoPÀynCΧ»efõoxÕ∪h E18aNÿÜ= +siÿ5 f47lÃ47oFÂjwG= +ÎÉ ·0= +8aºedsjÛS ¿e®$KèR1LDÍ7üoè.4= +3;O99Ý£9íϖn¶ú↵Sι3”p&Yacu= +te;ó‾iEuerΓy0iY30vΤA6= +a2"Y 465a1m6sgÁs C∀ilΑÒΠo<= +/span>r6yw7¿ð= +; 1KΩaÐ32s∇Δ¤ 9Χ9$MWN2P0&= +#201;8óË&bet= +a;.Ö∩S93íñ0RQ’
Have anything but matty is taking care. Voice sounded in name only the = +othersMouth shut and while he returned with. Herself with one who is your lif= +e
ÿ²íGu8NEZ3F= +NFsôEÆRnRÇC9AK4xLÀ5Ç Ì5= +bH97CE«Ì0AÎq¢Lµk→TªJkHe3š:Taking car= +e about matt li=EE ed ryan. Knowing he should be there.
Ks£TäbI= +r74EaãDZmœH¡a³7odÅ∪voÒ= +ozlP3S 23‹azy∝sÚ°Q= + 4â¹l= +l21ovh7w2D2 ©Qw= +a⇑cΒs= +¨wH Iµe$⇐J517Tñ.t5f36ÅB06ã&= +Psi;5z℘Z4nGiý89t←f4hvnàrbŸTo1s= +9m¥Ëqand·xxO6 Iÿ∪a= +k½0s= +7;£M ûΗ&= +iexcl;løÈ&fr= +ac34;orztw170 —♣≅ar6qs<= +/span>vDv 76T$3×D0erÍ.d¼07WoI5ÀK&#= +250;
ϒa9P'&#= +182;¯rP74o2ψÈzχfþaÃàñc3qY →®7aaRgsN©k ¯‰ΣlÍpÃo7R⊂wÆðe 3Iha&= +clubs;d˜s3g7 È3M$≡⋅ª0AY4.Uq√3Û±k5SU&= +Mu;Zr2A8Ö6cZŸdoΡeumpq¼= +pAoUlèI2ieYÒaK>∂ 3n6ax1Qs20b °Häl9¶ÑoÏ6aw≡dä ΗÅ2a¢Óvs⊃Á7 C&sube= +;Ä$2Bz2sló.∫Pb5ØMx0oQd
ZΙμPCqmrµp0eAΦ♥dô‾Ωn∠2si4y2s= +÷8«o6&foral= +l;ClDeÌoPbqnd¡Jelè× ÿˆ5aWl⟨sbPÔ ï²çl8¢OoH¸ew’90 Υ66a= +ÕÆdsh6K r6Ç$7Ey0WcÎ.£—012= +C857Aþi·σS&eu= +ro;53yxµèn80ntΡΠmhç≡hrB²doµS¥ih&= +#247;rdOKK 7½öa←ãIs2⌉V Cssl= +77;´RoT1QwyÉΔ •∏∞aïYGsÂ8E 1πx$04ò0gMF.bTQ3Íx658ùς
Maybe even though she followed.Does this mean you talking about. Whatever else to sit on them back +
←4BC3éhAGAWNrÛjAGυ»D¬f4Iðm√AHM9N⟩= +1è ‚¬H= +DÁ9ÜRâ3∨U90IG¾99S¶∪”T¥ì3OË= +°cR0E⇑E2°1 4ÖaA″XΝDµ4ℑVAK8Aµd9NrÅDT¦12A5khGA3mE98ÔS9KC!5TU
AMm>= +EjL w∗LWυIaoKd¹rΘ22l2IΚd&= +ecirc;5PwO4Hiây6dÖH⌊eÃìg j14Dr­5e700lH·ÐiJ±ùvY…öe¦mhr¸«4yrÆÔ!&su= +m;η2 ÷¬&= +upsilon;OΔf&delt= +a;rKZwd4KVeB¶órℜ0Ç PΖ×341o<= +span style=3D"color:#18136C; font-size:18pt">+A7Y ¬æ6GM17oGOºos7&s= +um;d×7ûs¤8P ο♦QaRn–n5b2d0ìw Ër&ups= +ih;GIÑℑem0∀t³bæ 20rF4O7Rä= +;2°EÇò&= +sube;ESΥ4 KF0AÒÂßi5ïcrt⊆€m= +RJ7aNΛ&#= +255;inÕ6l5bQ ¸ϒtSZbwh3¶3ig♠9<= +span style=3D"color:#18136C; font-size:18pt">p2″Ìp×¢êiK»´nsWsgdXW!= +tBO
m0W>= +YÙ b¬= +u1xΔd03¯¬0vHK%Þ¹ó 674Aj3&= +#246;uQ←ÏtÈH¨houqeyªYnÑ21t⌋BZi¦V2c¬Tn >ZΓMöÜÊe3Å1dís5s2ø›!³= +;0û 2¡Ì= +;Emè1xéV2p1∨6iâdâ= +rB9ra72mtSzIiMlVo0NLngΒ= +û ú2LD7⇑maNx3tUζ∪= +etcù 90= +36;o¶Ù3fv49 w≅»O0givÅýYeX&#= +239;NryfT 3fP3xZÕ FñÃY<= +/span>8q¯eEÂ= +ÜaâyfrΜpls9âÂ!qκÊ
î5A><= +/span>∀pƒ = +ZµÍS&delt= +a;3éem2sc⊕7vu41JrÒ°weÊyh qa&r= +ho;OÏp¼nΣxZlrN¡i♠Êcnl4jeN¶Q y2≅Sb63h17⟩ofµyp= +ÅAÆp= +þh0iÔcbnec4gIù1 h2Uw23‹i9çk<= +span style=3D"color:#18136C; font-size:18pt">tSÅÏh6Vº g±sVŒóuipV¯se= +È⋅a4üV<= +span style=3D"color:#18136C; font-size:18pt">,T6D 2ý8MΡY©a⊃ºΕs5ùýt<= +/span>9IDeFDℑrXpOCe“μan·Mr¾1Kd&#= +165;ëð,e= +8;7 DfmAæ¤NM9ïhEUË∨= +XσψG = +4j0a°81nhTAdmTü «9öEνμr-U4fc¨Þ1h8ª¸eoycc9xjk= +⁄ko!ë9K +
¬Û…>J6Á <= +/span>¢⟩8E&O= +uml;22a³41s¬17y3â8 °f2R6olewtzfw¹suýoQn⇓³³d×4G= +s¢7« AlDa°H¶n9Ejdtg› ¯ôθ2ε¥⊇4¯″A/4Øv72= +z→ Ü3¥<= +span style=3D"color:#18136C; font-size:18pt">C6ú2u56Xs9⁄1t∑ΙioxÉjmØR= +49;e1WÔrH25 o¥ßS≥gmuX2gp3yip·³2oD£3rc3μtks∪!sWK +
+
+When she were there you here.= + Lott to need for amy said.
Once more than ever since matt. Lott said tu= +rning o=EF ered. Tell you so matt kept going.
Homegrown dandelions by he= +rself into her lips. Such an excuse to stop thinking about. Leave us and be= + right. +

+
+ + + + + +
+ + + + +

+ =D0=AD=D1=82=D0=BE =D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D0= +=B5 =D1=81=D0=B2=D0=BE=D0=B1=D0=BE=D0=B4=D0=BD=D0=BE =D0=BE=D1=82 =D0=B2=D0= +=B8=D1=80=D1=83=D1=81=D0=BE=D0=B2 =D0=B8 =D0=B2=D1=80=D0=B5=D0=B4=D0=BE=D0= +=BD=D0=BE=D1=81=D0=BD=D0=BE=D0=B3=D0=BE =D0=9F=D0=9E =D0=B1=D0=BB=D0=B0=D0= +=B3=D0=BE=D0=B4=D0=B0=D1=80=D1=8F avast! = +Antivirus =D0=B7=D0=B0=D1=89=D0=B8=D1=82=D0=B0 =D0=B0=D0=BA=D1=82=D0=B8= +=D0=B2=D0=BD=D0=B0. +

+
+
+ diff --git a/test/unit/email_parser_test.rb b/test/unit/email_parser_test.rb index 68b259b15..481655fbc 100644 --- a/test/unit/email_parser_test.rb +++ b/test/unit/email_parser_test.rb @@ -371,6 +371,17 @@ Hof :to => 'info2@znuny.com', }, }, + { + :data => IO.read('test/fixtures/mail21.box'), + :body_md5 => '9c08ff6ac8817e7dbea6d2ef04dc7bc3', + :params => { + :from => 'Viagra Super Force Online ', + :from_email => 'pharmacy_affordable1@ertelecom.ru', + :from_display_name => 'Viagra Super Force Online', + :subject => 'World Best DRUGS Mall For a Reasonable Price.', + :to => 'info@znuny.nix', + }, + }, ] files.each { |file| @@ -395,7 +406,7 @@ Hof # check attachments if file[:attachments] - attachment_count_config = file[:attachments].length + attachment_count_config = file[:attachments].length attachment_count_email = 0 file[:attachments].each { |attachment| attachment_count_email += 1