Merge pull request #1347 from fatalbanana/rspamd-1.4

Rspamd 1.4: backports

3 files changed, 458 insertions, 644 deletions

diff --git a/conf/redirectors.inc b/conf/redirectors.inc
index 1b9180d6a..594654a45 100644
--- a/conf/redirectors.inc
+++ b/conf/redirectors.inc
@@ -1,270 +1,130 @@
-1c-bitrix.ru
-7pisem.ru
-action-emails.ru
-autodesk.com
-bsndsy.ru
-www.clickmeeting.com
-click.email4customers.com
-flane.info
-geteml.com
-www.grandstreamnetworks.ru
-ikeafamilynews.ru
-list-manage.com
-list-manage1.com
-api.m3653.net
-mandrillapp.com
-mlcampaignru.com
-mlsendru.com
-mobotix-news.com
-e.mail.ru
-email.mail.ostrovok.ru
-email.news.ostrovok.ru
-pechkincensor.ru
-pechkinspy.ru
-professionali.ru
-securityexpert.ru
-sendgrid.net
-sendsay.ru
-simplesite.com
-softlinemail.ru
-trusteml.com
-ulmart.ru
-vash-repetitor.ru
-webformyself.com
-zebratelecom.ru
-gmy.su
-goo.pm
-mtp.pl
-shortr.org
-ilnk.me
-urlgo.ru
-link.sendsay.ru
-allshort.ru
-n3n.in
-share.flocktory.com
-s0e.ru
-wuw.su
-xaa.su
-link.ac
-rlu.ru
-bit.do
-thnlnk.com
-innogam.es
-loo.gl
-linkde.info
-tin.cc
-bit.uz
-ourgplus.at
-int.kz
-bitby.net
-srclick.ru
-qnh.pl
-etdurl.com
-digidns.net
-honbattle.com
-out.houseofgaga.ru
-xcs.me
-ipsha.ru
-toma.ai
-stnx.at
-short.nr
-s.coop
-jmb.tw
-get.tf
-urloid.com
-tinyit.cc
-go-url.ru
-gnu.su
-vk.cc
-mee.la
-5url.net
-url.cn
-tiny.ps
-lcut.us
-1zs.info
-leto.tk
-gu.ma
-itbelarus.biz
-linkcash.biz
-urlclick.ru
-url.shinri.biz
-u.info-mg.ru
-aipro.ru
-#utro.ru
-informer.ru
-rnd.ru
-orbita.co.il
-ploshadka.ru
-li.ru
-7ly.ru
-#umenytt.se/url/c9d3a8
-umenytt.se
-nexturl.ru
-weblist.kharkov.ua
-widg.me
-bun.ru
-proext.com
-all-top.ru
-directtrafficlink.com
-#liveinternet.ru
-r.delphicomponent.ru
-nonameno.com
-speed-tester.info
-byyb.net
-cortas.elpais.com
-mini.drbrain.in
-hop.clickbank.net
-hostviet.biz
-#not a shortener
-gmetzner.de
-zerverteam.com
-airs.ru
-link.rengo.ru
-2tu.me
-6yo.org
-9mp.com
-avoo.net
-bai.lu
-cha.la
-easyurl.jp
-etwit.in
-folo.me
-gig140.com
-qrf.in
-mockurl.com
-mminurl.info
-offfoz.net
-ppt.cc
-pxlz.org
-q115.info
-t.cn
-to8.cc
-unfake.it
-uww.me
-ww.tl
-4.gg
-urlgoto.com
-xp.cm
-xw6.com
-xxw.me
 000d.ru
 0845.com
 0c.ru
 0lv.ru
 0pen.me
 0rz.tw
-0x3.us
-1-url.ru
-1-url.net
 10r.us
 123url.org
 140.uz
 17q.com
+1c-bitrix.ru
 1cl.in
+1ink.in
 1ink.ru
 1iny.com
 1lik.net
 1link.in
-1lnk.net
 1url.com
 1url.in
-2.gp
-2.ly
+1-url.net
+1-url.ru
 2big.at
 2dwww.com
+2.gp
 2it.info
-2cu.in
+2.ly
 2mb.eu
-2mi.co
 2qu.ru
 2sms.ru
+2tu.me
 2tu.us
 2url.org
-3.ly
-3x.si
-3.vu
 307.to
 3fw.ru
 3le.ru
-4.ly
-4url.tk
-4u.gd
+3.ly
+3.vu
+3x.si
+4.gg
 4job.ru
+4.ly
 4ms.me
-4osi.com
 4p5.com
 4ry.ru
 4sq.com
+4u.gd
 4url.cc
+4url.tk
 5.gp
 5link.tk
 5pl.us
+5url.net
 5z8.info
-6.ly
-6url.us
 6fr.ru
+6.ly
 6pn.com
 6url.com
-7.ly
+6yo.org
 70.ru
 74job.ru
+7.ly
+7ly.ru
+7pisem.ru
 7ruh.com
 7ry.us
 7xu.org
 8.ly
 8q.ro
+9mp.com
 9-n.org
 9xi.ru
-a.gg
-a.md
-arddl.com
-aka-url.com
-a.nf
 a1.tc
 a2k.in
 aa.cx
 aafter.us
-abcurl.net
 abe5.com
 access.im
-ad.vu
+action-emails.ru
 ad4.us
 adf.ly
 adjix.com
 adsbeta.net
-adzurl.com
-affurl.net
-afgurl.com
+ad.vu
 afx.cc
+a.gg
 ah.ae
+aipro.ru
+airs.ru
+aka-url.com
 alic.at
 all.fuseurl.com
+allshort.ru
+all-top.ru
 alturl.com
+a.md
 amzn.to
