Skip to content

LI id module: Fixing permission logic #4388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
SuperIzya wants to merge 1 commit into from
Closed

LI id module: Fixing permission logic #4388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 24 additions & 13 deletions ...i/channel/identity/v1/hooks/LiveIntentOmniChannelIdentityProcessedAuctionRequestHook.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import org.prebid.server.vertx.httpclient.HttpClient;
import org.prebid.server.vertx.httpclient.model.HttpClientResponse;

import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
Expand All @@ -58,6 +59,8 @@ public class LiveIntentOmniChannelIdentityProcessedAuctionRequestHook implements

private static final String CODE = "liveintent-omni-channel-identity-enrichment-hook";

private static final String INSERTER = "server";

private final LiveIntentOmniChannelProperties config;
private final JacksonMapper mapper;
private final HttpClient httpClient;
Expand Down Expand Up @@ -161,7 +164,11 @@ private MultiMap headers() {
}

private IdResResponse processResponse(HttpClientResponse response) {
return mapper.decodeValue(response.getBody(), IdResResponse.class);
final IdResResponse res = mapper.decodeValue(response.getBody(), IdResResponse.class);
final List<Eid> eids = res.getEids().stream()
.map(eid -> eid.toBuilder().inserter(INSERTER).build())
.toList();
return IdResResponse.of(eids);
}

private static Future<InvocationResult<AuctionRequestPayload>> noAction() {
Expand Down Expand Up @@ -208,14 +215,6 @@ private BidRequest updateAllowedBidders(BidRequest bidRequest, List<Eid> resolve
final ExtRequestPrebid extPrebid = ext != null ? ext.getPrebid() : null;
final ExtRequestPrebidData extPrebidData = extPrebid != null ? extPrebid.getData() : null;

final List<ExtRequestPrebidDataEidPermissions> existingPerms = extPrebidData != null
? extPrebidData.getEidPermissions()
: null;

if (CollectionUtils.isEmpty(existingPerms)) {
return bidRequest;
}

final ExtRequestPrebid updatedExtPrebid = Optional.ofNullable(extPrebid)
.map(ExtRequestPrebid::toBuilder)
.orElseGet(ExtRequestPrebid::builder)
Expand All @@ -237,7 +236,11 @@ private ExtRequestPrebidData updatePrebidData(ExtRequestPrebidData extPrebidData
.map(Eid::getSource)
.collect(Collectors.toSet());

final List<ExtRequestPrebidDataEidPermissions> updatedPermissions = extPrebidData.getEidPermissions().stream()
final List<ExtRequestPrebidDataEidPermissions> eidPermissions = extPrebidData != null
? ListUtils.emptyIfNull(extPrebidData.getEidPermissions())
: Collections.emptyList();

final List<ExtRequestPrebidDataEidPermissions> updatedPermissions = eidPermissions.stream()
.map(permission -> restrictEidPermission(permission, resolvedSources))
.filter(Objects::nonNull)
.toList();
Expand All @@ -252,16 +255,24 @@ private ExtRequestPrebidDataEidPermissions restrictEidPermission(ExtRequestPrebi
return permission;
}

final List<String> permittedBidders = ListUtils.emptyIfNull(permission.getBidders());

if (CollectionUtils.isEmpty(permittedBidders) || permittedBidders.contains("*")) {
return ExtRequestPrebidDataEidPermissions.builder()
.source(permission.getSource())
.bidders(targetBidders.stream().toList())
.build();
}

final List<String> finalBidders = ListUtils.emptyIfNull(permission.getBidders()).stream()
.filter(targetBidders::contains)
.toList();

return CollectionUtils.isEmpty(finalBidders)
? null
: ExtRequestPrebidDataEidPermissions
.builder()
.bidders(finalBidders)
: ExtRequestPrebidDataEidPermissions.builder()
.source(permission.getSource())
.bidders(finalBidders)
.build();
}

Expand Down
4 changes: 2 additions & 2 deletions ...mni/channel/identity/v1/LiveIntentOmniChannelIdentityProcessedAuctionRequestHookTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ public void callShouldEnrichUserEidsWithRequestedEids() {
.extracting(AuctionRequestPayload::bidRequest)
.extracting(BidRequest::getUser)
.extracting(User::getEids)
.isEqualTo(List.of(givenEid, expectedEid));
.isEqualTo(List.of(givenEid, expectedEid.toBuilder().inserter("server").build()));

verify(httpClient).post(
eq("https://test.com/idres"),
Expand Down Expand Up @@ -315,7 +315,7 @@ public void callShouldCreateUserAndUseRequestedEidsWhenUserIsAbsent() {
.extracting(AuctionRequestPayload::bidRequest)
.extracting(BidRequest::getUser)
.extracting(User::getEids)
.isEqualTo(List.of(expectedEid));
.isEqualTo(List.of(expectedEid.toBuilder().inserter("server").build()));

verify(httpClient).post(
eq("https://test.com/idres"),
Expand Down