diff --git a/config/config.go b/config/config.go index d118668805e..6577c1fbb5e 100755 --- a/config/config.go +++ b/config/config.go @@ -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 } @@ -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"` } diff --git a/gdpr/vendorlist-fetching.go b/gdpr/vendorlist-fetching.go index 66a3f4ad2d6..de6da7b4bfb 100644 --- a/gdpr/vendorlist-fetching.go +++ b/gdpr/vendorlist-fetching.go @@ -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. diff --git a/gdpr/vendorlist-fetching_test.go b/gdpr/vendorlist-fetching_test.go index e5ad8793b4f..62c6a5f9d09 100644 --- a/gdpr/vendorlist-fetching_test.go +++ b/gdpr/vendorlist-fetching_test.go @@ -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", }, } @@ -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") diff --git a/usersync/usersync.go b/usersync/usersync.go index 2b313a021f8..236acbe73a3 100644 --- a/usersync/usersync.go +++ b/usersync/usersync.go @@ -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,