-apsense.cc
+a.nf
 apeurl.com
+api.m3653.net
+apsense.cc
 apu.sh
 ar.gy
 arm.in
 arst.ch
-asylum.name
 atiny.me
 atto.co.za
 atu.ca
+autodesk.com
+avoo.net
 azc.cc
 b23.ru
-bitly.com
-bezurl.com
 b2l.me
 backupurl.com
 bacn.me
+bai.lu
 bcool.bz
+bezurl.com
 bi.gl
-bin.nu
 binged.it
+bin.nu
+bitby.net
+bit.do
 bit.gy
 bit.ly
+bitly.com
 biturl.net
+bit.uz
 bizj.us
 bloat.me
 bmu.li
@@ -273,39 +133,39 @@ bq.ro
 bravo.ly
 briefurl.pl
 bsa.ly
-bu.tt
+bsndsy.ru
 budurl.com
+bun.ru
+bu.tt
 byst.ro
+byyb.net
 bz9.com
 canurl.com
-cbs.so
-cjt99.tk
-cd.vg
-cjb.net
-cut4.me
 capello.linkatty.com
 capourl.com
-capturesplash.com
 care2share.tk
+cbs.so
 cbuz.com
 cctv.ws
+cd.vg
 cektkp.com
-cgctinyurl.co.uk
-cheykenadobo.com
+cha.la
 chilp.it
-chki.ws
 chzb.gr
-cl.lk
-clme.ru
-clickv.tk
-cl.ly
+cjb.net
+cjt99.tk
 clck.ru
-cli.gs
 cliccami.info
-click-me.us
 click2.info
+click.email4customers.com
+click-me.us
 clickthru.ca
+clickv.tk
+cli.gs
 clkit.co
+cl.lk
+cl.ly
+clme.ru
 cloakreferer.com
 clockurl.com
 clop.in
@@ -316,6 +176,7 @@ comyonet.com
 conta.cc
 coolestone.com
 cort.as
+cortas.elpais.com
 cot.ag
 cowurl.com
 cr.am
@@ -326,199 +187,202 @@ crop.im
 crum.pl
 ctvr.us
 cug.kr
+cut4.me
 cut.by
 cuthut.com
-cutlinks.info
 cutt.us
-d1k.us
+d2u.us
 d8z.ru
-da.lc
 dai.ly
+da.lc
 ddp.net
-dduri.info
 decenturl.com
 delivr.com
 dev0.ru
-dfl8.me
-di.gd
+dft.ba
 digbig.com
+di.gd
 digg.com
+digidns.net
 din.gy
-direct-9.com
+directtrafficlink.com
 disq.us
 dld.bz
 dlvr.it
-do.my
 doiop.com
+do.my
 dopen.us
 dot.tk
-dr.tl
 dr2.biz
 driz.ru
-drv2.com
-dupeurl.com
-d2u.us
+dr.tl
 durlz.info
-dwarfe.eu
 easyuri.com
+easyurl.jp
 easyurl.net
 eepurl.com
 ej.uz
 elurl.com
+email.mail.ostrovok.ru
+email.news.ostrovok.ru
+e.mail.ru
 emap.ws
+etdurl.com
 eweri.com
 exa.im
-extrasmallurl.com
 f1ru.net
 fa.by
 fanta.linkatty.com
-farturl.com
 fav.me
-fb.me
 fbi.pp.ua
+fb.me
 fbshare.me
-ff.im
 fff.to
+ff.im
 ffs.cc
 fi.gd
 fire.to
 firsturl.de
 firsturl.net
 fishurl.ru
+flane.info
 flavr.be
-flexurl.net
 flic.kr
 flq.us
 flx.im
 fly2.ws
+folo.me
 fo.my
-fogz.eu
 fon.gs
 forex-trade.be
 fqav.com
 freak.to
-free-redirect.tk
-free-url-redirection.com.ru
 freepl.us
+free-redirect.tk
 freeurl.me
+free-url-redirection.com.ru
 fur.ly
 fuseurl.com
-future.linkz.tv
 fuzzy.to
 fwd4.me
 fwds.me
 fwib.net
-fyn.im
 fyad.org
-1ink.in
-g.ro.lt
-qr.net
-gadaf.fi
-dft.ba
-g.ua
+fyn.im
 g00.me
+gadaf.fi
 game-url.com
 gentleurl.net
-get.sh
+geteml.com
 getlink.info
+get.sh
+get.tf
 gho.co
+gig140.com
 gizmo.do
 gl.am
 glink.co
 gltw.ru
-go.9nl.com
-go-links.net
-go.it
-go.ly
-go.qb.by
-go.usa.gov
+gmetzner.de
+gmy.su
+gnu.su
 go2-url.com
+go.9nl.com
 go9.us
 goandgrab.info
-goblig.com
 gog.tc
+go.it
+go-links.net
 golook.at
-goo.gl
+go.ly
 good.ly
+goo.gl
+goo.pm
+go.qb.by
 goshrink.com
+gosite.in
 goto.pattayacitythailand.com
-gourl.bz
-gourl.ws
 gourl.ca
-gourl.it
 gourl.gr
+gourl.it
+go-url.ru
+go.usa.gov
 gri.bz
+g.ro.lt
 gtgg.us
+g.ua
+gu.ma
 gurl.es
 haqm.com
-ho.io
 hex.io
 hhvx.com
-hi.kg
 hiderefer.com
 hijw.com
+hi.kg
 hit.kg
 hj.to
 hlurl.com
 hmm.ph
-ho.pe
+ho.io
+hop.clickbank.net
 hopclicks.com
+ho.pe
 hop.kz
 href.in
 hsblinks.com
 htxt.it
-huff.to
 hubb.me
