webauthn: enable server-link on Linux.

In M100 and 101, we accidentally enabled 3rd-party caBLE for Linux users on accounts.google.com. Metrics show that a number of users are actually doing that successfully. We "fixed" that bug, but since caBLEv2 appears to be working for Linux users, this change enables server-link for Linux officially. BUG=1316678 (cherry picked from commit e3a82d6) Change-Id: I8d3884ccfd3c8c45edfeb136bc7681da3162236e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3588737 Auto-Submit: Adam Langley <agl@chromium.org> Reviewed-by: Martin Kreichgauer <martinkr@google.com> Commit-Queue: Martin Kreichgauer <martinkr@google.com> Cr-Original-Commit-Position: refs/heads/main@{#993091} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3591641 Commit-Queue: Adam Langley <agl@chromium.org> Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Cr-Commit-Position: refs/branch-heads/5005@{#24} Cr-Branched-From: 5b4d945-refs/heads/main@{#992738}
chromium · Apr 19, 2022 · 0cb27cb · 0cb27cb
1 parent f6fc24d
commit 0cb27cb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc b/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc
@@ -558,7 +558,13 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCable(
   // TODO(crbug.com/1052397): Revisit the macro expression once build flag
   // switch of lacros-chrome is complete.
 #if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
-  pairings_from_extension = base::span<const device::CableDiscoveryData>();
+  if (std::any_of(pairings_from_extension.begin(),
+                  pairings_from_extension.end(),
+                  [](const device::CableDiscoveryData& v) -> bool {
+                    return v.version == device::CableDiscoveryData::Version::V1;
+                  })) {
+    pairings_from_extension = base::span<const device::CableDiscoveryData>();
+  }
 #endif
 
   std::vector<device::CableDiscoveryData> pairings;

diff --git a/chrome/browser/webauthn/chrome_authenticator_request_delegate_unittest.cc b/chrome/browser/webauthn/chrome_authenticator_request_delegate_unittest.cc
@@ -227,7 +227,7 @@ TEST_F(ChromeAuthenticatorRequestDelegateTest, CableConfiguration) {
       {
           "https://accounts.google.com",
           {v2_extension},
-          NONE_ON_LINUX(Result::kServerLink),
+          Result::kServerLink,
       },
   };