Merge main and resolve conflicts

GoogleChromeLabs · Mar 1, 2024 · 8ad44f0 · 8ad44f0
2 parents 6c7379e + 20cc714
commit 8ad44f0
Show file tree

Hide file tree

Showing 28 changed files with 424 additions and 98 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -241,7 +241,7 @@
 - Merge `main` into `develop` https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/451
 - Update flags and profile color in Chrome launcher https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/467
 
-# v0.5.0
+# v0.5.1
 
 ## Extension
 * Restructure `Facilitated Testing` landing page UI https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/493
@@ -259,4 +259,17 @@
 * Fix: Add conditional rendering in technology details panel https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/499
 
 ## Others
-* Disable auto opening of Chrome DevTools by default for all tabs https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/491
+* Disable auto opening of Chrome DevTools by default for all tabs https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/491
+
+
+# v0.5.2
+
+## Extension
+* List unmapped and orphaned cookies https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/527
+* Fix: Allow-listed rows to highlight after frame change https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/531
+* Fix: Related website sets not recognizing ccTLDs as part of the group https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/523
+
+
+## Others
+* Rename `third_party` to `assets` https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/530
+
diff --git a/bin/chrome-3pcd-ps.bat b/bin/chrome-3pcd-ps.bat
@@ -1,7 +1,7 @@
 :: Chrome 3pcd with PS Extension
 
 :: Download PS Extension