+huff.to
 hulu.com
 hurl.me
 hurl.ws
 huuk.net
 hvmnd.org
-hydrowaredirect.com
-i5.be
-iurlz.com
-ifree.kz
-iref.ws
 i2h.de
-ibrochure.me
+i5.be
 icanhaz.com
 idek.net
 idelink.com
+ifree.kz
 ih3.ru
+ikeafamilynews.ru
 ilix.in
+ilnk.me
+informer.ru
+innogam.es
 ino.me
-#ip.ru
+int.kz
+ipsha.ru
 ir.pe
 is.gd
 is.gs
 issuu.com
-its.my
 itshrunk.com
+its.my
+iurlz.com
 ix.lt
 ixr.be
-j.mp
-just.as
 j3w.it
 ja.cx
-jals.in
 jdem.cz
 jewi.sh
 jijr.com
+jmb.tw
+j.mp
 jom.la
 joo.ru
+just.as
 juu.cc
-kipq.com
-ki.tl
 keep2.me
-knb.im
-ktzr.us
 kickurl.com
+kipq.com
 kisaurl.com
+ki.tl
 kl.am
 klck.me
 klik.sihitam.com
 klx.co
-koooralink.com
+knb.im
 kon.tl
 kore.us
 korta.nu
@@ -526,77 +390,80 @@ kqon.com
 kr1n.ru
 krunchd.com
 krz.ch
+ktzr.us
 l24.cm
-lul.es
-lin.io
-lr.tc
-l.pr
 l3ss.me
-l2t.in
 l9k.net
 lat.ms
 lavvs.com
+lcut.us
 leeturl.net
+leto.tk
 liip.to
-linkx.me
 liltext.com
-link-shrink.com
-linkmenow.org
-linkyy.com
-link.hhut.ru
+lin.io
 link2me.ru
+link.ac
 linkbee.com
 linkbun.ch
+linkcash.biz
+linkde.info
 linkee.com
-linkhappy.net
+link.hhut.ru
 linkl.ru
+link.rengo.ru
+link.sendsay.ru
 linkslash.ca
-linkzip.net
 linkunion.de
+linkx.me
+linkyy.com
+linkzip.net
 lip.tc
+li.ru
+list-manage1.com
+list-manage.com
 little.im
 littleurl.net
 liurl.cn
-liverpoole.linkz.tv
 livehoster.org
 llinks.net
-ln-s.net
-ln-s.ru
 ln0.ru
 ln4.me
 lnk.by
 lnk.cm
 lnk.co
+lnkd.in
 lnk.gd
 lnk.in
 lnk.ly
 lnk.ms
-lnk.sk
-lnkd.in
 lnks.it
+lnk.sk
 lnkstts.com
 lnkurl.com
+ln-s.net
+ln-s.ru
 loh.ru
-looplink.net
+loo.gl
 lovebyt.es
 low.cc
+l.pr
+lr.tc
 lru.jp
 lrwk.com
-lt.tl
 ltos.ru
+lt.tl
+lul.es
 lurl.no
-lu2su.net
 lx2.net
 ly9.net
-mail.rambler.ru
 m4u.in
-myooo.info
-miud.in
-mo.by
 m7a.org
-m7mod.linkz.tv
 macte.ch
+mail.rambler.ru
+mandrillapp.com
 mash.to
+mee.la
 merky.de
 metamark.net
 micurl.com
@@ -610,274 +477,281 @@ minurl.fr
 minyurl.net
 minyurl.org
 mislead.in
+miud.in
 mixe.me
 mke.me
+mlcampaignru.com
+mlsendru.com
 mmt.su
+mobotix-news.com
+mo.by
 moby.to
+mockurl.com
 moourl.com
 mp77.com
 mrte.ch
+mtp.pl
 mty.in
-mu-premium.net
 mug.gs
-murl.bz
 murl.kz
 mvp.im
-mzan.si
-my0l.com
-mypaqe.com
-myurlshrunk.com
-mygoogleurl.com
-mylink.to
 mylink4u.info
-mylinklet.com
+mylink.to
 myloc.me
-mypc-market.co.uk
+myooo.info
+mypaqe.com
 mypl.us
 mytinyurl.net
 myurl.in
 myurl.si
 myxx.me
-n.pr
-neuf.tk
+mzan.si
+n3n.in
 n3r.ru
 nbc.co
-nbold.com
 nblo.gs
-netgod.tk
+nbold.com
 ne1.net
+netgod.tk
+neuf.tk
 newhotlink.com
+nexturl.ru
 nicesharing.com
 nik.im
 niurl.com
 nl.cr
 nn.nf
-no.io
-now.am
 no1.in
+no.io
+nonameno.com
 normalurl.com
-not.my
 notlong.com
+not.my
+now.am
+n.pr
 nsfw.in
 nutshellurl.com
 nxy.in
 nyti.ms
-o-x.fr
-o.ly
-oiurl.com
-o.pobierz-film.com
 oc1.us
 oeeq.com
-om.ly
+oiurl.com
+o.ly
 omf.gd
+om.ly
 omoikane.net
 on.cnn.com
 on.mktw.net
 oogyah.com
 oork.com
 opurl.us
+orbita.co.il
 orz.se
+ourgplus.at
+out.houseofgaga.ru
 ovr.me
 ow.ly
-owned.name
-p.ly
-prourl.de
-p.tl
-pduda.mobi
+o-x.fr
 p1.fr
 pathto.net
 pb8.ru
 pburl.com
 pcw.ro
+pduda.mobi
+pechkincensor.ru
+pechkinspy.ru
 peeep.us
 peekurl.com
 pendek.in
 penting.web.id
-petit-url.co.cc
 pfat.de
 pho.se
