Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/trusted-server-adapter-fastly/src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ fn build_ec_request_state(
}

let eids_cookie = crate::extract_cookie_value(req, COOKIE_TS_EIDS);
let sharedid = SharedIdRequest::from_request(identity.sharedid_storage().cookie_name(), req);
let sharedid = SharedIdRequest::for_write_back(identity.sharedid_storage(), req);

let geo_info = services
.geo()
Expand Down
69 changes: 69 additions & 0 deletions crates/trusted-server-core/src/ec/coordinator/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -749,6 +749,16 @@ impl<P: IdentityProvider> IdentityCoordinator for ProviderCoordinator<P> {
});
recount_found(&mut found);
}
// A provider whose stored ID wins ignores a cookie for a
// source the row already holds a live UID for.
if registered.provider.keeps_stored_uids() {
found.entries.retain(|(source, _)| {
!entry
.and_then(|entry| entry.ids.get(source.as_str()))
.is_some_and(|record| record.has_live_uid(lookup.now))
});
recount_found(&mut found);
}
if matches!(found.status, LookupStatus::Found { .. }) {
// An ID in the vendor's cookies means the visitor
// opted back in, so a remembered opt-out is
Expand Down Expand Up @@ -3819,6 +3829,65 @@ mod tests {
);
}

/// A cookie provider whose live stored UID wins over any cookie UID.
struct StoredWinsCookieProvider(EchoProvider);

impl IdentityProvider for StoredWinsCookieProvider {
fn capabilities(&self) -> &ProviderCapabilities {
self.0.capabilities()
}

fn build_request(
&self,
lookup: &LookupInput<'_>,
) -> Result<ProviderRequest, Report<ProviderError>> {
self.0.build_request(lookup)
}

fn parse_response<'body>(
&self,
response: ProviderResponse<'body>,
) -> Result<LookupOutcome<'body>, Report<ProviderError>> {
self.0.parse_response(response)
}

fn read_request_cookies<'cookie>(
&self,
cookies: RequestCookies<'cookie>,
) -> CookieRead<'cookie> {
self.0.read_request_cookies(cookies)
}

fn keeps_stored_uids(&self) -> bool {
true
}
}

#[test]
fn a_different_cookie_does_not_replace_a_stored_uid_that_wins() {
// Arrange: the row holds a live UID that outlives the cookie's.
let coordinator = coordinator_with(RegisteredProvider::new(
provider_config(""),
StoredWinsCookieProvider(cookie_provider(SourceInput::Anonymous, Some("vendor_id"))),
));
let transport = CannedTransport::new(ok_reply);

// Act
let results = run(
&coordinator,
&transport,
&snapshot_holding(record_until("stored-id", 4000)),
&granting(),
);

// Assert
assert!(
!matches!(only_status(&results), LookupStatus::Found { .. }),
"should keep the stored UID over a different cookie: {:?}",
only_status(&results)
);
}

#[test]
fn a_cookie_changing_only_the_agent_type_is_rewritten() {
let coordinator = cookie_coordinator();
Expand Down
Loading
Loading