New endpoint: GET /openrtb2/auction

extra/modules/wurfl-devicedetection/src/main/java/org/prebid/server/hooks/modules/com/scientiamobile/wurfl/devicedetection/v1/OrtbDeviceUpdater.java

@@ -241,7 +241,7 @@ private ExtDevice updateExt(ExtDevice ortbExtDevice) {
     }
 
     private ExtDevice copyExtDevice(ExtDevice original) {
-        final ExtDevice copy = ExtDevice.of(original.getAtts(), original.getPrebid());
+        final ExtDevice copy = ExtDevice.of(original.getAtts(), original.getIfaType(), original.getPrebid());
         mapper.fillExtension(copy, original);
         return copy;
     }

extra/modules/wurfl-devicedetection/src/test/java/org/prebid/server/hooks/modules/com/scientiamobile/wurfl/devicedetection/v1/WURFLDeviceDetectionRawAuctionRequestHookTest.java

@@ -95,7 +95,7 @@ public void callShouldReturnNoActionWhenDeviceHasWurflProperty() {
         // given
         final String ua = "Mozilla/5.0 (testPhone; CPU testPhone OS 1_0_2) Version/17.4.1 Mobile/12E GrandTest/604.1";
         final ExtDevicePrebid extDevicePrebid = ExtDevicePrebid.of(ExtDeviceInt.of(80, 80));
-        final ExtDevice extDevice = ExtDevice.of(0, extDevicePrebid);
+        final ExtDevice extDevice = ExtDevice.of(0, null, extDevicePrebid);
         final ObjectNode wurfl = mapper.mapper().createObjectNode();
         wurfl.put("wurfl_id", "test_phone_ver1");
         extDevice.addProperty("wurfl", wurfl);

src/main/java/org/prebid/server/auction/ImplicitParametersExtractor.java

@@ -13,6 +13,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.function.Function;
 
 /**
@@ -73,12 +74,13 @@ public List<String> ipFrom(MultiMap headers, String host) {
 
     private List<String> ipFrom(Function<String, String> headerGetter, String host) {
         final List<String> candidates = new ArrayList<>();
-        candidates.add(headerGetter.apply("True-Client-IP"));
-        final String xff = headerGetter.apply("X-Forwarded-For");
+        candidates.add(headerGetter.apply(HttpUtil.TRUE_CLIENT_IP_HEADER.toString()));
+        final String xff = headerGetter.apply(HttpUtil.X_FORWARDED_FOR_HEADER.toString());
         if (xff != null) {
             candidates.addAll(Arrays.asList(xff.split(",")));
         }
-        candidates.add(headerGetter.apply("X-Real-IP"));
+        candidates.add(headerGetter.apply(HttpUtil.X_REAL_IP_HEADER.toString()));
+        candidates.add(headerGetter.apply(HttpUtil.X_DEVICE_IP_HEADER.toString()));
         candidates.add(host);
 
         return candidates.stream()
@@ -91,7 +93,12 @@ private List<String> ipFrom(Function<String, String> headerGetter, String host)
      * Determines User-Agent by checking 'User-Agent' http header.
      */
     public String uaFrom(HttpRequestContext request) {
-        return StringUtils.trimToNull(request.getHeaders().get(HttpUtil.USER_AGENT_HEADER));
+        return Optional.ofNullable(getTrimmedHeader(request, HttpUtil.USER_AGENT_HEADER))
+                .orElseGet(() -> getTrimmedHeader(request, HttpUtil.X_DEVICE_USER_AGENT_HEADER));
+    }
+
+    private static String getTrimmedHeader(HttpRequestContext request, CharSequence header) {
+        return StringUtils.trimToNull(request.getHeaders().get(header));
     }
 
     /**

src/main/java/org/prebid/server/auction/requestfactory/AmpRequestFactory.java

@@ -530,7 +530,7 @@ private BidRequest fillExplicitParameters(BidRequest bidRequest, Account account
      */
     private BidRequest overrideParameters(BidRequest bidRequest, HttpRequestContext httpRequest, List<String> errors) {
         final String requestTargeting = httpRequest.getQueryParams().get(TARGETING_REQUEST_PARAM);
-        final ObjectNode targetingNode = readTargeting(requestTargeting);
+        final ObjectNode targetingNode = readTargeting(requestTargeting, mapper);
         final String referer = implicitParametersExtractor.refererFrom(httpRequest);
         ortbTypesResolver.normalizeTargeting(targetingNode, errors, referer);
 
@@ -547,7 +547,7 @@ private BidRequest overrideParameters(BidRequest bidRequest, HttpRequestContext
         return bidRequest;
     }
 
-    private ObjectNode readTargeting(String jsonTargeting) {
+    public static ObjectNode readTargeting(String jsonTargeting, JacksonMapper mapper) {
         try {
             final String decodedJsonTargeting = HttpUtil.decodeUrl(jsonTargeting);
             final JsonNode jsonNodeTargeting = decodedJsonTargeting != null
@@ -559,7 +559,7 @@ private ObjectNode readTargeting(String jsonTargeting) {
         }
     }
 
-    private ObjectNode validateAndGetTargeting(JsonNode jsonNodeTargeting) {
+    private static ObjectNode validateAndGetTargeting(JsonNode jsonNodeTargeting) {
         if (jsonNodeTargeting.isObject()) {
             return (ObjectNode) jsonNodeTargeting;
         } else {

src/main/java/org/prebid/server/auction/requestfactory/AuctionRequestFactory.java → src/main/java/org/prebid/server/auction/requestfactory/PostAuctionRequestFactory.java

@@ -34,10 +34,9 @@
 import java.util.Objects;
 import java.util.Optional;
 
-/**
- * Used in OpenRTB request processing.
- */
-public class AuctionRequestFactory {
+public class PostAuctionRequestFactory {
+
+    private static final String ENDPOINT = Endpoint.openrtb2_auction.value();
 
     private final Ortb2RequestFactory ortb2RequestFactory;
     private final StoredRequestProcessor storedRequestProcessor;
@@ -55,23 +54,21 @@ public class AuctionRequestFactory {
     private final GeoLocationServiceWrapper geoLocationServiceWrapper;
     private final BidAdjustmentsEnricher bidAdjustmentsEnricher;
 
-    private static final String ENDPOINT = Endpoint.openrtb2_auction.value();
-
-    public AuctionRequestFactory(Ortb2RequestFactory ortb2RequestFactory,
-                                 StoredRequestProcessor storedRequestProcessor,
-                                 ProfilesProcessor profilesProcessor,
-                                 BidRequestOrtbVersionConversionManager ortbVersionConversionManager,
-                                 AuctionGppService gppService,
-                                 CookieDeprecationService cookieDeprecationService,
-                                 ImplicitParametersExtractor paramsExtractor,
-                                 Ortb2ImplicitParametersResolver paramsResolver,
-                                 InterstitialProcessor interstitialProcessor,
-                                 OrtbTypesResolver ortbTypesResolver,
-                                 AuctionPrivacyContextFactory auctionPrivacyContextFactory,
-                                 DebugResolver debugResolver,
-                                 JacksonMapper mapper,
-                                 GeoLocationServiceWrapper geoLocationServiceWrapper,
-                                 BidAdjustmentsEnricher bidAdjustmentsEnricher) {
+    public PostAuctionRequestFactory(Ortb2RequestFactory ortb2RequestFactory,
+                                     StoredRequestProcessor storedRequestProcessor,
+                                     ProfilesProcessor profilesProcessor,
+                                     BidRequestOrtbVersionConversionManager ortbVersionConversionManager,
+                                     AuctionGppService gppService,
+                                     CookieDeprecationService cookieDeprecationService,
+                                     ImplicitParametersExtractor paramsExtractor,
+                                     Ortb2ImplicitParametersResolver paramsResolver,
+                                     InterstitialProcessor interstitialProcessor,
+                                     OrtbTypesResolver ortbTypesResolver,
+                                     AuctionPrivacyContextFactory auctionPrivacyContextFactory,
+                                     DebugResolver debugResolver,
+                                     JacksonMapper mapper,
+                                     GeoLocationServiceWrapper geoLocationServiceWrapper,
+                                     BidAdjustmentsEnricher bidAdjustmentsEnricher) {
 
         this.ortb2RequestFactory = Objects.requireNonNull(ortb2RequestFactory);
         this.storedRequestProcessor = Objects.requireNonNull(storedRequestProcessor);
@@ -90,9 +87,6 @@ public AuctionRequestFactory(Ortb2RequestFactory ortb2RequestFactory,
         this.bidAdjustmentsEnricher = Objects.requireNonNull(bidAdjustmentsEnricher);
     }
 
-    /**
-     * Creates {@link AuctionContext} and parses BidRequest based on {@link RoutingContext}.
-     */
     public Future<AuctionContext> parseRequest(RoutingContext routingContext, long startTime) {
         final String body;
         try {
@@ -112,9 +106,6 @@ public Future<AuctionContext> parseRequest(RoutingContext routingContext, long s
                 .recover(ortb2RequestFactory::restoreResultFromRejection);
     }
 
-    /**
-     * Enriches {@link AuctionContext}.
-     */
     public Future<AuctionContext> enrichAuctionContext(AuctionContext initialContext) {
         if (initialContext.isRequestRejected()) {
             return Future.succeededFuture(initialContext);
@@ -228,10 +219,6 @@ private Regs fillRegsWithValuesFromHttpRequest(Regs regs, HttpRequestContext htt
                 .build();
     }
 
-    /**
-     * Sets {@link BidRequest} properties which were not set explicitly by the client, but can be
-     * updated by values derived from headers and other request attributes.
-     */
     private Future<BidRequest> updateAndValidateBidRequest(AuctionContext auctionContext) {
         final Account account = auctionContext.getAccount();
         final HttpRequestContext httpRequest = auctionContext.getHttpRequest();