Merge pull request #796 from GoogleChromeLabs/develop

v0.10.1
GoogleChromeLabs · Aug 6, 2024 · 0883f95 · 0883f95
2 parents 6835545 + bdaac5a
commit 0883f95
Show file tree

Hide file tree

Showing 70 changed files with 468 additions and 179 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -440,4 +440,12 @@ Remove facilitated testing page Remove facilitated testing page https://github.c
 * Code Quality: Add E2E tests for extension and CLI https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/773
 * Chore: Make NPM commands used for development uniform. https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/775
 * Bump “fast-xml-parser” from 4.4.0 to 4.4.1 https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/790
-* Chore: Setup report package development configurations https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/756
+* Chore: Setup report package development configurations https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/756
+
+
+#v0.10.1
+
+# Changelog
+
+## Extension
+- Fix: Miscellaneous QA issues https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/795
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.10.0"
+set "ps_analysis_tool_version=v0.10.1"
 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.10.0"
+set "ps_analysis_tool_version=v0.10.1"
 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.10.0
+  ps_analysis_tool_version=v0.10.1
   extension_dir="/var/tmp"
   cd $extension_dir
   if [ ! -d $extension_dir/ps-analysis-tool-$ps_analysis_tool_version ]; then

diff --git a/docs/development-workflows.md b/docs/development-workflows.md
@@ -41,7 +41,7 @@ npm run dev:cli
 
 After making changes in the `cli`, `cli-dashboard`, or any CLI-related packages, use:
 ```bash
-npm run build:cli
+npm run build:cli:dashboard
 ```
 
 ## Build Workflows

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.10.0",
+	"version": "0.10.1",
 	"description": "Cookie Analysis Tool and CLI for analysis and understanding of cookie usage on web pages.",
 	"scripts": {
 		"build-storybook": "storybook build",

diff --git a/packages/analysis-utils/package.json b/packages/analysis-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@google-psat/analysis-utils",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "A package for CLI analysis",
   "main": "dist/index.js",
   "types": "dist-types/index.d.ts",

diff --git a/packages/analysis-utils/src/browserManagement/index.ts b/packages/analysis-utils/src/browserManagement/index.ts
@@ -334,7 +334,7 @@ export class BrowserManagement {
             domain: parsedCookie.domain,
             path: parsedCookie.path || '/',
             value: parsedCookie.value,
-            samesite: parsedCookie.samesite || 'Lax',
+            samesite: parsedCookie.samesite?.toLowerCase() || 'lax',
             expires: parsedCookie.expires || 'Session',
             httponly: parsedCookie.httponly || false,
             secure: parsedCookie.secure || false,
@@ -407,9 +407,9 @@ export class BrowserManagement {
           domain: associatedCookie.cookie.domain,
           path: associatedCookie.cookie.path || '/',
           value: associatedCookie.cookie.value,
-          sameSite: associatedCookie.cookie.sameSite || 'Lax',
+          samesite: associatedCookie.cookie.sameSite?.toLowerCase() || 'lax',
           expires: associatedCookie.cookie.expires || 'Session',
-          httpOnly: associatedCookie.cookie.httpOnly || false,
+          httponly: associatedCookie.cookie.httpOnly || false,
           secure: associatedCookie.cookie.secure || false,
           partitionKey: '',
         },
@@ -562,7 +562,12 @@ export class BrowserManagement {
             }
             const key = cookie.name + ':' + cookie.domain + ':' + cookie.path;
             frameCookies[key] = {
-              parsedCookie: { ...cookie, partitionKey: '' },
+              parsedCookie: {
+                ...cookie,
+                partitionKey: '',
+                httponly: false,
+                samesite: cookie.sameSite?.toLowerCase() || 'lax',
+              },
             };
           });
 

diff --git a/packages/analysis-utils/src/types.ts b/packages/analysis-utils/src/types.ts
@@ -56,7 +56,7 @@ export interface CookieLogDetails
   category: string;
   description: string;
   isFirstParty: 'Yes' | 'No';
-  sameSite: string;
+  samesite: string;
   partitionKey?: Protocol.Network.CookiePartitionKey;
   pageUrl: string;
   requestUrls: { [key: string]: string };

diff --git a/packages/cli-dashboard/package.json b/packages/cli-dashboard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@google-psat/cli-dashboard",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "Dashboard for visualizing cli analysis output",
   "author": {
     "name": "Google"

diff --git a/packages/cli-dashboard/src/app.tsx b/packages/cli-dashboard/src/app.tsx
@@ -60,6 +60,10 @@ const App = () => {
       return;
     }
 
+    if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
+      bodyTag.classList.add('dark');
+    }
+
     bodyTag.style.fontSize = '75%';
   }, []);
 
