diff --git a/disposable_email_blocklist.conf b/disposable_email_blocklist.conf index 68bad81..d3839b2 100644 --- a/disposable_email_blocklist.conf +++ b/disposable_email_blocklist.conf @@ -1,7 +1,4 @@ -*.33mail.com -0-00.usa.cc 0-mail.com -001.igg.biz 027168.com 0815.ru 0815.ry @@ -62,12 +59,13 @@ 1fsdfdsfsdf.tk 1mail.ml 1pad.de +1s.fr 1st-forms.com 1to1mail.org 1usemail.com 1webmail.info 1zhuan.com -2.0-00.usa.cc +2012-2016.ru 20email.eu 20email.it 20mail.eu @@ -92,7 +90,6 @@ 30minutemail.com 30wave.com 3202.com -333.igg.biz 33mail.com 36ru.com 3d-painting.com @@ -107,6 +104,7 @@ 4mail.cf 4mail.ga 4nextmail.com +4nmv.ru 4tb.host 4warding.com 4warding.net @@ -158,12 +156,10 @@ a-bc.net a45.in a7996.com aa5zy64.com -ab0.igg.biz abacuswe.us abakiss.com abcmail.email abilitywe.us -abnamro.usa.cc abovewe.us absolutewe.us abundantwe.us @@ -242,7 +238,6 @@ akgq701.com al-qaeda.us albionwe.us alchemywe.us -alfaromeo.igg.biz aliaswe.us alienware13.com aligamel.com @@ -350,7 +345,6 @@ aschenbrandt.net asdasd.nl asdasd.ru ashleyandrew.com -asiarap.usa.cc ask-mail.com asorent.com ass.pp.ua @@ -358,10 +352,10 @@ astonut.tk astroempires.info asu.mx asu.su +at.hm at0mik.org atnextmail.com attnetwork.com -audi.igg.biz augmentationtechnology.com ausgefallen.info auti.st @@ -396,7 +390,6 @@ barryogorman.com bartdevos.be basscode.org bauwerke-online.com -baxomale.ht.cx bazaaboom.com bbbbyyzz.info bbhost.us @@ -441,8 +434,8 @@ bladesmail.net blip.ch blnkt.net blogmyway.org +blogos.net blogspam.ro -blow-job.nut.cc bluedumpling.info bluewerks.com bnote.com @@ -518,7 +511,7 @@ caseedu.tk casualdx.com cavi.mx cbair.com -cc-cc.usa.cc +cbes.net cc.liamria cdpa.cc ceed.se @@ -535,7 +528,6 @@ chalupaurybnicku.cz chammy.info cheaphub.net cheatmail.de -chechnya.conf.work chibakenma.ml chickenkiller.com chielo.com @@ -561,6 +553,7 @@ click-email.com clickdeal.co clipmail.eu clixser.com +cloudns.cx clrmail.com cmail.club cmail.com @@ -571,6 +564,7 @@ cndps.com cnew.ir cnmsg.net cnsds.de +co.cc cobarekyo1.ml cocovpn.com codeandscotch.com @@ -582,15 +576,13 @@ coldemail.info compareshippingrates.org completegolfswing.com comwest.de +conf.work consumerriot.com contbay.com -cool.fr.nf coolandwacky.us coolimpool.org coreclip.com -correo.blogos.net cosmorph.com -courriel.fr.nf courrieltemporaire.com coza.ro crankhole.com @@ -727,8 +719,6 @@ divermail.com divismail.ru diwaq.com dlemail.ru -dm.w3internet.co.uk -dma.in-ulm.de dmarc.ro dndent.com dnses.ro @@ -794,7 +784,6 @@ dwse.edu.pl dyceroprojects.com dz17.net e-mail.com -e-mail.igg.biz e-mail.org e-marketstore.ru e-tomarigi.com @@ -832,7 +821,6 @@ email-fake.tk email-jetable.fr email-lab.com email-temp.com -email.cbes.net email.net email1.pro email60.com @@ -846,7 +834,6 @@ emailcu.icu emaildienst.de emaildrop.io emailfake.ml -emailfake.nut.cc emailfreedom.ml emailgo.de emailias.com @@ -881,7 +868,6 @@ emailtmp.com emailto.de emailure.net emailwarden.com -emailx.at.hm emailxfer.com emailz.cf emailz.ga @@ -991,7 +977,6 @@ fasttoyota.com fastyamaha.com fatflap.com fbma.tk -fbmail.usa.cc fddns.ml fdfdsfds.com fer-gabon.org @@ -1015,12 +1000,10 @@ fitnesrezink.ru fivemail.de fixmail.tk fizmail.com -flashbox.5july.org fleckens.hu flemail.ru flowu.com -flu-cc.flu.cc -flucc.flu.cc +flu.cc fluidsoft.us flurred.com fly-ts.de @@ -1059,7 +1042,6 @@ freeinbox.email freelance-france.eu freeletter.me freemail.ms -freemail.tweakly.net freemails.cf freemails.ga freemails.ml @@ -1097,6 +1079,7 @@ g2xmail.top g3xmail.top g4hdrop.us gafy.net +gage.ga galaxy.tv gally.jp gamail.top @@ -1121,7 +1104,6 @@ geew.ru gehensiemirnichtaufdensack.de geldwaschmaschine.de gelitik.in -gen.uu.gl genderfuck.net geronra.com geschent.biz @@ -1171,7 +1153,6 @@ glucosegrin.com gmal.com gmatch.org gmial.com -gmx.fr.nf gmx1mail.top gmxmail.top gmxmail.win @@ -1189,7 +1170,6 @@ gothere.biz gotmail.com gotmail.net gotmail.org -gotti.otherinbox.com gowikibooks.com gowikicampus.com gowikicars.com @@ -1211,6 +1191,7 @@ gregorygamel.com gregorygamel.net grish.de griuc.schule +grn.cc grr.la gruz-m.ru gs-arc.org @@ -1325,16 +1306,13 @@ huangniu8.com hukkmu.tk hulapla.de humaility.com -humn.ws.gy hungpackage.com hushmail.cf huskion.net hvastudiesucces.nl hwsye.net -i-phone.nut.cc i2pmail.org i6.cloudns.cc -i6.cloudns.cx iaoss.com ibnuh.bz icantbelieveineedtoexplainthisshit.com @@ -1348,6 +1326,7 @@ ieh-mail.de iencm.com iffymedia.com ige.es +igg.biz ignoremail.com ihateyoualot.info ihazspam.ca @@ -1363,6 +1342,7 @@ imgv.de immo-gerance.info imstations.com imul.info +in-ulm.de inbax.tk inbound.plus inbox.si @@ -1417,6 +1397,7 @@ ipsur.org irabops.com irc.so irish2me.com +irishspringrealty.com iroid.com ironiebehindert.de irssi.tv @@ -1433,24 +1414,17 @@ iuemail.men iwi.net ixx.io j-p.us -j8k2.usa.cc jafps.com jajxz.com -jamesbond.flu.cc -jamesbond.igg.biz -jamesbond.nut.cc -jamesbond.usa.cc janproz.com jaqis.com jdmadventures.com jdz.ro je-recycle.info -jeie.igg.biz jellow.ml jellyrolls.com jet-renovation.fr jetable.com -jetable.fr.nf jetable.net jetable.org jetable.pp.ua @@ -1512,8 +1486,6 @@ kimsdisk.com kingsq.ga kino-100.ru kiois.com -kir.ch.tc -kiryubox.cu.cc kismail.ru kisstwink.com kitnastar.com @@ -1541,8 +1513,6 @@ kpooa.com krd.ag krsw.tk krypton.tk -ks87.igg.biz -ks87.usa.cc ksmtrck.tk kuhrap.com kulmeo.com @@ -1563,7 +1533,6 @@ lackmail.ru lacto.info lags.us lain.ch -lajoska.pe.hu lak.pp.ua lakelivingstonrealestate.com lakqs.com @@ -1621,11 +1590,9 @@ login-email.tk logular.com loh.pp.ua loin.in -lol.ovpn.to lolfreak.net lolmail.biz lookugly.com -lopl.co.cc lordsofts.com lortemail.dk losemymail.com @@ -1665,7 +1632,6 @@ mail-temporaire.com mail-temporaire.fr mail-tester.com mail.by -mail.mezimages.net mail.wtf mail0.ga mail1.top @@ -1738,7 +1704,6 @@ mailinator.info mailinator.net mailinator.org mailinator.us -mailinator.usa.cc mailinator0.com mailinator1.com mailinator2.com @@ -1809,7 +1774,6 @@ mailtv.tv mailzi.ru mailzilla.com mailzilla.org -mailzilla.orgmbx.cc mainerfolg.info makemenaughty.club makemetheking.com @@ -1838,7 +1802,6 @@ mebelnu.info mechanicalresumes.com medkabinet-uzi.ru meepsheep.eu -mega.zik.dj meinspamschutz.de meltedbrownies.com meltmail.com @@ -1863,7 +1826,6 @@ migmail.pl migumail.com mihep.com mijnhva.nl -milk.gage.ga ministry-of-silly-walks.de minsmail.com mintemail.com @@ -1891,14 +1853,10 @@ molms.com momentics.ru monachat.tk monadi.ml -moncourrier.fr.nf -monemail.fr.nf moneypipe.net -monmail.fr.nf monumentmail.com moonwake.com moot.es -mor19.uu.gl moreawesomethanyou.com moreorcs.com morriesworld.ml @@ -1911,8 +1869,6 @@ moy-elektrik.ru moza.pl mozej.com mp-j.ga -mp-j.igg.biz -mp.igg.biz mr24.co msgos.com mspeciosa.com @@ -1980,7 +1936,6 @@ nanonym.ch naslazhdai.ru nationalgardeningclub.com nawmin.info -nbox.notif.me nbzmr.com negated.com neomailbox.com @@ -2033,7 +1988,6 @@ nolemail.ga nomail.cf nomail.ga nomail.pw -nomail.xl.cx nomail2me.com nomorespamemails.com nonspam.eu @@ -2041,11 +1995,11 @@ nonspammer.de nonze.ro noref.in norseforce.com -nospam.ze.tc nospam4.us nospamfor.us nospamthanks.info nothingtoseehere.ca +notif.me notmailinator.com notrnailinator.com notsharingmy.info @@ -2057,8 +2011,7 @@ ntlhelp.net nubescontrol.com nullbox.info nurfuerspam.de -nut-cc.nut.cc -nutcc.nut.cc +nut.cc nutpa.net nuts2trade.com nwldx.com @@ -2115,6 +2068,7 @@ optimaweb.me oranek.com ordinaryamerican.net oreidresume.com +orgmbx.cc oroki.de oshietechan.link otherinbox.com @@ -2122,7 +2076,6 @@ ourklips.com ourpreviewdomain.com outlawspam.com outmail.win -ovi.usa.cc ovpn.to owlpic.com ownsyou.de @@ -2145,7 +2098,7 @@ patonce.com pavilionx2.com payperex2.com payspun.com -pcusers.otherinbox.com +pe.hu pecinan.com pecinan.net pecinan.org @@ -2158,7 +2111,6 @@ pfui.ru phone-elkey.ru photo-impact.eu photomark.net -phpbb.uu.gl pi.vu piaa.me pig.pp.ua @@ -2259,7 +2211,6 @@ r4nd0m.de ra3.us rabin.ca rabiot.reisen -radiku.ye.vc raetp9.com rainbowly.ml raketenmann.de @@ -2283,7 +2234,6 @@ recipeforfailure.com recode.me reconmail.com recyclemail.dk -reddit.usa.cc redfeathercrow.com reftoken.net regbypass.com @@ -2298,6 +2248,7 @@ remote.li reptilegenetics.com resgedvgfed.tk revolvingdoorhoax.org +rfc822.org rhyta.com richfinances.pw riddermark.de @@ -2367,10 +2318,6 @@ secure-mail.biz secure-mail.cc secured-link.net securehost.com.es -securemail.flu.cc -securemail.igg.biz -securemail.nut.cc -securemail.usa.cc seekapps.com seekjobs4u.com sejaa.lv @@ -2442,7 +2389,6 @@ slushmail.com sluteen.com sly.io smallker.tk -smap.4nmv.ru smapfree24.com smapfree24.de smapfree24.eu @@ -2480,7 +2426,6 @@ soodonims.com soon.it spacebazzar.ru spam-be-gone.com -spam.2012-2016.ru spam.la spam.org.es spam.su @@ -2497,7 +2442,6 @@ spambog.net spambog.ru spambooger.com spambox.info -spambox.irishspringrealty.com spambox.me spambox.org spambox.us @@ -2549,7 +2493,6 @@ spamwc.cf spamwc.ga spamwc.gq spamwc.ml -speed.1s.fr speedgaus.net sperma.cf spikio.com @@ -2612,7 +2555,6 @@ symphonyresume.com syosetu.gq syujob.accountants szerz.com -t.psh.me tafmail.com tafoi.gr taglead.com @@ -2642,7 +2584,6 @@ temp-mail.org temp-mail.pp.ua temp-mail.ru temp-mails.com -temp.headstrong.de tempail.com tempalias.com tempe-mail.com @@ -2862,9 +2803,8 @@ urhen.com uroid.com us.af us.to -usa-cc.usa.cc +usa.cc used-product.fr -username.e4ward.com ushijima1129.cf ushijima1129.ga ushijima1129.gq @@ -2956,7 +2896,6 @@ walala.org walkmail.net walkmail.ru wallm.com -wasteland.rfc822.org watch-harry-potter.com watchever.biz watchfull.net @@ -2972,13 +2911,11 @@ web2mailco.com webcontact-france.eu webemail.me webm4il.info -webmail.igg.biz webmail24.top webtrip.ch webuser.in wee.my wef.gr -wefjo.grn.cc weg-werf-email.de wegwerf-email-addressen.de wegwerf-email-adressen.de @@ -3014,7 +2951,6 @@ whatpaas.com whatsaas.com whiffles.org whopy.com -whtjddn.33mail.com whyspam.me wibblesmith.com wickmail.net @@ -3040,12 +2976,12 @@ wpg.im wralawfirm.com writeme.us wronghead.com +ws.gy wudet.men wuespdj.xyz wupics.com wuzup.net wuzupmail.net -www.e4ward.com wwwnew.eu wxnw.net x24.com @@ -3059,7 +2995,6 @@ xcpy.com xemaps.com xemne.com xents.com -xing886.uu.gl xjoi.com xl.cx xmail.com @@ -3097,7 +3032,6 @@ ycn.ro ye.vc yedi.org yep.it -yert.ye.vc yhg.biz ynmrealty.com yodx.ro @@ -3109,7 +3043,6 @@ yopmail.fr yopmail.gq yopmail.net yopmail.pp.ua -yopmail.usa.cc yordanmail.cf you-spam.com yougotgoated.com @@ -3142,6 +3075,7 @@ zarabotokdoma11.ru zasod.com zaym-zaym.ru zdenka.net +ze.tc zebins.com zebins.eu zehnminuten.de diff --git a/verify.py b/verify.py index 38ddd0d..2512184 100644 --- a/verify.py +++ b/verify.py @@ -29,7 +29,6 @@ def check_for_public_suffixes(filename): lines = files[filename] suffix_detected = False psl = None - download_suffixes() with open("public_suffix_list.dat", "r") as latest: psl = PublicSuffixList(latest) for i, line in enumerate(lines): @@ -49,6 +48,22 @@ def check_for_public_suffixes(filename): sys.exit(1) +def check_for_third_level_domains(filename): + with open("public_suffix_list.dat", "r") as latest: + psl = PublicSuffixList(latest) + + invalid = { + line + for line in files[filename] + if len(psl.privateparts(line.strip())) > 1 + } + if invalid: + print("The following domains contain a third or lower level domain in {!r}:".format(filename)) + for line in sorted(invalid): + print("* {}".format(line)) + sys.exit(1) + + def check_for_non_lowercase(filename): lines = files[filename] invalid = set(lines) - set(line.lower() for line in lines) @@ -86,13 +101,19 @@ def check_for_intersection(filename_a, filename_b): print("The following domains appear in both lists:") for line in sorted(intersection): print("* {}".format(line)) + sys.exit(1) if __name__ == "__main__": + # Download the list of public suffixes + download_suffixes() # Check if any domains have a public suffix check_for_public_suffixes(blocklist) + # Check if any domains are a third or lower level domain + check_for_third_level_domains(blocklist) + # Check if any domains are not lowercase check_for_non_lowercase(allowlist) check_for_non_lowercase(blocklist)