[dotnet] Fix CDP error getting body of redirect responses

SeleniumHQ · Oct 13, 2021 · e41fc34 · e41fc34
1 parent 21163d6
commit e41fc34
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 28 deletions.
diff --git a/dotnet/src/webdriver/DevTools/v85/V85Network.cs b/dotnet/src/webdriver/DevTools/v85/V85Network.cs
@@ -241,14 +241,18 @@ await fetch.ContinueWithAuth(new ContinueWithAuthCommandSettings()
         /// <returns>A task that represents the asynchronous operation.</returns>
         public override async Task AddResponseBody(HttpResponseData responseData)
         {
-            var bodyResponse = await fetch.GetResponseBody(new Fetch.GetResponseBodyCommandSettings() { RequestId = responseData.RequestId });
-            if (bodyResponse.Base64Encoded)
+            // If the response is a redirect, retrieving the body will throw an error in CDP.
+            if (responseData.StatusCode < 300 || responseData.StatusCode > 399)
             {
-                responseData.Body = Encoding.UTF8.GetString(Convert.FromBase64String(bodyResponse.Body));
-            }
-            else
-            {
-                responseData.Body = bodyResponse.Body;
+                var bodyResponse = await fetch.GetResponseBody(new Fetch.GetResponseBodyCommandSettings() { RequestId = responseData.RequestId });
+                if (bodyResponse.Base64Encoded)
+                {
+                    responseData.Body = Encoding.UTF8.GetString(Convert.FromBase64String(bodyResponse.Body));
+                }
+                else
+                {
+                    responseData.Body = bodyResponse.Body;
+                }
             }
         }
 

diff --git a/dotnet/src/webdriver/DevTools/v93/V93Network.cs b/dotnet/src/webdriver/DevTools/v93/V93Network.cs
@@ -241,14 +241,18 @@ await fetch.ContinueWithAuth(new ContinueWithAuthCommandSettings()
         /// <returns>A task that represents the asynchronous operation.</returns>
         public override async Task AddResponseBody(HttpResponseData responseData)
         {
-            var bodyResponse = await fetch.GetResponseBody(new Fetch.GetResponseBodyCommandSettings() { RequestId = responseData.RequestId });
-            if (bodyResponse.Base64Encoded)
+            // If the response is a redirect, retrieving the body will throw an error in CDP.
+            if (responseData.StatusCode < 300 || responseData.StatusCode > 399)
             {
-                responseData.Body = Encoding.UTF8.GetString(Convert.FromBase64String(bodyResponse.Body));
-            }
-            else
-            {
-                responseData.Body = bodyResponse.Body;
+                var bodyResponse = await fetch.GetResponseBody(new Fetch.GetResponseBodyCommandSettings() { RequestId = responseData.RequestId });
+                if (bodyResponse.Base64Encoded)
+                {
+                    responseData.Body = Encoding.UTF8.GetString(Convert.FromBase64String(bodyResponse.Body));
+                }
+                else
+                {
+                    responseData.Body = bodyResponse.Body;
+                }
             }
         }
 

diff --git a/dotnet/src/webdriver/DevTools/v94/V94Network.cs b/dotnet/src/webdriver/DevTools/v94/V94Network.cs
@@ -241,14 +241,18 @@ await fetch.ContinueWithAuth(new ContinueWithAuthCommandSettings()
         /// <returns>A task that represents the asynchronous operation.</returns>
         public override async Task AddResponseBody(HttpResponseData responseData)
         {
-            var bodyResponse = await fetch.GetResponseBody(new Fetch.GetResponseBodyCommandSettings() { RequestId = responseData.RequestId });
-            if (bodyResponse.Base64Encoded)
+            // If the response is a redirect, retrieving the body will throw an error in CDP.
+            if (responseData.StatusCode < 300 || responseData.StatusCode > 399)
             {
-                responseData.Body = Encoding.UTF8.GetString(Convert.FromBase64String(bodyResponse.Body));
-            }
-            else
-            {
-                responseData.Body = bodyResponse.Body;
+                var bodyResponse = await fetch.GetResponseBody(new Fetch.GetResponseBodyCommandSettings() { RequestId = responseData.RequestId });
+                if (bodyResponse.Base64Encoded)
+                {
+                    responseData.Body = Encoding.UTF8.GetString(Convert.FromBase64String(bodyResponse.Body));
+                }
+                else
+                {
+                    responseData.Body = bodyResponse.Body;
+                }
             }
         }
 

diff --git a/dotnet/src/webdriver/DevTools/v95/V95Network.cs b/dotnet/src/webdriver/DevTools/v95/V95Network.cs
@@ -241,14 +241,18 @@ await fetch.ContinueWithAuth(new ContinueWithAuthCommandSettings()
         /// <returns>A task that represents the asynchronous operation.</returns>
         public override async Task AddResponseBody(HttpResponseData responseData)
         {
-            var bodyResponse = await fetch.GetResponseBody(new Fetch.GetResponseBodyCommandSettings() { RequestId = responseData.RequestId });
-            if (bodyResponse.Base64Encoded)
+            // If the response is a redirect, retrieving the body will throw an error in CDP.
+            if (responseData.StatusCode < 300 || responseData.StatusCode > 399)
             {
-                responseData.Body = Encoding.UTF8.GetString(Convert.FromBase64String(bodyResponse.Body));
-            }
-            else
-            {
-                responseData.Body = bodyResponse.Body;
+                var bodyResponse = await fetch.GetResponseBody(new Fetch.GetResponseBodyCommandSettings() { RequestId = responseData.RequestId });
+                if (bodyResponse.Base64Encoded)
+                {
+                    responseData.Body = Encoding.UTF8.GetString(Convert.FromBase64String(bodyResponse.Body));
+                }
+                else
+                {
+                    responseData.Body = bodyResponse.Body;
+                }
             }
         }