@@ -130,7 +134,7 @@ const App = () => {
   }
 
   return (
-    <div className="w-full h-screen flex">
+    <div className="w-full h-screen flex dark:bg-raisin-black text-raisin-black dark:text-bright-gray">
       <SiteReport
         completeJson={completeJsonReport}
         cookies={cookies}

diff --git a/packages/cli-dashboard/src/dummyData/PSAT_DATA.js b/packages/cli-dashboard/src/dummyData/PSAT_DATA.js
@@ -22,6 +22,151 @@ export default {
       cookieData: {
         'https://open.spotify.com': {
           frameCookies: {
+            '_cc_cccrwdcntrl.net/': {
+              parsedCookie: {
+                domain: '.crwdcntrl.net',
+                name: '_cc_cc',
+                path: '/',
+                samesite: 'none',
+                httponly: false,
+                priority: 'Medium',
+                value:
+                  '"ACZ4nGNQMDewNDA1N080NjA0SzVINbQwSzExMbcwNLMwNDQzNjBnAIK0Wb7zGRAAACRYCVA%3D"',
+                partitionKey: '',
+                expires: '2025-04-15T11:27:27.639Z',
+                httpOnly: false,
+                sameParty: false,
+                sameSite: 'None',
+                secure: true,
+                session: false,
+                size: 82,
+                sourcePort: 443,
+                sourceScheme: 'Secure',
+              },
+              warningReasons: [],
+              blockedReasons: ['ThirdPartyPhaseout'],
+              networkEvents: {
+                requestEvents: [],
+                responseEvents: [],
+              },
+              headerType: 'http',
+              isFirstParty: false,
+              url: '',
+              frameIdList: ['6C93EFD2145CB7798F6C74BC08576FAE'],
+              analytics: {
+                platform: 'Lotame',
+                category: 'Marketing',
+                name: '_cc_cc',
+                domain: 'crwdcntrl.net',
+                description: 'OCD__cc_cc_description',
+                retention: 'OCD_retention_session',
+                dataController: 'Lotame',
+                gdprUrl:
+                  'https://www.lotame.com/about-lotame/privacy/lotames-products-services-privacy-policy/',
+                wildcard: '0',
+              },
+              blockingStatus: {
+                inboundBlock: 'NOT_BLOCKED',
+                outboundBlock: 'BLOCKED_IN_ALL_EVENTS',
+              },
+              isBlocked: true,
+            },
+            '_cc_audcrwdcntrl.net/': {
+              parsedCookie: {
+                domain: '.crwdcntrl.net',
+                name: '_cc_aud',
+                path: '/',
+                samesite: 'none',
+                httponly: false,
+                priority: 'Medium',
+                value: '"ABR4nGNgYGBIm%2BU7nwEOABfpAe0%3D"',
+                partitionKey: '',
+                expires: '2025-04-15T11:27:27.639Z',
+                httpOnly: false,
+                sameParty: false,
+                sameSite: 'None',
+                secure: true,
+                session: false,
+                size: 41,
+                sourcePort: 443,
+                sourceScheme: 'Secure',
+              },
+              warningReasons: [],
+              blockedReasons: ['ThirdPartyPhaseout'],
+              networkEvents: {
+                requestEvents: [],
+                responseEvents: [],
+              },
+              headerType: 'http',
+              isFirstParty: false,
+              url: '',
+              frameIdList: ['6C93EFD2145CB7798F6C74BC08576FAE'],
+              analytics: {
+                platform: 'Lotame',
+                category: 'Marketing',
+                name: '_cc_aud',
+                domain: 'crwdcntrl.net',
+                description: 'OCD__cc_aud_description',
+                retention: 'OCD_retention_269_days',
+                dataController: 'Lotame',
+                gdprUrl:
+                  'https://www.lotame.com/about-lotame/privacy/lotames-products-services-privacy-policy/',
+                wildcard: '0',
+              },
+              blockingStatus: {
+                inboundBlock: 'NOT_BLOCKED',
+                outboundBlock: 'BLOCKED_IN_ALL_EVENTS',
+              },
+              isBlocked: true,
+            },
+            'plsGeoObjspectator.org/': {
+              isBlocked: false,
+              parsedCookie: {
+                domain: 'spectator.org',
+                expires: '2024-08-03T07:24:10.000Z',
+                httpOnly: false,
+                name: 'plsGeoObj',
+                path: '/',
+                priority: 'Medium',
+                sameParty: false,
+                sameSite: 'Lax',
+                secure: false,
+                session: false,
+                size: 117,
+                sourcePort: 443,
+                sourceScheme: 'Secure',
+                value:
+                  '{"ip":"59.88.27.175","country":"IN","region":"MH","city":"Pune","zip":"411004","location":"18.6161,73.7286"}',
+                httponly: false,
+                samesite: 'lax',
+                partitionKey: '',
+              },
+              networkEvents: {
+                requestEvents: [],
+                responseEvents: [],
+              },
+              blockedReasons: [],
+              analytics: {
+                platform: 'Unknown',
+                category: 'Uncategorized',
+                name: '',
+                domain: '',
+                description: '',
+                retention: '',
+                dataController: '',
+                gdprUrl: '',
+                wildcard: '',
+              },
+              url: '',
+              headerType: 'http',
+              isFirstParty: true,
+              frameIdList: ['6C93EFD2145CB7798F6C74BC08576FAE'],
+              blockingStatus: {
+                inboundBlock: 'NOT_BLOCKED',
+                outboundBlock: 'NOT_BLOCKED',
+              },
+              warningReasons: [],
+            },
             'sp_t:.spotify.com:/': {
               parsedCookie: {
                 name: 'sp_t',