Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WebAuthn] Clean up observers in CcidService #14274

Merged
merged 1 commit into from
May 24, 2023
Merged

[WebAuthn] Clean up observers in CcidService #14274

merged 1 commit into from
May 24, 2023

Conversation

pascoej
Copy link
Member

@pascoej pascoej commented May 23, 2023 •
edited by webkit-early-warning-system

52e6f05

[WebAuthn] Clean up observers in CcidService
https://bugs.webkit.org/show_bug.cgi?id=257240
rdar://109060751

Reviewed by Brent Fulgham.

This change ensures removeObserver:forKeyPath: is called for each observer we
add via addObserver in CcidService.

* Source/WebKit/UIProcess/WebAuthentication/Cocoa/CcidService.h:
* Source/WebKit/UIProcess/WebAuthentication/Cocoa/CcidService.mm:
(WebKit::CcidService::~CcidService):
(WebKit::CcidService::removeObservers):
(WebKit::CcidService::platformStartDiscovery):
(WebKit::CcidService::updateSlots):
(-[_WKSmartCardSlotStateObserver observeValueForKeyPath:ofObject:change:context:]):
(-[_WKSmartCardSlotStateObserver removeObserver]):

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

6896738

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

@pascoej pascoej requested a review from cdumez as a code owner May 23, 2023 23:46
@pascoej pascoej self-assigned this May 23, 2023
@pascoej pascoej added the WebKit Misc. For miscellaneous bugs in the WebKit framework (and not JavaScriptCore or WebCore). label May 23, 2023
@pascoej pascoej requested a review from brentfulgham May 23, 2023 23:47
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label May 23, 2023
@webkit-early-warning-system
Copy link
Collaborator

EWS run on previous version of this PR (hash 246d7a2)

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

@pascoej pascoej removed the merging-blocked Applied to prevent a change from being merged label May 24, 2023
@pascoej pascoej force-pushed the eng/WebAuthn-Clean-up-observers-in-CcidService branch from 246d7a2 to 6896738 Compare May 24, 2023 00:14
@pascoej
Copy link
Member Author

pascoej commented May 24, 2023

I think the style checker error here is erroneous as it's treating the forward declaration as an identifier.

@webkit-early-warning-system
Copy link
Collaborator

EWS run on current version of this PR (hash 6896738)

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

@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label May 24, 2023
brentfulgham
brentfulgham approved these changes May 24, 2023
View reviewed changes
Copy link
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 reasonable. Is there a way you could test this behavior works properly?

@pascoej
Copy link
Member Author

pascoej commented May 24, 2023

I tested manually with local logging to verify observers are added and removed as expected.

@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 May 24, 2023
@pascoej
[WebAuthn] Clean up observers in CcidService
52e6f05 
https://bugs.webkit.org/show_bug.cgi?id=257240
rdar://109060751

Reviewed by Brent Fulgham.

This change ensures removeObserver:forKeyPath: is called for each observer we
add via addObserver in CcidService.

* Source/WebKit/UIProcess/WebAuthentication/Cocoa/CcidService.h:
* Source/WebKit/UIProcess/WebAuthentication/Cocoa/CcidService.mm:
(WebKit::CcidService::~CcidService):
(WebKit::CcidService::removeObservers):
(WebKit::CcidService::platformStartDiscovery):
(WebKit::CcidService::updateSlots):
(-[_WKSmartCardSlotStateObserver observeValueForKeyPath:ofObject:change:context:]):
(-[_WKSmartCardSlotStateObserver removeObserver]):

Canonical link: https://commits.webkit.org/264485@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/WebAuthn-Clean-up-observers-in-CcidService branch from 6896738 to 52e6f05 Compare May 24, 2023 21:33
@webkit-commit-queue
Copy link
Collaborator

Committed 264485@main (52e6f05): https://commits.webkit.org/264485@main

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

@webkit-commit-queue webkit-commit-queue merged commit 52e6f05 into WebKit:main May 24, 2023
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label May 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@brentfulgham brentfulgham brentfulgham approved these changes

@cdumez cdumez Awaiting requested review from cdumez cdumez is a code owner

Assignees

@pascoej pascoej

Labels
WebKit Misc. For miscellaneous bugs in the WebKit framework (and not JavaScriptCore or WebCore).
Projects
None yet
Milestone
No milestone
5 participants
@pascoej @webkit-early-warning-system @webkit-commit-queue @brentfulgham @webkit-ews-buildbot