diff --git a/.gitignore b/.gitignore index c9d178c..bd93b38 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,9 @@ lib-cov # Coverage directory used by tools like istanbul coverage +# nyc test coverage +.nyc_output + # Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) .grunt @@ -23,18 +26,22 @@ coverage # Compiled binary addons (http://nodejs.org/api/addons.html) build/Release -# Dependency directory -# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git +# Dependency directories node_modules +jspm_packages # Optional npm cache directory .npm -.npmrc # Optional REPL history .node_repl_history -test/fixtures/out - package-lock.json -.nyc_output +bower_components +# Optional npm cache directory +.npmrc +.idea +.DS_Store + +test/fixtures/out +haraka-update.sh \ No newline at end of file diff --git a/.npmignore b/.npmignore index 5af6867..b10c4d1 100644 --- a/.npmignore +++ b/.npmignore @@ -1,11 +1,61 @@ +# Logs +logs +*.log +npm-debug.log* + +# Runtime data +pids +*.pid +*.seed + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (http://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules +jspm_packages + +# Optional npm cache directory +.npm + +# Optional REPL history +.node_repl_history + +package-lock.json +bower_components +# Optional npm cache directory +.npmrc +.idea +.DS_Store +haraka-update.sh + .github +.release .codeclimate.yml -.DS_Store .editorconfig .gitignore .gitmodules .lgtm.yml -.release +appveyor.yml +codecov.yml +.travis.yml +.eslintrc.yaml +.eslintrc.json + http/bower_components http/node_modules -codecov.yml diff --git a/.release b/.release index 20e8e5d..0890e94 160000 --- a/.release +++ b/.release @@ -1 +1 @@ -Subproject commit 20e8e5dbcf634c2f568d973966be42c4504db480 +Subproject commit 0890e945e4e061c96c7b2ab45017525904c17728 diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b3d24e..c3ed7bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ ### Unreleased +### [1.1.0] - 2022-09-29 + +- updated TLD files +- switch http -> https for extra-tlds URL +- for PSL updater, use project root, #74 + + ### [1.0.34] - 2022-06-05 - ci: reusable workflows from haraka/.github @@ -170,3 +177,4 @@ [1.0.32]: https://github.com/haraka/haraka-tld/releases/tag/1.0.31 [1.0.34]: https://github.com/haraka/haraka-tld/releases/tag/1.0.33 +[1.1.0]: https://github.com/haraka/haraka-tld/releases/tag/1.1.0 diff --git a/etc/extra-tlds b/etc/extra-tlds index ad417c5..a7c020c 100644 --- a/etc/extra-tlds +++ b/etc/extra-tlds @@ -300,6 +300,7 @@ perso.tc ph.tc pisem.su pl.tc +plesk.page pochta.com pochta.ru pochtamt.ru diff --git a/etc/public-suffix-list b/etc/public-suffix-list index 4218ae3..171971f 100644 --- a/etc/public-suffix-list +++ b/etc/public-suffix-list @@ -1022,6 +1022,11 @@ k12.il muni.il net.il org.il +ישראל +אקדמיה.ישראל +ישוב.ישראל +צהל.ישראל +ממשל.ישראל im ac.im co.im @@ -1033,18 +1038,47 @@ plc.co.im tt.im tv.im in +5g.in +6g.in +ac.in +ai.in +am.in +bihar.in +biz.in +business.in +ca.in +cn.in co.in +com.in +coop.in +cs.in +delhi.in +dr.in +edu.in +er.in firm.in -net.in -org.in gen.in +gov.in +gujarat.in ind.in +info.in +int.in +internet.in +io.in +me.in +mil.in +net.in nic.in -ac.in -edu.in +org.in +pg.in +post.in +pro.in res.in -gov.in -mil.in +travel.in +tv.in +uk.in +up.in +us.in info int eu.int @@ -7438,6 +7472,48 @@ s3-website.eu-central-1.amazonaws.com s3-website.eu-west-2.amazonaws.com s3-website.eu-west-3.amazonaws.com s3-website.us-east-2.amazonaws.com +vfs.cloud9.af-south-1.amazonaws.com +webview-assets.cloud9.af-south-1.amazonaws.com +vfs.cloud9.ap-east-1.amazonaws.com +webview-assets.cloud9.ap-east-1.amazonaws.com +vfs.cloud9.ap-northeast-1.amazonaws.com +webview-assets.cloud9.ap-northeast-1.amazonaws.com +vfs.cloud9.ap-northeast-2.amazonaws.com +webview-assets.cloud9.ap-northeast-2.amazonaws.com +vfs.cloud9.ap-northeast-3.amazonaws.com +webview-assets.cloud9.ap-northeast-3.amazonaws.com +vfs.cloud9.ap-south-1.amazonaws.com +webview-assets.cloud9.ap-south-1.amazonaws.com +vfs.cloud9.ap-southeast-1.amazonaws.com +webview-assets.cloud9.ap-southeast-1.amazonaws.com +vfs.cloud9.ap-southeast-2.amazonaws.com +webview-assets.cloud9.ap-southeast-2.amazonaws.com +vfs.cloud9.ca-central-1.amazonaws.com +webview-assets.cloud9.ca-central-1.amazonaws.com +vfs.cloud9.eu-central-1.amazonaws.com +webview-assets.cloud9.eu-central-1.amazonaws.com +vfs.cloud9.eu-north-1.amazonaws.com +webview-assets.cloud9.eu-north-1.amazonaws.com +vfs.cloud9.eu-south-1.amazonaws.com +webview-assets.cloud9.eu-south-1.amazonaws.com +vfs.cloud9.eu-west-1.amazonaws.com +webview-assets.cloud9.eu-west-1.amazonaws.com +vfs.cloud9.eu-west-2.amazonaws.com +webview-assets.cloud9.eu-west-2.amazonaws.com +vfs.cloud9.eu-west-3.amazonaws.com +webview-assets.cloud9.eu-west-3.amazonaws.com +vfs.cloud9.me-south-1.amazonaws.com +webview-assets.cloud9.me-south-1.amazonaws.com +vfs.cloud9.sa-east-1.amazonaws.com +webview-assets.cloud9.sa-east-1.amazonaws.com +vfs.cloud9.us-east-1.amazonaws.com +webview-assets.cloud9.us-east-1.amazonaws.com +vfs.cloud9.us-east-2.amazonaws.com +webview-assets.cloud9.us-east-2.amazonaws.com +vfs.cloud9.us-west-1.amazonaws.com +webview-assets.cloud9.us-west-1.amazonaws.com +vfs.cloud9.us-west-2.amazonaws.com +webview-assets.cloud9.us-west-2.amazonaws.com t3l3p0rt.net tele.amune.org apigee.io @@ -7479,6 +7555,7 @@ supersale.jp theshop.jp shopselect.net base.shop +beagleboard.io *.beget.app betainabox.com bnr.la @@ -7982,6 +8059,8 @@ myddns.rocks blogsite.xyz dynv6.net e4.cz +easypanel.app +easypanel.host eero.online eero-stage.online elementor.cloud @@ -8186,6 +8265,10 @@ forgeblocks.com id.forgerock.io framer.app framercanvas.com +framer.media +framer.photos +framer.website +framer.wiki *.frusky.de ravpage.co.il 0e.vc @@ -8291,6 +8374,7 @@ kill.jp kilo.jp kuron.jp littlestar.jp +lolipopmc.jp lolitapunk.jp lomo.jp lovepop.jp @@ -8480,6 +8564,8 @@ häkkinen.fi *.moonscale.io moonscale.net iki.fi +ibxos.it +iliadboxos.it impertrixcdn.com impertrix.com smushcdn.com @@ -8531,7 +8617,9 @@ pixolino.com na4u.ru iopsys.se ipifony.net +iservschule.de mein-iserv.de +schulplattform.de schulserver.de test-iserv.de iserv.dev @@ -8724,6 +8812,7 @@ mediatech.dev hra.health miniserver.com memset.net +messerli.app *.cloud.metacentrum.cz custom.metacentrum.cz flt.cloud.muni.cz @@ -8737,6 +8826,7 @@ azure-mobile.net cloudapp.net azurestaticapps.net 1.azurestaticapps.net +2.azurestaticapps.net centralus.azurestaticapps.net eastasia.azurestaticapps.net eastus2.azurestaticapps.net @@ -9030,9 +9120,9 @@ rocky.page сочи.рус спб.рус я.рус -builder.code.com -dev-builder.code.com -stg-builder.code.com +*.builder.code.com +*.dev-builder.code.com +*.stg-builder.code.com sandcats.io logoip.de logoip.com @@ -9102,6 +9192,7 @@ alpha.bounty-full.com beta.bounty-full.com small-web.org vp4.me +streamlitapp.com try-snowplow.com srht.site stackhero-network.com diff --git a/etc/top-level-tlds b/etc/top-level-tlds index 84c9dd0..d5665c0 100644 --- a/etc/top-level-tlds +++ b/etc/top-level-tlds @@ -1,4 +1,4 @@ -# Version 2022052300, Last Updated Mon May 23 07:07:01 2022 UTC +# Version 2022092900, Last Updated Thu Sep 29 07:07:02 2022 UTC AAA AARP ABARTH diff --git a/package.json b/package.json index b22746a..0f6874f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "haraka-tld", - "version": "1.0.34", + "version": "1.1.0", "description": "Haraka TLD utilities", "main": "index.js", "directories": { diff --git a/update_tld_files b/update_tld_files index fe00633..ed29c5b 100755 --- a/update_tld_files +++ b/update_tld_files @@ -13,4 +13,4 @@ $CURL -f -s -S -o - https://publicsuffix.org/list/effective_tld_names.dat | grep $CURL -f -s -S -o etc/top-level-tlds https://data.iana.org/TLD/tlds-alpha-by-domain.txt $CURL -f -s -S -o etc/two-level-tlds http://george.surbl.org/two-level-tlds $CURL -f -s -S -o etc/three-level-tlds http://george.surbl.org/three-level-tlds -$CURL -f -s -S -o etc/extra-tlds http://rss.uribl.com/hosters/hosters.txt +$CURL -f -s -S -o etc/extra-tlds https://rss.uribl.com/hosters/hosters.txt