-php-ru.info
 phpm.ru
+php-ru.info
 pi90.com
-piks.nl
 picourl.ru
+piks.nl
 ping.fm
 pli.gs
 plink.es
 plo.cc
+ploshadka.ru
 plugin.name
 plusphp.com
+p.ly
 pnt.me
 pobierz-film.tk
-ponyurl.com
 politi.co
+ponyurl.com
 poo.pr
 post.ly
 pot.vg
 pp.gg
+ppt.cc
 pra.im
 privacy-surf.com
+proext.com
+professionali.ru
 profile.to
+prourl.de
 ptiturl.com
+p.tl
 pub.vitrue.com
 punyurl.com
 purl.org
 pvh.me
 pw.ly
+pxlz.org
 py6.ru
 pygmyurl.com
 pysper.com
 q32.ru
-qkr.cc
 qick.ws
 qid.in
+qkr.cc
 qlnk.net
 qlql.ru
+qnh.pl
 qr.cx
 qr.ee
+qrf.in
+qr.net
 qru.ru
 qte.me
 qtwk.com
-qu.tc
-quicklink.to
 quik.in
 qurl.com
+qu.tc
 qz.bz
-r-ss.de
-romb.su
-r.im
 rb6.me
-rdr.to
+r.delphicomponent.ru
 rdrct.us
+rdr.to
 read.bi
-retweet.cc
-reduc.in
-reurl.org
 readthis.ca
 reallytinyurl.com
 redir.ec
-redire.ru
 redirectingat.com
 redirects.ca
+redire.ru
 redirx.com
+reduc.in
 referer.us
+retweet.cc
 retwt.me
+reurl.org
 rhwm.eu
-ri.ms
 rickroll.it
+r.im
+ri.ms
 riz.gd
+rlu.ru
 rmse.ru
+rnd.ru
+romb.su
+r-ss.de
 rt.nu
-ru.ly
-rurls.ru
 rubyurl.com
+ru.ly
 rurl.org
 rurl.ru
+rurls.ru
 rustech.org
 rww.tw
-s-m.co
-swturl.com
-sq6.ru
-sqezurl.com
-sayabit.com
-sami.24.gg
 s0bu.ru
+s0e.ru
 s4c.in
 s7y.us
 s8.hk
-saf.li
 safe.mn
+saf.li
+sami.24.gg
+sayabit.com
+s.coop
 scurtare-url.hi2.ro
 sdut.us
+securityexpert.ru
 securl.ru
+sendgrid.net
 sendit.in
+sendsay.ru
 sendurl.info
-sg-url.tk
 sg4d.com
+sg-url.tk
 shadyurl.com
+share.flocktory.com
 shar.es
 shink.de
 shiturl.com
 shli.de
-shor7.com
-shorten.co.za
-short-urls.net
-short-url.co.uk
-shorttheurl.com
 shorl.com
-short-l.com
-short-ly.co.cc
-short-me.com
-short.as
-short.foot-clip.com
-short.ie
-short.im
-short.su
-short.to
 shortb.net
 shorten.im
 shorten.ws
-shortenme.net
-shortlink.ws
+short.ie
+short.im
 shortlinks.co.uk
-shortmyurl.net
-shortn.me
+short-me.com
 shortner.com
+shortn.me
+short.nr
+short.su
+short.to
 shorturl.asia
 shorturl.com
+short-url.co.uk
 shorturls.co.uk
-shout.to
 shortz.me
+shout.to
 show.my
 shrinkee.com
 shrinkify.com
 shrinkr.com
-shrt.fr
-shrt.st
 shrten.com
+shrt.fr
 shrtl.com
+shrt.st
 shrunkin.com
-shudogg.info
 shx.in
+simplesite.com
 simurl.com
-sitecut.net
 sitefwd.com
 sk9.pl
-sl.to
-slamurl.com
 slate.me
 sli.su
 slki.ru
-slmurl.com
-slnk.me
-slurl4.com
+sl.to
 smallr.com
-smurl.ca
 smallurl.in
 smallurl.ru
 smalur.com
-smarturls.info
+s-m.co
 smsh.me
+smurl.ca
 smurl.name
-sn.im
 sn9.ru
+sn.im
 snipr.com
 snipurl.com
-snipurl.us
 snurl.com
-so.vg
+softlinemail.ru
 sokrati.ru
 somexyz.com
 song.ly
 sorturl.net
+so.vg
 sp2.ro
 spedr.com
+speed-tester.info
+sq6.ru
+srclick.ru
 srcom.net
 srnk.net
 srs.li
 srtn.me
-starturl.com
 starts.com
+starturl.com
+stnx.at
 stump.ws
 su.ly
 su.pr
@@ -886,239 +760,242 @@ surl.hu
 surl.me
 surs.nl
 susurl.com
-#like_avast.com_t.co
-ta.gg
-taourl.com
-gosite.in
-tld30.com
-thinurl.info
-thexyz.org
-tty.su
-thurl.in
-t.lh.com
-twitter.com
+swturl.com
 t1ny.net
 ta.gd
+ta.gg
 tagiturl.com
+taourl.com
 tbd.ly
+t.cn
 tcrn.ch
 techto.us
 tez.co
 tgl.net
 tgr.me
 tgr.ph
-th.ly
 th8.us
-thesurl.com
+thexyz.org
 thinfi.com
+th.ly
+thnlnk.com
+thurl.in
 tie.ly
 tighturl.com
+tin.cc
 tiniuri.com
-tiny.by
-tiny.cc
-tiny.ly
-tiny.pl
 tiny9.com
 tinyarro.ws
-tinyftw.com
+tiny.by
+tiny.cc
+tinyit.cc
 tinylink.ca
 tinylink.in
