Merge branch 'release/v1.7' into feature/AG-169

AdguardTeam · Oct 17, 2022 · d1a7f38 · d1a7f38
2 parents d7f0ae2 + cfa9570
commit d1a7f38
Show file tree

Hide file tree

Showing 20 changed files with 769 additions and 191 deletions.
diff --git a/dist/build.txt b/dist/build.txt
@@ -1 +1 @@
-version=1.6.51
+version=1.6.55
diff --git a/dist/redirect-files/pardot-1.0.js b/dist/redirect-files/pardot-1.0.js
@@ -0,0 +1,81 @@
+(function(source, args) {
+    function Pardot(source) {
+        window.piVersion = "1.0.2";
+        window.piScriptNum = 0;
+        window.piScriptObj = [];
+        window.checkNamespace = noopFunc;
+        window.getPardotUrl = noopStr;
+        window.piGetParameter = noopNull;
+        window.piSetCookie = noopFunc;
+        window.piGetCookie = noopStr;
+        function piTracker() {
+            window.pi = {
+                tracker: {
+                    visitor_id: "",
+                    visitor_id_sign: "",
+                    pi_opt_in: "",
+                    campaign_id: ""
+                }
+            };
+            window.piScriptNum += 1;
+        }
+        window.piResponse = noopFunc;
+        window.piTracker = piTracker;
+        piTracker();
+        hit(source);
+    }
+    function hit(source, message) {
+        if (source.verbose !== true) {
+            return;
+        }
+        try {
+            var log = console.log.bind(console);
+            var trace = console.trace.bind(console);
+            var prefix = source.ruleText || "";
+            if (source.domainName) {
+                var AG_SCRIPTLET_MARKER = "#%#//";
+                var UBO_SCRIPTLET_MARKER = "##+js";
+                var ruleStartIndex;
+                if (source.ruleText.indexOf(AG_SCRIPTLET_MARKER) > -1) {
+                    ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
+                } else if (source.ruleText.indexOf(UBO_SCRIPTLET_MARKER) > -1) {
+                    ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
+                }
+                var rulePart = source.ruleText.slice(ruleStartIndex);
+                prefix = "".concat(source.domainName).concat(rulePart);
+            }
+            var LOG_MARKER = "log: ";
+            if (message) {
+                if (message.indexOf(LOG_MARKER) === -1) {
+                    log("".concat(prefix, " message:\n").concat(message));
+                } else {
+                    log(message.slice(LOG_MARKER.length));
+                }
+            }
+            log("".concat(prefix, " trace start"));
+            if (trace) {
+                trace();
+            }
+            log("".concat(prefix, " trace end"));
+        } catch (e) {}
+        if (typeof window.__debug === "function") {
+            window.__debug(source);
+        }
+    }
+    function noopFunc() {}
+    function noopStr() {
+        return "";
+    }
+    function noopNull() {
+        return null;
+    }
+    const updatedArgs = args ? [].concat(source).concat(args) : [ source ];
+    try {
+        Pardot.apply(this, updatedArgs);
+    } catch (e) {
+        console.log(e);
+    }
+})({
+    name: "pardot-1.0",
+    args: []
+}, []);
diff --git a/dist/redirects.json b/dist/redirects.json
@@ -293,6 +293,13 @@
         "contentType": "application/javascript;base64",
         "content": "IWZ1bmN0aW9uKHNvdXJjZSxhcmdzKXtjb25zdCB1cGRhdGVkQXJncz1hcmdzP1tdLmNvbmNhdChzb3VyY2UpLmNvbmNhdChhcmdzKTpbc291cmNlXTt0cnl7KGZ1bmN0aW9uKHNvdXJjZSl7d2luZG93LmV2YWw9ZnVuY3Rpb24ocyl7IWZ1bmN0aW9uKHNvdXJjZSxtZXNzYWdlKXtpZighMD09PXNvdXJjZS52ZXJib3NlKXt0cnl7dmFyIGxvZz1jb25zb2xlLmxvZy5iaW5kKGNvbnNvbGUpLHRyYWNlPWNvbnNvbGUudHJhY2UuYmluZChjb25zb2xlKSxwcmVmaXg9c291cmNlLnJ1bGVUZXh0fHwiIjtpZihzb3VyY2UuZG9tYWluTmFtZSl7dmFyIHJ1bGVTdGFydEluZGV4LEFHX1NDUklQVExFVF9NQVJLRVI9IiMlIy8vIixVQk9fU0NSSVBUTEVUX01BUktFUj0iIyMranMiO3NvdXJjZS5ydWxlVGV4dC5pbmRleE9mKEFHX1NDUklQVExFVF9NQVJLRVIpPi0xP3J1bGVTdGFydEluZGV4PXNvdXJjZS5ydWxlVGV4dC5pbmRleE9mKEFHX1NDUklQVExFVF9NQVJLRVIpOnNvdXJjZS5ydWxlVGV4dC5pbmRleE9mKFVCT19TQ1JJUFRMRVRfTUFSS0VSKT4tMSYmKHJ1bGVTdGFydEluZGV4PXNvdXJjZS5ydWxlVGV4dC5pbmRleE9mKFVCT19TQ1JJUFRMRVRfTUFSS0VSKSk7dmFyIHJ1bGVQYXJ0PXNvdXJjZS5ydWxlVGV4dC5zbGljZShydWxlU3RhcnRJbmRleCk7cHJlZml4PSIiLmNvbmNhdChzb3VyY2UuZG9tYWluTmFtZSkuY29uY2F0KHJ1bGVQYXJ0KX12YXIgTE9HX01BUktFUj0ibG9nOiAiO21lc3NhZ2UmJigtMT09PW1lc3NhZ2UuaW5kZXhPZihMT0dfTUFSS0VSKT9sb2coIiIuY29uY2F0KHByZWZpeCwiIG1lc3NhZ2U6XG4iKS5jb25jYXQobWVzc2FnZSkpOmxvZyhtZXNzYWdlLnNsaWNlKExPR19NQVJLRVIubGVuZ3RoKSkpLGxvZygiIi5jb25jYXQocHJlZml4LCIgdHJhY2Ugc3RhcnQiKSksdHJhY2UmJnRyYWNlKCksbG9nKCIiLmNvbmNhdChwcmVmaXgsIiB0cmFjZSBlbmQiKSl9Y2F0Y2goZSl7fSJmdW5jdGlvbiI9PXR5cGVvZiB3aW5kb3cuX19kZWJ1ZyYmd2luZG93Ll9fZGVidWcoc291cmNlKX19KHNvdXJjZSwiQWRHdWFyZCBoYXMgcHJldmVudGVkIGV2YWw6XG4iLmNvbmNhdChzKSl9LmJpbmQoKX0pLmFwcGx5KHRoaXMsdXBkYXRlZEFyZ3MpfWNhdGNoKGUpe2NvbnNvbGUubG9nKGUpfX0oe25hbWU6Im5vZXZhbCIsYXJnczpbXX0sW10pOw=="
     },
