From ff8491ed87d451863a19afbb7d78d490d6f957e2 Mon Sep 17 00:00:00 2001
From: Joshua Hood <[email protected]>
Date: Wed, 06 May 2026 07:26:26 -0700
Subject: [PATCH] [iOS] Fix SB keypress event listening

Bug: 508259433,504185807
Change-Id: I8dda45f2394fd4249f5a24d558e9ec4e0df6f42f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7818799
Reviewed-by: Daniel White <[email protected]>
Commit-Queue: jdh <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1626163}
---

diff --git a/ios/chrome/browser/safe_browsing/model/password_protection_egtest.mm b/ios/chrome/browser/safe_browsing/model/password_protection_egtest.mm
index 70a58a9..09a66999 100644
--- a/ios/chrome/browser/safe_browsing/model/password_protection_egtest.mm
+++ b/ios/chrome/browser/safe_browsing/model/password_protection_egtest.mm
@@ -35,7 +35,21 @@
 std::unique_ptr<net::test_server::HttpResponse> HandleRequest(
     const net::test_server::HttpRequest& request) {
   auto http_response = std::make_unique<net::test_server::BasicHttpResponse>();
-  http_response->set_content("Input: <input type='text' id='input'>");
+  if (request.relative_url.find("preventDefault=true") != std::string::npos) {
+    http_response->set_content(
+        "Input: <input type='text' id='input'>"
+        "<script>"
+        "  document.getElementById('input').addEventListener('keydown', "
+        "function(e) {"
+        "    e.preventDefault();"
+        "    if (e.key.length === 1) {"
+        "      document.getElementById('input').value += e.key;"
+        "    }"
+        "  });"
+        "</script>");
+  } else {
+    http_response->set_content("Input: <input type='text' id='input'>");
+  }
   http_response->set_content_type("text/html");
   return http_response;
 }
@@ -61,7 +75,9 @@
       std::string("--mark_as_allowlisted_for_phish_guard=") +
       _allowlistedURL.spec());
 
-  if ([self isRunningTest:@selector(testPasswordReuseDetectionWarning)]) {
+  if ([self isRunningTest:@selector(testPasswordReuseDetectionWarning)] ||
+      [self isRunningTest:@selector
+            (testPasswordReuseDetectionKeydownPreventDefault)]) {
     // Use commandline args to save a fake phishing cached verdict.
     config.additional_args.push_back(
         std::string("--mark_as_phish_guard_phishing=") + _phishingURL.spec());
@@ -116,6 +132,19 @@
                                               kWaitForUIElementTimeout];
 }
 
+// Tests that password protection UI is shown even when the webpage cancels
+// keydown events.
+- (void)testPasswordReuseDetectionKeydownPreventDefault {
+  [ChromeEarlGrey loadURL:GURL(_phishingURL.spec() + "?preventDefault=true")];
+  [ChromeEarlGrey waitForWebStateContainingText:kInputPage];
+
+  [self typePasswordIntoWebInput];
+  [ChromeEarlGrey
+      waitForUIElementToAppearWithMatcher:PasswordProtectionMatcher()
+                                  timeout:base::test::ios::
+                                              kWaitForUIElementTimeout];
+}
+
 // Tests that password protection UI is not shown when saved password is reused
 // on safe site.
 - (void)testPasswordProtectionNotShownForAllowListedURL {
diff --git a/ios/chrome/browser/safe_browsing/model/password_protection_java_script_feature.mm b/ios/chrome/browser/safe_browsing/model/password_protection_java_script_feature.mm
index 41e7ad0..10ad6418 100644
--- a/ios/chrome/browser/safe_browsing/model/password_protection_java_script_feature.mm
+++ b/ios/chrome/browser/safe_browsing/model/password_protection_java_script_feature.mm
@@ -8,6 +8,7 @@
 #import "base/ios/ios_util.h"
 #import "base/no_destructor.h"
 #import "base/strings/sys_string_conversions.h"
+#import "base/strings/utf_string_conversions.h"
 #import "ios/chrome/browser/safe_browsing/model/input_event_observer.h"
 #import "ios/web/public/js_messaging/script_message.h"
 
@@ -19,7 +20,7 @@
 // Values for the "eventType" field in messages received by this feature's
 // script message handler.
 const char kPasteEventType[] = "TextPasted";
-const char kKeyPressedEventType[] = "KeyPressed";
+const char kKeyDownEventType[] = "KeyDown";
 }  // namespace
 
 PasswordProtectionJavaScriptFeature::PasswordProtectionJavaScriptFeature()
@@ -71,11 +72,12 @@
     return;
   }
 
-  if (*event_type == kKeyPressedEventType) {
-    // A keypress event should consist of a single character. A longer string
+  if (*event_type == kKeyDownEventType) {
+    // A key event should consist of a single character. A longer string
     // means the message isn't well-formed, so might be coming from a
     // compromised WebProcess.
-    if ((*text).size() > 1) {
+    std::u16string text16 = base::UTF8ToUTF16(*text);
+    if (text16.length() != 1) {
       return;
     }
     observer->OnKeyPressed(*text);
diff --git a/ios/chrome/browser/safe_browsing/model/resources/password_protection.ts b/ios/chrome/browser/safe_browsing/model/resources/password_protection.ts
index 4bd2acdd..80be253 100644
--- a/ios/chrome/browser/safe_browsing/model/resources/password_protection.ts
+++ b/ios/chrome/browser/safe_browsing/model/resources/password_protection.ts
@@ -5,22 +5,23 @@
 import {sendWebKitMessage} from '//ios/web/public/js_messaging/resources/utils.js';
 
 /*
-* @fileoverview Adds listeners that forward keypress and paste events to the
-* browser. The browser uses this information to detect and warn the user about
-* situations where the user enters one of their saved passwords on a
-* possibly-unsafe site
-*/
+ * @fileoverview Adds listeners that forward keydown and paste events to the
+ * browser. The browser uses this information to detect and warn the user about
+ * situations where the user enters one of their saved passwords on a
+ * possibly-unsafe site
+ */
 
 /**
- * Listens for keypress events and forwards the entered key to the browser.
+ * Listens for keydown events and forwards the entered key to the browser.
  */
-function onKeypressEvent(event : KeyboardEvent) : void {
-  // Only forward events where the entered key has length 1, to avoid forwarding
-  // special keys like "Enter".
-  if (event.isTrusted && event.key.length === 1) {
+function onKeydownEvent(event: KeyboardEvent): void {
+  // Only forward events where the entered key has length 1, to avoid
+  // forwarding special keys like "Enter".
+  if (event.isTrusted && event.key.length === 1 && !event.ctrlKey &&
+      !event.metaKey) {
     sendWebKitMessage(
         'PasswordProtectionTextEntered',
-        {eventType: 'KeyPressed', text: event.key});
+        {eventType: 'KeyDown', text: event.key});
   }
 }
 
@@ -49,5 +50,5 @@
 
 // Events are first dispatched to the window object, in the capture phase of
 // JavaScript event dispatch, so listen for them there.
-window.addEventListener('keypress', onKeypressEvent, true);
+window.addEventListener('keydown', onKeydownEvent, true);
 window.addEventListener('paste', onPasteEvent, true);