-set "ps_analysis_tool_version=v0.5.1"
+set "ps_analysis_tool_version=v0.5.2"
 cd /d %TEMP%
 if not exist %TEMP%\ps-analysis-tool-%ps_analysis_tool_version% (
     mkdir %TEMP%\ps-analysis-tool-%ps_analysis_tool_version%

diff --git a/bin/chrome-default-ps.bat b/bin/chrome-default-ps.bat
@@ -1,7 +1,7 @@
 :: Default Chrome with PS Extension
 
 :: Download PS Extension
-set "ps_analysis_tool_version=v0.5.1"
+set "ps_analysis_tool_version=v0.5.2"
 cd /d %TEMP%
 if not exist %TEMP%\ps-analysis-tool-%ps_analysis_tool_version% (
     mkdir %TEMP%\ps-analysis-tool-%ps_analysis_tool_version%

diff --git a/bin/chrome_launcher.sh b/bin/chrome_launcher.sh
@@ -2,7 +2,7 @@
 
 # Download Extension
 extension_setup() {
-  ps_analysis_tool_version=v0.5.1
+  ps_analysis_tool_version=v0.5.2
   extension_dir="/var/tmp"
   cd $extension_dir
   if [ ! -d $extension_dir/ps-analysis-tool-$ps_analysis_tool_version ]; then

diff --git a/data/related_website_sets.json b/data/related_website_sets.json
@@ -109,13 +109,21 @@
       }
     },
     {
-      "contact": "prashant.tiwari@htdigital.in",
+      "contact": "himanshu.agrawal@htdigital.in",
       "primary": "https://hindustantimes.com",
       "associatedSites": [
-        "https://livemint.com"
+        "https://livemint.com",
+        "https://livehindustan.com",
+        "https://healthshots.com",
+        "https://ottplay.com",
+        "https://desimartini.com"
       ],
       "rationaleBySite": {
-        "https://livemint.com": "Specialized Platform for economics"
+        "https://livemint.com": "https://livemint.com",
+        "https://livehindustan.com": "https://livehindustan.com",
+        "https://healthshots.com": "https://healthshots.com",
+        "https://ottplay.com": "https://ottplay.com",
+        "https://desimartini.com": "https://desimartini.com"
       }
     },
     {
@@ -517,6 +525,88 @@
         "https://stripecdn.com": "Serves static assets accelerating page loads and sandboxes select Javascript",
         "https://stripe.network": "Receives telemetry preventing fraud across Stripe services"
       }
+    },
+    {
+      "contact": "support@coch.org",
+      "primary": "https://repid.org",
+      "associatedSites": [
+        "https://reshim.org",
+        "https://human-talk.org"
+      ],
+      "rationaleBySite": {
+        "https://reshim.org": "Silent login",
+        "https://human-talk.org": "Silent login"
+      }
+    },
+    {
+      "contact": "noc@yandex-team.ru",
+      "primary": "https://ya.ru",
+      "associatedSites": [
+        "https://yandex.ru",
+        "https://yandex.net",
+        "https://turbopages.org",
+        "https://auto.ru",
+        "https://kinopoisk.ru",
+        "https://clck.ru",
+        "https://edadeal.ru",
+        "https://webvisor.com",
+        "https://yastatic.net"
+      ],
+      "rationaleBySite": {
+        "https://yandex.ru": "Yandex owned website",
+        "https://yandex.net": "Yandex owned website",
+        "https://yastatic.net": "Yandex owned website",
+        "https://auto.ru": "Yandex owned website",
+        "https://kinopoisk.ru": "Yandex owned website",
+        "https://clck.ru": "Yandex owned website",
+        "https://webvisor.com": "Yandex owned website",
+        "https://turbopages.org": "Yandex owned website",
+        "https://edadeal.ru": "Yandex owned website"
+      },
+      "ccTLDs": {
+        "https://ya.ru": [
+          "https://ya.cc"
+        ],
+        "https://yandex.ru": [
+          "https://yandex.az",
+          "https://yandex.by",
+          "https://yandex.kz",
+          "https://yandex.md",
+          "https://yandex.tj",
+          "https://yandex.tm",
+          "https://yandex.uz",
+          "https://yandex.st",
+          "https://yandex.com",
+          "https://yandex.com.am",
+          "https://yandex.com.ru"
+        ]
+      }
+    },
+    {
+      "primary": "https://victorymedium.com",
+      "contact": "privacy@victorymedium.com",
+      "associatedSites": [
+        "https://standardsandpraiserepurpose.com"
+      ],
+      "serviceSites": [
+        "https://technology-revealed.com"
+      ],
+      "rationaleBySite": {
+        "https://standardsandpraiserepurpose.com": "Publisher #1 for RWS Test",
+        "https://technology-revealed.com": "Frequency Capping Domain #1 for RWS Test"
+      }
+    },
+    {
+      "contact": "nien@startupislandtaiwan.com",
+      "primary": "https://startupislandtaiwan.com",
+      "associatedSites": [
+        "https://startupislandtaiwan.net",
+        "https://startupislandtaiwan.org"
+      ],
+      "rationaleBySite": {
+        "https://startupislandtaiwan.net": "Domain alias",
+        "https://startupislandtaiwan.org": "Domain alias"
+      }
     }
   ]
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "ps-analysis-tool",
-	"version": "0.5.1",
+	"version": "0.5.2",
 	"description": "Cookie Analysis Tool and CLI for analysis and understanding of cookie usage on web pages.",
 	"scripts": {
 		"cli:prebuild": "node ./scripts/delete-build-artifacts.cjs",

diff --git a/packages/cli-dashboard/package.json b/packages/cli-dashboard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ps-analysis-tool/cli-dashboard",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Dashboard for visualizing cli analysis output",
   "repository": {
     "type": "git",

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ps-analysis-tool/cli",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "CLI tool for analysis",
   "main": "index.js",
   "scripts": {

diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
@@ -46,7 +46,7 @@ const DELAY_TIME = 20000;
 const program = new Command();
 
 program
-  .version('0.5.1')
+  .version('0.5.2')
   .description('CLI to test a URL for 3p cookies')
   .option('-u, --url <value>', 'URL of a site')
   .option('-s, --sitemap-url <value>', 'URL of a sitemap')

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ps-analysis-tool/common",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "A package for common utilities that are being used in multiple packages",
   "main": "./dist/index.js",
   "types": "./dist-types/index.d.ts",

diff --git a/packages/common/src/constants/index.ts b/packages/common/src/constants/index.ts
@@ -14,3 +14,5 @@
  * limitations under the License.
  */
 export const UNKNOWN_FRAME_KEY = 'Unknown Frames';
+export const ORPHANED_COOKIE_KEY = 'Orphaned Cookies';
+export const UNMAPPED_COOKIE_KEY = 'Unmapped Cookies';
diff --git a/packages/common/src/utils/filterCookiesByFrame.ts b/packages/common/src/utils/filterCookiesByFrame.ts
@@ -16,6 +16,7 @@
 /**
  * Internal dependencies.
  */
+import { ORPHANED_COOKIE_KEY, UNMAPPED_COOKIE_KEY } from '../constants';
 import { CookieTableData } from '../cookies.types';
 
 interface Cookies {
@@ -53,12 +54,19 @@ const filterCookiesByFrame = (
           hasFrame = true;
         }
       });
-      if (
-        !hasFrame &&
-        cookie.frameIdList !== undefined &&
-        cookie.frameIdList?.length > 0
-      ) {
-        frameFilteredCookies[key] = cookie;
+
+      if (!hasFrame && cookie.frameIdList !== undefined) {
+        if (
+          frameUrl === UNMAPPED_COOKIE_KEY &&
+          cookie.frameIdList?.length === 0
+        ) {
+          frameFilteredCookies[key] = cookie;
+        } else if (
+          frameUrl === ORPHANED_COOKIE_KEY &&
+          cookie.frameIdList?.length > 0
+        ) {
+          frameFilteredCookies[key] = cookie;
+        }
       }
     });
   }

