Skip to content
This repository has been archived by the owner on Dec 22, 2022. It is now read-only.

Commit

Permalink
Add gdpr.tcf1.fetch_gvl deprecation warning and update GVL subdomain (p…
Browse files Browse the repository at this point in the history
  • Loading branch information
bsardo authored Jan 20, 2021
1 parent f5f0b03 commit 50b49a0
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 11 deletions.
5 changes: 4 additions & 1 deletion config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,9 @@ func (cfg *GDPR) validate(errs []error) []error {
if cfg.AMPException == true {
errs = append(errs, fmt.Errorf("gdpr.amp_exception has been discontinued and must be removed from your config. If you need to disable GDPR for AMP, you may do so per-account (gdpr.integration_enabled.amp) or at the host level for the default account (account_defaults.gdpr.integration_enabled.amp)"))
}
if cfg.TCF1.FetchGVL == true {
glog.Warning("gdpr.tcf1.fetch_gvl is deprecated and will be removed in a future version, at which point TCF1 will always use the fallback GVL")
}
return errs
}

Expand All @@ -234,7 +237,7 @@ func (t *GDPRTimeouts) ActiveTimeout() time.Duration {

// TCF1 defines the TCF1 specific configurations for GDPR
type TCF1 struct {
FetchGVL bool `mapstructure:"fetch_gvl"`
FetchGVL bool `mapstructure:"fetch_gvl"` // Deprecated: In a future version TCF1 will always use the fallback GVL
FallbackGVLPath string `mapstructure:"fallback_gvl_path"`
}

Expand Down
8 changes: 4 additions & 4 deletions gdpr/vendorlist-fetching.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,14 @@ func preloadCache(ctx context.Context, client *http.Client, urlMaker func(uint16
func vendorListURLMaker(vendorListVersion uint16, tcfSpecVersion uint8) string {
if tcfSpecVersion == tcf2SpecVersion {
if vendorListVersion == 0 {
return "https://vendorlist.consensu.org/v2/vendor-list.json"
return "https://vendor-list.consensu.org/v2/vendor-list.json"
}
return "https://vendorlist.consensu.org/v2/archives/vendor-list-v" + strconv.Itoa(int(vendorListVersion)) + ".json"
return "https://vendor-list.consensu.org/v2/archives/vendor-list-v" + strconv.Itoa(int(vendorListVersion)) + ".json"
}
if vendorListVersion == 0 {
return "https://vendorlist.consensu.org/vendorlist.json"
return "https://vendor-list.consensu.org/vendorlist.json"
}
return "https://vendorlist.consensu.org/v-" + strconv.Itoa(int(vendorListVersion)) + "/vendorlist.json"
return "https://vendor-list.consensu.org/v-" + strconv.Itoa(int(vendorListVersion)) + "/vendorlist.json"
}

// newOccasionalSaver returns a wrapped version of saveOne() which only activates every few minutes.
Expand Down
10 changes: 5 additions & 5 deletions gdpr/vendorlist-fetching_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -596,25 +596,25 @@ func TestVendorListURLMaker(t *testing.T) {
description: "TCF1 - Latest",
tcfSpecVersion: 1,
vendorListVersion: 0, // Forces latest version.
expectedURL: "https://vendorlist.consensu.org/vendorlist.json",
expectedURL: "https://vendor-list.consensu.org/vendorlist.json",
},
{
description: "TCF1 - Specific",
tcfSpecVersion: 1,
vendorListVersion: 42,
expectedURL: "https://vendorlist.consensu.org/v-42/vendorlist.json",
expectedURL: "https://vendor-list.consensu.org/v-42/vendorlist.json",
},
{
description: "TCF2 - Latest",
tcfSpecVersion: 2,
vendorListVersion: 0, // Forces latest version.
expectedURL: "https://vendorlist.consensu.org/v2/vendor-list.json",
expectedURL: "https://vendor-list.consensu.org/v2/vendor-list.json",
},
{
description: "TCF2 - Specific",
tcfSpecVersion: 2,
vendorListVersion: 42,
expectedURL: "https://vendorlist.consensu.org/v2/archives/vendor-list-v42.json",
expectedURL: "https://vendor-list.consensu.org/v2/archives/vendor-list-v42.json",
},
}

Expand Down Expand Up @@ -710,7 +710,7 @@ type serverSettings struct {
// If the "version" query param doesn't exist, it returns a 400.
//
// If the "version" query param points to a version which doesn't exist, it returns a 403.
// Don't ask why... that's just what the official page is doing. See https://vendorlist.consensu.org/v-9999/vendorlist.json
// Don't ask why... that's just what the official page is doing. See https://vendor-list.consensu.org/v-9999/vendorlist.json
func mockServer(settings serverSettings) func(http.ResponseWriter, *http.Request) {
return func(w http.ResponseWriter, req *http.Request) {
vendorListVersion := req.URL.Query().Get("version")
Expand Down
2 changes: 1 addition & 1 deletion usersync/usersync.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ type Usersyncer interface {

// GDPRVendorID returns the ID in the IAB Global Vendor List which refers to this Bidder.
//
// The Global Vendor list can be found here: https://vendorlist.consensu.org/vendorlist.json
// The Global Vendor list can be found here: https://vendor-list.consensu.org/vendorlist.json
// Bidders can register for the list here: https://register.consensu.org/
//
// If you're not on the list, this should return 0. If cookie sync requests have GDPR consent info,
Expand Down

0 comments on commit 50b49a0

Please sign in to comment.