Change domain fallback and harmonized hostname extraction

Author: t-sormonte

src/main/java/org/prebid/server/bidder/sparteo/SparteoBidder.java

@@ -13,6 +13,7 @@
 import com.iab.openrtb.response.BidResponse;
 import com.iab.openrtb.response.SeatBid;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.prebid.server.bidder.Bidder;
 import org.prebid.server.bidder.model.BidderBid;
 import org.prebid.server.bidder.model.BidderCall;
@@ -30,6 +31,8 @@
 import org.prebid.server.util.BidderUtil;
 import org.prebid.server.util.HttpUtil;
 
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -185,20 +188,58 @@ private String replaceMacros(Site site, App app, String networkId) {
         return resolveEndpoint(domain, networkId, bundle);
     }
 
+    private static String normalizeHostname(String host) {
+        String h = StringUtils.trimToEmpty(host);
+        if (h.isEmpty()) {
+            return "";
+        }
+
+        String hostname = null;
+        try {
+            hostname = new URI(h).getHost();
+        } catch (URISyntaxException e) {
+        }
+
+        if (StringUtils.isNotEmpty(hostname)) {
+            h = hostname;
+        } else {
+            if (h.contains(":")) {
+                h = StringUtils.substringBefore(h, ":");
+            } else {
+                h = StringUtils.substringBefore(h, "/");
+            }
+        }
+
+        h = h.toLowerCase();
+        h = StringUtils.removeStart(h, "www.");
+        h = StringUtils.removeEnd(h, ".");
+
+        return "null".equals(h) ? "" : h;
+    }
+
     private String resolveDomain(Site site, App app) {
         if (site != null) {
-            final String siteDomain = site.getDomain();
+            final String siteDomain = normalizeHostname(site.getDomain());
             if (siteDomain != null && !siteDomain.isEmpty()) {
                 return siteDomain;
             }
-            final Publisher pub = site.getPublisher();
-            if (pub != null && pub.getDomain() != null && !pub.getDomain().isEmpty()) {
-                return pub.getDomain();
+        }
+
+        if (app != null) {
+            final String appDomain = normalizeHostname(app.getDomain());
+            if (appDomain != null && !appDomain.isEmpty()) {
+                return appDomain;
             }
+            return null;
         }
-        if (app != null && app.getDomain() != null && !app.getDomain().isEmpty()) {
-            return app.getDomain();
+
+        if (site != null) {
+            final String fromPage = normalizeHostname(site.getPage());
+            if (fromPage != null && !fromPage.isEmpty()) {
+                return fromPage;
+            }
         }
+
         return null;
     }
 

src/test/java/org/prebid/server/bidder/sparteo/SparteoBidderTest.java

@@ -683,12 +683,12 @@ public void makeBidsShouldReturnEmptyResultWhenSeatBidHasEmptyBidList() throws J
     public void makeHttpRequestsShouldAppendDomainAndNetworkIdAsQueryParams() {
         // given
         final ObjectNode impExt = mapper.createObjectNode();
-        impExt.set("bidder", mapper.createObjectNode()
-                .put("networkId", "testNetworkId"));
+        impExt.set("bidder", mapper.createObjectNode().put("networkId", "testNetworkId"));
 
         final BidRequest bidRequest = givenBidRequest(
                 request -> request.site(Site.builder()
-                        .publisher(Publisher.builder().domain("dev.sparteo.com").build())
+                        .domain("dev.sparteo.com")
+                        .publisher(Publisher.builder().build())
                         .build()),
                 givenImp(imp -> imp.ext(impExt)));
 
@@ -700,8 +700,34 @@ public void makeHttpRequestsShouldAppendDomainAndNetworkIdAsQueryParams() {
         assertThat(result.getValue()).hasSize(1);
 
         final String uri = result.getValue().get(0).getUri();
+        assertThat(uri).isEqualTo(
+                "https://test.sparteo.com/endpoint?network_id=testNetworkId&domain=dev.sparteo.com");
+    }
+
+    @Test
+    public void makeHttpRequestsShouldAppendSitePageDomainAndNetworkIdAsQueryParams() {
+        // given
+        final ObjectNode impExt = mapper.createObjectNode();
+        impExt.set("bidder", mapper.createObjectNode().put("networkId", "testNetworkId"));
+
+        final BidRequest bidRequest = givenBidRequest(
+                request -> request.site(Site.builder()
+                        .domain(null)
+                        .page("https://www.dev.sparteo.com:3000/p")
+                        .publisher(Publisher.builder().build())
+                        .build()),
+                givenImp(imp -> imp.ext(impExt)));
+
+        // when
+        final Result<List<HttpRequest<BidRequest>>> result = sparteoBidder.makeHttpRequests(bidRequest);
+
+        // then
+        assertThat(result.getErrors()).isEmpty();
+        assertThat(result.getValue()).hasSize(1);
 
-        assertThat(uri).isEqualTo("https://test.sparteo.com/endpoint?network_id=testNetworkId&domain=dev.sparteo.com");
+        final String uri = result.getValue().get(0).getUri();
+        assertThat(uri).isEqualTo(
+                "https://test.sparteo.com/endpoint?network_id=testNetworkId&domain=dev.sparteo.com");
     }
 
     @Test
@@ -920,6 +946,58 @@ public void makeHttpRequestsShouldNotAppendBundleWhenNoAppBundle() {
                 .isEqualTo("https://test.sparteo.com/endpoint?network_id=networkId&domain=dev.sparteo.com");
     }
 
+    @Test
+    public void normalizeHostnameShouldReturnBaseDomain() {
+        final String base = "dev.sparteo.com";
+
+        // Already normalized
+        assertThat(normalize(base)).isEqualTo(base);
+
+        // Case folding + trimming
+        assertThat(normalize("DeV.SpArTeO.CoM")).isEqualTo(base);
+        assertThat(normalize("  " + base + "  ")).isEqualTo(base);
+
+        // Strip leading "www."
+        assertThat(normalize("www." + base)).isEqualTo(base);
+        assertThat(normalize("WWW." + base)).isEqualTo(base);
+
+        // Strip exactly ONE trailing dot
+        assertThat(normalize(base + ".")).isEqualTo(base);
+        // Pathological: multiple trailing dots → only one removed by the method
+        assertThat(normalize(base + "..")).isEqualTo(base + ".");
+
+        // Literal "null" (any case) -> empty string
+        assertThat(normalize("null")).isEqualTo("");
+        assertThat(normalize("NuLl")).isEqualTo("");
+
+        // Empty / whitespace-only -> empty string
+        assertThat(normalize("")).isEqualTo("");
+        assertThat(normalize("   ")).isEqualTo("");
+
+        // Non-"www" prefixes are NOT stripped
+        assertThat(normalize("www2." + base)).isEqualTo("www2." + base);
+
+        // Bare host + port
+        assertThat(normalize("www." + base + ":8080")).isEqualTo(base);
+        assertThat(normalize("DEV.SPARTEO.COM:443")).isEqualTo(base);
+        assertThat(normalize(base + ".:8443")).isEqualTo(base); // trailing dot + port
+
+        // Bare host + path
+        assertThat(normalize(base + "/some/path?x=1")).isEqualTo(base);
+        assertThat(normalize("www." + base + "/p")).isEqualTo(base);
+
+        // Bare host + port + path
+        assertThat(normalize(base + ":8080/p?q=1")).isEqualTo(base);
+        assertThat(normalize("www." + base + ":3000/some/path")).isEqualTo(base);
+
+        // Absolute URLs
+        assertThat(normalize("https://www." + base + "/x")).isEqualTo(base);
+        assertThat(normalize("http://WWW." + base + ":8080/abc")).isEqualTo(base);
+
+        // Odd spacing around URL
+        assertThat(normalize("   https://www." + base + ":3000/x  ")).isEqualTo(base);
+    }
+
     private BidRequest givenBidRequest(UnaryOperator<BidRequest.BidRequestBuilder> customizer, Imp... imps) {
         return customizer.apply(BidRequest.builder().imp(asList(imps))).build();
     }
@@ -979,4 +1057,14 @@ private ObjectNode createBidExtWithEmptyPrebid() {
         bidExt.set("prebid", mapper.createObjectNode());
         return bidExt;
     }
+
+    private static String normalize(String in) {
+        try {
+            final var m = SparteoBidder.class.getDeclaredMethod("normalizeHostname", String.class);
+            m.setAccessible(true);
+            return (String) m.invoke(null, in);
+        } catch (ReflectiveOperationException e) {
+            throw new RuntimeException("Unable to call normalizeHostname via reflection", e);
+        }
+    }
 }