diff --git a/packages/design-system/package.json b/packages/design-system/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ps-analysis-tool/design-system",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "A package for presentational components that are being used in multiple packages",
   "main": "./src/index.ts",
   "source":"./src/index.ts",

diff --git a/packages/design-system/src/components/sidebar/sidebarChild.tsx b/packages/design-system/src/components/sidebar/sidebarChild.tsx
@@ -17,7 +17,11 @@
  * External dependencies.
  */
 import React, { useEffect, useRef } from 'react';
-import { ArrowDown, ArrowDownWhite } from '@ps-analysis-tool/design-system';
+import {
+  ArrowDown,
+  ArrowDownWhite,
+  InfoIcon,
+} from '@ps-analysis-tool/design-system';
 
 /**
  * Internal dependencies.
@@ -128,7 +132,20 @@ const SidebarChild = ({
             )}
           </div>
         )}
-        <p className="whitespace-nowrap pr-1">{sidebarItem.title}</p>
+        <p className="flex flex-row items-center justify-center whitespace-nowrap gap-x-1 pr-1">
+          {sidebarItem.title}
+          {sidebarItem.infoIconDescription ? (
+            <span title={sidebarItem.infoIconDescription}>
+              <InfoIcon
+                className={`${
+                  isKeySelected(itemKey) && isSidebarFocused
+                    ? 'fill-white'
+                    : 'fill-gray'
+                }`}
+              />
+            </span>
+          ) : null}
+        </p>
         <div
           className="absolute"
           style={{

diff --git a/packages/design-system/src/components/sidebar/useSidebar/index.tsx b/packages/design-system/src/components/sidebar/useSidebar/index.tsx
@@ -33,6 +33,7 @@ export type SidebarItemValue = {
   title: string;
   children: SidebarItems;
   popupTitle?: string;
+  infoIconDescription?: string;
   extraInterfaceToTitle?: React.ReactNode;
   dropdownOpen?: boolean;
   panel?: React.ReactNode;

diff --git a/packages/eslint-import-resolver/package.json b/packages/eslint-import-resolver/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ps-analysis-tool/eslint-import-resolver",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "",
   "main": "src/index.cjs",
   "scripts": {

diff --git a/packages/extension/package.json b/packages/extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ps-analysis-tool/extension",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Chrome extension for cookie analysis",
   "repository": {
     "type": "git",