Skip to content
Merged
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
1 change: 0 additions & 1 deletion docs/config-app.md
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@ There are several typical keys:
- `adapters.<BIDDER_NAME>.usersync.redirect-url` - the redirect part of url for synchronizing UIDs cookie.
- `adapters.<BIDDER_NAME>.usersync.cookie-family-name` - the family name by which user ids within adapter's realm are stored in uidsCookie.
- `adapters.<BIDDER_NAME>.usersync.type` - usersync type (i.e. redirect, iframe).
- `adapters.<BIDDER_NAME>.usersync.support-cors` - flag signals if CORS supported by usersync.
- `adapters.<BIDDER_NAME>.debug.allow` - enables debug output in the auction response for the given bidder. Default `true`.
- `adapters.<BIDDER_NAME>.tmax-deduction-ms` - adjusts the tmax sent to the bidder by deducting the provided value (ms). Default `0 ms` - no deduction.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,27 @@
package org.prebid.server.auction.bidderrequestpostprocessor;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.iab.openrtb.request.BidRequest;
import io.vertx.core.Future;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.prebid.server.auction.aliases.BidderAliases;
import org.prebid.server.auction.model.AuctionContext;
import org.prebid.server.auction.model.BidderRequest;
import org.prebid.server.model.UpdateResult;
import org.prebid.server.proto.openrtb.ext.request.ExtRequest;
import org.prebid.server.proto.openrtb.ext.request.ExtRequestBidAdjustmentFactors;
import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebid;
import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidAlternateBidderCodes;
import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidAlternateBidderCodesBidder;
import org.prebid.server.proto.openrtb.ext.request.ImpMediaType;

import java.math.BigDecimal;
import java.util.Collections;
import java.util.EnumMap;
import java.util.Iterator;
import java.util.Map;

