Merge branch 'master' into next-gen

Add PrivacyTools recommendation

See merge request KevinRoebert/ClearUrls!60

.github/lockdown.yml

@@ -0,0 +1,39 @@
+# Configuration for Repo Lockdown - https://github.com/dessant/repo-lockdown
+
+# Skip issues and pull requests created before a given timestamp. Timestamp must
+# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
+#skipCreatedBefore: false
+
+# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
+#exemptLabels: []
+
+# Comment to post before closing or locking. Set to `false` to disable
+#comment: true
+
+# Label to add before closing or locking. Set to `false` to disable
+#label: true
+
+# Close issues and pull requests
+#close: true
+
+# Lock issues and pull requests
+#lock: true
+
+# Limit to only `issues` or `pulls`
+#only: pulls
+
+# Optionally, specify configuration settings just for `issues` or `pulls`
+issues:
+   comment: >
+     This repository is only a mirror of https://gitlab.com/KevinRoebert/ClearUrls. Issues are readed here, but not directly addressed. If possible, please use the GitLab repo or this support mail address: clearurls_1 (at) kevinroebert.de.
+   lock: false
+   close: true
+
+pulls:
+   comment: >
+     This repository is just a mirror of https://gitlab.com/KevinRoebert/ClearUrls. Only there pull requests accepted.   
+   lock: false
+   close: true
+
+# Repository to extend settings from
+# _extends: repo

.gitlab/issue_templates/Bug.md

@@ -36,7 +36,7 @@ You do not have to reinstall Firefox or disable all addons. You can just create
 * **Version**: [compulsory. you must provide your version]
 * **Platform**: [either `uname -a` output, or if Windows, version and 32-bit or
   64-bit]
-* **Country**: [The country from which you called the page. You can found your country here: http://ip-api.com/json/?fields=country]
+* **Country**: [The country from which you called the page. You can found your country here: https://ipapi.co//country_capital]
 
 ### Log
 <!-- Please enable the log functionality of ClearURLs and attach the exported log to this bug report. -->

README.md

@@ -1,6 +1,6 @@
-<a href="https://www.buymeacoffee.com/KevinRoebert" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/default-orange.png" alt="Buy Me A Coffee" height="51" width="217"></a>
+<a href="https://www.buymeacoffee.com/KevinRoebert" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/default-orange.png" alt="Buy Me A Coffee" height="60"></a>
 
-[<img src="https://addons.cdn.mozilla.net/static/img/addons-buttons/AMO-button_1.png" alt="for Firefox">](https://addons.mozilla.org/en-US/firefox/addon/clearurls/) [<img src="https://gitlab.com/KevinRoebert/ClearUrls/-/raw/master/promotion/MEA-button.png" alt="for Edge">](https://microsoftedge.microsoft.com/addons/detail/mdkdmaickkfdekbjdoojfalpbkgaddei) [<img src="https://developer.chrome.com/webstore/images/ChromeWebStore_BadgeWBorder_v2_206x58.png"  alt="for Chrome">](https://chrome.google.com/webstore/detail/clearurls/lckanjgmijmafbedllaakclkaicjfmnk)
+[<img src="https://blog.mozilla.org/addons/files/2020/04/get-the-addon-fx-apr-2020.svg" alt="for Firefox" height="60px">](https://addons.mozilla.org/en-US/firefox/addon/clearurls/) [<img src="https://gitlab.com/KevinRoebert/ClearUrls/-/raw/master/promotion/MEA-button.png" alt="for Edge" height="60px">](https://microsoftedge.microsoft.com/addons/detail/mdkdmaickkfdekbjdoojfalpbkgaddei) [<img src="https://developer.chrome.com/webstore/images/ChromeWebStore_BadgeWBorder_v2_206x58.png" alt="for Chrome" height="60px">](https://chrome.google.com/webstore/detail/clearurls/lckanjgmijmafbedllaakclkaicjfmnk)
 
 # <sub><img src="https://gitlab.com/KevinRoebert/ClearUrls/raw/master/img/clearurls.svg" width="64px" height="64px"></sub> ClearURLs 
 
@@ -75,8 +75,9 @@ Please push your translation into the folder `_locales/{country code}/messages.j
 ## Recommended by...
 *  [ghacks-user.js](https://github.com/ghacksuserjs/ghacks-user.js/wiki/4.1-Extensions)
 *  [Awesome Humane Tech List](https://github.com/humanetech-community/awesome-humane-tech#tracking)
+*  [PrivacyTools](https://www.privacytools.io/browsers/#addons)
 *  ClearURLs is part of Mozilla's recommended extensions program
-  
+
 ## Permissions
 Reasoning for needed permissions you can find under [this discussion](https://gitlab.com/KevinRoebert/ClearUrls/issues/159).
 

clearurls.js

@@ -32,10 +32,10 @@ var os;
  * for each provider given as parameter.
  *
  * @param  {Provider} provider      Provider-Object
- * @param pureUrl                   URL as String
- * @param {boolean} quiet           if the action should be displayed in log and statistics
- * @param {requestDetails} request  the request details
- * @return {Array}                  Array with changes and url fields
+ * @param  {string}   pureUrl       URL as String
+ * @param  {boolean}  quiet         If the action should be displayed in log and statistics
+ * @param {requestDetails} request  The request details
+ * @return {object}                 Object with changes and url fields
  */
 function removeFieldsFormURL(provider, pureUrl, quiet = false, request = null) {
     let url = pureUrl;
@@ -82,7 +82,7 @@ function removeFieldsFormURL(provider, pureUrl, quiet = false, request = null) {
 
     /*
     * Expand the url by provider redirections. So no tracking on
-    * url redirections form sites to sites.
+    * url redirections form site to site.
     */
     let re = provider.getRedirection(url);
     if (re !== null) {
@@ -92,8 +92,8 @@ function removeFieldsFormURL(provider, pureUrl, quiet = false, request = null) {
         if (!quiet) {
             pushToLog(pureUrl, url, translate('log_redirect'));
             increaseGlobalURLCounter(1);
-            increaseBadged(false, request)
-        };
+            increaseBadged(false, request);
+        }
 
         return {
             "redirect": true,

core_js/storage.js

@@ -199,7 +199,7 @@ function initSettings() {
     storage.historyListenerEnabled = true;
     storage.localHostsSkipping = true;
     storage.referralMarketing = false;
-    storage.logLimit = -1;
+    storage.logLimit = 100;
     storage.domainBlocking = true;
     storage.pingBlocking = true;
     storage.eTagFiltering = true;

data/data.min.json

@@ -3,6 +3,62 @@
         "amazon": {
             "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(amazon)(\\.[a-zA-Z]{2,}).*",
             "completeProvider": false,
+            "rules": [
+                "pf_rd_[a-zA-Z]",
+                "qid",
+                "sr",
+                "srs",
+                "pd_rd_[a-zA-Z]*",
+                "__mk_[a-zA-Z]{1,3}_[a-zA-Z]{1,3}",
+                "spIA",
+                "ms3_c",
+                "[a-zA-Z%0-9]*ie",
+                "refRID",
+                "colid",
+                "coliid",
+                "[^a-zA-Z%0-9]adId",
+                "qualifier",
+                "_encoding",
+                "smid",
+                "field-lbr_brands_browse-bin",
+                "ref_?",
+                "th",
+                "sprefix",
+                "crid",
+                "keywords",
+                "cv_ct_[a-zA-Z]+",
+                "linkCode",
+                "creativeASIN",
+                "ascsubtag",
+                "aaxitk",
+                "hsa_cr_id",
+                "sb-ci-[a-zA-Z]+",
+                "rnid",
+                "dchild",
+                "camp",
+                "creative",
+                "s"
+            ],
+            "referralMarketing": [
+                "tag"
+            ],
+            "exceptions": [
+                ".*(amazon\\.).*(\\/gp).*\\/redirector.html\\/.*",
+                ".*(amazon\\.).*(\\/hz\\/reviews-render\\/ajax\\/).*",
+                ".*(amazon\\.).*(\\/gp).*\\/cart\\/ajax-update.html\\/.*",
+                ".*(amazon\\.).*\\/message-us\\?.*",
+                ".*(amazon\\.).*(\\/gp).*\\/video\\/api\\/.*",
+                ".*(amazon\\.).*\\/s\\?.*"
+            ],
+            "rawRules": [
+                "\\/ref=[^\\/\\?]*"
+            ],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "amazon search": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(amazon)(\\.[a-zA-Z]{2,}).*\\/s.*\\?.*",
+            "completeProvider": false,
             "rules": [
                 "pf_rd_[a-zA-Z]",
                 "qid",
@@ -41,16 +97,10 @@
             "referralMarketing": [
                 "tag"
             ],
-            "exceptions": [
-                ".*(amazon\\.).*(\\/gp).*\\/redirector.html\\/.*",
-                ".*(amazon\\.).*(\\/hz\\/reviews-render\\/ajax\\/).*",
-                ".*(amazon\\.).*(\\/gp).*\\/cart\\/ajax-update.html\\/.*",
-                ".*(amazon\\.).*\\/message-us\\?.*",
-                ".*(amazon\\.).*(\\/gp).*\\/video\\/api\\/.*"
-            ],
             "rawRules": [
                 "\\/ref=[^\\/\\?]*"
             ],
+            "exceptions": [],
             "redirections": [],
             "forceRedirection": false
         },
@@ -101,7 +151,8 @@
                 "sourceid",
                 "sxsrf",
                 "rlz",
-                "i-would-rather-use-firefox"
+                "i-would-rather-use-firefox",
+                "stick"
             ],
             "referralMarketing": [
                 "referrer"
@@ -134,7 +185,8 @@
             "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(google)(\\.[a-zA-Z]{2,})\\/search\\?.*",
             "completeProvider": false,
             "rules": [
-                "client"
+                "client",
+                "sclient"
             ],
             "referralMarketing": [],
             "rawRules": [],
@@ -180,7 +232,7 @@
             "urlPattern": ".*",
             "completeProvider": false,
             "rules": [
-                "(%3F)?utm(_[a-zA-Z]*)?",
+                "(%3F)?utm(_[a-zA-Z_]*)?",
                 "(%3F)?ga_[a-zA-Z_]+",
                 "(%3F)?yclid",
                 "(%3F)?_openstat",
@@ -210,7 +262,8 @@
                 "(%3F)?dclid",
                 "Echobox",
                 "(%3F)?spm",
-                "(%3F)?vn(_[a-zA-Z]*)+"
+                "(%3F)?vn(_[a-zA-Z]*)+",
+                "(%3F)?cid"
             ],
             "referralMarketing": [],
             "rawRules": [],
@@ -250,7 +303,11 @@
                 ".*(\\.gog\\.com\\/click\\.html).*",
                 ".*(login\\.progressive\\.com).*",
                 ".*(sephora\\.com\\/api\\/).*",
-                ".*(contestgirl\\.com).*"
+                ".*(contestgirl\\.com).*",
+                ".*agenciatributaria.gob.es.*",
+                ".*login\\.ingbank\\.pl.*",
+                "wss?:\\/\\/.*zoom\\.us.*",
+                ".*api\\.bilibili\\.com.*"
             ],
             "redirections": [],
             "forceRedirection": false
@@ -401,7 +458,18 @@
         "reddit": {
             "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(reddit)(\\.[a-zA-Z]{2,}).*",
             "completeProvider": false,
-            "rules": [],
+            "rules": [
+                "%24deep_link",
+                "\\$deep_link",
+                "correlation_id",
+                "ref_campaign",
+                "ref_source",
+                "%243p",
+                "\\$3p",
+                "%24original_url",
+                "\\$original_url",
+                "_branch_match_id"
+            ],
             "referralMarketing": [],
             "rawRules": [],
             "exceptions": [],
@@ -1053,7 +1121,9 @@
             "referralMarketing": [],
             "rawRules": [],
             "exceptions": [],
-            "redirections": [],
+            "redirections": [
+                ".*u=([^&]*)"
+            ],
             "forceRedirection": false
         },
         "lazada.com.my": {
@@ -1641,7 +1711,10 @@
                 "mots",
                 "noredirect",
                 "RewriteLast",
-                "lien"
+                "lien",
+                "aComposeInputSearch",
+                "type_recherche_forum",
+                "add_mots"
             ],
             "referralMarketing": [],
             "rawRules": [],
@@ -1658,7 +1731,216 @@
                 "type_recherche",
                 "noredirect",
                 "RewriteLast",
-                "lien"
+                "lien",
+                "aComposeInputSearch",
+                "type_recherche_forum"
+            ],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "bestbuy.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(bestbuy)(\\.com).*",
+            "completeProvider": false,
+            "rules": [
+                "irclickid",
+                "irgwc",
+                "loc",
+                "acampID",
+                "mpid",
+                "intl"
+            ],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "digidip.net": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(digidip)(\\.net).*",
+            "completeProvider": false,
+            "rules": [],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [
+                ".*url=([^&]*)"
+            ],
+            "forceRedirection": false
+        },
+        "tiktok.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(tiktok)(\\.com).*",
+            "completeProvider": false,
+            "rules": [
+                "u_code",
+                "preview_pb",
+                "language",
+                "_d",
+                "timestamp",
+                "user_id",
+                "share_app_name",
+                "share_iid",
+                "source"
+            ],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "autoplus.fr": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(autoplus)(\\.fr).*",
+            "completeProvider": false,
+            "rules": [
+                "idprob",
+                "hash",
+                "sending_id",
+                "site_id",
+                "dr_tracker"
+            ],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "bigfishgames.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(bigfishgames)(\\.com).*",
+            "completeProvider": false,
+            "rules": [
+                "pc",
+                "npc",
+                "npv[0-9]+",
+                "npi"
+            ],
+            "referralMarketing": [],
+            "rawRules": [
+                "\\?pc$"
+            ],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "dpbolvw.net": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(dpbolvw)(\\.net).*",
+            "completeProvider": false,
+            "rules": [],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [
+                ".*url=([^&]*)"
+            ],
+            "forceRedirection": false
+        },
+        "humblebundle.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(humblebundle)(\\.com).*",
+            "completeProvider": false,
+            "rules": [],
+            "referralMarketing": [
+                "partner"
+            ],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "cafepedagogique.net": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(cafepedagogique)(\\.net).*",
+            "completeProvider": false,
+            "rules": [
+                "actId",
+                "actCampaignType",
+                "actSource"
+            ],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "bloculus.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(bloculus)(\\.com).*",
+            "completeProvider": false,
+            "rules": [
+                "tl_[a-zA-Z_]+"
+            ],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "mailpanion.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(mailpanion)(\\.com).*",
+            "completeProvider": false,
+            "rules": [],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [
+                ".*destination=([^&]*)"
+            ],
+            "forceRedirection": false
+        },
+        "signtr.website": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(signtr)(\\.website).*",
+            "completeProvider": false,
+            "rules": [],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [
+                ".*redirect=([^&]*)"
+            ],
+            "forceRedirection": false
+        },
+        "mailtrack.io": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(mailtrack)(\\.io).*",
+            "completeProvider": false,
+            "rules": [],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [
+                ".*url=([^&]*)"
+            ],
+            "forceRedirection": false
+        },
+        "zillow.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(zillow)(\\.com).*",
+            "completeProvider": false,
+            "rules": [
+                "rtoken"
+            ],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "realtor.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(realtor)(\\.com).*",
+            "completeProvider": false,
+            "rules": [
+                "ex",
+                "identityID",
+                "MID",
+                "RID"
+            ],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "redfin.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(redfin)(\\.com).*",
+            "completeProvider": false,
+            "rules": [
+                "riftinfo"
             ],
             "referralMarketing": [],
             "rawRules": [],
@@ -1667,4 +1949,4 @@
             "forceRedirection": false
         }
     }
-}
+}

manifest.json

@@ -38,7 +38,6 @@
         "default_popup": "html/popup.html"
     },
     "permissions": [
-        "*://*/*",
         "<all_urls>",
         "webRequest",
         "webRequestBlocking",