macos: continue sysext downgrade when stale deactivation is already missing#8812
Open
atavism wants to merge 2 commits into
Open
macos: continue sysext downgrade when stale deactivation is already missing#8812atavism wants to merge 2 commits into
atavism wants to merge 2 commits into
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR addresses a macOS system extension downgrade edge case where the deactivate-then-activate replacement flow can fail during deactivation with OSSystemExtensionErrorDomain code extensionNotFound (error 4), and should still proceed to activate the bundled extension when activateAfter=true.
Changes:
- Adds recovery logic to continue with activation when replacement deactivation fails with
extensionNotFoundin a deactivate-then-activate flow. - Refactors stale-registry error classification with a shared
extensionNotFoundcheck helper. - Adds focused unit tests covering continue / non-continue scenarios for the new recovery path.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
macos/Runner/VPN/SystemExtensionManager.swift |
Adds logic to treat extensionNotFound during replacement deactivation as recoverable (continue to activation) and refactors stale-registry detection. |
macos/RunnerTests/RunnerTests.swift |
Adds tests validating the new continue-on-missing-deactivation behavior and negative cases. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+32
to
+34
| replacementDeactivationFailed: Bool | ||
| ) -> Bool { | ||
| guard replacementDeactivationFailed else { return false } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes a macOS system extension downgrade edge case where the downgrade flow could fail with
OSSystemExtensionErrorDomain error 4(extensionNotFound) during the deactivation stepChanges
extensionNotFoundduring replacement deactivation as recoverable whenactivateAfter=true