+    {
+        "title": "pardot-1.0",
+        "aliases": [],
+        "isBlocking": false,
+        "contentType": "application/javascript;base64",
+        "content": "IWZ1bmN0aW9uKHNvdXJjZSxhcmdzKXtmdW5jdGlvbiBub29wRnVuYygpe31mdW5jdGlvbiBub29wU3RyKCl7cmV0dXJuIiJ9ZnVuY3Rpb24gbm9vcE51bGwoKXtyZXR1cm4gbnVsbH1jb25zdCB1cGRhdGVkQXJncz1hcmdzP1tdLmNvbmNhdChzb3VyY2UpLmNvbmNhdChhcmdzKTpbc291cmNlXTt0cnl7KGZ1bmN0aW9uKHNvdXJjZSl7ZnVuY3Rpb24gcGlUcmFja2VyKCl7d2luZG93LnBpPXt0cmFja2VyOnt2aXNpdG9yX2lkOiIiLHZpc2l0b3JfaWRfc2lnbjoiIixwaV9vcHRfaW46IiIsY2FtcGFpZ25faWQ6IiJ9fSx3aW5kb3cucGlTY3JpcHROdW0rPTF9d2luZG93LnBpVmVyc2lvbj0iMS4wLjIiLHdpbmRvdy5waVNjcmlwdE51bT0wLHdpbmRvdy5waVNjcmlwdE9iaj1bXSx3aW5kb3cuY2hlY2tOYW1lc3BhY2U9bm9vcEZ1bmMsd2luZG93LmdldFBhcmRvdFVybD1ub29wU3RyLHdpbmRvdy5waUdldFBhcmFtZXRlcj1ub29wTnVsbCx3aW5kb3cucGlTZXRDb29raWU9bm9vcEZ1bmMsd2luZG93LnBpR2V0Q29va2llPW5vb3BTdHIsd2luZG93LnBpUmVzcG9uc2U9bm9vcEZ1bmMsd2luZG93LnBpVHJhY2tlcj1waVRyYWNrZXIscGlUcmFja2VyKCksZnVuY3Rpb24oc291cmNlLG1lc3NhZ2Upe2lmKCEwPT09c291cmNlLnZlcmJvc2Upe3RyeXt2YXIgbG9nPWNvbnNvbGUubG9nLmJpbmQoY29uc29sZSksdHJhY2U9Y29uc29sZS50cmFjZS5iaW5kKGNvbnNvbGUpLHByZWZpeD1zb3VyY2UucnVsZVRleHR8fCIiO2lmKHNvdXJjZS5kb21haW5OYW1lKXt2YXIgcnVsZVN0YXJ0SW5kZXgsQUdfU0NSSVBUTEVUX01BUktFUj0iIyUjLy8iLFVCT19TQ1JJUFRMRVRfTUFSS0VSPSIjIytqcyI7c291cmNlLnJ1bGVUZXh0LmluZGV4T2YoQUdfU0NSSVBUTEVUX01BUktFUik+LTE/cnVsZVN0YXJ0SW5kZXg9c291cmNlLnJ1bGVUZXh0LmluZGV4T2YoQUdfU0NSSVBUTEVUX01BUktFUik6c291cmNlLnJ1bGVUZXh0LmluZGV4T2YoVUJPX1NDUklQVExFVF9NQVJLRVIpPi0xJiYocnVsZVN0YXJ0SW5kZXg9c291cmNlLnJ1bGVUZXh0LmluZGV4T2YoVUJPX1NDUklQVExFVF9NQVJLRVIpKTt2YXIgcnVsZVBhcnQ9c291cmNlLnJ1bGVUZXh0LnNsaWNlKHJ1bGVTdGFydEluZGV4KTtwcmVmaXg9IiIuY29uY2F0KHNvdXJjZS5kb21haW5OYW1lKS5jb25jYXQocnVsZVBhcnQpfXZhciBMT0dfTUFSS0VSPSJsb2c6ICI7bWVzc2FnZSYmKC0xPT09bWVzc2FnZS5pbmRleE9mKExPR19NQVJLRVIpP2xvZygiIi5jb25jYXQocHJlZml4LCIgbWVzc2FnZTpcbiIpLmNvbmNhdChtZXNzYWdlKSk6bG9nKG1lc3NhZ2Uuc2xpY2UoTE9HX01BUktFUi5sZW5ndGgpKSksbG9nKCIiLmNvbmNhdChwcmVmaXgsIiB0cmFjZSBzdGFydCIpKSx0cmFjZSYmdHJhY2UoKSxsb2coIiIuY29uY2F0KHByZWZpeCwiIHRyYWNlIGVuZCIpKX1jYXRjaChlKXt9ImZ1bmN0aW9uIj09dHlwZW9mIHdpbmRvdy5fX2RlYnVnJiZ3aW5kb3cuX19kZWJ1Zyhzb3VyY2UpfX0oc291cmNlKX0pLmFwcGx5KHRoaXMsdXBkYXRlZEFyZ3MpfWNhdGNoKGUpe2NvbnNvbGUubG9nKGUpfX0oe25hbWU6InBhcmRvdC0xLjAiLGFyZ3M6W119LFtdKTs="
+    },
     {
         "title": "prebid-ads",
         "aliases": [

diff --git a/dist/redirects.yml b/dist/redirects.yml
@@ -1,6 +1,6 @@
 #
 #    AdGuard Scriptlets (Redirects Source)
-#    Version 1.6.51
+#    Version 1.6.55
 #
 - title: 1x1-transparent.gif
   description: |-
@@ -2933,6 +2933,94 @@
     }, []);
   file: noeval.js
 
