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 #3099

Merged
merged 6 commits 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

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.

Testing:

There's an option in the debug menu to remove the VPN configuration.

  1. Start the VPN.
  2. Test that the tunnel works.
  3. See the monitors are running in Console.app.
  4. Debug menu > VPN > Reset > Remove VPN Configuration
  5. Check that the VPN is stopped
  6. Check in Console.app that the monitors are stopped
  7. Start the VPN again and ensure it works fine

Definition of Done:


Internal references:

Pull Request Review Checklist
Software Engineering Expectations
Technical Design Template
Pull Request Documentation

@diegoreymendez diegoreymendez self-assigned this Jul 18, 2024
@github-actions github-actions bot added the bot: not in app board Added by automation for pull requests with tasks not added to iOS App Board Asana project label Jul 18, 2024
@github-actions github-actions bot removed the bot: not in app board Added by automation for pull requests with tasks not added to iOS App Board Asana project label Jul 18, 2024
@diegoreymendez diegoreymendez marked this pull request as ready for review July 18, 2024 07:04
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 comment about an unintentional change.

diegoreymendez added a commit to duckduckgo/BrowserServicesKit that referenced this pull request Jul 19, 2024
…onitors (#900)

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.
@@ -64,6 +64,9 @@
<Test
Identifier = "AutoconsentMessageProtocolTests/testEval()">
</Test>
<Test
Identifier = "SyncSettingsViewControllerErrorTests/test_WhenAccountRemoved_ErrorHandlerSyncDidTurnOffCalled()">
</Test>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Disabling flaky test.

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 diegoreymendez merged commit 9eb684b into main Jul 19, 2024
14 checks passed
@diegoreymendez diegoreymendez deleted the diego/fix-remove-vpn-configuration branch July 19, 2024 11:18
samsymons added a commit that referenced this pull request Jul 19, 2024
# By Christopher Brind (1) and others
# Via GitHub
* main:
  [DuckPlayer] 6 - Init updates and Watch on YouTube (#3066)
  New Tab Page Shortcuts section (#3104)
  Fix VPN configuration removal to stop the tunnel (#3099)
  avoid resizing webview when keyboard shows/hides (#3094)
  Add support for skipping sending usage pixels for remote messages (#3106)

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
samsymons added a commit that referenced this pull request Jul 19, 2024
# By Daniel Bernal (2) and others
# Via GitHub
* main:
  Update BSK for Mac RMF changes (#3107)
  [DuckPlayer] 7- Open Settings (#3110)
  [DuckPlayer] 6 - Init updates and Watch on YouTube (#3066)
  New Tab Page Shortcuts section (#3104)
  Fix VPN configuration removal to stop the tunnel (#3099)
  avoid resizing webview when keyboard shows/hides (#3094)
  Add support for skipping sending usage pixels for remote messages (#3106)

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
samsymons added a commit that referenced this pull request Jul 19, 2024
# By Christopher Brind (9) and others
# Via Chris Brind (1) and GitHub (1)
* main: (48 commits)
  Reduce VPN manager instances (#3097)
  Update BSK for Mac RMF changes (#3107)
  [DuckPlayer] 7- Open Settings (#3110)
  [DuckPlayer] 6 - Init updates and Watch on YouTube (#3066)
  New Tab Page Shortcuts section (#3104)
  Fix VPN configuration removal to stop the tunnel (#3099)
  avoid resizing webview when keyboard shows/hides (#3094)
  Add support for skipping sending usage pixels for remote messages (#3106)
  Bump submodules/privacy-reference-tests from `a242bf0` to `afb4f61` (#3096)
  Updates BSK to 171.2.3
  Remove print (#3101)
  Update Package.resolved file (#3102)
  New Tab Page favorites section (#3083)
  Properly compare actual value of the entitlement check (#3100)
  fix ui tests broken by new onboarding and use shared setup flow (#3081)
  AdHoc lane: Make proper assignment to variable (#3095)
  Expand AdHoc build workflow, add debug bookmarks screen (#3086)
  Update BSK to latest - for macOS fix to AdAttribution (#3084)
  Revert "Fix tests"
  Fix tests
  ...

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	DuckDuckGo/NetworkProtectionStatusViewModel.swift
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.

None yet

2 participants