+tiny.ly
+tiny.pl
+tiny.ps
 tinyuri.ca
 tinyurl.com
 tinyurl.ru
 tki.me
-tl.gd
 tldr.in
+tl.gd
+t.lh.com
 tlim.ru
 tllg.net
 tmi.me
 tnij.org
 tny.com
 tny.tc
+to8.cc
+togoto.us
 to.je
 to.ly
-togoto.us
+toma.ai
 tos.co
 totc.us
 tourl.fr
 toysr.us
 tozm.com
 tpm.ly
-tr.im
 tra.kz
 trg.li
-trieka.linkz.tv
 trii.us
+tr.im
 trimurl.me
 trunc.it
-trusted-link.us
+trusteml.com
+tty.su
 tuckinfo.com
-tuaurl.com
 tux-pla.net
 tvsl.eu
-tw1t.net
 tweet.ms
 tweez.me
 twhub.com
-twirific.com
 twirl.at
 twitclicks.com
-twitloops.com
+twitter.com
 twitterurl.net
-twitterurl.org
 twiturl.de
 twiu.ru
 twurl.cc
 twurl.nl
-twurls.co.cc
 tyny.me
-u.mavrev.com
-u.nu
-u.to
 u2s.in
 u76.org
 ub0.cc
+u.info-mg.ru
 ukril.ru
 ulk.me
+ulmart.ru
 ulo.me
 ulu.lu
-uncleurl.com
-uoid.me
+u.mavrev.com
+umenytt.se
+unfake.it
+u.nu
 updating.me
-uplode.in
-ur.ly
-urle.us
-url4t.com
-urlxs.fr
-urlbit.us
-urlin.it
-urls.co.za
-urlsqueeze.com
-urls.vg
-url.g4team.com
 ur1.ca
 ur3.us
-urlgeo.me
-urlu.ms
 ural-tender.ru
-urlshort.me
-urlsim.com
-urltwit.com
-urlrunt.me
-urlmint.com
-url-go.com
-url-zip.com
-url.az
-url.b24.am
-url.co.uk
-url.dflix.net
-url.ie
-url.lotpatrol.com
-url.mk.ua
-url.vsofte.ru
-url.yanclex.com
 url2.ru
-url2go.net
-url3.ru
 url360.me
+url3.ru
 url4.eu
 url4.ru
+url4t.com
 url5.ru
 url66.com
 urla.ru
+url.az
+url.b24.am
+urlbit.us
 urlborg.com
 urlbrief.com
 urlcantik.com
+urlclick.ru
+url.cn
 urlcorta.es
+url.co.uk
 urlcover.com
 urlcut.com
 urldefender.com
 urldepo.ru
+url.dflix.net
 urlel.com
 urlenco.de
-urlg.in
+urle.us
+url.g4team.com
 urlgator.com
-urli.nl
+urlgeo.me
+urlg.in
+url-go.com
+urlgo.ru
+url.ie
+urlin.it
 urlink.eu
+urli.nl
 urlite.de
-urll-short.co.cc
+url.lotpatrol.com
+urlmint.com
+url.mk.ua
 urlms.com
+urloid.com
 urloo.com
 urlot.com
 urlredo.com
-urls.im
-urls247.com
 urlscott.com
+urls.co.za
+url.shinri.biz
 urlshorteningservicefortwitter.com
-urlshrinkit.com
+urlshort.me
+urls.im
+urlsim.com
 urlsnip.com
 urlsp.in
-urlthing.net
-urltoday.info
+urlsqueeze.com
+urls.vg
+urltwit.com
+urlu.ms
 urlus.ru
+url.vsofte.ru
 urlx.ie
+urlxs.fr
+ur.ly
+url.yanclex.com
 urlz.at
-urlz.ro
 urlzen.com
-urlzip.co.tv
+url-zip.com
+urlz.ro
 usat.ly
 use.my
-uuu.su
+u.to
 uud.in
+uuu.su
+uww.me
 uyurl.com
 vani.sh
-vst.tv
+vash-repetitor.ru
 vb.ly
 vc8.net
 vgn.am
-viralurl.org
 view.my
+vk.cc
 vl.am
 vll.me
 vog.me
 vovka.com
-w00t.in
-wik.ro
-wooshorturl.com
-wowurl.com
-wz.ae
+vst.tv
 w3t.org
 w55.de
 wa.la
 wapo.st
 wapurl.co.uk
+webformyself.com
+weblist.kharkov.ua
 weburl.me
 weeclix.com
 wez.su
 whspr.it
+widg.me
+wik.ro
 wipi.es
 wlatcy-moch.tk
 wlink.me.uk
 wmturls.com
 wom.im
+wowurl.com
 wp.me
 wp.nu
 wurl.in
 wurl.us
-x.vu
-x-url.com
-xrls.tk
+wuw.su
+ww.tl
+www.clickmeeting.com
+www.grandstreamnetworks.ru
+wz.ae
 x2t.com
+xaa.su
 xav.cc
 xcqv.com
+xcs.me
 xd5.net
 xdvn.net
 xew.co
 xops.fr
+xp.cm
 xr.com
 xrl.in
+xrls.tk
 xrl.us
+x-url.com
 xurl.es
 xurl.jp
+x.vu
 xvx.su
+xw6.com
 xxsurl.de
-y-url.ru
-yi.pe
+xxw.me
 y.ahoo.it
 yatuc.com
 ydn.ru
@@ -1126,27 +1003,29 @@ ye.pe
 yep.it
 yfrog.com
 yhoo.it
+yi.pe
 yiyd.com
 ysu.me
 yuarel.com
 yurl.in
+y-url.ru
 yurl.ru
 z0p.de
