Fix ext.prebid.analytics flag to be tolerant for invalid input (#1283)

Author: rpanchyk

src/main/java/org/prebid/server/analytics/AnalyticsReporterDelegator.java

@@ -114,9 +114,8 @@ private void logUnknownAdapters(AuctionEvent auctionEvent) {
         final BidRequest bidRequest = auctionEvent.getAuctionContext().getBidRequest();
         final ExtRequest extRequest = bidRequest.getExt();
         final ExtRequestPrebid extPrebid = extRequest != null ? extRequest.getPrebid() : null;
-        final ObjectNode analytics = extPrebid != null ? extPrebid.getAnalytics() : null;
-        final Iterator<String> analyticsFieldNames = analytics != null && !analytics.isEmpty()
-                ? analytics.fieldNames() : null;
+        final JsonNode analytics = extPrebid != null ? extPrebid.getAnalytics() : null;
+        final Iterator<String> analyticsFieldNames = isNotEmptyObjectNode(analytics) ? analytics.fieldNames() : null;
 
         if (analyticsFieldNames != null) {
             final List<String> unknownAdapterNames = StreamUtil.asStream(analyticsFieldNames)
@@ -132,6 +131,10 @@ private void logUnknownAdapters(AuctionEvent auctionEvent) {
         }
     }
 
+    private static boolean isNotEmptyObjectNode(JsonNode analytics) {
+        return analytics != null && analytics.isObject() && !analytics.isEmpty();
+    }
+
     private static <T> T updateEvent(T event, String adapter) {
         if (!ADAPTERS_PERMITTED_FOR_FULL_DATA.contains(adapter) && event instanceof AuctionEvent) {
             final AuctionEvent auctionEvent = (AuctionEvent) event;
@@ -154,14 +157,14 @@ private static AuctionContext updateAuctionContextAdapter(AuctionContext context
     private static BidRequest updateBidRequest(BidRequest bidRequest, String adapterName) {
         final ExtRequest requestExt = bidRequest.getExt();
         final ExtRequestPrebid extPrebid = requestExt != null ? requestExt.getPrebid() : null;
-        final ObjectNode analytics = extPrebid != null ? extPrebid.getAnalytics() : null;
+        final JsonNode analytics = extPrebid != null ? extPrebid.getAnalytics() : null;
         ObjectNode preparedAnalytics = null;
-        if (analytics != null && !analytics.isEmpty()) {
-            preparedAnalytics = prepareAnalytics(analytics, adapterName);
+        if (isNotEmptyObjectNode(analytics)) {
+            preparedAnalytics = prepareAnalytics((ObjectNode) analytics, adapterName);
         }
-        final ExtRequest updatedExtRequest = preparedAnalytics != null ? ExtRequest.of(extPrebid.toBuilder()
-                .analytics(preparedAnalytics)
-                .build()) : null;
+        final ExtRequest updatedExtRequest = preparedAnalytics != null
+                ? ExtRequest.of(extPrebid.toBuilder().analytics(preparedAnalytics).build())
+                : null;
 
         if (updatedExtRequest != null) {
             updatedExtRequest.addProperties(requestExt.getProperties());

src/main/java/org/prebid/server/bidder/beachfront/BeachfrontBidder.java

@@ -421,7 +421,7 @@ private List<BeachfrontResponseSlot> makeBeachfrontResponseSlots(String response
             return mapper.mapper().readValue(
                     responseBody,
                     mapper.mapper().getTypeFactory().constructCollectionType(List.class, BeachfrontResponseSlot.class));
-        } catch (IOException ex) {
+        } catch (IOException e) {
             throw new PreBidException("server response failed to unmarshal "
                     + "as valid rtb. Run with request.debug = 1 for more info");
         }

src/main/java/org/prebid/server/handler/CookieSyncHandler.java

@@ -215,8 +215,8 @@ private void handleCookieSyncContextResult(AsyncResult<CookieSyncContext> cookie
             final TcfContext tcfContext = cookieSyncContext.getPrivacyContext().getTcfContext();
             try {
                 validateCookieSyncContext(cookieSyncContext);
-            } catch (InvalidRequestException | UnauthorizedUidsException ex) {
-                handleErrors(ex, routingContext, tcfContext);
+            } catch (InvalidRequestException | UnauthorizedUidsException e) {
+                handleErrors(e, routingContext, tcfContext);
                 return;
             }
 
@@ -648,7 +648,6 @@ private void handleErrors(Throwable error, RoutingContext routingContext, TcfCon
             metrics.updateUserSyncOptoutMetric();
             status = HttpResponseStatus.UNAUTHORIZED.code();
             body = String.format("Unauthorized: %s", message);
-
         } else {
             status = HttpResponseStatus.INTERNAL_SERVER_ERROR.code();
             body = String.format("Unexpected setuid processing error: %s", message);

src/main/java/org/prebid/server/handler/SetuidHandler.java

@@ -142,8 +142,8 @@ private void handleSetuidContextResult(AsyncResult<SetuidContext> setuidContextR
 
             try {
                 validateSetuidContext(setuidContext, bidder);
-            } catch (InvalidRequestException | UnauthorizedUidsException ex) {
-                handleErrors(ex, routingContext, tcfContext);
+            } catch (InvalidRequestException | UnauthorizedUidsException e) {
+                handleErrors(e, routingContext, tcfContext);
                 return;
             }
 

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

@@ -1,5 +1,6 @@
 package org.prebid.server.proto.openrtb.ext.request;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.Builder;
@@ -120,5 +121,5 @@ public class ExtRequestPrebid {
     /**
      * Defines the contract for bidrequest.ext.prebid.analytics
      */
-    ObjectNode analytics;
+    JsonNode analytics;
 }

src/test/java/org/prebid/server/analytics/AnalyticsReporterDelegatorTest.java

@@ -104,6 +104,29 @@ public void shouldPassEventToAllDelegates() {
         assertThat(captureEvent(secondReporter)).isSameAs(EVENT);
     }
 
+    @Test
+    public void shouldTolerateInvalidExtPrebidAnalyticsNode() {
+        // given
+        final TextNode analyticsNode = new TextNode("invalid");
+        final AuctionEvent givenAuctionEvent = givenAuctionEvent(bidRequestBuilder ->
+                bidRequestBuilder.ext(ExtRequest.of(ExtRequestPrebid.builder()
+                        .analytics(analyticsNode)
+                        .build())));
+
+        // when
+        target.processEvent(givenAuctionEvent, TcfContext.empty());
+
+        // then
+        verify(vertx, times(2)).runOnContext(any());
+        assertThat(asList(captureAuctionEvent(firstReporter), captureAuctionEvent(secondReporter)))
+                .extracting(AuctionEvent::getAuctionContext)
+                .extracting(AuctionContext::getBidRequest)
+                .extracting(BidRequest::getExt)
+                .extracting(ExtRequest::getPrebid)
+                .extracting(ExtRequestPrebid::getAnalytics)
+                .containsExactly(analyticsNode, analyticsNode);
+    }
+
     @Test
     public void shouldPassOnlyAdapterRelatedEntriesToAnalyticReporters() {
         // given