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.

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

Fix VPN configuration removal to stop the tunnel #900

Merged
merged 1 commit into from
Jul 19, 2024

Conversation

diegoreymendez
Copy link
Contributor

@diegoreymendez diegoreymendez commented Jul 18, 2024

Task/Issue URL: https://app.asana.com/0/1207603085593419/1207832283330964/f
iOS PR: duckduckgo/iOS#3099
macOS PR: duckduckgo/macos-browser#2991

What kind of version bump will this require?: Patch

Optional:

Tech Design URL:
CC:

Description:

Fix the VPN configuration removal handling in the extension to stop the tunnel.

Testing:

Test through the platform-specific PRs.

Definition of Done:


Internal references:

Software Engineering Expectations
Technical Design Template

Comment on lines +1159 to +1160
completionHandler?(nil)
await cancelTunnel(with: TunnelError.appRequestedCancellation)
Copy link
Contributor

Choose a reason for hiding this comment

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

Any reason the completion handler comes before the cancel operation?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah - I want to make sure the completion handler is always called to prevent things from getting into a weird state. It's very likely that cancelling the tunnel will try to deallocate the PacketTunnelProvider and I'm ware of what might happen if the completion wasn't called before.

Copy link
Contributor

@samsymons samsymons left a comment

Choose a reason for hiding this comment

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

LGTM with one question, not a blocker.

@diegoreymendez diegoreymendez marked this pull request as ready for review July 19, 2024 10:52
@diegoreymendez diegoreymendez merged commit 3274feb into main Jul 19, 2024
13 checks passed
@diegoreymendez diegoreymendez deleted the diego/fix-remove-vpn-configuration branch July 19, 2024 10:54
diegoreymendez added a commit to duckduckgo/macos-browser that referenced this pull request Jul 19, 2024
Task/Issue URL:
https://app.asana.com/0/1207603085593419/1207832283330964/f

iOS PR: duckduckgo/iOS#3099
BSK PR: duckduckgo/BrowserServicesKit#900

## Description:

Fix the VPN configuration removal handling in the extension to stop the
tunnel.
diegoreymendez added a commit to duckduckgo/iOS that referenced this pull request Jul 19, 2024
Task/Issue URL: https://app.asana.com/0/1207603085593419/1207832283330964/f

macOS PR: duckduckgo/macos-browser#2991
BSK PR: duckduckgo/BrowserServicesKit#900

## Description:

Fix the VPN configuration removal handling in the extension to stop the tunnel.
samsymons added a commit that referenced this pull request Jul 19, 2024
* main:
  Resetting all state for the VPN will cancel the tunnel and stop the monitors (#900)
  Add support for skipping sending usage pixels for remote messages (#902)
  Bump Tests/BrowserServicesKitTests/Resources/privacy-reference-tests (#896)
  Removes the listen port from the wireguard client (#901)
samsymons added a commit that referenced this pull request Jul 19, 2024
* main:
  Resetting all state for the VPN will cancel the tunnel and stop the monitors (#900)
  Add support for skipping sending usage pixels for remote messages (#902)
samsymons added a commit that referenced this pull request Jul 19, 2024
* main:
  Remove unused VPN session utilities (#898)
  Add new deprecated Mac remote message attribute. (#903)
  Resetting all state for the VPN will cancel the tunnel and stop the monitors (#900)
  Add support for skipping sending usage pixels for remote messages (#902)
  Bump Tests/BrowserServicesKitTests/Resources/privacy-reference-tests (#896)
  Removes the listen port from the wireguard client (#901)
  Be explicit when performing developer redirects (#884)
  C-S-S cross origin fixes
  Update C-S-S version (#892)
  Add a debug menu action to reset Remote Messages on macOS (#891)
  Add desktop specific RMF attributes (#883)
  Upload exception message to Sentry (#856)
  Add locale to broken site report (#889)
  Add new subfeature for duckplayer (#885)
  Swiftlint refactoring (#882)
  Remote Messaging Framework for macOS (#876)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants