Network Protection #1211

samsymons · 2023-05-23T01:17:32Z

Task/Issue URL: https://app.asana.com/0/1199230911884351/1204654293315452/f
Tech Design URL:
CC: @ayoy @diegoreymendez @graeme @mallexxx

Description:

This PR adds Network Protection to the macOS browser.

Steps to test this PR:

To test basic connectivity:

Test that building of all targets succeeds
Test that you can archive a build of the app with NetP included, using the archive.sh script
Once you have a build, move it to the /Applications directory and run it
Visit the Settings -> About page, and click the version number label 7 times (until a prompt appears)
Enter an invite code from here
Connect to NetP - you should get a prompt asking you to allow the system extension
Verify that you are now running and connected to a nearby server

Issues to fix:

Fix ShellCheck (done in a PR, not yet merged and pushed to this branch)
The WireGuard XCFramework is checked into the branch directly (done in a PR)
There is some config hardcoded into the project files

Internal references:

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

Task/Issue URL: https://app.asana.com/0/0/1203279827923530/f Tech Design URL: CC: Description: This PR sets the macOS repo up for NetP work in the following ways: • Two new configurations have been added, NetworkProtection_Debug and NetworkProtection_Release, with their own bundle IDs • A new app icon has been added to both of them, to differentiate these builds from others • The product name has been set to DuckDuckGo Network Protection • The Network Extension entitlement has been added to the new configurations • Sparkle updates have been disabled. I am tracking this with a TODO (NetP): comment, but am open to a better way to keep track of changes that we need to undo before merging this into the upstream repo Note, this change does not yet add a new target for the VPN extension. I plan to keep that in a separate PR to avoid this one getting too large.

Task/Issue URL: https://app.asana.com/0/0/1203340357678926/f Tech Design URL: CC: Description: This PR adds an empty packet tunnel provider to the macOS browser. It uses Network Protection Extension as the target name, but uses DuckDuckGo Network Protection as the product name, since that is what will be visible to users who are looking in Activity Monitor etc.

…ogger initialization

…est, and fixes the VPN duplication issue

… VPN again

…ress support.

…onnectivity Asana task: https://app.asana.com/0/0/1203279827923539/f

…ing easier

…ration Improve NetP configuration

samsymons · 2023-05-26T05:45:01Z

DuckDuckGo/Common/Logging/Logging.swift

