strip x-client-data headers from requests in webrequest script

Author: ablanathtanalba

src/js/webrequest.js

@@ -142,11 +142,11 @@ function onBeforeSendHeaders(details) {
   if (_isTabChromeInternal(tab_id)) {
     // DNT policy requests: strip cookies
     if (type == "xmlhttprequest" && url.endsWith("/.well-known/dnt-policy.txt")) {
-      // remove Cookie headers
+      // remove Cookie headers and X-Client-Data headers
       let newHeaders = [];
       for (let i = 0, count = details.requestHeaders.length; i < count; i++) {
         let header = details.requestHeaders[i];
-        if (header.name.toLowerCase() != "cookie") {
+        if (header.name.toLowerCase() != "cookie" && header.name.toLowerCase() != "x-client-data") {
           newHeaders.push(header);
         }
       }
@@ -187,10 +187,10 @@ function onBeforeSendHeaders(details) {
   if (action == constants.COOKIEBLOCK || action == constants.USER_COOKIEBLOCK) {
     let newHeaders;
 
-    // GET requests: remove cookie headers, reduce referrer header to origin
+    // GET requests: remove cookie headers and X-client-data headers, reduce referrer header to origin
     if (details.method == "GET") {
       newHeaders = details.requestHeaders.filter(header => {
-        return (header.name.toLowerCase() != "cookie");
+        return (header.name.toLowerCase() != "cookie" && header.name.toLowerCase() != "x-client-data");
       }).map(header => {
         if (header.name.toLowerCase() == "referer") {
           header.value = header.value.slice(
@@ -201,10 +201,10 @@ function onBeforeSendHeaders(details) {
         return header;
       });
 
-    // remove cookie and referrer headers otherwise
+    // remove cookie, referrer, and X-Client-Data headers otherwise
     } else {
       newHeaders = details.requestHeaders.filter(header => {
-        return (header.name.toLowerCase() != "cookie" && header.name.toLowerCase() != "referer");
+        return (header.name.toLowerCase() != "cookie" && header.name.toLowerCase() != "referer" && header.name.toLowerCase() != "x-client-data");
       });
     }