Merge branch 'refs/heads/get-interface' into functional-tests/general-get-interface

Author: osulzhenko

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

@@ -12,6 +12,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.function.Function;
 
 /**
@@ -72,12 +73,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()
@@ -90,7 +92,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/util/HttpUtil.java

@@ -40,8 +40,10 @@ public final class HttpUtil {
             HttpHeaderValues.APPLICATION_JSON + ";" + HttpHeaderValues.CHARSET + "="
                     + StandardCharsets.UTF_8.toString().toLowerCase();
 
+    public static final CharSequence TRUE_CLIENT_IP_HEADER = HttpHeaders.createOptimized("True-Client-Ip");
     public static final CharSequence X_FORWARDED_FOR_HEADER = HttpHeaders.createOptimized("X-Forwarded-For");
     public static final CharSequence X_REAL_IP_HEADER = HttpHeaders.createOptimized("X-Real-Ip");
+    public static final CharSequence X_DEVICE_IP_HEADER = HttpHeaders.createOptimized("X-Device-Ip");
     public static final CharSequence DNT_HEADER = HttpHeaders.createOptimized("DNT");
     public static final CharSequence ORIGIN_HEADER = HttpHeaders.createOptimized("Origin");
     public static final CharSequence ACCEPT_HEADER = HttpHeaders.createOptimized("Accept");
@@ -53,6 +55,7 @@ public final class HttpUtil {
     public static final CharSequence X_REQUESTED_WITH_HEADER = HttpHeaders.createOptimized("X-Requested-With");
     public static final CharSequence REFERER_HEADER = HttpHeaders.createOptimized("Referer");
     public static final CharSequence USER_AGENT_HEADER = HttpHeaders.createOptimized("User-Agent");
+    public static final CharSequence X_DEVICE_USER_AGENT_HEADER = HttpHeaders.createOptimized("X-Device-User-Agent");
     public static final CharSequence COOKIE_HEADER = HttpHeaders.createOptimized("Cookie");
     public static final CharSequence SEC_COOKIE_DEPRECATION =
             HttpHeaders.createOptimized("Sec-Cookie-Deprecation");