Kill switch #1408

mallexxx · 2023-07-28T14:25:13Z

Task/Issue URL: https://app.asana.com/0/72649045549333/1204311881295998/f
Tech Design URL:
BSK PR: duckduckgo/BrowserServicesKit#438

Description:

Kill Switch (enforceRoutes) toggle
Excluded routes basic (hardcoded ddg) implementation
Connect on Launch feature
cleanup, some refactoring

Steps to test this PR:

Validate VPN is working with default settings, Local Routes are excluded
Disconnect, activate enforceRoutes, connect, validate VPN is working, routes bypassing vpn - not
Activate DDG exclusion, validate "my ip" SERP request returns real ip, deactivate exclusion - ip should be VPN‘s
Disconnect. Activate connect on log in; restart Status Bar Agent - connection shouldn‘t be initiated. Reboot: VPN should reconnect automatically
Validate connection/disconnection from System Settings works and exclusions/enforceRoutes settings applied

Internal references:

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

github-actions · 2023-07-28T14:27:56Z

	Warnings
⚠️	PR has more than 500 lines of code changing. Consider splitting into smaller PRs if possible.

Generated by 🚫 dangerJS against c938e92

…dation to shouldAutoConnect on Log In

DuckDuckGo/AppDelegate/AppDelegate.swift

mallexxx · 2023-07-31T12:50:50Z

DuckDuckGo/Common/Extensions/NSApplicationExtension.swift

@@ -40,15 +40,16 @@ extension NSApplication {
            }
        }
    }
-    @objc dynamic var runType: RunType { .normal }
+    @objc dynamic class var runType: RunType { .normal }


UserDefaultsWrapper uses runType to distinguish test runs - this was crashing in the Agent

...uckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionSimulateFailureMenu.swift

mallexxx · 2023-07-31T12:55:33Z

...workProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift

-        case missingProviderConfiguration
-        case missingPixelHeaders
-    }
+    struct MissingPixelHeaders: Error { }


MissingProviderConfiguration() moved to the base class

diegoreymendez

Adding some comments.

diegoreymendez · 2023-07-31T14:38:59Z

Added some initial feedback, this is still ongoing though.

DuckDuckGo/AppDelegate/AppDelegate.swift

DuckDuckGo/Main/Main.swift

...etworkProtection/AppAndExtensionAndAgentTargets/NetworkProtectionUserDefaultsConstants.swift

DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionLoginItemsManager.swift

DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift

diegoreymendez

Added another set of comments, the review is sill ongoing.

One thing I didn't add inline is - the simulate tunnel option isn't working well for me. I pointed to a line were it seems we're mixing tunnel and controller errors, but I'm not sure if that's the cause of it.

It's simply not doing anything most of the time.

DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift

...uckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionSimulateFailureMenu.swift

DuckDuckGo/Menus/MainMenu.storyboard

diegoreymendez · 2023-08-01T16:17:55Z

@mallexxx - Could I ask you to share the configuration / rules that you're using in WireShark to test that the traffic is properly routed through the tunnel? I'd like to make sure I'm doing it right.

mallexxx · 2023-08-02T06:45:03Z

Reorganized the menu and disabling 10.0.0.0 from exclusions when enforceRoutes is active because otherwise DNS isn‘t working (and tunnel not working when 10.11.12.1 added to inclusions)
fixed tunnel failure action mistake

