Bug 1813982 - XPCOM interface to authenticator-rs. r=keeler,geckoview…

…-reviewers,m_kato Differential Revision: https://phabricator.services.mozilla.com/D171269
iaxat · Mar 16, 2023 · 0a0369f · 0a0369f
1 parent cb4b57f
commit 0a0369f
Show file tree

Hide file tree

Showing 38 changed files with 3,783 additions and 1,533 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
@@ -7550,14 +7550,14 @@ var WebAuthnPromptHelper = {
   },
 
   observe(aSubject, aTopic, aData) {
-    let mgr = aSubject.QueryInterface(Ci.nsIU2FTokenManager);
     let data = JSON.parse(aData);
 
     // If we receive a cancel, it might be a WebAuthn prompt starting in another
     // window, and the other window's browsing context will send out the
     // cancellations, so any cancel action we get should prompt us to cancel.
     if (data.action == "cancel") {
       this.cancel(data);
+      return;
     }
 
     if (
@@ -7567,6 +7567,10 @@ var WebAuthnPromptHelper = {
       return;
     }
 
+    let mgr = aSubject.QueryInterface(
+      data.is_ctap2 ? Ci.nsIWebAuthnController : Ci.nsIU2FTokenManager
+    );
+
     if (data.action == "register") {
       this.register(mgr, data);
     } else if (data.action == "register-direct") {
@@ -7631,7 +7635,7 @@ var WebAuthnPromptHelper = {
         label: unescape(decodeURIComponent(usernames[i])),
         accessKey: i.toString(),
         callback(aState) {
-          mgr.resumeWithSelectedSignResult(tid, i);
+          mgr.signatureSelectionCallback(tid, i);
         },
       });
     }
@@ -7657,7 +7661,7 @@ var WebAuthnPromptHelper = {
       aPassword
     );
     if (res) {
-      mgr.pinCallback(aPassword.value);
+      mgr.pinCallback(tid, aPassword.value);
     } else {
       mgr.cancel(tid);
     }

diff --git a/dom/webauthn/AndroidWebAuthnTokenManager.cpp b/dom/webauthn/AndroidWebAuthnTokenManager.cpp
@@ -88,8 +88,7 @@ void AndroidWebAuthnTokenManager::Drop() {
 }
 
 RefPtr<U2FRegisterPromise> AndroidWebAuthnTokenManager::Register(
-    const WebAuthnMakeCredentialInfo& aInfo, bool aForceNoneAttestation,
-    void _status_callback(rust_ctap2_status_update_res*)) {
+    const WebAuthnMakeCredentialInfo& aInfo, bool aForceNoneAttestation) {
   AssertIsOnOwningThread();
 
   ClearPromises();
@@ -276,8 +275,7 @@ void AndroidWebAuthnTokenManager::HandleRegisterResult(
 }
 
 RefPtr<U2FSignPromise> AndroidWebAuthnTokenManager::Sign(
-    const WebAuthnGetAssertionInfo& aInfo,
-    void _status_callback(rust_ctap2_status_update_res*)) {
+    const WebAuthnGetAssertionInfo& aInfo) {
   AssertIsOnOwningThread();
 
   ClearPromises();

diff --git a/dom/webauthn/AndroidWebAuthnTokenManager.h b/dom/webauthn/AndroidWebAuthnTokenManager.h
@@ -109,12 +109,11 @@ class AndroidWebAuthnTokenManager final : public U2FTokenTransport {
   ~AndroidWebAuthnTokenManager() {}
 
   virtual RefPtr<U2FRegisterPromise> Register(
-      const WebAuthnMakeCredentialInfo& aInfo, bool aForceNoneAttestation,
-      void status_callback(rust_ctap2_status_update_res*)) override;
+      const WebAuthnMakeCredentialInfo& aInfo,
+      bool aForceNoneAttestation) override;
 
   virtual RefPtr<U2FSignPromise> Sign(
-      const WebAuthnGetAssertionInfo& aInfo,
-      void status_callback(rust_ctap2_status_update_res*)) override;
+      const WebAuthnGetAssertionInfo& aInfo) override;
 
   void Cancel() override;
 

diff --git a/dom/webauthn/AuthrsTransport.cpp b/dom/webauthn/AuthrsTransport.cpp
@@ -0,0 +1,29 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "AuthrsTransport.h"
+#include "nsIWebAuthnController.h"
+#include "nsCOMPtr.h"
+
+namespace {
+extern "C" {
+
+// Implemented in Rust
+nsresult authrs_transport_constructor(nsIWebAuthnTransport** result);
+
+}  // extern "C"
+}  // namespace
+
+namespace mozilla::dom {
+
+already_AddRefed<nsIWebAuthnTransport> NewAuthrsTransport() {
+  nsCOMPtr<nsIWebAuthnTransport> transport;
+  nsresult rv = authrs_transport_constructor(getter_AddRefs(transport));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return nullptr;
+  }
+  return transport.forget();
+}
+
+}  // namespace mozilla::dom
diff --git a/dom/webauthn/AuthrsTransport.h b/dom/webauthn/AuthrsTransport.h
@@ -0,0 +1,17 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef DOM_WEBAUTHN_AUTHRS_BRIDGE_H_
+#define DOM_WEBAUTHN_AUTHRS_BRIDGE_H_
+
+#include "mozilla/AlreadyAddRefed.h"
+#include "nsIWebAuthnController.h"
+
+namespace mozilla::dom {
+
+already_AddRefed<nsIWebAuthnTransport> NewAuthrsTransport();
+
+}  // namespace mozilla::dom
+
+#endif  // DOM_WEBAUTHN_AUTHRS_BRIDGE_H_