public class BidderRequestCleaner implements BidderRequestPostProcessor {

Expand All @@ -17,21 +31,168 @@ public Future<BidderRequestPostProcessingResult> process(BidderRequest bidderReq
AuctionContext auctionContext) {

final BidRequest bidRequest = bidderRequest.getBidRequest();
final ExtRequest ext = bidRequest.getExt();
final UpdateResult<ExtRequest> cleanedExt = cleanExt(bidRequest.getExt(), bidderRequest.getBidder());

final BidderRequest cleanedBidderRequest = cleanedExt.isUpdated()
? bidderRequest.with(bidRequest.toBuilder().ext(cleanedExt.getValue()).build())
: bidderRequest;

return Future.succeededFuture(BidderRequestPostProcessingResult.withValue(cleanedBidderRequest));
}

private UpdateResult<ExtRequest> cleanExt(ExtRequest ext, String bidder) {
final ExtRequestPrebid extPrebid = ext != null ? ext.getPrebid() : null;
final ObjectNode bidderControls = extPrebid != null ? extPrebid.getBiddercontrols() : null;
if (extPrebid == null) {
return UpdateResult.unaltered(ext);
}

if (bidderControls == null) {
return resultOf(bidderRequest);
final UpdateResult<ExtRequestBidAdjustmentFactors> cleanedBidAdjustmentFactors =
cleanBidAdjustmentFactors(extPrebid.getBidadjustmentfactors(), bidder);
final UpdateResult<ObjectNode> cleanedBidAdjustments =
cleanBidAdjustments(extPrebid.getBidadjustments(), bidder);
final UpdateResult<ExtRequestPrebidAlternateBidderCodes> cleanedAlternateCodes =
cleanAlternateCodes(extPrebid.getAlternateBidderCodes(), bidder);

if (!cleanedBidAdjustmentFactors.isUpdated()
&& !cleanedBidAdjustments.isUpdated()
&& !cleanedAlternateCodes.isUpdated()
&& ObjectUtils.allNull(
extPrebid.getReturnallbidstatus(),
extPrebid.getAliasgvlids(),
extPrebid.getAdservertargeting(),
extPrebid.getCache(),
extPrebid.getEvents(),
extPrebid.getNosale(),
extPrebid.getBiddercontrols(),
extPrebid.getAnalytics(),
extPrebid.getPassthrough(),
extPrebid.getKvps())) {

return UpdateResult.unaltered(ext);
}

final ExtRequest cleanedExt = ExtRequest.of(extPrebid.toBuilder().biddercontrols(null).build());
final ExtRequest cleanedExt = ExtRequest.of(extPrebid.toBuilder()
.returnallbidstatus(null)
.aliasgvlids(null)
.bidadjustmentfactors(cleanedBidAdjustmentFactors.getValue())
.bidadjustments(cleanedBidAdjustments.getValue())
.adservertargeting(null)
.cache(null)
.events(null)
.nosale(null)
.biddercontrols(null)
.analytics(null)
.passthrough(null)
.kvps(null)
.alternateBidderCodes(cleanedAlternateCodes.getValue())
.build());
cleanedExt.addProperties(ext.getProperties());

return resultOf(bidderRequest.with(bidRequest.toBuilder().ext(cleanedExt).build()));
return UpdateResult.updated(cleanedExt);
}

private static UpdateResult<ExtRequestBidAdjustmentFactors> cleanBidAdjustmentFactors(
ExtRequestBidAdjustmentFactors bidAdjustmentFactors,
String bidder) {

if (bidAdjustmentFactors == null) {
return UpdateResult.unaltered(null);
}

final Map<String, BigDecimal> cleanedAdjustments =
cleanBidderMap(bidAdjustmentFactors.getAdjustments(), bidder);
final EnumMap<ImpMediaType, Map<String, BigDecimal>> cleanedMediaTypes =
cleanMediaTypes(bidAdjustmentFactors.getMediatypes(), bidder);

if (cleanedAdjustments == null && cleanedMediaTypes == null) {
return UpdateResult.updated(null);
}

final ExtRequestBidAdjustmentFactors cleanedBidAdjustmentFactors = ExtRequestBidAdjustmentFactors.builder()
.mediatypes(cleanedMediaTypes)
.build();
if (cleanedAdjustments != null) {
cleanedAdjustments.forEach(cleanedBidAdjustmentFactors::addFactor);
}

return UpdateResult.updated(cleanedBidAdjustmentFactors);
}

private static <T> Map<String, T> cleanBidderMap(Map<String, T> map, String bidder) {
if (map == null) {
return null;
}

for (Map.Entry<String, T> entry : map.entrySet()) {
if (StringUtils.equalsIgnoreCase(entry.getKey(), bidder)) {
return Collections.singletonMap(entry.getKey(), entry.getValue());
}
}

return null;
}

private static Future<BidderRequestPostProcessingResult> resultOf(BidderRequest bidderRequest) {
return Future.succeededFuture(BidderRequestPostProcessingResult.withValue(bidderRequest));
private static EnumMap<ImpMediaType, Map<String, BigDecimal>> cleanMediaTypes(
EnumMap<ImpMediaType, Map<String, BigDecimal>> mediaTypes,
String bidder) {

if (mediaTypes == null) {
return null;
}

final EnumMap<ImpMediaType, Map<String, BigDecimal>> cleanedMediaTypes = new EnumMap<>(ImpMediaType.class);
for (Map.Entry<ImpMediaType, Map<String, BigDecimal>> entry : mediaTypes.entrySet()) {
final Map<String, BigDecimal> cleanedMap = cleanBidderMap(entry.getValue(), bidder);
if (cleanedMap != null) {
cleanedMediaTypes.put(entry.getKey(), cleanedMap);
}
}

return !cleanedMediaTypes.isEmpty() ? cleanedMediaTypes : null;
}

private static UpdateResult<ObjectNode> cleanBidAdjustments(ObjectNode bidAdjustments, String bidder) {
if (bidAdjustments == null) {
return UpdateResult.unaltered(null);
}

final ObjectNode cleanedBidAdjustments = bidAdjustments.deepCopy();
final JsonNode mediaTypeToBidAdjustments = cleanedBidAdjustments.path("mediatype");
for (Iterator<JsonNode> maps = mediaTypeToBidAdjustments.elements(); maps.hasNext(); ) {
final JsonNode bidderMap = maps.next();
if (!bidderMap.isObject()) {
continue;
}

for (Iterator<String> bidders = bidderMap.fieldNames(); bidders.hasNext(); ) {
if (!StringUtils.equalsIgnoreCase(bidders.next(), bidder)) {
bidders.remove();
}
}

if (bidderMap.isEmpty()) {
maps.remove();
}
}

return !mediaTypeToBidAdjustments.isEmpty()
? UpdateResult.updated(cleanedBidAdjustments)
: UpdateResult.updated(null);
}

private static UpdateResult<ExtRequestPrebidAlternateBidderCodes> cleanAlternateCodes(
ExtRequestPrebidAlternateBidderCodes alternateBidderCodes,
String bidder) {

final Map<String, ExtRequestPrebidAlternateBidderCodesBidder> bidders = alternateBidderCodes != null
? alternateBidderCodes.getBidders()
: null;
if (bidders == null) {
return UpdateResult.unaltered(alternateBidderCodes);
}

return UpdateResult.updated(ExtRequestPrebidAlternateBidderCodes.of(
alternateBidderCodes.getEnabled(),
cleanBidderMap(bidders, bidder)));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ private Future<Account> wrapFailure(Throwable exception, String accountId, HttpR
if (exception instanceof UnauthorizedAccountException) {
return Future.failedFuture(exception);
} else if (exception instanceof PreBidException) {
unknownAccountLogger.warn(accountErrorMessage(exception.getMessage(), httpRequest), 100);
unknownAccountLogger.warn(accountErrorMessage(exception.getMessage(), httpRequest), logSamplingRate);
} else {
metrics.updateAccountRequestRejectedByFailedFetch(accountId);
logger.warn("Error occurred while fetching account: {}", exception.getMessage());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ public UsersyncInfo build(String bidder,
hostCookieUid == null
? buildSyncUrl(bidder, usersyncMethod, privacy)
: buildSetUidUrl(bidder, HttpUtil.encodeUrl(hostCookieUid), usersyncMethod, privacy),
usersyncMethod.getType(),
usersyncMethod.isSupportCORS());
usersyncMethod.getType());
}

private String buildSyncUrl(String bidder, UsersyncMethod usersyncMethod, Privacy privacy) {
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/org/prebid/server/bidder/UsersyncMethod.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,5 @@ public class UsersyncMethod {

String uidMacro;

boolean supportCORS;

UsersyncFormat formatOverride;
}
Loading
Loading