-zxc9.com
-zolp.net
 z2z.ca
 zapt.in
 zazi.me
 zcom.us
+zebratelecom.ru
 zeep.in
 zi.ma
 zi.mu
 zio.in
 zipmyurl.com
-zoom-to.net
+zolp.net
 zrps.info
 zti.me
 zud.me
 zurl.ws
-zz.gd
+zxc9.com
 zzang.kr
+zz.gd
diff --git a/contrib/publicsuffix/effective_tld_names.dat b/contrib/publicsuffix/effective_tld_names.dat
index d756b85ca..b811f16a8 100644
--- a/contrib/publicsuffix/effective_tld_names.dat
+++ b/contrib/publicsuffix/effective_tld_names.dat
@@ -4513,20 +4513,21 @@ org.ng
 sch.ng
 
 // ni : http://www.nic.ni/
+ni
+ac.ni
+biz.ni
+co.ni
 com.ni
-gob.ni
 edu.ni
-org.ni
-nom.ni
-net.ni
-mil.ni
-co.ni
-biz.ni
-web.ni
-int.ni
-ac.ni
+gob.ni
 in.ni
 info.ni
+int.ni
+mil.ni
+net.ni
+nom.ni
+org.ni
+web.ni
 
 // nl : https://en.wikipedia.org/wiki/.nl
 //      https://www.sidn.nl/
@@ -5907,143 +5908,13 @@ gov.rs
 in.rs
 org.rs
 
-// ru : http://www.cctld.ru/ru/docs/aktiv_8.php
-// Industry domains
+// ru : https://cctld.ru/en/domains/domens_ru/reserved/
 ru
 ac.ru
-com.ru
 edu.ru
-int.ru
-net.ru
-org.ru
-pp.ru
-// Geographical domains
-adygeya.ru
-altai.ru
-amur.ru
-arkhangelsk.ru
-astrakhan.ru
-bashkiria.ru
-belgorod.ru
-bir.ru
-bryansk.ru
-buryatia.ru
-cbg.ru
-chel.ru
-chelyabinsk.ru
-chita.ru
-chukotka.ru
-chuvashia.ru
-dagestan.ru
-dudinka.ru
-e-burg.ru
-grozny.ru
-irkutsk.ru
-ivanovo.ru
-izhevsk.ru
-jar.ru
-joshkar-ola.ru
-kalmykia.ru
-kaluga.ru
-kamchatka.ru
-karelia.ru
-kazan.ru
-kchr.ru
-kemerovo.ru
-khabarovsk.ru
-khakassia.ru
-khv.ru
-kirov.ru
-koenig.ru
-komi.ru
-kostroma.ru
-krasnoyarsk.ru
-kuban.ru
-kurgan.ru
-kursk.ru
-lipetsk.ru
-magadan.ru
-mari.ru
-mari-el.ru
-marine.ru
-mordovia.ru
-// mosreg.ru  Bug 1090800 - removed at request of Aleksey Konstantinov <konstantinovav@mosreg.ru>
-msk.ru
-murmansk.ru
-nalchik.ru
-nnov.ru
-nov.ru
-novosibirsk.ru
-nsk.ru
-omsk.ru
-orenburg.ru
-oryol.ru
-palana.ru
-penza.ru
-perm.ru
-ptz.ru
-rnd.ru
-ryazan.ru
-sakhalin.ru
-samara.ru
-saratov.ru
-simbirsk.ru
-smolensk.ru
-spb.ru
-stavropol.ru
-stv.ru
-surgut.ru
-tambov.ru
-tatarstan.ru
-tom.ru
-tomsk.ru
-tsaritsyn.ru
-tsk.ru
-tula.ru
-tuva.ru
-tver.ru
-tyumen.ru
-udm.ru
-udmurtia.ru
-ulan-ude.ru
-vladikavkaz.ru
-vladimir.ru
-vladivostok.ru
-volgograd.ru
-vologda.ru
-voronezh.ru
-vrn.ru
-vyatka.ru
-yakutia.ru
-yamal.ru
-yaroslavl.ru
-yekaterinburg.ru
-yuzhno-sakhalinsk.ru
-// More geographical domains
-amursk.ru
-baikal.ru
-cmw.ru
-fareast.ru
-jamal.ru
-kms.ru
-k-uralsk.ru
-kustanai.ru
-kuzbass.ru
-mytis.ru
-nakhodka.ru
-nkz.ru
-norilsk.ru
-oskol.ru
-pyatigorsk.ru
-rubtsovsk.ru
-snz.ru
-syzran.ru
-vdonsk.ru
-zgrad.ru
-// State domains
 gov.ru
+int.ru
 mil.ru
-// Technical domains
 test.ru
 
 // rw : http://www.nic.rw/cgi-bin/policy.pl
@@ -7247,7 +7118,7 @@ sch.zm
 *.zw
 
 
-// List of new gTLDs imported from https://newgtlds.icann.org/newgtlds.csv on 2016-08-17T00:17:46Z
+// List of new gTLDs imported from https://newgtlds.icann.org/newgtlds.csv on 2016-11-29T01:06:51Z
 
 // aaa : 2015-02-26 American Automobile Association, Inc.
 aaa
@@ -7657,7 +7528,7 @@ bosch
 // bostik : 2015-05-28 Bostik SA
 bostik
 
-// boston : 2015-12-10 Boston Globe Media Partners, LLC
+// boston : 2015-12-10
 boston
 
 // bot : 2014-12-18 Amazon EU S.à r.l.
@@ -8203,9 +8074,6 @@ email
 // emerck : 2014-04-03 Merck KGaA
 emerck
 
