From f2a7e5ec6b327366b0976fa5c4405c5c40037bb5 Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Tue, 26 May 2020 15:48:21 +0200
Subject: [PATCH] [Grid] Changing host header before forwarding commands to the
 driver

Fixes #8326 and fixes #7821
ChromeDriver will reject requests if the host header contains something different
than localhost and no whitelistedIps are configured.
This does not affect other drivers.
---
 .../openqa/selenium/grid/node/ProtocolConvertingSession.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/java/server/src/org/openqa/selenium/grid/node/ProtocolConvertingSession.java b/java/server/src/org/openqa/selenium/grid/node/ProtocolConvertingSession.java
index a470bfc7b11d7..5e7dbfcdd2f46 100644
--- a/java/server/src/org/openqa/selenium/grid/node/ProtocolConvertingSession.java
+++ b/java/server/src/org/openqa/selenium/grid/node/ProtocolConvertingSession.java
@@ -61,6 +61,9 @@ protected ProtocolConvertingSession(
 
   @Override
   public HttpResponse execute(HttpRequest req) {
+    String host = "host";
+    req.removeHeader(host);
+    req.addHeader(host, String.format("%s:%s", getUri().getHost(), getUri().getPort()));
     HttpResponse res = handler.execute(req);
     if (req.getMethod() == DELETE && killUrl.equals(req.getUri())) {
       stop();