-#if DEBUG
- assertionFailure("\(message)")
+func logOrAssertionFailure(_ message: String) {
+#if DEBUG && !CI


This should probably be reverted, and instead the cause of this failing on CI should be investigated fully

DuckDuckGo/Common/Extensions/TimeIntervalExtension.swift

DuckDuckGo/Assets.xcassets/Images/InviteLockSuccess.imageset/Intive-Lock-Succes-96.pdf

DuckDuckGo/AppDelegate/AppDelegate.swift

DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Task/Issue URL: Tech Design URL: CC: Description: This PR removes NetP from the App Store target.

* bundle libswift_Concurrency.dylib in SysEx Task/Issue URL: https://app.asana.com/0/1202406491309510/1204667934411108

Configuration/App/DuckDuckGo.xcconfig

DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

It wasn’t used any more.

…checking if they're running before

ayoy

I think that’s all I can do for this pull request. Configuration changes look good, the App Store app compiles and runs fine. I’ve also checked the review build again and this time, when installed to /Applications it worked great (notifications prompt + login item + agent). It’s good to go from my side, but let me know if you end up merging more fixes and you’d want me to have another look.

ayoy · 2023-05-26T13:37:35Z

Configuration/Global.xcconfig

+// This is temporarily set this back to its default value, as a part of merging Network Protection. There are a small number of warnings introduced in
+// that feature, and more time is needed to address them. To avoid bothering other developers, this is being disabled and a task to fix it will be
+// prioritized.
+SWIFT_STRICT_CONCURRENCY = minimal;


Yeah, sorry for this - we tried to get these warnings resolved, but they're complicated. Alex has a PR up which addresses some of this, but it had other effects so we decided to hold off on merging it in favour of this approach.

ayoy · 2023-05-26T13:42:46Z

I forgot to congratulate all of you for the amazing work guys @samsymons @diegoreymendez @mallexxx @graeme. Hats off 🙇

# By Dominik Kapusta # Via GitHub * upstream_develop: Sync Engine with support for syncing bookmarks (#1203) # Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo/AppDelegate/AppDelegate.swift

This matches the convention already established in the browser.

* upstream_develop: Update BSK with autofill 7.1.0 (#1225) Autofill password generation support for iOS (#1212)

This should have no effect as Global.xcconfig specifies this, but I’d rather keep the xcconfig files the same as develop as possible.

* release/1.42.0: (26 commits) Bump version to 1.42.0 (28) Update embedded files Network Protection (#1211) Update BSK with autofill 7.1.0 (#1225) Autofill password generation support for iOS (#1212) Sync Engine with support for syncing bookmarks (#1203) Bump BSK for messaging updates (#1213) add newTab pixel, fire pixels only for new users first time (#1219) Update tds endpoint (#1218) prevent devices from being fetch when sync not visible (#1214) License and contributor guidelines for open-sourcing (#1189) Add a unique Bitwarden decryption failure pixel (#1197) Bump version to 1.41.0 (27) Update embedded files Check that the source and target frame security origins are equal (#1207) Add activation points pixels (#1206) Add Login export links to settings and Autofill 3 dot menu (#1183) sync device connected names (#1205) Autofill/subdomain matching (#1122) add-windows-browser-download-link-privacy-config (#1198) ...

samsymons and others added 30 commits November 9, 2022 11:45

Added the 'Toggle Network Protection' menu

8511315

Very first working implementation of NetP

25ba98d

Cleaning up for code review

b9d3116

Replaces a literal with a proper constant

16aa731

Fixed the author for two files

e5dcb05

Removed some commented code

77a982e

Removed an extra space

d7d3a53

Fixes some files, removes commented code

e2b0bdc

Cleans up the bundle IDs for the network extension and improves our l…

90c15bc

…ogger initialization

Fixed some warnings, improved logging code

edd2906

Cleans up the code

d73a1bb

Removes code, cleans up code, removes the keychain authorization requ…

e3a3052

…est, and fixes the VPN duplication issue

Resolves a merge conflicts due to some changes I hadn't pulled

753eb06

Removes a build step that wasn't necessary, cleans up code, fixes the…

ee4a31f

… VPN again

Implements Keychain sharing, makes the VPN more resilient

05ffe78

Moved the NetP private key to an environment variable. Added IPv6 add…

b21c9e9

…ress support.

Merge pull request #3 from more-duckduckgo-org/diego/implement-netp-c…

965c624

…onnectivity Asana task: https://app.asana.com/0/0/1203279827923539/f

Uses a quick config file to customize the configuration and make test…

72dfd94

…ing easier

Enabled the network server capability

b3d4a0d

Implements a status bar NetP menu, and a more options NetP submenu

80f239d

Added two files I missed in my previous commit

c80926f

Merges NetP/develop into develop

232b2e0

Merge branch 'develop' into diego/fix-netp-configuration

003004f

Cleans up the code a bit

85a01a1

Implements NetworkProtectionLogger to unify logging logic

26d6234

Merge pull request #4 from more-duckduckgo-org/diego/fix-netp-configu…

b2b000e

…ration Improve NetP configuration

Merge branch 'network-protection' into diego/implement-netp-status-menu

f33462a

Makes an IUO a proper optional

46f619a

samsymons commented May 26, 2023

View reviewed changes

DuckDuckGo/Common/Extensions/TimeIntervalExtension.swift Outdated Show resolved Hide resolved

samsymons commented May 26, 2023

View reviewed changes

DuckDuckGo/Assets.xcassets/Images/InviteLockSuccess.imageset/Intive-Lock-Succes-96.pdf Outdated Show resolved Hide resolved

samsymons commented May 26, 2023

View reviewed changes

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

samsymons commented May 26, 2023

View reviewed changes

DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved Outdated Show resolved Hide resolved

samsymons and others added 3 commits May 25, 2023 23:10

Remove NetP from the App Store target (#110)

305febd

Task/Issue URL: Tech Design URL: CC: Description: This PR removes NetP from the App Store target.

bundle libswift_Concurrency.dylib in SysEx (#109)

b3370e3

* bundle libswift_Concurrency.dylib in SysEx Task/Issue URL: https://app.asana.com/0/1202406491309510/1204667934411108

Lower the Swift Concurrency checking level temporarily.

c644735

ayoy reviewed May 26, 2023

View reviewed changes

Configuration/App/DuckDuckGo.xcconfig Show resolved Hide resolved

DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved Outdated Show resolved Hide resolved

samsymons and others added 9 commits May 25, 2023 23:32

Update unit tests to account for non-NetP builds.

11e4f71

Simplify the system extension bundle ID.

1ce1d0c

Remove the network extension entitlement from the App Store target.

98a2ecb

Delete FileManager+Extension.

5cce11b

It wasn’t used any more.

Disabling login items should not throw exceptions, because we're not …

ce4c724

…checking if they're running before

Some small fixes from PR feedback

3a7a69e

Fixed a typo in a file name and updated the name in the file header

2592164

Rolled back a change that broke SYSEX_BUNDLE_ID

daf9f68

Added a comment to clarify an unclear choice

874a60f

ayoy approved these changes May 26, 2023

View reviewed changes

samsymons added 7 commits May 26, 2023 08:20

Merge branch 'upstream_develop' into network-protection

429e9ed

# By Dominik Kapusta # Via GitHub * upstream_develop: Sync Engine with support for syncing bookmarks (#1203) # Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo/AppDelegate/AppDelegate.swift

Fix a post-merge issue.

be219af

Turn off all NetP logging by default.

3d3c881

This matches the convention already established in the browser.

Merge branch 'upstream_develop' into network-protection

6f400d3

* upstream_develop: Update BSK with autofill 7.1.0 (#1225) Autofill password generation support for iOS (#1212)

Update the BSK version in NetworkProtection, and add a comment.

c78eeaf

Restore the original Common.xcconfig settings.

458b599

This should have no effect as Global.xcconfig specifies this, but I’d rather keep the xcconfig files the same as develop as possible.

Fix a typo.

b055a89

samsymons merged commit 75b6ee7 into develop May 26, 2023

samsymons deleted the sam/network-protection branch May 26, 2023 19:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Network Protection #1211

Network Protection #1211

samsymons commented May 23, 2023 •

edited

Loading

samsymons May 26, 2023

ayoy left a comment

ayoy May 26, 2023

samsymons May 26, 2023

ayoy commented May 26, 2023

Network Protection #1211

Network Protection #1211

Conversation

samsymons commented May 23, 2023 • edited Loading

Internal references:

samsymons May 26, 2023

Choose a reason for hiding this comment

ayoy left a comment

Choose a reason for hiding this comment

ayoy May 26, 2023

Choose a reason for hiding this comment

samsymons May 26, 2023

Choose a reason for hiding this comment

ayoy commented May 26, 2023

samsymons commented May 23, 2023 •

edited

Loading