Skip to content

Commit

Permalink
Merge branch 'main' of github.com:GoogleChromeLabs/ps-analysis-tool i…
Browse files Browse the repository at this point in the history
…nto develop
  • Loading branch information
amovar18 committed Dec 12, 2024
2 parents 614dfc6 + 1566540 commit 496656d
Show file tree
Hide file tree
Showing 42 changed files with 471 additions and 280 deletions.
15 changes: 14 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -473,4 +473,17 @@ Remove facilitated testing page Remove facilitated testing page https://github.c
* Remove Wappalyzer used for technologies from CLI https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/833

## Others
* Resolve high and moderate vulnerabilities in package dependencies https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/836
* Resolve high and moderate vulnerabilities in package dependencies https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/836


#v0.12.0

# Changelog

## Extension

- https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/848

## CLI
- https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/830
- https://github.com/GoogleChromeLabs/ps-analysis-tool/pull/849
217 changes: 192 additions & 25 deletions assets/data/open-cookie-database.json
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,19 @@
"wildcard": "0"
}
],
"_gali": [
{
"platform": "Google Analytics",
"category": "Analytics",
"name": "_gali",
"domain": "",
"description": "OCD__gali_description",
"retention": "OCD_retention_30_seconds",
"dataController": "Google",
"gdprUrl": "https://business.safety.google/privacy/",
"wildcard": "0"
}
],
"_ga_*": [
{
"platform": "Google Analytics",
Expand Down Expand Up @@ -662,6 +675,19 @@
"wildcard": "0"
}
],
"_gcl_gs": [
{
"platform": "Google Ads",
"category": "Marketing",
"name": "_gcl_gs",
"domain": "",
"description": "OCD__gcl_gs_description",
"retention": "OCD_retention_90_Days",
"dataController": "Google",
"gdprUrl": "https://business.safety.google/privacy/",
"wildcard": "0"
}
],
"_gcl_gb": [
{
"platform": "Google Ads",
Expand Down Expand Up @@ -779,6 +805,121 @@
"wildcard": "0"
}
],
"_Secure-ENID": [
{
"platform": "Google",
"category": "Functional",
"name": "_Secure-ENID",
"domain": "",
"description": "OCD__Secure_ENID_description",
"retention": "OCD_retention_13_months",
"dataController": "Google",
"gdprUrl": "https://business.safety.google/privacy/",
"wildcard": "0"
}
],
"Secure-YEC": [
{
"platform": "Google",
"category": "Functional",
"name": "Secure-YEC",
"domain": "",
"description": "OCD_Secure_YEC_description",
"retention": "OCD_retention_13_months",
"dataController": "Google",
"gdprUrl": "https://business.safety.google/privacy/",
"wildcard": "0"
}
],
"CGIC": [
{
"platform": "Google",
"category": "Functional",
"name": "CGIC",
"domain": "",
"description": "OCD_CGIC_description",
"retention": "OCD_retention_6_months",
"dataController": "Google",
"gdprUrl": "https://business.safety.google/privacy/",
"wildcard": "0"
}
],
"_Secure-YEC": [
{
"platform": "Google",
"category": "Functional",
"name": "_Secure-YEC",
"domain": "",
"description": "OCD__Secure_YEC_description",
"retention": "OCD_retention_13_months",
"dataController": "Google",
"gdprUrl": "https://business.safety.google/privacy/",
"wildcard": "0"
}
],
"AdID": [
{
"platform": "Google",
"category": "Marketing",
"name": "AdID",
"domain": "",
"description": "OCD_AdID_description",
"retention": "OCD_retention_2_weeks",
"dataController": "Google",
"gdprUrl": "https://business.safety.google/privacy/",
"wildcard": "0"
}
],
"DSID": [
{
"platform": "Google",
"category": "Marketing",
"name": "DSID",
"domain": "",
"description": "OCD_DSID_description",
"retention": "OCD_retention_2_weeks",
"dataController": "Google",
"gdprUrl": "https://business.safety.google/privacy/",
"wildcard": "0"
},
{
"platform": "DoubleClick/Google Marketing",
"category": "Marketing",
"name": "DSID",
"domain": "doubleclick.net (3rd party)",
"description": "This cookie is used for targeting, analyzing and optimisation of ad campaigns in DoubleClick/Google Marketing Suite",
"retention": "2 weeks",
"dataController": "Google",
"gdprUrl": "https://business.safety.google/privacy/",
"wildcard": "0"
}
],
"gcl": [
{
"platform": "Google",
"category": "Marketing",
"name": "gcl",
"domain": "",
"description": "OCD_gcl_description",
"retention": "OCD_retention_90_days",
"dataController": "Google",
"gdprUrl": "https://business.safety.google/privacy/",
"wildcard": "0"
}
],
"gac": [
{
"platform": "Google",
"category": "Marketing",
"name": "gac",
"domain": "",
"description": "OCD_gac_description",
"retention": "OCD_retention_90_days",
"dataController": "Google",
"gdprUrl": "https://business.safety.google/privacy/",
"wildcard": "0"
}
],
"AEC": [
{
"platform": "Google Ads",
Expand Down Expand Up @@ -1078,6 +1219,19 @@
"wildcard": "0"
}
],
"__Secure-ENID": [
{
"platform": "Google",
"category": "Functional",
"name": "__Secure-ENID",
"domain": ".google.com",
"description": "OCD___Secure_ENID_description",
"retention": "OCD_retention_11_Months",
"dataController": "Google",
"gdprUrl": "https://business.safety.google/privacy/",
"wildcard": "0"
}
],
"SEARCH_SAMESITE": [
{
"platform": "Google",
Expand Down Expand Up @@ -1494,19 +1648,6 @@
"wildcard": "0"
}
],
"DSID": [
{
"platform": "DoubleClick/Google Marketing",
"category": "Marketing",
"name": "DSID",
"domain": "doubleclick.net (3rd party)",
"description": "OCD_DSID_description",
"retention": "OCD_retention_2_weeks",
"dataController": "Google",
"gdprUrl": "https://business.safety.google/privacy/",
"wildcard": "0"
}
],
"ID": [
{
"platform": "DoubleClick/Google Marketing",
Expand Down Expand Up @@ -10394,7 +10535,7 @@
"description": "OCD_SSR_caching_description",
"retention": "OCD_retention_session",
"dataController": "Wix.com",
"gdprUrl": "https://support.wix.com/erticle/cookies-and-your-wix-site",
"gdprUrl": "https://support.wix.com/article/cookies-and-your-wix-site",
"wildcard": "0"
}
],
Expand All @@ -10407,7 +10548,7 @@
"description": "OCD_smSession_description",
"retention": "OCD_retention_2_weeks",
"dataController": "Wix.com",
"gdprUrl": "https://support.wix.com/erticle/cookies-and-your-wix-site",
"gdprUrl": "https://support.wix.com/article/cookies-and-your-wix-site",
"wildcard": "0"
}
],
Expand All @@ -10420,7 +10561,7 @@
"description": "OCD_svSession_description",
"retention": "OCD_retention_2_years",
"dataController": "Wix.com",
"gdprUrl": "https://support.wix.com/erticle/cookies-and-your-wix-site",
"gdprUrl": "https://support.wix.com/article/cookies-and-your-wix-site",
"wildcard": "0"
}
],
Expand All @@ -10433,7 +10574,7 @@
"description": "OCD_ForceFlashSite_description",
"retention": "OCD_retention_session",
"dataController": "Wix.com",
"gdprUrl": "https://support.wix.com/erticle/cookies-and-your-wix-site",
"gdprUrl": "https://support.wix.com/article/cookies-and-your-wix-site",
"wildcard": "0"
}
],
Expand All @@ -10446,7 +10587,7 @@
"description": "OCD_hs_description",
"retention": "OCD_retention_session",
"dataController": "Wix.com",
"gdprUrl": "https://support.wix.com/erticle/cookies-and-your-wix-site",
"gdprUrl": "https://support.wix.com/article/cookies-and-your-wix-site",
"wildcard": "0"
}
],
Expand All @@ -10459,7 +10600,7 @@
"description": "OCD_bSession_description",
"retention": "OCD_retention_30_minutes",
"dataController": "Wix.com",
"gdprUrl": "https://support.wix.com/erticle/cookies-and-your-wix-site",
"gdprUrl": "https://support.wix.com/article/cookies-and-your-wix-site",
"wildcard": "0"
}
],
Expand All @@ -10472,7 +10613,7 @@
"description": "OCD_TS01__description",
"retention": "OCD_retention_session",
"dataController": "Wix.com",
"gdprUrl": "https://support.wix.com/erticle/cookies-and-your-wix-site",
"gdprUrl": "https://support.wix.com/article/cookies-and-your-wix-site",
"wildcard": "1"
}
],
Expand All @@ -10485,7 +10626,7 @@
"description": "OCD_fedops_logger_sessionId_description",
"retention": "OCD_retention_12_months",
"dataController": "Wix.com",
"gdprUrl": "https://support.wix.com/erticle/cookies-and-your-wix-site",
"gdprUrl": "https://support.wix.com/article/cookies-and-your-wix-site",
"wildcard": "0"
}
],
Expand All @@ -10498,7 +10639,7 @@
"description": "OCD_wixLanguage_description",
"retention": "OCD_retention_12_months",
"dataController": "Wix.com",
"gdprUrl": "https://support.wix.com/erticle/cookies-and-your-wix-site",
"gdprUrl": "https://support.wix.com/article/cookies-and-your-wix-site",
"wildcard": "0"
}
],
Expand All @@ -10511,7 +10652,7 @@
"description": "OCD__wixCIDX_description",
"retention": "OCD_retention_3_months",
"dataController": "Wix.com",
"gdprUrl": "https://support.wix.com/erticle/cookies-and-your-wix-site",
"gdprUrl": "https://support.wix.com/article/cookies-and-your-wix-site",
"wildcard": "0"
}
],
Expand All @@ -10524,7 +10665,7 @@
"description": "OCD__wix_browser_sess_description",
"retention": "OCD_retention_session",
"dataController": "Wix.com",
"gdprUrl": "https://support.wix.com/erticle/cookies-and-your-wix-site",
"gdprUrl": "https://support.wix.com/article/cookies-and-your-wix-site",
"wildcard": "0"
}
],
Expand All @@ -10537,7 +10678,7 @@
"description": "OCD_consent_policy_description",
"retention": "OCD_retention_12_months",
"dataController": "Wix.com",
"gdprUrl": "https://support.wix.com/erticle/cookies-and-your-wix-site",
"gdprUrl": "https://support.wix.com/article/cookies-and-your-wix-site",
"wildcard": "0"
}
],
Expand Down Expand Up @@ -28363,6 +28504,32 @@
"wildcard": "1"
}
],
"pxid": [
{
"platform": "Permutive",
"category": "Functional",
"name": "pxid",
"domain": "",
"description": "OCD_pxid_description",
"retention": "OCD_retention_89_Days",
"dataController": "Permutive",
"gdprUrl": "https://permutive.com/privacy/",
"wildcard": "0"
}
],
"permutive-id": [
{
"platform": "Permutive",
"category": "Functional",
"name": "permutive-id",
"domain": "",
"description": "OCD_permutive_id_description",
"retention": "OCD_retention_1095_Days",
"dataController": "Permutive",
"gdprUrl": "https://permutive.com/privacy/",
"wildcard": "0"
}
],
"cs": [
{
"platform": "GumGum",
Expand Down
2 changes: 1 addition & 1 deletion bin/chrome-3pcd-ps.bat
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
:: Chrome 3pcd with PS Extension

:: Download PS Extension
set "ps_analysis_tool_version=v0.11.0"
set "ps_analysis_tool_version=v0.12.0"
cd /d %TEMP%
if not exist %TEMP%\ps-analysis-tool-%ps_analysis_tool_version% (
mkdir %TEMP%\ps-analysis-tool-%ps_analysis_tool_version%
Expand Down
2 changes: 1 addition & 1 deletion bin/chrome-default-ps.bat
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
:: Default Chrome with PS Extension

:: Download PS Extension
set "ps_analysis_tool_version=v0.11.0"
set "ps_analysis_tool_version=v0.12.0"
cd /d %TEMP%
if not exist %TEMP%\ps-analysis-tool-%ps_analysis_tool_version% (
mkdir %TEMP%\ps-analysis-tool-%ps_analysis_tool_version%
Expand Down
2 changes: 1 addition & 1 deletion bin/chrome_launcher.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Download Extension
extension_setup() {
ps_analysis_tool_version=v0.11.0
ps_analysis_tool_version=v0.12.0
extension_dir="/var/tmp"
cd $extension_dir
if [ ! -d $extension_dir/ps-analysis-tool-$ps_analysis_tool_version ]; then
Expand Down
Loading

0 comments on commit 496656d

Please sign in to comment.