VPN is sometimes stopped twice #1213
Merged
Conversation
This file contains 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
diegoreymendez
commented
Feb 5, 2025
diegoreymendez
commented
Feb 5, 2025
| @@ -700,7 +700,6 @@ open class PacketTunnelProvider: NEPacketTunnelProvider { | |||
| } | |||
|
|
|||
| Logger.networkProtection.error("🔴 Stopping VPN due to no auth token") | |||
| await cancelTunnel(with: TunnelError.startingTunnelWithoutAuthToken) | |||
There was a problem hiding this comment.
No need to cancel the tunnel if we're throwing an error below, which is the right way to cancel startup.
This was referenced Feb 5, 2025
samsymons
approved these changes
Feb 6, 2025
diegoreymendez
commented
Feb 6, 2025
| case .vpnAccessRevoked: | ||
| return "VPN disconnected due to expired subscription" | ||
| case .couldNotGenerateTunnelConfiguration(let internalError): | ||
| return "Failed to generate a tunnel configuration: \(internalError.localizedDescription)" | ||
| case .simulateTunnelFailureError: | ||
| return "Simulated a tunnel error as requested" | ||
| case .tokenReset: |
There was a problem hiding this comment.
Differentiating a specific case that was previously reported as startingTunnelWithoutAuthToken.
diegoreymendez
commented
Feb 6, 2025
| } | ||
| case .reset: | ||
| // This case should in theory not be possible, but it's ideal to have this in place | ||
| // in case an error in the controller on the client side allows it. | ||
| try await tokenHandler.removeToken() | ||
| throw TunnelError.startingTunnelWithoutAuthToken | ||
| try? await tokenHandler.removeToken() |
There was a problem hiding this comment.
Even if this fails, this isn't the real failure reason - the real failure reason is the token is being removed which, as described above, is an abnormal scenario. The removal failing shouldn't be the error we get.
diegoreymendez
commented
Feb 6, 2025
| @@ -603,22 +608,22 @@ open class PacketTunnelProvider: NEPacketTunnelProvider { | |||
| try await tokenHandler.refreshToken() | |||
| } catch { | |||
| Logger.networkProtection.fault("Error force-refreshing token container: \(error, privacy: .public)\n \(newTokenContainer.refreshToken, privacy: .public)") | |||
| throw TunnelError.startingTunnelWithoutAuthToken | |||
| throw TunnelError.startingTunnelWithoutAuthToken(internalError: error) | |||
There was a problem hiding this comment.
Just taking advantage that there's underlying error info.
samsymons
approved these changes
Feb 6, 2025
diegoreymendez
added a commit
to duckduckgo/iOS
that referenced
this pull request
Feb 7, 2025
Task/Issue URL: https://app.asana.com/0/1207603085593419/1209322889682604/f macOS PR: duckduckgo/macos-browser#3829 BSK PR: duckduckgo/BrowserServicesKit#1213 **Description**: Fixes an issue where the tunnel is being stopped twice.
diegoreymendez
added a commit
to duckduckgo/macos-browser
that referenced
this pull request
Feb 7, 2025
Task/Issue URL: https://app.asana.com/0/1207603085593419/1209322889682604/f iOS PR: duckduckgo/iOS#3928 BSK PR: duckduckgo/BrowserServicesKit#1213 **Description**: Fixes an issue where the tunnel is being stopped twice.
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.
Task/Issue URL: https://app.asana.com/0/1207603085593419/1209322889682604/f
iOS PR: duckduckgo/iOS#3928
macOS PR: duckduckgo/macos-browser#3829
What kind of version bump will this require?: Patch
Description
Fixes an issue where the tunnel is being stopped twice.
Testing
Please refer to the platform-specific PRs for testing instructions.
Internal references:
Software Engineering Expectations
Technical Design Template