chromium/src
0
Fork 0
Code Activity

[webauthn] Remove WebAuthenticationCrosPlatformAuthenticator flag

Browse Source 
Remove WebAuthenticationCrosPlatformAuthenticator flag. It is expired.

Fixed: 1419259
Change-Id: Ib08e14b3a5a4f1e2063490f4058a52af1b5d43eb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5039013
Auto-Submit: Nina Satragno <nsatragno@chromium.org>
Reviewed-by: Martin Kreichgauer <martinkr@google.com>
Commit-Queue: Martin Kreichgauer <martinkr@google.com>
Cr-Commit-Position: refs/heads/main@{#1226202}
This commit is contained in:
Nina Satragno
2023-11-17 17:47:22 +00:00
committed by Chromium LUCI CQ
parent 115c91f3a8
commit a17896b69c
8 changed files with 14 additions and 57 deletions

8
chrome/browser/about_flags.cc

@ -7148,14 +7148,6 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kLegacyTechReportTopLevelUrlDescription, kOsAll,
FEATURE_VALUE_TYPE(features::kLegacyTechReportTopLevelUrl)},
#if BUILDFLAG(IS_CHROMEOS_ASH)
{"enable-web-authentication-chromeos-authenticator",
flag_descriptions::kEnableWebAuthenticationChromeOSAuthenticatorName,
flag_descriptions::
kEnableWebAuthenticationChromeOSAuthenticatorDescription,
kOsCrOS, FEATURE_VALUE_TYPE(device::kWebAuthCrosPlatformAuthenticator)},
#endif
{
"zero-copy-tab-capture",
flag_descriptions::kEnableZeroCopyTabCaptureName,

5
chrome/browser/flag-metadata.json

@ -3696,11 +3696,6 @@
"owners": [ "stahon@microsoft.com", "liahiscock@microsoft.com", "dmurph@chromium.org", "steimel@chromium.org" ],
"expiry_milestone": 125
},
{
"name": "enable-web-authentication-chromeos-authenticator",
"owners": [ "yichengli@chromium.org", "martinkr@chromium.org" ],
"expiry_milestone": 92
},
{
"name": "enable-web-bluetooth",
"owners": [ "web-bluetooth@google.com" ],

6
chrome/browser/flag_descriptions.cc

@ -1516,12 +1516,6 @@ const char kEnableSystemEntropyOnPerformanceNavigationTimingDescription[] =
"while the user agent was under load. See "
"https://chromestatus.com/feature/5186950448283648 for more information.";
const char kEnableWebAuthenticationChromeOSAuthenticatorName[] =
"ChromeOS platform Web Authentication support";
const char kEnableWebAuthenticationChromeOSAuthenticatorDescription[] =
"Enable the ChromeOS platform authenticator for the Web Authentication "
"API.";
const char kEnableZeroCopyTabCaptureName[] = "Zero-copy tab capture";
const char kEnableZeroCopyTabCaptureDescription[] =
"Enable zero-copy content tab for getDisplayMedia() APIs.";

20
content/browser/webauth/authenticator_common_impl.cc

@ -316,17 +316,15 @@ std::unique_ptr<device::FidoDiscoveryFactory> MakeDiscoveryFactory(
#if BUILDFLAG(IS_CHROMEOS)
// Ignore the ChromeOS u2fd virtual U2F HID device so that it doesn't collide
// with the ChromeOS platform authenticator, also implemented in u2fd.
if (base::FeatureList::IsEnabled(device::kWebAuthCrosPlatformAuthenticator)) {
// There are two possible PIDs the virtual U2F HID device could use, with or
// without corp protocol functionality.
constexpr device::VidPid kChromeOsU2fdVidPid{0x18d1, 0x502c};
constexpr device::VidPid kChromeOsU2fdCorpVidPid{0x18d1, 0x5212};
discovery_factory->set_hid_ignore_list(
{kChromeOsU2fdVidPid, kChromeOsU2fdCorpVidPid});
discovery_factory->set_generate_request_id_callback(
GetWebAuthenticationDelegate()->GetGenerateRequestIdCallback(
render_frame_host));
}
// There are two possible PIDs the virtual U2F HID device could use, with or
// without corp protocol functionality.
constexpr device::VidPid kChromeOsU2fdVidPid{0x18d1, 0x502c};
constexpr device::VidPid kChromeOsU2fdCorpVidPid{0x18d1, 0x5212};
discovery_factory->set_hid_ignore_list(
{kChromeOsU2fdVidPid, kChromeOsU2fdCorpVidPid});
discovery_factory->set_generate_request_id_callback(
GetWebAuthenticationDelegate()->GetGenerateRequestIdCallback(
render_frame_host));
#endif // BUILDFLAG(IS_CHROMEOS)
return discovery_factory;

5
content/browser/webauth/is_uvpaa.cc

@ -57,11 +57,6 @@ void IsUVPlatformAuthenticatorAvailable(
#elif BUILDFLAG(IS_CHROMEOS)
void IsUVPlatformAuthenticatorAvailable(
IsUVPlatformAuthenticatorAvailableCallback callback) {
if (!base::FeatureList::IsEnabled(
device::kWebAuthCrosPlatformAuthenticator)) {
std::move(callback).Run(false);
return;
}
device::ChromeOSAuthenticator::IsUVPlatformAuthenticatorAvailable(
std::move(callback));
}

7
device/fido/features.cc

@ -40,13 +40,6 @@ BASE_FEATURE(kWebAuthCableExtensionAnywhere,
"WebAuthenticationCableExtensionAnywhere",
base::FEATURE_DISABLED_BY_DEFAULT);
#if BUILDFLAG(IS_CHROMEOS)
// Enabled in M102. Ready to be removed.
BASE_FEATURE(kWebAuthCrosPlatformAuthenticator,
"WebAuthenticationCrosPlatformAuthenticator",
base::FEATURE_ENABLED_BY_DEFAULT);
#endif // BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_ANDROID)
// Enabled in M116. Remove in or after M119.
BASE_FEATURE(kWebAuthnAndroidHybridClientUi,

6
device/fido/features.h

@ -23,12 +23,6 @@ COMPONENT_EXPORT(DEVICE_FIDO) BASE_DECLARE_FEATURE(kWebAuthUseNativeWinApi);
COMPONENT_EXPORT(DEVICE_FIDO)
BASE_DECLARE_FEATURE(kWebAuthCableExtensionAnywhere);
#if BUILDFLAG(IS_CHROMEOS)
// Enable a ChromeOS platform authenticator
COMPONENT_EXPORT(DEVICE_FIDO)
BASE_DECLARE_FEATURE(kWebAuthCrosPlatformAuthenticator);
#endif // BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_ANDROID)
// Enable UI options to explicitly invoke hybrid CTAP authentication on
// Android.

14
device/fido/fido_discovery_factory.cc

@ -236,15 +236,11 @@ FidoDiscoveryFactory::MaybeCreatePlatformDiscovery() const {
#if BUILDFLAG(IS_CHROMEOS)
std::vector<std::unique_ptr<FidoDiscoveryBase>>
FidoDiscoveryFactory::MaybeCreatePlatformDiscovery() const {
if (base::FeatureList::IsEnabled(kWebAuthCrosPlatformAuthenticator)) {
auto discovery = std::make_unique<FidoChromeOSDiscovery>(
generate_request_id_callback_,
std::move(get_assertion_request_for_legacy_credential_check_));
discovery->set_require_power_button_mode(
require_legacy_cros_authenticator_);
return SingleDiscovery(std::move(discovery));
}
return {};
auto discovery = std::make_unique<FidoChromeOSDiscovery>(
generate_request_id_callback_,
std::move(get_assertion_request_for_legacy_credential_check_));
discovery->set_require_power_button_mode(require_legacy_cros_authenticator_);
return SingleDiscovery(std::move(discovery));
}
void FidoDiscoveryFactory::set_generate_request_id_callback(