Skip to content

[WebAuthn] Conditional passkey request presents conditional control even after AbortController.abort()#9449

Merged
webkit-early-warning-system merged 1 commit intoWebKit:mainfrom
pascoej:eng/WebAuthn-Conditional-passkey-request-presents-conditional-control-even-after-AbortController-abort
Feb 2, 2023
Merged

[WebAuthn] Conditional passkey request presents conditional control even after AbortController.abort()#9449
webkit-early-warning-system merged 1 commit intoWebKit:mainfrom
pascoej:eng/WebAuthn-Conditional-passkey-request-presents-conditional-control-even-after-AbortController-abort

Conversation

@pascoej
Copy link
Copy Markdown
Member

@pascoej pascoej commented Feb 1, 2023

ba76ae8

[WebAuthn] Conditional passkey request presents conditional control even after AbortController.abort()
https://bugs.webkit.org/show_bug.cgi?id=250589
rdar://99535627

Reviewed by Brent Fulgham.

Currently conditional mediation requests do not get cancelled whenever the abort controller for its
request is called. This patch changes that by calling cancel on the daemon whenever the abort controller
is called.

* Source/WebCore/Modules/webauthn/AuthenticatorCoordinator.cpp:
(WebCore::AuthenticatorCoordinator::discoverFromExternalSource):
* Source/WebCore/Modules/webauthn/AuthenticatorCoordinatorClient.h:
* Source/WebKit/UIProcess/WebAuthentication/WebAuthenticatorCoordinatorProxy.cpp:
(WebKit::WebAuthenticatorCoordinatorProxy::cancel):
* Source/WebKit/UIProcess/WebAuthentication/WebAuthenticatorCoordinatorProxy.h:
* Source/WebKit/UIProcess/WebAuthentication/WebAuthenticatorCoordinatorProxy.messages.in:
* Source/WebKit/WebProcess/WebAuthentication/WebAuthenticatorCoordinator.cpp:
(WebKit::WebAuthenticatorCoordinator::cancel):
* Source/WebKit/WebProcess/WebAuthentication/WebAuthenticatorCoordinator.h:

Canonical link: https://commits.webkit.org/259754@main

d32eea9

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 🧪 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🛠 gtk ✅ 🛠 wincairo
✅ 🧪 webkitperl ❌ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 mac-wk1 ✅ 🧪 api-gtk
✅ 🛠 tv ✅ 🧪 mac-wk2
✅ 🛠 tv-sim ✅ 🧪 mac-AS-debug-wk2
✅ 🛠 watch ✅ 🧪 mac-wk2-stress
✅ 🛠 🧪 merge ✅ 🛠 watch-sim

@pascoej pascoej requested a review from cdumez as a code owner February 1, 2023 14:50
@pascoej pascoej self-assigned this Feb 1, 2023
@pascoej pascoej added the Forms For bugs specific to form elements (checkboxes, buttons, text fields, etc.) label Feb 1, 2023
@pascoej pascoej requested a review from brentfulgham February 1, 2023 14:51
@webkit-early-warning-system
Copy link
Copy Markdown
Collaborator

webkit-early-warning-system commented Feb 1, 2023

@rmondello
Copy link
Copy Markdown
Member

Nits.

Cerrently conditional mediation requests do not get cancelled whenever the abort controller for it’s

Currently

its

Copy link
Copy Markdown
Contributor

@brentfulgham brentfulgham left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, but please correct the minor nits before landing.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Should only be one line of whitespace

@pascoej pascoej force-pushed the eng/WebAuthn-Conditional-passkey-request-presents-conditional-control-even-after-AbortController-abort branch from 75e7bf4 to d32eea9 Compare February 1, 2023 21:06
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Feb 2, 2023
@pascoej pascoej added merge-queue Applied to send a pull request to merge-queue and removed merging-blocked Applied to prevent a change from being merged labels Feb 2, 2023
…ven after AbortController.abort()

https://bugs.webkit.org/show_bug.cgi?id=250589
rdar://99535627

Reviewed by Brent Fulgham.

Currently conditional mediation requests do not get cancelled whenever the abort controller for its
request is called. This patch changes that by calling cancel on the daemon whenever the abort controller
is called.

* Source/WebCore/Modules/webauthn/AuthenticatorCoordinator.cpp:
(WebCore::AuthenticatorCoordinator::discoverFromExternalSource):
* Source/WebCore/Modules/webauthn/AuthenticatorCoordinatorClient.h:
* Source/WebKit/UIProcess/WebAuthentication/WebAuthenticatorCoordinatorProxy.cpp:
(WebKit::WebAuthenticatorCoordinatorProxy::cancel):
* Source/WebKit/UIProcess/WebAuthentication/WebAuthenticatorCoordinatorProxy.h:
* Source/WebKit/UIProcess/WebAuthentication/WebAuthenticatorCoordinatorProxy.messages.in:
* Source/WebKit/WebProcess/WebAuthentication/WebAuthenticatorCoordinator.cpp:
(WebKit::WebAuthenticatorCoordinator::cancel):
* Source/WebKit/WebProcess/WebAuthentication/WebAuthenticatorCoordinator.h:

Canonical link: https://commits.webkit.org/259754@main
@webkit-early-warning-system webkit-early-warning-system force-pushed the eng/WebAuthn-Conditional-passkey-request-presents-conditional-control-even-after-AbortController-abort branch from d32eea9 to ba76ae8 Compare February 2, 2023 16:19
@webkit-commit-queue
Copy link
Copy Markdown
Collaborator

Committed 259754@main (ba76ae8): https://commits.webkit.org/259754@main

Reviewed commits have been landed. Closing PR #9449 and removing active labels.

@webkit-early-warning-system webkit-early-warning-system merged commit ba76ae8 into WebKit:main Feb 2, 2023
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Feb 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Forms For bugs specific to form elements (checkboxes, buttons, text fields, etc.)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants