@browserless.io/browserless 2.27.0 → 2.28.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +12 -1
- package/bin/browserless.js +6 -6
- package/build/limiter.js +3 -1
- package/build/routes/chrome/http/content.post.body.json +8 -8
- package/build/routes/chrome/http/pdf.post.body.json +8 -8
- package/build/routes/chrome/http/scrape.post.body.json +8 -8
- package/build/routes/chrome/http/screenshot.post.body.json +8 -8
- package/build/routes/chromium/http/content.post.body.json +8 -8
- package/build/routes/chromium/http/pdf.post.body.json +8 -8
- package/build/routes/chromium/http/scrape.post.body.json +8 -8
- package/build/routes/chromium/http/screenshot.post.body.json +8 -8
- package/build/routes/edge/http/content.post.body.json +8 -8
- package/build/routes/edge/http/pdf.post.body.json +8 -8
- package/build/routes/edge/http/scrape.post.body.json +8 -8
- package/build/routes/edge/http/screenshot.post.body.json +8 -8
- package/build/sdk-utils.js +6 -1
- package/extensions/ublocklite/_locales/ar/messages.json +0 -8
- package/extensions/ublocklite/_locales/az/messages.json +0 -8
- package/extensions/ublocklite/_locales/be/messages.json +0 -8
- package/extensions/ublocklite/_locales/bg/messages.json +0 -8
- package/extensions/ublocklite/_locales/bn/messages.json +0 -8
- package/extensions/ublocklite/_locales/br_FR/messages.json +0 -8
- package/extensions/ublocklite/_locales/bs/messages.json +0 -8
- package/extensions/ublocklite/_locales/ca/messages.json +0 -8
- package/extensions/ublocklite/_locales/cs/messages.json +0 -8
- package/extensions/ublocklite/_locales/cv/messages.json +1 -9
- package/extensions/ublocklite/_locales/cy/messages.json +0 -8
- package/extensions/ublocklite/_locales/da/messages.json +0 -8
- package/extensions/ublocklite/_locales/de/messages.json +0 -8
- package/extensions/ublocklite/_locales/el/messages.json +0 -8
- package/extensions/ublocklite/_locales/en/messages.json +1 -9
- package/extensions/ublocklite/_locales/en_GB/messages.json +0 -8
- package/extensions/ublocklite/_locales/eo/messages.json +1 -9
- package/extensions/ublocklite/_locales/es/messages.json +0 -8
- package/extensions/ublocklite/_locales/et/messages.json +0 -8
- package/extensions/ublocklite/_locales/eu/messages.json +0 -8
- package/extensions/ublocklite/_locales/fa/messages.json +0 -8
- package/extensions/ublocklite/_locales/fi/messages.json +0 -8
- package/extensions/ublocklite/_locales/fil/messages.json +0 -8
- package/extensions/ublocklite/_locales/fr/messages.json +0 -8
- package/extensions/ublocklite/_locales/fy/messages.json +0 -8
- package/extensions/ublocklite/_locales/gl/messages.json +0 -8
- package/extensions/ublocklite/_locales/gu/messages.json +1 -9
- package/extensions/ublocklite/_locales/he/messages.json +0 -8
- package/extensions/ublocklite/_locales/hi/messages.json +0 -8
- package/extensions/ublocklite/_locales/hr/messages.json +0 -8
- package/extensions/ublocklite/_locales/hu/messages.json +0 -8
- package/extensions/ublocklite/_locales/hy/messages.json +0 -8
- package/extensions/ublocklite/_locales/id/messages.json +0 -8
- package/extensions/ublocklite/_locales/it/messages.json +27 -35
- package/extensions/ublocklite/_locales/ja/messages.json +0 -8
- package/extensions/ublocklite/_locales/ka/messages.json +0 -8
- package/extensions/ublocklite/_locales/kk/messages.json +1 -9
- package/extensions/ublocklite/_locales/kn/messages.json +0 -8
- package/extensions/ublocklite/_locales/ko/messages.json +0 -8
- package/extensions/ublocklite/_locales/lt/messages.json +1 -9
- package/extensions/ublocklite/_locales/lv/messages.json +0 -8
- package/extensions/ublocklite/_locales/mk/messages.json +0 -8
- package/extensions/ublocklite/_locales/ml/messages.json +0 -8
- package/extensions/ublocklite/_locales/mr/messages.json +1 -9
- package/extensions/ublocklite/_locales/ms/messages.json +0 -8
- package/extensions/ublocklite/_locales/nb/messages.json +0 -8
- package/extensions/ublocklite/_locales/nl/messages.json +0 -8
- package/extensions/ublocklite/_locales/oc/messages.json +1 -9
- package/extensions/ublocklite/_locales/pa/messages.json +0 -8
- package/extensions/ublocklite/_locales/pl/messages.json +0 -8
- package/extensions/ublocklite/_locales/pt_BR/messages.json +1 -9
- package/extensions/ublocklite/_locales/pt_PT/messages.json +3 -11
- package/extensions/ublocklite/_locales/ro/messages.json +0 -8
- package/extensions/ublocklite/_locales/ru/messages.json +0 -8
- package/extensions/ublocklite/_locales/si/messages.json +0 -8
- package/extensions/ublocklite/_locales/sk/messages.json +0 -8
- package/extensions/ublocklite/_locales/sl/messages.json +1 -9
- package/extensions/ublocklite/_locales/so/messages.json +1 -9
- package/extensions/ublocklite/_locales/sq/messages.json +0 -8
- package/extensions/ublocklite/_locales/sr/messages.json +0 -8
- package/extensions/ublocklite/_locales/sv/messages.json +0 -8
- package/extensions/ublocklite/_locales/sw/messages.json +1 -9
- package/extensions/ublocklite/_locales/ta/messages.json +1 -9
- package/extensions/ublocklite/_locales/te/messages.json +1 -9
- package/extensions/ublocklite/_locales/th/messages.json +0 -8
- package/extensions/ublocklite/_locales/tr/messages.json +8 -16
- package/extensions/ublocklite/_locales/uk/messages.json +0 -8
- package/extensions/ublocklite/_locales/ur/messages.json +0 -8
- package/extensions/ublocklite/_locales/vi/messages.json +0 -8
- package/extensions/ublocklite/_locales/zh_CN/messages.json +3 -11
- package/extensions/ublocklite/_locales/zh_TW/messages.json +0 -8
- package/extensions/ublocklite/css/default.css +1 -3
- package/extensions/ublocklite/css/settings.css +0 -14
- package/extensions/ublocklite/dashboard.html +0 -5
- package/extensions/ublocklite/js/background.js +37 -54
- package/extensions/ublocklite/js/filter-lists.js +1 -2
- package/extensions/ublocklite/js/mode-manager.js +8 -2
- package/extensions/ublocklite/js/ruleset-manager.js +17 -42
- package/extensions/ublocklite/js/settings.js +16 -7
- package/extensions/ublocklite/js/utils.js +13 -0
- package/extensions/ublocklite/manifest.json +5 -5
- package/extensions/ublocklite/rulesets/generic-details.json +9 -114
- package/extensions/ublocklite/rulesets/main/annoyances-cookies.json +15 -11
- package/extensions/ublocklite/rulesets/main/annoyances-others.json +5 -2
- package/extensions/ublocklite/rulesets/main/annoyances-overlays.json +9 -5
- package/extensions/ublocklite/rulesets/main/annoyances-social.json +0 -1
- package/extensions/ublocklite/rulesets/main/annoyances-widgets.json +1 -1
- package/extensions/ublocklite/rulesets/main/badware.json +25 -16
- package/extensions/ublocklite/rulesets/main/chn-0.json +32 -20
- package/extensions/ublocklite/rulesets/main/cze-0.json +2 -3
- package/extensions/ublocklite/rulesets/main/default.json +87 -84
- package/extensions/ublocklite/rulesets/main/deu-0.json +2 -3
- package/extensions/ublocklite/rulesets/main/fra-0.json +27 -31
- package/extensions/ublocklite/rulesets/main/idn-0.json +3 -3
- package/extensions/ublocklite/rulesets/main/ind-0.json +25 -33
- package/extensions/ublocklite/rulesets/main/irn-0.json +1 -1
- package/extensions/ublocklite/rulesets/main/isr-0.json +5 -2
- package/extensions/ublocklite/rulesets/main/jpn-1.json +7 -2
- package/extensions/ublocklite/rulesets/main/nor-0.json +1 -2
- package/extensions/ublocklite/rulesets/main/openphish-domains.json +3661 -3691
- package/extensions/ublocklite/rulesets/main/pol-0.json +9 -202
- package/extensions/ublocklite/rulesets/main/rus-0.json +20 -13
- package/extensions/ublocklite/rulesets/main/rus-1.json +3 -2
- package/extensions/ublocklite/rulesets/main/spa-0.json +1 -0
- package/extensions/ublocklite/rulesets/main/spa-1.json +3 -2
- package/extensions/ublocklite/rulesets/main/stevenblack-hosts.json +4270 -2524
- package/extensions/ublocklite/rulesets/main/swe-1.json +30 -33
- package/extensions/ublocklite/rulesets/main/tha-0.json +3 -2
- package/extensions/ublocklite/rulesets/main/tur-0.json +9 -10
- package/extensions/ublocklite/rulesets/main/ukr-0.json +25 -7
- package/extensions/ublocklite/rulesets/main/urlhaus-full.json +472 -360
- package/extensions/ublocklite/rulesets/main/vie-1.json +49 -49
- package/extensions/ublocklite/rulesets/modify-headers/chn-0.json +8 -0
- package/extensions/ublocklite/rulesets/modify-headers/default.json +5 -5
- package/extensions/ublocklite/rulesets/modify-headers/fra-0.json +1 -0
- package/extensions/ublocklite/rulesets/modify-headers/vie-1.json +1 -1
- package/extensions/ublocklite/rulesets/redirect/chn-0.json +1 -1
- package/extensions/ublocklite/rulesets/redirect/default.json +11 -14
- package/extensions/ublocklite/rulesets/redirect/pol-0.json +0 -16
- package/extensions/ublocklite/rulesets/redirect/swe-1.json +158 -11
- package/extensions/ublocklite/rulesets/redirect/tur-0.json +4 -2
- package/extensions/ublocklite/rulesets/redirect/vie-1.json +3 -3
- package/extensions/ublocklite/rulesets/regex/badware.json +6 -2
- package/extensions/ublocklite/rulesets/regex/chn-0.json +4 -2
- package/extensions/ublocklite/rulesets/regex/default.json +7 -0
- package/extensions/ublocklite/rulesets/regex/pol-0.json +1 -5
- package/extensions/ublocklite/rulesets/regex/swe-1.json +0 -1
- package/extensions/ublocklite/rulesets/removeparam/adguard-spyware-url.json +6 -3
- package/extensions/ublocklite/rulesets/removeparam/rus-1.json +1 -1
- package/extensions/ublocklite/rulesets/ruleset-details.json +201 -201
- package/extensions/ublocklite/rulesets/scripting/declarative/annoyances-cookies.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/declarative/annoyances-others.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/declarative/annoyances-overlays.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/declarative/chn-0.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/declarative/default.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/declarative/irn-0.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/declarative/jpn-1.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/declarative/kor-1.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/declarative/pol-0.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/declarative/rus-0.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/declarative/rus-1.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/declarative/spa-1.js +4 -4
- package/extensions/ublocklite/rulesets/scripting/declarative/swe-1.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/declarative/tur-0.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/declarative/ukr-0.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/declarative/vie-1.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/generic/annoyances-cookies.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/generic/annoyances-others.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/generic/annoyances-overlays.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/generic/annoyances-social.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/generic/chn-0.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/generic/default.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/generic/idn-0.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/generic/isr-0.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/generic/jpn-1.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/generic/kor-1.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/generic/pol-0.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/generic/swe-1.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/generic/tur-0.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/generic/ukr-0.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/generichigh/chn-0.css +0 -4
- package/extensions/ublocklite/rulesets/scripting/generichigh/default.css +6 -3
- package/extensions/ublocklite/rulesets/scripting/generichigh/fra-0.css +3 -0
- package/extensions/ublocklite/rulesets/scripting/generichigh/kor-1.css +2 -1
- package/extensions/ublocklite/rulesets/scripting/generichigh/rus-0.css +1 -0
- package/extensions/ublocklite/rulesets/scripting/generichigh/swe-1.css +3 -0
- package/extensions/ublocklite/rulesets/scripting/generichigh/tur-0.css +7 -0
- package/extensions/ublocklite/rulesets/scripting/procedural/annoyances-cookies.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/procedural/annoyances-others.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/procedural/annoyances-overlays.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/procedural/chn-0.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/procedural/cze-0.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/procedural/default.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/procedural/deu-0.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/procedural/fin-0.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/procedural/fra-0.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/procedural/ind-0.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/procedural/kor-1.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/procedural/nor-0.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/procedural/pol-0.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/procedural/rus-0.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/procedural/rus-1.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/procedural/swe-1.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/procedural/ukr-0.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/procedural/vie-1.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-cookies.set-constant.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-cookies.set-cookie.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-cookies.set-local-storage-item.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-cookies.trusted-click-element.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-cookies.trusted-set-cookie-reload.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-cookies.trusted-set-cookie.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-cookies.trusted-set-local-storage-item.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-others.remove-cookie.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.abort-current-script.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.abort-on-property-read.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.abort-on-property-write.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.abort-on-stack-trace.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.addEventListener-defuser.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.href-sanitizer.js +541 -0
- package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.noeval-if.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.prevent-fetch.js +18 -7
- package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.prevent-setInterval.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.prevent-setTimeout.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.prevent-xhr.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.remove-node-text.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.set-constant.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.set-local-storage-item.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.trusted-click-element.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.trusted-replace-node-text.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/chn-0.prevent-fetch.js +16 -5
- package/extensions/ublocklite/rulesets/scripting/scriptlet/default.abort-current-script.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/scriptlet/default.abort-on-property-read.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/scriptlet/default.abort-on-property-write.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/default.abort-on-stack-trace.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/scriptlet/default.addEventListener-defuser.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/scriptlet/default.adjust-setInterval.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/scriptlet/default.adjust-setTimeout.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/scriptlet/default.json-prune.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/default.noeval-if.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/scriptlet/default.nowebrtc.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/scriptlet/default.prevent-fetch.js +18 -7
- package/extensions/ublocklite/rulesets/scripting/scriptlet/default.prevent-requestAnimationFrame.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/default.prevent-setInterval.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/default.prevent-setTimeout.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/default.prevent-window-open.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/default.prevent-xhr.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/scriptlet/default.remove-attr.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/default.remove-cookie.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/default.remove-node-text.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/default.set-constant.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/scriptlet/default.set-cookie.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/scriptlet/default.set-local-storage-item.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/scriptlet/default.trusted-replace-argument.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/default.trusted-replace-node-text.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/scriptlet/default.trusted-replace-outbound-text.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/scriptlet/default.trusted-set-constant.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/scriptlet/default.trusted-set-cookie.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/scriptlet/default.trusted-suppress-native-method.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/fra-0.prevent-fetch.js +16 -5
- package/extensions/ublocklite/rulesets/scripting/scriptlet/hun-0.prevent-fetch.js +16 -5
- package/extensions/ublocklite/rulesets/scripting/scriptlet/idn-0.prevent-fetch.js +16 -5
- package/extensions/ublocklite/rulesets/scripting/scriptlet/idn-0.prevent-window-open.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/scriptlet/irn-0.json-prune.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/irn-0.prevent-fetch.js +16 -5
- package/extensions/ublocklite/rulesets/scripting/scriptlet/isr-0.prevent-fetch.js +16 -5
- package/extensions/ublocklite/rulesets/scripting/scriptlet/jpn-1.href-sanitizer.js +541 -0
- package/extensions/ublocklite/rulesets/scripting/scriptlet/jpn-1.prevent-fetch.js +16 -5
- package/extensions/ublocklite/rulesets/scripting/scriptlet/jpn-1.prevent-setTimeout.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/kor-1.prevent-fetch.js +16 -5
- package/extensions/ublocklite/rulesets/scripting/scriptlet/nld-0.abort-on-property-read.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/scriptlet/nld-0.prevent-fetch.js +16 -5
- package/extensions/ublocklite/rulesets/scripting/scriptlet/nor-0.prevent-fetch.js +16 -5
- package/extensions/ublocklite/rulesets/scripting/scriptlet/nor-0.remove-attr.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/scriptlet/pol-0.abort-current-script.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/pol-0.abort-on-property-read.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/pol-0.abort-on-property-write.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/pol-0.addEventListener-defuser.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/pol-0.noeval-if.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/pol-0.prevent-setInterval.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/pol-0.prevent-setTimeout.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/pol-0.set-constant.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/scriptlet/rus-0.abort-on-property-read.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/rus-0.addEventListener-defuser.js +4 -4
- package/extensions/ublocklite/rulesets/scripting/scriptlet/rus-0.adjust-setTimeout.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/scriptlet/rus-0.href-sanitizer.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/rus-0.prevent-fetch.js +16 -5
- package/extensions/ublocklite/rulesets/scripting/scriptlet/rus-0.prevent-setInterval.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/scriptlet/rus-0.prevent-setTimeout.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/scriptlet/rus-0.remove-node-text.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/scriptlet/rus-0.set-constant.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/scriptlet/rus-1.addEventListener-defuser.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/rus-1.prevent-fetch.js +16 -5
- package/extensions/ublocklite/rulesets/scripting/scriptlet/rus-1.remove-cookie.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/rus-1.set-constant.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/scriptlet/spa-1.abort-on-property-read.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/spa-1.addEventListener-defuser.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/scriptlet/spa-1.prevent-fetch.js +18 -7
- package/extensions/ublocklite/rulesets/scripting/scriptlet/spa-1.set-constant.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/swe-1.set-cookie.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/tur-0.abort-on-property-read.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/tur-0.abort-on-property-write.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/tur-0.adjust-setInterval.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/tur-0.prevent-fetch.js +16 -5
- package/extensions/ublocklite/rulesets/scripting/scriptlet/tur-0.remove-attr.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/tur-0.set-constant.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/ukr-0.remove-node-text.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/scriptlet/vie-1.abort-current-script.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/scriptlet/vie-1.abort-on-property-read.js +1 -1
- package/extensions/ublocklite/rulesets/scripting/scriptlet/vie-1.prevent-fetch.js +16 -5
- package/extensions/ublocklite/rulesets/scripting/scriptlet/vie-1.set-constant.js +2 -2
- package/extensions/ublocklite/rulesets/scripting/specific/annoyances-cookies.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/specific/annoyances-others.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/specific/annoyances-overlays.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/specific/annoyances-social.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/specific/chn-0.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/specific/cze-0.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/specific/default.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/specific/deu-0.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/specific/fin-0.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/specific/fra-0.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/specific/idn-0.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/specific/ind-0.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/specific/isr-0.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/specific/jpn-1.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/specific/kor-1.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/specific/nld-0.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/specific/nor-0.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/specific/pol-0.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/specific/rou-1.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/specific/rus-0.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/specific/spa-0.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/specific/spa-1.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/specific/swe-1.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/specific/tha-0.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/specific/tur-0.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/specific/ukr-0.js +3 -3
- package/extensions/ublocklite/rulesets/scripting/specific/vie-1.js +3 -3
- package/extensions/ublocklite/rulesets/scriptlet-details.json +209 -337
- package/extensions/ublocklite/rulesets/strictblock/annoyances-cookies.json +0 -1
- package/extensions/ublocklite/rulesets/strictblock/annoyances-others.json +1 -0
- package/extensions/ublocklite/rulesets/strictblock/badware.json +394 -385
- package/extensions/ublocklite/rulesets/strictblock/chn-0.json +126 -185
- package/extensions/ublocklite/rulesets/strictblock/default.json +28 -25
- package/extensions/ublocklite/rulesets/strictblock/fra-0.json +344 -42
- package/extensions/ublocklite/rulesets/strictblock/jpn-1.json +155 -153
- package/extensions/ublocklite/rulesets/strictblock/openphish-domains.json +37645 -0
- package/extensions/ublocklite/rulesets/strictblock/pol-0.json +42653 -1
- package/extensions/ublocklite/rulesets/strictblock/spa-1.json +2 -0
- package/extensions/ublocklite/rulesets/strictblock/stevenblack-hosts.json +4270 -2524
- package/extensions/ublocklite/rulesets/strictblock/ukr-0.json +64 -60
- package/extensions/ublocklite/rulesets/strictblock/urlhaus-full.json +472 -360
- package/extensions/ublocklite/rulesets/urlskip/annoyances-overlays.json +6 -0
- package/extensions/ublocklite/rulesets/urlskip/default.json +51 -0
- package/extensions/ublocklite/ublock.zip +0 -0
- package/package.json +8 -8
- package/src/limiter.ts +3 -1
- package/src/sdk-utils.ts +16 -12
- package/static/docs/swagger.json +10 -10
- package/static/docs/swagger.min.json +9 -9
- package/static/function/client.js +22 -18
- package/static/function/index.html +22 -18
package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.href-sanitizer.js
ADDED
|
@@ -0,0 +1,541 @@
|
|
|
1
|
+
/*******************************************************************************
|
|
2
|
+
|
|
3
|
+
uBlock Origin Lite - a comprehensive, MV3-compliant content blocker
|
|
4
|
+
Copyright (C) 2014-present Raymond Hill
|
|
5
|
+
|
|
6
|
+
This program is free software: you can redistribute it and/or modify
|
|
7
|
+
it under the terms of the GNU General Public License as published by
|
|
8
|
+
the Free Software Foundation, either version 3 of the License, or
|
|
9
|
+
(at your option) any later version.
|
|
10
|
+
|
|
11
|
+
This program is distributed in the hope that it will be useful,
|
|
12
|
+
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
13
|
+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
14
|
+
GNU General Public License for more details.
|
|
15
|
+
|
|
16
|
+
You should have received a copy of the GNU General Public License
|
|
17
|
+
along with this program. If not, see {http://www.gnu.org/licenses/}.
|
|
18
|
+
|
|
19
|
+
Home: https://github.com/gorhill/uBlock
|
|
20
|
+
|
|
21
|
+
*/
|
|
22
|
+
|
|
23
|
+
// ruleset: annoyances-overlays
|
|
24
|
+
|
|
25
|
+
// Important!
|
|
26
|
+
// Isolate from global scope
|
|
27
|
+
|
|
28
|
+
// Start of local scope
|
|
29
|
+
(function uBOL_hrefSanitizer() {
|
|
30
|
+
|
|
31
|
+
/******************************************************************************/
|
|
32
|
+
|
|
33
|
+
function hrefSanitizer(
|
|
34
|
+
selector = '',
|
|
35
|
+
source = ''
|
|
36
|
+
) {
|
|
37
|
+
if ( typeof selector !== 'string' ) { return; }
|
|
38
|
+
if ( selector === '' ) { return; }
|
|
39
|
+
const safe = safeSelf();
|
|
40
|
+
const logPrefix = safe.makeLogPrefix('href-sanitizer', selector, source);
|
|
41
|
+
if ( source === '' ) { source = 'text'; }
|
|
42
|
+
const sanitizeCopycats = (href, text) => {
|
|
43
|
+
let elems = [];
|
|
44
|
+
try {
|
|
45
|
+
elems = document.querySelectorAll(`a[href="${href}"`);
|
|
46
|
+
}
|
|
47
|
+
catch {
|
|
48
|
+
}
|
|
49
|
+
for ( const elem of elems ) {
|
|
50
|
+
elem.setAttribute('href', text);
|
|
51
|
+
}
|
|
52
|
+
return elems.length;
|
|
53
|
+
};
|
|
54
|
+
const validateURL = text => {
|
|
55
|
+
if ( typeof text !== 'string' ) { return ''; }
|
|
56
|
+
if ( text === '' ) { return ''; }
|
|
57
|
+
if ( /[\x00-\x20\x7f]/.test(text) ) { return ''; }
|
|
58
|
+
try {
|
|
59
|
+
const url = new URL(text, document.location);
|
|
60
|
+
return url.href;
|
|
61
|
+
} catch {
|
|
62
|
+
}
|
|
63
|
+
return '';
|
|
64
|
+
};
|
|
65
|
+
const extractParam = (href, source) => {
|
|
66
|
+
if ( Boolean(source) === false ) { return href; }
|
|
67
|
+
const recursive = source.includes('?', 1);
|
|
68
|
+
const end = recursive ? source.indexOf('?', 1) : source.length;
|
|
69
|
+
try {
|
|
70
|
+
const url = new URL(href, document.location);
|
|
71
|
+
let value = url.searchParams.get(source.slice(1, end));
|
|
72
|
+
if ( value === null ) { return href }
|
|
73
|
+
if ( recursive ) { return extractParam(value, source.slice(end)); }
|
|
74
|
+
return value;
|
|
75
|
+
} catch {
|
|
76
|
+
}
|
|
77
|
+
return href;
|
|
78
|
+
};
|
|
79
|
+
const extractURL = (elem, source) => {
|
|
80
|
+
if ( /^\[.*\]$/.test(source) ) {
|
|
81
|
+
return elem.getAttribute(source.slice(1,-1).trim()) || '';
|
|
82
|
+
}
|
|
83
|
+
if ( source === 'text' ) {
|
|
84
|
+
return elem.textContent
|
|
85
|
+
.replace(/^[^\x21-\x7e]+/, '') // remove leading invalid characters
|
|
86
|
+
.replace(/[^\x21-\x7e]+$/, '') // remove trailing invalid characters
|
|
87
|
+
;
|
|
88
|
+
}
|
|
89
|
+
if ( source.startsWith('?') === false ) { return ''; }
|
|
90
|
+
const steps = source.replace(/(\S)\?/g, '\\1?').split(/\s+/);
|
|
91
|
+
const url = steps.length === 1
|
|
92
|
+
? extractParam(elem.href, source)
|
|
93
|
+
: urlSkip(elem.href, false, steps);
|
|
94
|
+
if ( url === undefined ) { return; }
|
|
95
|
+
return url.replace(/ /g, '%20');
|
|
96
|
+
};
|
|
97
|
+
const sanitize = ( ) => {
|
|
98
|
+
let elems = [];
|
|
99
|
+
try {
|
|
100
|
+
elems = document.querySelectorAll(selector);
|
|
101
|
+
}
|
|
102
|
+
catch {
|
|
103
|
+
return false;
|
|
104
|
+
}
|
|
105
|
+
for ( const elem of elems ) {
|
|
106
|
+
if ( elem.localName !== 'a' ) { continue; }
|
|
107
|
+
if ( elem.hasAttribute('href') === false ) { continue; }
|
|
108
|
+
const href = elem.getAttribute('href');
|
|
109
|
+
const text = extractURL(elem, source);
|
|
110
|
+
const hrefAfter = validateURL(text);
|
|
111
|
+
if ( hrefAfter === '' ) { continue; }
|
|
112
|
+
if ( hrefAfter === href ) { continue; }
|
|
113
|
+
elem.setAttribute('href', hrefAfter);
|
|
114
|
+
const count = sanitizeCopycats(href, hrefAfter);
|
|
115
|
+
safe.uboLog(logPrefix, `Sanitized ${count+1} links to\n${hrefAfter}`);
|
|
116
|
+
}
|
|
117
|
+
return true;
|
|
118
|
+
};
|
|
119
|
+
let observer, timer;
|
|
120
|
+
const onDomChanged = mutations => {
|
|
121
|
+
if ( timer !== undefined ) { return; }
|
|
122
|
+
let shouldSanitize = false;
|
|
123
|
+
for ( const mutation of mutations ) {
|
|
124
|
+
if ( mutation.addedNodes.length === 0 ) { continue; }
|
|
125
|
+
for ( const node of mutation.addedNodes ) {
|
|
126
|
+
if ( node.nodeType !== 1 ) { continue; }
|
|
127
|
+
shouldSanitize = true;
|
|
128
|
+
break;
|
|
129
|
+
}
|
|
130
|
+
if ( shouldSanitize ) { break; }
|
|
131
|
+
}
|
|
132
|
+
if ( shouldSanitize === false ) { return; }
|
|
133
|
+
timer = safe.onIdle(( ) => {
|
|
134
|
+
timer = undefined;
|
|
135
|
+
sanitize();
|
|
136
|
+
});
|
|
137
|
+
};
|
|
138
|
+
const start = ( ) => {
|
|
139
|
+
if ( sanitize() === false ) { return; }
|
|
140
|
+
observer = new MutationObserver(onDomChanged);
|
|
141
|
+
observer.observe(document.body, {
|
|
142
|
+
subtree: true,
|
|
143
|
+
childList: true,
|
|
144
|
+
});
|
|
145
|
+
};
|
|
146
|
+
runAt(( ) => { start(); }, 'interactive');
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
function runAt(fn, when) {
|
|
150
|
+
const intFromReadyState = state => {
|
|
151
|
+
const targets = {
|
|
152
|
+
'loading': 1, 'asap': 1,
|
|
153
|
+
'interactive': 2, 'end': 2, '2': 2,
|
|
154
|
+
'complete': 3, 'idle': 3, '3': 3,
|
|
155
|
+
};
|
|
156
|
+
const tokens = Array.isArray(state) ? state : [ state ];
|
|
157
|
+
for ( const token of tokens ) {
|
|
158
|
+
const prop = `${token}`;
|
|
159
|
+
if ( Object.hasOwn(targets, prop) === false ) { continue; }
|
|
160
|
+
return targets[prop];
|
|
161
|
+
}
|
|
162
|
+
return 0;
|
|
163
|
+
};
|
|
164
|
+
const runAt = intFromReadyState(when);
|
|
165
|
+
if ( intFromReadyState(document.readyState) >= runAt ) {
|
|
166
|
+
fn(); return;
|
|
167
|
+
}
|
|
168
|
+
const onStateChange = ( ) => {
|
|
169
|
+
if ( intFromReadyState(document.readyState) < runAt ) { return; }
|
|
170
|
+
fn();
|
|
171
|
+
safe.removeEventListener.apply(document, args);
|
|
172
|
+
};
|
|
173
|
+
const safe = safeSelf();
|
|
174
|
+
const args = [ 'readystatechange', onStateChange, { capture: true } ];
|
|
175
|
+
safe.addEventListener.apply(document, args);
|
|
176
|
+
}
|
|
177
|
+
|
|
178
|
+
function safeSelf() {
|
|
179
|
+
if ( scriptletGlobals.safeSelf ) {
|
|
180
|
+
return scriptletGlobals.safeSelf;
|
|
181
|
+
}
|
|
182
|
+
const self = globalThis;
|
|
183
|
+
const safe = {
|
|
184
|
+
'Array_from': Array.from,
|
|
185
|
+
'Error': self.Error,
|
|
186
|
+
'Function_toStringFn': self.Function.prototype.toString,
|
|
187
|
+
'Function_toString': thisArg => safe.Function_toStringFn.call(thisArg),
|
|
188
|
+
'Math_floor': Math.floor,
|
|
189
|
+
'Math_max': Math.max,
|
|
190
|
+
'Math_min': Math.min,
|
|
191
|
+
'Math_random': Math.random,
|
|
192
|
+
'Object': Object,
|
|
193
|
+
'Object_defineProperty': Object.defineProperty.bind(Object),
|
|
194
|
+
'Object_defineProperties': Object.defineProperties.bind(Object),
|
|
195
|
+
'Object_fromEntries': Object.fromEntries.bind(Object),
|
|
196
|
+
'Object_getOwnPropertyDescriptor': Object.getOwnPropertyDescriptor.bind(Object),
|
|
197
|
+
'Object_hasOwn': Object.hasOwn.bind(Object),
|
|
198
|
+
'RegExp': self.RegExp,
|
|
199
|
+
'RegExp_test': self.RegExp.prototype.test,
|
|
200
|
+
'RegExp_exec': self.RegExp.prototype.exec,
|
|
201
|
+
'Request_clone': self.Request.prototype.clone,
|
|
202
|
+
'String': self.String,
|
|
203
|
+
'String_fromCharCode': String.fromCharCode,
|
|
204
|
+
'String_split': String.prototype.split,
|
|
205
|
+
'XMLHttpRequest': self.XMLHttpRequest,
|
|
206
|
+
'addEventListener': self.EventTarget.prototype.addEventListener,
|
|
207
|
+
'removeEventListener': self.EventTarget.prototype.removeEventListener,
|
|
208
|
+
'fetch': self.fetch,
|
|
209
|
+
'JSON': self.JSON,
|
|
210
|
+
'JSON_parseFn': self.JSON.parse,
|
|
211
|
+
'JSON_stringifyFn': self.JSON.stringify,
|
|
212
|
+
'JSON_parse': (...args) => safe.JSON_parseFn.call(safe.JSON, ...args),
|
|
213
|
+
'JSON_stringify': (...args) => safe.JSON_stringifyFn.call(safe.JSON, ...args),
|
|
214
|
+
'log': console.log.bind(console),
|
|
215
|
+
// Properties
|
|
216
|
+
logLevel: 0,
|
|
217
|
+
// Methods
|
|
218
|
+
makeLogPrefix(...args) {
|
|
219
|
+
return this.sendToLogger && `[${args.join(' \u205D ')}]` || '';
|
|
220
|
+
},
|
|
221
|
+
uboLog(...args) {
|
|
222
|
+
if ( this.sendToLogger === undefined ) { return; }
|
|
223
|
+
if ( args === undefined || args[0] === '' ) { return; }
|
|
224
|
+
return this.sendToLogger('info', ...args);
|
|
225
|
+
|
|
226
|
+
},
|
|
227
|
+
uboErr(...args) {
|
|
228
|
+
if ( this.sendToLogger === undefined ) { return; }
|
|
229
|
+
if ( args === undefined || args[0] === '' ) { return; }
|
|
230
|
+
return this.sendToLogger('error', ...args);
|
|
231
|
+
},
|
|
232
|
+
escapeRegexChars(s) {
|
|
233
|
+
return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
234
|
+
},
|
|
235
|
+
initPattern(pattern, options = {}) {
|
|
236
|
+
if ( pattern === '' ) {
|
|
237
|
+
return { matchAll: true, expect: true };
|
|
238
|
+
}
|
|
239
|
+
const expect = (options.canNegate !== true || pattern.startsWith('!') === false);
|
|
240
|
+
if ( expect === false ) {
|
|
241
|
+
pattern = pattern.slice(1);
|
|
242
|
+
}
|
|
243
|
+
const match = /^\/(.+)\/([gimsu]*)$/.exec(pattern);
|
|
244
|
+
if ( match !== null ) {
|
|
245
|
+
return {
|
|
246
|
+
re: new this.RegExp(
|
|
247
|
+
match[1],
|
|
248
|
+
match[2] || options.flags
|
|
249
|
+
),
|
|
250
|
+
expect,
|
|
251
|
+
};
|
|
252
|
+
}
|
|
253
|
+
if ( options.flags !== undefined ) {
|
|
254
|
+
return {
|
|
255
|
+
re: new this.RegExp(this.escapeRegexChars(pattern),
|
|
256
|
+
options.flags
|
|
257
|
+
),
|
|
258
|
+
expect,
|
|
259
|
+
};
|
|
260
|
+
}
|
|
261
|
+
return { pattern, expect };
|
|
262
|
+
},
|
|
263
|
+
testPattern(details, haystack) {
|
|
264
|
+
if ( details.matchAll ) { return true; }
|
|
265
|
+
if ( details.re ) {
|
|
266
|
+
return this.RegExp_test.call(details.re, haystack) === details.expect;
|
|
267
|
+
}
|
|
268
|
+
return haystack.includes(details.pattern) === details.expect;
|
|
269
|
+
},
|
|
270
|
+
patternToRegex(pattern, flags = undefined, verbatim = false) {
|
|
271
|
+
if ( pattern === '' ) { return /^/; }
|
|
272
|
+
const match = /^\/(.+)\/([gimsu]*)$/.exec(pattern);
|
|
273
|
+
if ( match === null ) {
|
|
274
|
+
const reStr = this.escapeRegexChars(pattern);
|
|
275
|
+
return new RegExp(verbatim ? `^${reStr}$` : reStr, flags);
|
|
276
|
+
}
|
|
277
|
+
try {
|
|
278
|
+
return new RegExp(match[1], match[2] || undefined);
|
|
279
|
+
}
|
|
280
|
+
catch {
|
|
281
|
+
}
|
|
282
|
+
return /^/;
|
|
283
|
+
},
|
|
284
|
+
getExtraArgs(args, offset = 0) {
|
|
285
|
+
const entries = args.slice(offset).reduce((out, v, i, a) => {
|
|
286
|
+
if ( (i & 1) === 0 ) {
|
|
287
|
+
const rawValue = a[i+1];
|
|
288
|
+
const value = /^\d+$/.test(rawValue)
|
|
289
|
+
? parseInt(rawValue, 10)
|
|
290
|
+
: rawValue;
|
|
291
|
+
out.push([ a[i], value ]);
|
|
292
|
+
}
|
|
293
|
+
return out;
|
|
294
|
+
}, []);
|
|
295
|
+
return this.Object_fromEntries(entries);
|
|
296
|
+
},
|
|
297
|
+
onIdle(fn, options) {
|
|
298
|
+
if ( self.requestIdleCallback ) {
|
|
299
|
+
return self.requestIdleCallback(fn, options);
|
|
300
|
+
}
|
|
301
|
+
return self.requestAnimationFrame(fn);
|
|
302
|
+
},
|
|
303
|
+
offIdle(id) {
|
|
304
|
+
if ( self.requestIdleCallback ) {
|
|
305
|
+
return self.cancelIdleCallback(id);
|
|
306
|
+
}
|
|
307
|
+
return self.cancelAnimationFrame(id);
|
|
308
|
+
}
|
|
309
|
+
};
|
|
310
|
+
scriptletGlobals.safeSelf = safe;
|
|
311
|
+
if ( scriptletGlobals.bcSecret === undefined ) { return safe; }
|
|
312
|
+
// This is executed only when the logger is opened
|
|
313
|
+
safe.logLevel = scriptletGlobals.logLevel || 1;
|
|
314
|
+
let lastLogType = '';
|
|
315
|
+
let lastLogText = '';
|
|
316
|
+
let lastLogTime = 0;
|
|
317
|
+
safe.toLogText = (type, ...args) => {
|
|
318
|
+
if ( args.length === 0 ) { return; }
|
|
319
|
+
const text = `[${document.location.hostname || document.location.href}]${args.join(' ')}`;
|
|
320
|
+
if ( text === lastLogText && type === lastLogType ) {
|
|
321
|
+
if ( (Date.now() - lastLogTime) < 5000 ) { return; }
|
|
322
|
+
}
|
|
323
|
+
lastLogType = type;
|
|
324
|
+
lastLogText = text;
|
|
325
|
+
lastLogTime = Date.now();
|
|
326
|
+
return text;
|
|
327
|
+
};
|
|
328
|
+
try {
|
|
329
|
+
const bc = new self.BroadcastChannel(scriptletGlobals.bcSecret);
|
|
330
|
+
let bcBuffer = [];
|
|
331
|
+
safe.sendToLogger = (type, ...args) => {
|
|
332
|
+
const text = safe.toLogText(type, ...args);
|
|
333
|
+
if ( text === undefined ) { return; }
|
|
334
|
+
if ( bcBuffer === undefined ) {
|
|
335
|
+
return bc.postMessage({ what: 'messageToLogger', type, text });
|
|
336
|
+
}
|
|
337
|
+
bcBuffer.push({ type, text });
|
|
338
|
+
};
|
|
339
|
+
bc.onmessage = ev => {
|
|
340
|
+
const msg = ev.data;
|
|
341
|
+
switch ( msg ) {
|
|
342
|
+
case 'iamready!':
|
|
343
|
+
if ( bcBuffer === undefined ) { break; }
|
|
344
|
+
bcBuffer.forEach(({ type, text }) =>
|
|
345
|
+
bc.postMessage({ what: 'messageToLogger', type, text })
|
|
346
|
+
);
|
|
347
|
+
bcBuffer = undefined;
|
|
348
|
+
break;
|
|
349
|
+
case 'setScriptletLogLevelToOne':
|
|
350
|
+
safe.logLevel = 1;
|
|
351
|
+
break;
|
|
352
|
+
case 'setScriptletLogLevelToTwo':
|
|
353
|
+
safe.logLevel = 2;
|
|
354
|
+
break;
|
|
355
|
+
}
|
|
356
|
+
};
|
|
357
|
+
bc.postMessage('areyouready?');
|
|
358
|
+
} catch {
|
|
359
|
+
safe.sendToLogger = (type, ...args) => {
|
|
360
|
+
const text = safe.toLogText(type, ...args);
|
|
361
|
+
if ( text === undefined ) { return; }
|
|
362
|
+
safe.log(`uBO ${text}`);
|
|
363
|
+
};
|
|
364
|
+
}
|
|
365
|
+
return safe;
|
|
366
|
+
}
|
|
367
|
+
|
|
368
|
+
function urlSkip(url, blocked, steps, directive = {}) {
|
|
369
|
+
try {
|
|
370
|
+
let redirectBlocked = false;
|
|
371
|
+
let urlout = url;
|
|
372
|
+
for ( const step of steps ) {
|
|
373
|
+
const urlin = urlout;
|
|
374
|
+
const c0 = step.charCodeAt(0);
|
|
375
|
+
// Extract from hash
|
|
376
|
+
if ( c0 === 0x23 && step === '#' ) { // #
|
|
377
|
+
const pos = urlin.indexOf('#');
|
|
378
|
+
urlout = pos !== -1 ? urlin.slice(pos+1) : '';
|
|
379
|
+
continue;
|
|
380
|
+
}
|
|
381
|
+
// Extract from URL parameter name at position i
|
|
382
|
+
if ( c0 === 0x26 ) { // &
|
|
383
|
+
const i = (parseInt(step.slice(1)) || 0) - 1;
|
|
384
|
+
if ( i < 0 ) { return; }
|
|
385
|
+
const url = new URL(urlin);
|
|
386
|
+
if ( i >= url.searchParams.size ) { return; }
|
|
387
|
+
const params = Array.from(url.searchParams.keys());
|
|
388
|
+
urlout = decodeURIComponent(params[i]);
|
|
389
|
+
continue;
|
|
390
|
+
}
|
|
391
|
+
// Enforce https
|
|
392
|
+
if ( c0 === 0x2B && step === '+https' ) { // +
|
|
393
|
+
const s = urlin.replace(/^https?:\/\//, '');
|
|
394
|
+
if ( /^[\w-]:\/\//.test(s) ) { return; }
|
|
395
|
+
urlout = `https://${s}`;
|
|
396
|
+
continue;
|
|
397
|
+
}
|
|
398
|
+
// Decode
|
|
399
|
+
if ( c0 === 0x2D ) { // -
|
|
400
|
+
// Base64
|
|
401
|
+
if ( step === '-base64' ) {
|
|
402
|
+
urlout = self.atob(urlin);
|
|
403
|
+
continue;
|
|
404
|
+
}
|
|
405
|
+
// Safe Base64
|
|
406
|
+
if ( step === '-safebase64' ) {
|
|
407
|
+
if ( urlSkip.safeBase64Replacer === undefined ) {
|
|
408
|
+
urlSkip.safeBase64Map = { '-': '+', '_': '/' };
|
|
409
|
+
urlSkip.safeBase64Replacer = s => urlSkip.safeBase64Map[s];
|
|
410
|
+
}
|
|
411
|
+
urlout = urlin.replace(/[-_]/g, urlSkip.safeBase64Replacer);
|
|
412
|
+
urlout = self.atob(urlout);
|
|
413
|
+
continue;
|
|
414
|
+
}
|
|
415
|
+
// URI component
|
|
416
|
+
if ( step === '-uricomponent' ) {
|
|
417
|
+
urlout = decodeURIComponent(urlin);
|
|
418
|
+
continue;
|
|
419
|
+
}
|
|
420
|
+
// Enable skip of blocked requests
|
|
421
|
+
if ( step === '-blocked' ) {
|
|
422
|
+
redirectBlocked = true;
|
|
423
|
+
continue;
|
|
424
|
+
}
|
|
425
|
+
}
|
|
426
|
+
// Regex extraction from first capture group
|
|
427
|
+
if ( c0 === 0x2F ) { // /
|
|
428
|
+
const re = directive.cache ?? new RegExp(step.slice(1, -1));
|
|
429
|
+
if ( directive.cache === null ) {
|
|
430
|
+
directive.cache = re;
|
|
431
|
+
}
|
|
432
|
+
const match = re.exec(urlin);
|
|
433
|
+
if ( match === null ) { return; }
|
|
434
|
+
if ( match.length <= 1 ) { return; }
|
|
435
|
+
urlout = match[1];
|
|
436
|
+
continue;
|
|
437
|
+
}
|
|
438
|
+
// Extract from URL parameter
|
|
439
|
+
if ( c0 === 0x3F ) { // ?
|
|
440
|
+
urlout = (new URL(urlin)).searchParams.get(step.slice(1));
|
|
441
|
+
if ( urlout === null ) { return; }
|
|
442
|
+
if ( urlout.includes(' ') ) {
|
|
443
|
+
urlout = urlout.replace(/ /g, '%20');
|
|
444
|
+
}
|
|
445
|
+
continue;
|
|
446
|
+
}
|
|
447
|
+
// Unknown directive
|
|
448
|
+
return;
|
|
449
|
+
}
|
|
450
|
+
const urlfinal = new URL(urlout);
|
|
451
|
+
if ( urlfinal.protocol !== 'https:' ) {
|
|
452
|
+
if ( urlfinal.protocol !== 'http:' ) { return; }
|
|
453
|
+
}
|
|
454
|
+
if ( blocked && redirectBlocked !== true ) { return; }
|
|
455
|
+
return urlout;
|
|
456
|
+
} catch {
|
|
457
|
+
}
|
|
458
|
+
}
|
|
459
|
+
|
|
460
|
+
/******************************************************************************/
|
|
461
|
+
|
|
462
|
+
const scriptletGlobals = {}; // eslint-disable-line
|
|
463
|
+
const argsList = [["a[href^=\"https://steamcommunity.com/linkfilter/?u=http\"]","?u"]];
|
|
464
|
+
const hostnamesMap = new Map([["store.steampowered.com",0]]);
|
|
465
|
+
const exceptionsMap = new Map([]);
|
|
466
|
+
const hasEntities = false;
|
|
467
|
+
const hasAncestors = false;
|
|
468
|
+
|
|
469
|
+
const collectArgIndices = (hn, map, out) => {
|
|
470
|
+
let argsIndices = map.get(hn);
|
|
471
|
+
if ( argsIndices === undefined ) { return; }
|
|
472
|
+
if ( typeof argsIndices !== 'number' ) {
|
|
473
|
+
for ( const argsIndex of argsIndices ) {
|
|
474
|
+
out.add(argsIndex);
|
|
475
|
+
}
|
|
476
|
+
} else {
|
|
477
|
+
out.add(argsIndices);
|
|
478
|
+
}
|
|
479
|
+
};
|
|
480
|
+
|
|
481
|
+
const indicesFromHostname = (hostname, suffix = '') => {
|
|
482
|
+
const hnParts = hostname.split('.');
|
|
483
|
+
const hnpartslen = hnParts.length;
|
|
484
|
+
if ( hnpartslen === 0 ) { return; }
|
|
485
|
+
for ( let i = 0; i < hnpartslen; i++ ) {
|
|
486
|
+
const hn = `${hnParts.slice(i).join('.')}${suffix}`;
|
|
487
|
+
collectArgIndices(hn, hostnamesMap, todoIndices);
|
|
488
|
+
collectArgIndices(hn, exceptionsMap, tonotdoIndices);
|
|
489
|
+
}
|
|
490
|
+
if ( hasEntities ) {
|
|
491
|
+
const n = hnpartslen - 1;
|
|
492
|
+
for ( let i = 0; i < n; i++ ) {
|
|
493
|
+
for ( let j = n; j > i; j-- ) {
|
|
494
|
+
const en = `${hnParts.slice(i,j).join('.')}.*${suffix}`;
|
|
495
|
+
collectArgIndices(en, hostnamesMap, todoIndices);
|
|
496
|
+
collectArgIndices(en, exceptionsMap, tonotdoIndices);
|
|
497
|
+
}
|
|
498
|
+
}
|
|
499
|
+
}
|
|
500
|
+
};
|
|
501
|
+
|
|
502
|
+
const entries = (( ) => {
|
|
503
|
+
const docloc = document.location;
|
|
504
|
+
const origins = [ docloc.origin ];
|
|
505
|
+
if ( docloc.ancestorOrigins ) {
|
|
506
|
+
origins.push(...docloc.ancestorOrigins);
|
|
507
|
+
}
|
|
508
|
+
return origins.map((origin, i) => {
|
|
509
|
+
const beg = origin.lastIndexOf('://');
|
|
510
|
+
if ( beg === -1 ) { return; }
|
|
511
|
+
const hn = origin.slice(beg+3)
|
|
512
|
+
const end = hn.indexOf(':');
|
|
513
|
+
return { hn: end === -1 ? hn : hn.slice(0, end), i };
|
|
514
|
+
}).filter(a => a !== undefined);
|
|
515
|
+
})();
|
|
516
|
+
if ( entries.length === 0 ) { return; }
|
|
517
|
+
|
|
518
|
+
const todoIndices = new Set();
|
|
519
|
+
const tonotdoIndices = new Set();
|
|
520
|
+
|
|
521
|
+
indicesFromHostname(entries[0].hn);
|
|
522
|
+
if ( hasAncestors ) {
|
|
523
|
+
for ( const entry of entries ) {
|
|
524
|
+
if ( entry.i === 0 ) { continue; }
|
|
525
|
+
indicesFromHostname(entry.hn, '>>');
|
|
526
|
+
}
|
|
527
|
+
}
|
|
528
|
+
|
|
529
|
+
// Apply scriplets
|
|
530
|
+
for ( const i of todoIndices ) {
|
|
531
|
+
if ( tonotdoIndices.has(i) ) { continue; }
|
|
532
|
+
try { hrefSanitizer(...argsList[i]); }
|
|
533
|
+
catch { }
|
|
534
|
+
}
|
|
535
|
+
|
|
536
|
+
/******************************************************************************/
|
|
537
|
+
|
|
538
|
+
// End of local scope
|
|
539
|
+
})();
|
|
540
|
+
|
|
541
|
+
void 0;
|
|
@@ -325,8 +325,8 @@ function safeSelf() {
|
|
|
325
325
|
/******************************************************************************/
|
|
326
326
|
|
|
327
327
|
const scriptletGlobals = {}; // eslint-disable-line
|
|
328
|
-
const argsList = [["
|
|
329
|
-
const hostnamesMap = new Map([["
|
|
328
|
+
const argsList = [["oncontextmenu"],["disable_copy"],["AdBlocker"],["alert"],["String.fromCharCode"],["debugger"]];
|
|
329
|
+
const hostnamesMap = new Map([["runmods.com",0],["magesy.blog",1],["magesypro.pro",1],["romviet.com",2],["isekaipalace.com",3],["seriesperu.com",4],["alexsportz.online",5],["sportea.online",5],["freetvsports.xyz",5],["movie-web.app",5]]);
|
|
330
330
|
const exceptionsMap = new Map([]);
|
|
331
331
|
const hasEntities = false;
|
|
332
332
|
const hasAncestors = false;
|
package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.prevent-fetch.js
CHANGED
|
@@ -26,17 +26,28 @@
|
|
|
26
26
|
// Isolate from global scope
|
|
27
27
|
|
|
28
28
|
// Start of local scope
|
|
29
|
-
(function
|
|
29
|
+
(function uBOL_preventFetch() {
|
|
30
30
|
|
|
31
31
|
/******************************************************************************/
|
|
32
32
|
|
|
33
|
-
function
|
|
33
|
+
function preventFetch(...args) {
|
|
34
|
+
preventFetchFn(false, ...args);
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
function preventFetchFn(
|
|
38
|
+
trusted = false,
|
|
34
39
|
propsToMatch = '',
|
|
35
40
|
responseBody = '',
|
|
36
41
|
responseType = ''
|
|
37
42
|
) {
|
|
38
43
|
const safe = safeSelf();
|
|
39
|
-
const
|
|
44
|
+
const scriptletName = `${trusted ? 'trusted-' : ''}prevent-fetch`;
|
|
45
|
+
const logPrefix = safe.makeLogPrefix(
|
|
46
|
+
scriptletName,
|
|
47
|
+
propsToMatch,
|
|
48
|
+
responseBody,
|
|
49
|
+
responseType
|
|
50
|
+
);
|
|
40
51
|
const needles = [];
|
|
41
52
|
for ( const condition of safe.String_split.call(propsToMatch, /\s+/) ) {
|
|
42
53
|
if ( condition === '' ) { continue; }
|
|
@@ -112,7 +123,7 @@ function noFetchIf(
|
|
|
112
123
|
if ( proceed ) {
|
|
113
124
|
return context.reflect();
|
|
114
125
|
}
|
|
115
|
-
return Promise.resolve(generateContentFn(
|
|
126
|
+
return Promise.resolve(generateContentFn(trusted, responseBody)).then(text => {
|
|
116
127
|
safe.uboLog(logPrefix, `Prevented with response "${text}"`);
|
|
117
128
|
const response = new Response(text, {
|
|
118
129
|
headers: {
|
|
@@ -461,8 +472,8 @@ function safeSelf() {
|
|
|
461
472
|
/******************************************************************************/
|
|
462
473
|
|
|
463
474
|
const scriptletGlobals = {}; // eslint-disable-line
|
|
464
|
-
const argsList = [["www3.doubleclick.net"],["googlesyndication"],["
|
|
465
|
-
const hostnamesMap = new Map([["tools.jabrek.net",0],["maxedtech.com",1],["textcleaner.net",1],["socialcounts.org",1],["viewing.nyc",1],["autopareri.com",1],["curseforge.com",1],["
|
|
475
|
+
const argsList = [["www3.doubleclick.net"],["googlesyndication"],["analytics"],["ads"],["/googlesyndication|googletag/"],["cloudflareinsights.com"],["/adsbygoogle|ad-manager/"],["doubleclick"]];
|
|
476
|
+
const hostnamesMap = new Map([["tools.jabrek.net",0],["maxedtech.com",1],["textcleaner.net",1],["socialcounts.org",1],["viewing.nyc",1],["autopareri.com",1],["curseforge.com",1],["ddys.*",2],["theonegenerator.com",3],["mcskinhistory.com",3],["bypass.city",4],["adbypass.org",4],["amtraker.com",5],["ark-unity.com",6],["pokeos.com",7],["sporttotal.tv",7]]);
|
|
466
477
|
const exceptionsMap = new Map([]);
|
|
467
478
|
const hasEntities = true;
|
|
468
479
|
const hasAncestors = false;
|
|
@@ -530,7 +541,7 @@ if ( hasAncestors ) {
|
|
|
530
541
|
// Apply scriplets
|
|
531
542
|
for ( const i of todoIndices ) {
|
|
532
543
|
if ( tonotdoIndices.has(i) ) { continue; }
|
|
533
|
-
try {
|
|
544
|
+
try { preventFetch(...argsList[i]); }
|
|
534
545
|
catch { }
|
|
535
546
|
}
|
|
536
547
|
|
|
@@ -362,8 +362,8 @@ function safeSelf() {
|
|
|
362
362
|
/******************************************************************************/
|
|
363
363
|
|
|
364
364
|
const scriptletGlobals = {}; // eslint-disable-line
|
|
365
|
-
const argsList = [["height"],["
|
|
366
|
-
const hostnamesMap = new Map([["smashboards.com",0],["
|
|
365
|
+
const argsList = [["height"],["debugger"],["visibility","1000"],["removeChild"],["modal"],["_0x"],["clearInterval(loginReady)"],["offsetHeight"],["adsbygoogle"],["dfgh-adsbygoogle"],["/_0x|devtools/"],["debug"],["detect"],["console.clear"],["/DevTools|_0x/"],["ads"],["devtoolsDetector"],["DevToolsOpen"],["devtool"],["getComputedStyle"],["/devtools|debu/"],["/devtool|console\\.clear/"]];
|
|
366
|
+
const hostnamesMap = new Map([["smashboards.com",0],["avdelphi.com",1],["pornhd8k.net",1],["masuit.com",1],["phimfit.com",1],["iphonecake.com",2],["ziperto.com",2],["compartiendofull.net",2],["themeparktourist.com",2],["bluemoon-mcfc.co.uk",3],["bendigoadvertiser.com.au",4],["lvturbo.com",5],["sbbrisk.com",5],["sbface.com",5],["sbspeed.com",5],["streamsb.net",5],["wouterplanet.com",5],["actvid.com",5],["myflixerz.to",5],["putlocker.pe",5],["theflixertv.to",5],["vipstreams.in",5],["699pic.com",6],["thinkamericana.com",7],["menrec.com",7],["mocah.org",8],["coolwallpapers.me",9],["sflix.to",10],["sflix.is",10],["sflix.ca",10],["sflix2.to",10],["webnovel.com",11],["vgembed.com",12],["sbot.cf",13],["bluphim.com",13],["cdnmoviking.tech",13],["movie4kto.net",14],["alfred.camera",15],["vidstreaming.xyz",16],["choosingnothing.com",16],["jetv.xyz",16],["ngelmat.net",17],["vidsrc.*",18],["embed.su",18],["bembed.net",18],["embedv.net",18],["fslinks.org",18],["listeamed.net",18],["v6embed.xyz",18],["vembed.*",18],["vgplayer.xyz",18],["vid-guard.com",18],["fightful.com",19],["player.melaniezettofrais.online",20],["sussytoons.*",21]]);
|
|
367
367
|
const exceptionsMap = new Map([]);
|
|
368
368
|
const hasEntities = true;
|
|
369
369
|
const hasAncestors = false;
|