I‘m not using any custom config for WireShark, just opening bridge100 inspector when the browser is run in VM (see https://app.asana.com/0/0/1204180319229419/f)

diegoreymendez

I rolled back the approval, as I just noticed there's no iOS PR. Would you add the integration PR for iOS?

mallexxx · 2023-08-02T16:35:13Z

duckduckgo/iOS#1891

diegoreymendez

I'm approving this optimistically so we can move forward. If there's anything at this point we'll need to tackle it as a follow up.

Task/Issue URL: https://app.asana.com/0/72649045549333/1204311881295998/f iOS PR: duckduckgo/iOS#1891 macOS PR: duckduckgo/macos-browser#1408

Task/Issue URL: https://app.asana.com/0/72649045549333/1204311881295998/f BSK PR: duckduckgo/BrowserServicesKit#438 macOS PR: duckduckgo/macos-browser#1408

mallexxx added 2 commits July 28, 2023 20:16

kill switch

04727ff

Merge remote-tracking branch 'origin/develop' into alex/kill-switch

1191b09

mallexxx added the includes BSK changes label Jul 28, 2023

mallexxx requested a review from diegoreymendez July 28, 2023 14:25

mallexxx assigned diegoreymendez Jul 28, 2023

mallexxx mentioned this pull request Jul 28, 2023

Kill switch duckduckgo/BrowserServicesKit#438

Merged

mallexxx changed the title ~~kill switch~~ [WIP] kill switch Jul 31, 2023

mallexxx assigned mallexxx and unassigned diegoreymendez Jul 31, 2023

Exclusion list in debug menu; IncludedRoutes; added system start vali…

1f1f597

…dation to shouldAutoConnect on Log In

mallexxx assigned diegoreymendez and unassigned mallexxx Jul 31, 2023

mallexxx commented Jul 31, 2023

View reviewed changes

DuckDuckGo/AppDelegate/AppDelegate.swift Outdated Show resolved Hide resolved

mallexxx commented Jul 31, 2023

View reviewed changes

...uckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionSimulateFailureMenu.swift Show resolved Hide resolved

mallexxx commented Jul 31, 2023

View reviewed changes

cleanup

b8c532c

mallexxx changed the title ~~[WIP] kill switch~~ Kill switch Jul 31, 2023

diegoreymendez reviewed Jul 31, 2023

View reviewed changes

diegoreymendez self-requested a review July 31, 2023 14:39

diegoreymendez reviewed Jul 31, 2023

View reviewed changes

diegoreymendez self-requested a review July 31, 2023 17:01

PR review adjustments

f49ab20

diegoreymendez reviewed Aug 1, 2023

View reviewed changes

mallexxx added 3 commits August 2, 2023 12:38

set NatP availability to macOS 11.4

8c3680d

PR fixes

0c823ac

Merge remote-tracking branch 'origin/develop' into alex/kill-switch

b5ed735

diegoreymendez self-requested a review August 2, 2023 16:03

diegoreymendez approved these changes Aug 2, 2023

View reviewed changes

diegoreymendez self-requested a review August 2, 2023 16:08

diegoreymendez requested changes Aug 2, 2023

View reviewed changes

mallexxx mentioned this pull request Aug 2, 2023

BSK update: KS duckduckgo/iOS#1891

Merged

13 tasks

mallexxx added 3 commits August 3, 2023 11:27

bump bsk

1e59eb7

upd BSK, minor adjustments

cf391a9

Merge remote-tracking branch 'origin/develop' into alex/kill-switch

315b198

diegoreymendez self-requested a review August 3, 2023 15:31

diegoreymendez approved these changes Aug 3, 2023

View reviewed changes

mallexxx added a commit to duckduckgo/BrowserServicesKit that referenced this pull request Aug 4, 2023

Kill switch (#438)

f419ede

Task/Issue URL: https://app.asana.com/0/72649045549333/1204311881295998/f iOS PR: duckduckgo/iOS#1891 macOS PR: duckduckgo/macos-browser#1408

mallexxx added 4 commits August 4, 2023 11:13

add --force-exclude linter rule

c3e8ca9

rollback ConfigurationError

9e409b4

BSK -> 72.0.0

7001857

Merge remote-tracking branch 'origin/develop' into alex/kill-switch

3737598

mallexxx added a commit to duckduckgo/iOS that referenced this pull request Aug 4, 2023

BSK update: KS (#1891)

f9b22ae

Task/Issue URL: https://app.asana.com/0/72649045549333/1204311881295998/f BSK PR: duckduckgo/BrowserServicesKit#438 macOS PR: duckduckgo/macos-browser#1408

last minute fixes, drop unused code

c938e92

mallexxx merged commit f8df91f into develop Aug 4, 2023
10 checks passed

mallexxx deleted the alex/kill-switch branch August 4, 2023 06:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Kill switch #1408

Kill switch #1408

mallexxx commented Jul 28, 2023 •

edited

Loading

github-actions bot commented Jul 28, 2023 •

edited

Loading

mallexxx Jul 31, 2023

mallexxx Jul 31, 2023

diegoreymendez left a comment •

edited

Loading

diegoreymendez commented Jul 31, 2023

diegoreymendez left a comment

diegoreymendez commented Aug 1, 2023

mallexxx commented Aug 2, 2023 •

edited

Loading

diegoreymendez left a comment

mallexxx commented Aug 2, 2023

diegoreymendez left a comment

Kill switch #1408

Kill switch #1408

Conversation

mallexxx commented Jul 28, 2023 • edited Loading

Internal references:

github-actions bot commented Jul 28, 2023 • edited Loading

mallexxx Jul 31, 2023

Choose a reason for hiding this comment

mallexxx Jul 31, 2023

Choose a reason for hiding this comment

diegoreymendez left a comment • edited Loading

Choose a reason for hiding this comment

diegoreymendez commented Jul 31, 2023

diegoreymendez left a comment

Choose a reason for hiding this comment

diegoreymendez commented Aug 1, 2023

mallexxx commented Aug 2, 2023 • edited Loading

diegoreymendez left a comment

Choose a reason for hiding this comment

mallexxx commented Aug 2, 2023

diegoreymendez left a comment

Choose a reason for hiding this comment

mallexxx commented Jul 28, 2023 •

edited

Loading

github-actions bot commented Jul 28, 2023 •

edited

Loading

diegoreymendez left a comment •

edited

Loading

mallexxx commented Aug 2, 2023 •

edited

Loading