chore: tweak HidChooserContext::IsFidoAllowedForOrigin

electron · Oct 16, 2023 · dd28916 · dd28916
1 parent 107e71a
commit dd28916
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/shell/browser/hid/electron_hid_delegate.cc b/shell/browser/hid/electron_hid_delegate.cc
@@ -124,7 +124,7 @@ bool ElectronHidDelegate::IsFidoAllowedForOrigin(
     content::BrowserContext* browser_context,
     const url::Origin& origin) {
   auto* chooser_context = GetChooserContext(browser_context);
-  return chooser_context->IsFidoAllowedForOrigin(origin);
+  return chooser_context && chooser_context->IsFidoAllowedForOrigin(origin);
 }
 
 bool ElectronHidDelegate::IsServiceWorkerAllowedForOrigin(

diff --git a/shell/browser/hid/hid_chooser_context.cc b/shell/browser/hid/hid_chooser_context.cc
@@ -200,7 +200,10 @@ bool HidChooserContext::IsFidoAllowedForOrigin(const url::Origin& origin) {
   }
 #endif  // BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
 
-  return false;
+  // This differs from upstream - we want to allow users greater
+  // ability to communicate with FIDO devices in Electron.
+  return base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kDisableHidBlocklist);
 }
 
 void HidChooserContext::AddDeviceObserver(DeviceObserver* observer) {