+- title: pardot-1.0
+  comment: Mocks the pd.js file of Salesforce
+  aliases: []
+  contentType: application/javascript
+  content: |-
+    (function(source, args) {
+        function Pardot(source) {
+            window.piVersion = "1.0.2";
+            window.piScriptNum = 0;
+            window.piScriptObj = [];
+            window.checkNamespace = noopFunc;
+            window.getPardotUrl = noopStr;
+            window.piGetParameter = noopNull;
+            window.piSetCookie = noopFunc;
+            window.piGetCookie = noopStr;
+            function piTracker() {
+                window.pi = {
+                    tracker: {
+                        visitor_id: "",
+                        visitor_id_sign: "",
+                        pi_opt_in: "",
+                        campaign_id: ""
+                    }
+                };
+                window.piScriptNum += 1;
+            }
+            window.piResponse = noopFunc;
+            window.piTracker = piTracker;
+            piTracker();
+            hit(source);
+        }
+        function hit(source, message) {
+            if (source.verbose !== true) {
+                return;
+            }
+            try {
+                var log = console.log.bind(console);
+                var trace = console.trace.bind(console);
+                var prefix = source.ruleText || "";
+                if (source.domainName) {
+                    var AG_SCRIPTLET_MARKER = "#%#//";
+                    var UBO_SCRIPTLET_MARKER = "##+js";
+                    var ruleStartIndex;
+                    if (source.ruleText.indexOf(AG_SCRIPTLET_MARKER) > -1) {
+                        ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
+                    } else if (source.ruleText.indexOf(UBO_SCRIPTLET_MARKER) > -1) {
+                        ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
+                    }
+                    var rulePart = source.ruleText.slice(ruleStartIndex);
+                    prefix = "".concat(source.domainName).concat(rulePart);
+                }
+                var LOG_MARKER = "log: ";
+                if (message) {
+                    if (message.indexOf(LOG_MARKER) === -1) {
+                        log("".concat(prefix, " message:\n").concat(message));
+                    } else {
+                        log(message.slice(LOG_MARKER.length));
+                    }
+                }
+                log("".concat(prefix, " trace start"));
+                if (trace) {
+                    trace();
+                }
+                log("".concat(prefix, " trace end"));
+            } catch (e) {}
+            if (typeof window.__debug === "function") {
+                window.__debug(source);
+            }
+        }
+        function noopFunc() {}
+        function noopStr() {
+            return "";
+        }
+        function noopNull() {
+            return null;
+        }
+        const updatedArgs = args ? [].concat(source).concat(args) : [ source ];
+        try {
+            Pardot.apply(this, updatedArgs);
+        } catch (e) {
+            console.log(e);
+        }
+    })({
+        name: "pardot-1.0",
+        args: []
+    }, []);
+  file: pardot-1.0.js
+
 - title: prebid-ads
   comment: 'Sets predefined constants on a page:'
   aliases: