[pull] master from prebid:master

extra/pom.xml

@@ -50,7 +50,7 @@
         <metrics-influxdb.version>1.3.4</metrics-influxdb.version>
         <vertx.prometheus.version>0.16.0</vertx.prometheus.version>
         <iabtcf.version>2.0.10</iabtcf.version>
-        <gpp-encoder.version>3.2.3</gpp-encoder.version>
+        <gpp-encoder.version>3.2.4</gpp-encoder.version>
         <maxmind-client.version>4.2.1</maxmind-client.version>
         <protobuf.version>3.25.6</protobuf.version>
         <protoc.version>${protobuf.version}</protoc.version>

src/main/java/org/prebid/server/bidder/afront/AfrontBidder.java

@@ -0,0 +1,146 @@
+package org.prebid.server.bidder.afront;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.iab.openrtb.request.BidRequest;
+import com.iab.openrtb.request.Device;
+import com.iab.openrtb.request.Imp;
+import com.iab.openrtb.response.BidResponse;
+import com.iab.openrtb.response.SeatBid;
+import io.vertx.core.MultiMap;
+import org.apache.commons.collections4.CollectionUtils;
+import org.prebid.server.bidder.Bidder;
+import org.prebid.server.bidder.model.BidderBid;
+import org.prebid.server.bidder.model.BidderCall;
+import org.prebid.server.bidder.model.BidderError;
+import org.prebid.server.bidder.model.HttpRequest;
+import org.prebid.server.bidder.model.Result;
+import org.prebid.server.exception.PreBidException;
+import org.prebid.server.json.DecodeException;
+import org.prebid.server.json.JacksonMapper;
+import org.prebid.server.proto.openrtb.ext.ExtPrebid;
+import org.prebid.server.proto.openrtb.ext.request.afront.ExtImpAfront;
+import org.prebid.server.proto.openrtb.ext.response.BidType;
+import org.prebid.server.util.BidderUtil;
+import org.prebid.server.util.HttpUtil;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+public class AfrontBidder implements Bidder<BidRequest> {
+
+    private static final TypeReference<ExtPrebid<?, ExtImpAfront>> TYPE_REFERENCE = new TypeReference<>() {
+    };
+
+    private static final String ACCOUNT_ID_MACRO = "{{AccountId}}";
+    private static final String SOURCE_ID_MACRO = "{{SourceId}}";
+
+    private final String endpointUrl;
+    private final JacksonMapper mapper;
+
+    public AfrontBidder(String endpointUrl, JacksonMapper mapper) {
+        this.endpointUrl = HttpUtil.validateUrl(Objects.requireNonNull(endpointUrl));
+        this.mapper = Objects.requireNonNull(mapper);
+    }
+
+    @Override
+    public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest request) {
+        final ExtImpAfront extImp;
+        try {
+            extImp = parseImpExt(request.getImp().getFirst());
+        } catch (PreBidException e) {
+            return Result.withError(BidderError.badInput(e.getMessage()));
+        }
+
+        final String resolvedEndpoint = resolveEndpoint(extImp);
+        final BidRequest outgoingRequest = modifyRequest(request);
+        final HttpRequest<BidRequest> httpRequest =
+                BidderUtil.defaultRequest(outgoingRequest, makeHeaders(request.getDevice()), resolvedEndpoint, mapper);
+
+        return Result.withValue(httpRequest);
+    }
+
+    private ExtImpAfront parseImpExt(Imp imp) {
+        try {
+            return mapper.mapper().convertValue(imp.getExt(), TYPE_REFERENCE).getBidder();
+        } catch (IllegalArgumentException e) {
+            throw new PreBidException("ext.bidder not provided");
+        }
+    }
+
+    private String resolveEndpoint(ExtImpAfront extImp) {
+        return endpointUrl
+                .replace(ACCOUNT_ID_MACRO, HttpUtil.encodeUrl(extImp.getAccountId()))
+                .replace(SOURCE_ID_MACRO, HttpUtil.encodeUrl(extImp.getSourceId()));
+    }
+
+    private static BidRequest modifyRequest(BidRequest request) {
+        final List<Imp> modifiedImps = request.getImp().stream()
+                .map(imp -> imp.toBuilder().ext(null).build())
+                .toList();
+
+        return request.toBuilder()
+                .imp(modifiedImps)
+                .build();
+    }
+
+    private static MultiMap makeHeaders(Device device) {
+        final MultiMap headers = HttpUtil.headers()
+                .add(HttpUtil.X_OPENRTB_VERSION_HEADER, "2.5");
+
+        if (device != null) {
+            HttpUtil.addHeaderIfValueIsNotEmpty(headers, HttpUtil.X_FORWARDED_FOR_HEADER, device.getIpv6());
+            HttpUtil.addHeaderIfValueIsNotEmpty(headers, HttpUtil.X_FORWARDED_FOR_HEADER, device.getIp());
+            HttpUtil.addHeaderIfValueIsNotEmpty(headers, HttpUtil.USER_AGENT_HEADER, device.getUa());
+        }
+
+        return headers;
+    }
+
+    @Override
+    public Result<List<BidderBid>> makeBids(BidderCall<BidRequest> httpCall, BidRequest bidRequest) {
+        try {
+            final BidResponse bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class);
+            return Result.withValues(extractBids(bidRequest, bidResponse));
+        } catch (DecodeException e) {
+            return Result.withError(BidderError.badServerResponse(e.getMessage()));
+        }
+    }
+
+    private static List<BidderBid> extractBids(BidRequest bidRequest, BidResponse bidResponse) {
+        if (bidResponse == null || CollectionUtils.isEmpty(bidResponse.getSeatbid())) {
+            return Collections.emptyList();
+        }
+        return bidsFromResponse(bidRequest, bidResponse);
+    }
+
+    private static List<BidderBid> bidsFromResponse(BidRequest bidRequest, BidResponse bidResponse) {
+        final Map<String, Imp> imps = bidRequest.getImp().stream()
+                .collect(Collectors.toMap(Imp::getId, Function.identity()));
+
+        return bidResponse.getSeatbid().stream()
+                .filter(Objects::nonNull)
+                .map(SeatBid::getBid)
+                .filter(Objects::nonNull)
+                .flatMap(Collection::stream)
+                .filter(Objects::nonNull)
+                .map(bid -> BidderBid.of(bid, getBidType(bid.getImpid(), imps), bidResponse.getCur()))
+                .collect(Collectors.toList());
+    }
+
+    private static BidType getBidType(String impId, Map<String, Imp> imps) {
+        final Imp imp = imps.get(impId);
+        if (imp != null) {
+            if (imp.getVideo() != null) {
+                return BidType.video;
+            } else if (imp.getXNative() != null) {
+                return BidType.xNative;
+            }
+        }
+        return BidType.banner;
+    }
+}

