Fix for Copilot CloudFlare Turnstile Verification fail 66/320666/9
authorchiragmaheshwari <c.maheshwari@samsung.com>
Wed, 20 Nov 2024 12:44:24 +0000 (18:14 +0530)
committerBot Blink <blinkbot@samsung.com>
Fri, 22 Nov 2024 09:02:08 +0000 (09:02 +0000)
To resolve CloudFlare Turnstile verification fail on Microsoft Copilot -
Reverted patch https://review.tizen.org/gerrit/#/c/255240/

Change-Id: If7809838cc0b0037b8949d0a1e4064adc7e7febb
Signed-off-by: chiragmaheshwari <c.maheshwari@samsung.com>
third_party/blink/renderer/core/loader/frame_loader.cc

index 61e6647a171261923855ba91609219638ce19783..8eaeee5106234d1794382efb3f0f4bd012def611 100644 (file)
@@ -813,21 +813,8 @@ void FrameLoader::StartNavigation(FrameLoadRequest& request,
     return;
   }
 
-  if (url.ProtocolIsJavaScript()) {
-    if (!origin_window ||
-        origin_window->CanExecuteScripts(kAboutToExecuteScript)) {
-      if (origin_window && request.GetFrameType() ==
-                               mojom::blink::RequestContextFrameType::kNested) {
-        LogJavaScriptUrlHistogram(origin_window, url.GetPath());
-      }
-
-      frame_->GetDocument()->ProcessJavaScriptUrl(url,
-                                                  request.JavascriptWorld());
-    }
-    return;
-  }
 #if BUILDFLAG(IS_TIZEN)
-  else {
+  {
     using CSPDisposition = network::mojom::CSPDisposition;
     CSPDisposition should_check_main_world_csp =
         ContentSecurityPolicy::ShouldBypassMainWorldDeprecated(
@@ -839,11 +826,26 @@ void FrameLoader::StartNavigation(FrameLoadRequest& request,
                       request.GetNavigationPolicy(),
                       should_check_main_world_csp,
                       ContentSecurityPolicy::CheckHeaderType::kCheckEnforce) ==
-        kNavigationPolicyIgnore)
+        kNavigationPolicyIgnore) {
       return;
+    }
   }
 #endif
 
+  if (url.ProtocolIsJavaScript()) {
+    if (!origin_window ||
+        origin_window->CanExecuteScripts(kAboutToExecuteScript)) {
+      if (origin_window && request.GetFrameType() ==
+                               mojom::blink::RequestContextFrameType::kNested) {
+        LogJavaScriptUrlHistogram(origin_window, url.GetPath());
+      }
+
+      frame_->GetDocument()->ProcessJavaScriptUrl(url,
+                                                  request.JavascriptWorld());
+    }
+    return;
+  }
+
   if (request.GetNavigationPolicy() == kNavigationPolicyCurrentTab &&
       (!origin_window || origin_window->GetSecurityOrigin()->CanAccess(
                              frame_->DomWindow()->GetSecurityOrigin()))) {