-// emerson : 2015-07-23 Emerson Electric Co.
-emerson
-
 // energy : 2014-09-11 Binky Birch, LLC
 energy
 
@@ -8434,7 +8302,7 @@ fujitsu
 // fujixerox : 2015-07-23 Xerox DNHC LLC
 fujixerox
 
-// fun : 2016-01-14 Oriental Trading Company, Inc.
+// fun : 2016-01-14
 fun
 
 // fund : 2014-03-20 John Castle, LLC
@@ -8692,6 +8560,9 @@ honeywell
 // horse : 2013-11-21 Top Level Domain Holdings Limited
 horse
 
+// hospital : 2016-10-20 Ruby Pike, LLC
+hospital
+
 // host : 2014-04-17 DotHost Inc.
 host
 
@@ -9289,7 +9160,7 @@ mortgage
 // moscow : 2013-12-19 Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID)
 moscow
 
-// moto : 2015-06-04 Charleston Road Registry Inc.
+// moto : 2015-06-04
 moto
 
 // motorcycles : 2014-01-09 DERMotorcycles, LLC
@@ -9436,7 +9307,7 @@ nyc
 // obi : 2014-09-25 OBI Group Holding SE & Co. KGaA
 obi
 
-// observer : 2015-04-30 Guardian News and Media Limited
+// observer : 2015-04-30
 observer
 
 // off : 2015-07-23 Johnson Shareholdings, Inc.
@@ -10716,7 +10587,7 @@ xn--cck2b3b
 xn--cg4bki
 삼성
 
-// xn--czr694b : 2014-01-16 HU YI GLOBAL INFORMATION RESOURCES (HOLDING) COMPANY. HONGKONG LIMITED
+// xn--czr694b : 2014-01-16 Dot Trademark TLD Holding Company Limted
 xn--czr694b
 商标
 
@@ -10792,7 +10663,7 @@ xn--hxt814e
 xn--i1b6b1a6a2e
 संगठन
 
-// xn--imr513n : 2014-12-11 HU YI GLOBAL INFORMATION RESOURCES (HOLDING) COMPANY. HONGKONG LIMITED
+// xn--imr513n : 2014-12-11 Dot Trademark TLD Holding Company Limted
 xn--imr513n
 餐厅
 
@@ -11048,57 +10919,84 @@ beep.pl
 cloudfront.net
 
 // Amazon Elastic Compute Cloud: https://aws.amazon.com/ec2/
-// Submitted by Philip Allchin <pallchin@amazon.com>
-compute.amazonaws.com
-ap-northeast-1.compute.amazonaws.com
-ap-northeast-2.compute.amazonaws.com
-ap-southeast-1.compute.amazonaws.com
-ap-southeast-2.compute.amazonaws.com
-eu-central-1.compute.amazonaws.com
-eu-west-1.compute.amazonaws.com
-sa-east-1.compute.amazonaws.com
-us-gov-west-1.compute.amazonaws.com
-us-west-1.compute.amazonaws.com
-us-west-2.compute.amazonaws.com
-compute-1.amazonaws.com
-z-1.compute-1.amazonaws.com
-z-2.compute-1.amazonaws.com
+// Submitted by Luke Wells <psl-maintainers@amazon.com>
+*.compute.amazonaws.com
+*.compute-1.amazonaws.com
+*.compute.amazonaws.com.cn
 us-east-1.amazonaws.com
-compute.amazonaws.com.cn
-cn-north-1.compute.amazonaws.com.cn
 
 // Amazon Elastic Beanstalk : https://aws.amazon.com/elasticbeanstalk/
-// Submitted by Adam Stein <astein@amazon.com>
-elasticbeanstalk.com
+// Submitted by Luke Wells <psl-maintainers@amazon.com>
+elasticbeanstalk.cn-north-1.amazonaws.com.cn
+*.elasticbeanstalk.com
 
 // Amazon Elastic Load Balancing : https://aws.amazon.com/elasticloadbalancing/
-// Submitted by Scott Vidmar <svidmar@amazon.com>
-elb.amazonaws.com
+// Submitted by Luke Wells <psl-maintainers@amazon.com>
+*.elb.amazonaws.com
+*.elb.amazonaws.com.cn
 
 // Amazon S3 : https://aws.amazon.com/s3/
-// Submitted by Luke Wells <lawells@amazon.com>
-s3.amazonaws.com
+// Submitted by Luke Wells <psl-maintainers@amazon.com>
+*.s3.amazonaws.com
 s3-ap-northeast-1.amazonaws.com
 s3-ap-northeast-2.amazonaws.com
+s3-ap-south-1.amazonaws.com
 s3-ap-southeast-1.amazonaws.com
 s3-ap-southeast-2.amazonaws.com
+s3-ca-central-1.amazonaws.com
 s3-eu-central-1.amazonaws.com
 s3-eu-west-1.amazonaws.com
 s3-external-1.amazonaws.com
-s3-external-2.amazonaws.com
 s3-fips-us-gov-west-1.amazonaws.com
 s3-sa-east-1.amazonaws.com
 s3-us-gov-west-1.amazonaws.com
+s3-us-east-2.amazonaws.com
 s3-us-west-1.amazonaws.com
 s3-us-west-2.amazonaws.com
 s3.ap-northeast-2.amazonaws.com
+s3.ap-south-1.amazonaws.com
 s3.cn-north-1.amazonaws.com.cn
+s3.ca-central-1.amazonaws.com
 s3.eu-central-1.amazonaws.com