src/main/java/org/prebid/server/bidder/ix/IxBidder.java

@@ -21,7 +21,6 @@
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.prebid.server.bidder.Bidder;
-import org.prebid.server.bidder.ix.model.request.IxDiag;
 import org.prebid.server.bidder.ix.model.response.IxBidResponse;
 import org.prebid.server.bidder.ix.model.response.IxExtBidResponse;
 import org.prebid.server.bidder.ix.model.response.NativeV11Wrapper;
@@ -65,6 +64,8 @@ public class IxBidder implements Bidder<BidRequest> {
     private static final TypeReference<ExtPrebid<?, ExtImpIx>> IX_EXT_TYPE_REFERENCE =
             new TypeReference<>() {
             };
+    private static final String PBSP_JAVA = "java";
+    private static final String PBS_VERSION_UNKNOWN = "unknown";
 
     private final String endpointUrl;
     private final PrebidVersionProvider prebidVersionProvider;
@@ -204,11 +205,11 @@ private ExtRequest modifyRequestExt(ExtRequest extRequest, Set<String> siteIds)
             modifiedExt = ExtRequest.empty();
         }
 
-        modifiedExt.addProperty("ixdiag", mapper.mapper().valueToTree(makeDiagData(extRequest, siteIds)));
+        modifiedExt.addProperty("ixdiag", makeDiagData(extRequest, siteIds));
         return modifiedExt;
     }
 
-    private IxDiag makeDiagData(ExtRequest extRequest, Set<String> siteIds) {
+    private ObjectNode makeDiagData(ExtRequest extRequest, Set<String> siteIds) {
         final String pbjsv = Optional.ofNullable(extRequest)
                 .map(ExtRequest::getPrebid)
                 .map(ExtRequestPrebid::getChannel)
@@ -221,7 +222,23 @@ private IxDiag makeDiagData(ExtRequest extRequest, Set<String> siteIds) {
                 ? siteIds.stream().sorted().collect(Collectors.joining(", "))
                 : null;
 
-        return IxDiag.of(pbsv, pbjsv, multipleSiteIds);
+        final ObjectNode ixdiag = Optional.ofNullable(extRequest)
+                .map(ext -> ext.getProperty("ixdiag"))
+                .filter(JsonNode::isObject)
+                .map(ObjectNode.class::cast)
+                .orElse(mapper.mapper().createObjectNode())
+                .put("pbsv", pbsv == null ? PBS_VERSION_UNKNOWN : pbsv)
+                .put("pbsp", PBSP_JAVA);
+
+        if (multipleSiteIds != null) {
+            ixdiag.put("multipleSiteIds", multipleSiteIds);
+        }
+
+        if (pbjsv != null) {
+            ixdiag.put("pbjsv", pbjsv);
+        }
+
+        return ixdiag;
     }
 
     @Override

src/main/java/org/prebid/server/bidder/onetag/OnetagBidder.java

@@ -22,7 +22,6 @@
 import org.prebid.server.util.BidderUtil;
 import org.prebid.server.util.HttpUtil;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -45,20 +44,18 @@ public OnetagBidder(String endpointUrl, JacksonMapper mapper) {
 
     @Override
     public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest request) {
-        final List<Imp> modifiedImps = new ArrayList<>();
         String requestPubId = null;
         for (Imp imp : request.getImp()) {
             try {
                 final ExtImpOnetag impExt = parseImpExt(imp);
                 requestPubId = resolveAndValidatePubId(impExt.getPubId(), requestPubId);
-
-                modifiedImps.add(imp.toBuilder().ext(impExt.getExt()).build());
             } catch (PreBidException e) {
                 return Result.withError(BidderError.badInput(e.getMessage()));
             }
         }
 
-        return Result.withValue(createRequest(request, modifiedImps, requestPubId));
+        final String url = endpointUrl.replace(URL_PUBLISHER_ID_MACRO, StringUtils.defaultString(requestPubId));
+        return Result.withValue(BidderUtil.defaultRequest(request, url, mapper));
     }
 
     private ExtImpOnetag parseImpExt(Imp imp) {
@@ -69,8 +66,8 @@ private ExtImpOnetag parseImpExt(Imp imp) {
         }
     }
 
-    private String resolveAndValidatePubId(String impExtPubId, String requestPubId) {
-        if (StringUtils.isEmpty(impExtPubId)) {
+    private static String resolveAndValidatePubId(String impExtPubId, String requestPubId) {
+        if (StringUtils.isBlank(impExtPubId)) {
             throw new PreBidException("The publisher ID must not be empty");
         }
         if (requestPubId != null && !impExtPubId.equals(requestPubId)) {
@@ -79,13 +76,6 @@ private String resolveAndValidatePubId(String impExtPubId, String requestPubId)
         return impExtPubId;
     }
 
-    private HttpRequest<BidRequest> createRequest(BidRequest request, List<Imp> imps, String pubId) {
-        final String url = endpointUrl.replace(URL_PUBLISHER_ID_MACRO, pubId);
-        final BidRequest outgoingRequest = request.toBuilder().imp(imps).build();
-
-        return BidderUtil.defaultRequest(outgoingRequest, url, mapper);
-    }
-
     @Override
     public final Result<List<BidderBid>> makeBids(BidderCall<BidRequest> httpCall, BidRequest bidRequest) {
         try {

src/main/java/org/prebid/server/proto/openrtb/ext/request/afront/ExtImpAfront.java

@@ -0,0 +1,14 @@
+package org.prebid.server.proto.openrtb.ext.request.afront;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Value;
+
+@Value(staticConstructor = "of")
+public class ExtImpAfront {
+
+    @JsonProperty("accountId")
+    String accountId;
+
+    @JsonProperty("sourceId")
+    String sourceId;
+}

src/main/java/org/prebid/server/spring/config/bidder/AfrontConfiguration.java

@@ -0,0 +1,41 @@
+package org.prebid.server.spring.config.bidder;
+
+import org.prebid.server.bidder.BidderDeps;
+import org.prebid.server.bidder.afront.AfrontBidder;
+import org.prebid.server.json.JacksonMapper;
+import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties;
+import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler;
+import org.prebid.server.spring.config.bidder.util.UsersyncerCreator;
+import org.prebid.server.spring.env.YamlPropertySourceFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+
+import jakarta.validation.constraints.NotBlank;
+
+@Configuration
+@PropertySource(value = "classpath:/bidder-config/afront.yaml", factory = YamlPropertySourceFactory.class)
+public class AfrontConfiguration {
+
+    private static final String BIDDER_NAME = "afront";
+
+    @Bean("afrontConfigurationProperties")
+    @ConfigurationProperties("adapters.afront")
+    BidderConfigurationProperties configurationProperties() {
+        return new BidderConfigurationProperties();
+    }
+
+    @Bean
+    BidderDeps afrontBidderDeps(BidderConfigurationProperties afrontConfigurationProperties,
+                                @NotBlank @Value("${external-url}") String externalUrl,
+                                JacksonMapper mapper) {
+
+        return BidderDepsAssembler.forBidder(BIDDER_NAME)
+                .withConfig(afrontConfigurationProperties)
+                .usersyncerCreator(UsersyncerCreator.create(externalUrl))
+                .bidderCreator(config -> new AfrontBidder(config.getEndpoint(), mapper))
+                .assemble();
+    }
+}

src/main/resources/bidder-config/afront.yaml

@@ -0,0 +1,22 @@
+# Contact support@afront.io to connect with Afront exchange.
+# We have the following regional endpoint sub-domains:
+# US East: snt1
+# APAC: snt2
+# EU: snt3
+# Please deploy this config in each of your datacenters with the appropriate regional subdomain
+adapters:
+  afront:
+    endpoint: https://snt1.afront.io/?rsd={{SourceId}}&sk={{AccountId}}
+    endpoint-compression: gzip
+    meta-info:
+      maintainer-email: support@afront.io
+      app-media-types:
+        - banner
+        - video
+        - native
+      site-media-types:
+        - banner
+        - video
+        - native
+      supported-vendors:
+      vendor-id: 0

src/main/resources/bidder-config/copper6ssp.yaml

@@ -12,7 +12,7 @@ adapters:
         - video
         - native
       supported-vendors:
-      vendor-id: 0
+      vendor-id: 1356
     usersync:
       cookie-family-name: copper6ssp
       redirect:

src/main/resources/bidder-config/kobler.yaml

@@ -11,4 +11,6 @@ adapters:
       maintainer-email: bidding-support@kobler.no
       site-media-types:
       - banner
+      app-media-types:
+      - banner
       vendor-id: 0

src/main/resources/bidder-config/seedtag.yaml

@@ -12,6 +12,6 @@ adapters:
     usersync:
       cookie-family-name: seedtag
       iframe:
-        url: https://s.seedtag.com/cs/cookiesync/prebid?gdpr={{gdpr}}&gdpr_consent={{gdpr_consent}}&usp_consent={{us_privacy}}&redirect={{redirect_url}}
+        url: https://s.seedtag.com/cs/cookiesync/prebid?gdpr={{gdpr}}&gdpr_consent={{gdpr_consent}}&usp_consent={{us_privacy}}&gpp={{gpp}}&gpp_sid={{gpp_sid}}&redirect={{redirect_url}}
         support-cors: false
         uid-macro: '$UID'