+s3.us-east-2.amazonaws.com
+s3.dualstack.ap-northeast-1.amazonaws.com
+s3.dualstack.ap-northeast-2.amazonaws.com
+s3.dualstack.ap-south-1.amazonaws.com
+s3.dualstack.ap-southeast-1.amazonaws.com
+s3.dualstack.ap-southeast-2.amazonaws.com
+s3.dualstack.ca-central-1.amazonaws.com
+s3.dualstack.eu-central-1.amazonaws.com
+s3.dualstack.eu-west-1.amazonaws.com
+s3.dualstack.sa-east-1.amazonaws.com
+s3.dualstack.us-east-1.amazonaws.com
+s3.dualstack.us-east-2.amazonaws.com
+s3-website-us-east-1.amazonaws.com
+s3-website-us-west-1.amazonaws.com
+s3-website-us-west-2.amazonaws.com
+s3-website-ap-northeast-1.amazonaws.com
+s3-website-ap-southeast-1.amazonaws.com
+s3-website-ap-southeast-2.amazonaws.com
+s3-website-eu-west-1.amazonaws.com
+s3-website-sa-east-1.amazonaws.com
+s3-website.ap-northeast-2.amazonaws.com
+s3-website.ap-south-1.amazonaws.com
+s3-website.ca-central-1.amazonaws.com
+s3-website.eu-central-1.amazonaws.com
+s3-website.us-east-2.amazonaws.com
+
+// Amune : https://amune.org/
+// Submitted by Team Amune <cert@amune.org>
+t3l3p0rt.net
+tele.amune.org
 
 // Aptible : https://www.aptible.com/
 // Submitted by Thomas Orozco <thomas@aptible.com>
 on-aptible.com
 
+// Asociación Amigos de la Informática "Euskalamiga" : http://encounter.eus/
+// Submitted by Hector Martin <marcan@euskalencounter.org>
+user.party.eus
+
 // Association potager.org : https://potager.org/
 // Submitted by Lunar <jardiniers@potager.org>
 pimienta.org
@@ -11693,13 +11591,16 @@ us-2.evennode.com
 // Submitted by Peter Ruibal <public-suffix@fb.com>
 apps.fbsbx.com
 
-// Fastly Inc. http://www.fastly.com/
-// Submitted by Vladimir Vuksan <vladimir@fastly.com>
+// Fastly Inc. : http://www.fastly.com/
+// Submitted by Fastly Security <security@fastly.com>
+map.fastly.net
+a.prod.fastly.net
+global.prod.fastly.net
 a.ssl.fastly.net
 b.ssl.fastly.net
 global.ssl.fastly.net
-a.prod.fastly.net
-global.prod.fastly.net
+fastlylb.net
+map.fastlylb.net
 
 // Featherhead : https://featherhead.xyz/
 // Submitted by Simon Menke <simon@featherhead.xyz>
@@ -11752,9 +11653,12 @@ gist.githubcloud.com
 // Submitted by Alex Hanselka <alex@gitlab.com>
 gitlab.io
 
+// UKHomeOffice : https://www.gov.uk/government/organisations/home-office
+// Submitted by Jon Shanks <jon.shanks@digital.homeoffice.gov.uk>
+homeoffice.gov.uk
+
 // GlobeHosting, Inc.
 // Submitted by Zoltan Egresi <egresi@globehosting.com>
-ro.com
 ro.im
 shop.ro
 
@@ -12104,6 +12008,10 @@ gotpantheon.com
 // Submitted by Steve Leung <steveleung@peplink.com>
 mypep.link
 
+// Planet-Work : https://www.planet-work.com/
+// Submitted by Frédéric VANNIÈRE <f.vanniere@planet-work.com>
+on-web.fr
+
 // prgmr.com : https://prgmr.com/
 // Submitted by Sarah Newman <owner@prgmr.com>
 xen.prgmr.com
@@ -12260,6 +12168,22 @@ townnews-staging.com
 // Submitted by TuxFamily administrators <adm@staff.tuxfamily.org>
 tuxfamily.org
 
+// TwoDNS : https://www.twodns.de/
+// Submitted by TwoDNS-Support <support@two-dns.de>
+dd-dns.de
+diskstation.eu
+diskstation.org
+dray-dns.de
+draydns.de
+dyn-vpn.de
+dynvpn.de
+mein-vigor.de
+my-vigor.de
+my-wan.de
+syno-ds.de
+synology-diskstation.de
+synology-ds.de
+
 // UDR Limited : http://www.udr.hk.com
 // Submitted by registry <hostmaster@udr.hk.com>
 hk.com
@@ -12275,6 +12199,10 @@ lib.de.us
 // Submitted by Simon Kissel <hostmaster@viprinet.com>
 router.management
 
+// Western Digital Technologies, Inc : https://www.wdc.com
+// Submitted by Jung Jin <jungseok.jin@wdc.com>
+remotewd.com
+
 // Wikimedia Labs : https://wikitech.wikimedia.org
 // Submitted by Yuvi Panda <yuvipanda@wikimedia.org>
 wmflabs.org
@@ -12302,4 +12230,10 @@ za.org
 // Submitted by Olli Vanhoja <olli@zeit.co>
 now.sh
 
+// 1GB LLC : https://www.1gb.ua/
+// Submitted by 1GB LLC <noc@1gb.com.ua>
+cc.ua
+inf.ua
+ltd.ua
+
 // ===END PRIVATE DOMAINS===
diff --git a/interface/js/rspamd.js b/interface/js/rspamd.js
index 40a9799e6..8d6b83e0c 100644
--- a/interface/js/rspamd.js
+++ b/interface/js/rspamd.js
@@ -1172,6 +1172,7 @@
             $(dialog).show();
             $('#connectHost').focus();
             $(backdrop).show();
+            document.getElementById("connectPassword").focus();
             $('#connectForm').one('submit', function (e) {
                 e.preventDefault();
                 var password = $('#connectPassword').val();