This repository was archived by the owner on Feb 24, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 16
Network Protection #1211
Merged
Merged
Network Protection #1211
Changes from all commits
Commits
Show all changes
233 commits
Select commit
Hold shift + click to select a range
fb04460
Add Network Protection configurations (#1)
samsymons 2165059
Add a template packet tunnel provider (#2)
samsymons 8511315
Added the 'Toggle Network Protection' menu
diegoreymendez 25ba98d
Very first working implementation of NetP
diegoreymendez b9d3116
Cleaning up for code review
diegoreymendez 16aa731
Replaces a literal with a proper constant
diegoreymendez e5dcb05
Fixed the author for two files
diegoreymendez 77a982e
Removed some commented code
diegoreymendez d7d3a53
Removed an extra space
diegoreymendez e2b0bdc
Fixes some files, removes commented code
diegoreymendez 90c15bc
Cleans up the bundle IDs for the network extension and improves our l…
diegoreymendez edd2906
Fixed some warnings, improved logging code
diegoreymendez d73a1bb
Cleans up the code
diegoreymendez e3a3052
Removes code, cleans up code, removes the keychain authorization requ…
diegoreymendez 753eb06
Resolves a merge conflicts due to some changes I hadn't pulled
diegoreymendez ee4a31f
Removes a build step that wasn't necessary, cleans up code, fixes the…
diegoreymendez 05ffe78
Implements Keychain sharing, makes the VPN more resilient
diegoreymendez b21c9e9
Moved the NetP private key to an environment variable. Added IPv6 add…
diegoreymendez 965c624
Merge pull request #3 from more-duckduckgo-org/diego/implement-netp-c…
diegoreymendez 72dfd94
Uses a quick config file to customize the configuration and make test…
diegoreymendez b3d4a0d
Enabled the network server capability
diegoreymendez 80f239d
Implements a status bar NetP menu, and a more options NetP submenu
diegoreymendez c80926f
Added two files I missed in my previous commit
diegoreymendez 232b2e0
Merges NetP/develop into develop
diegoreymendez 003004f
Merge branch 'develop' into diego/fix-netp-configuration
diegoreymendez 85a01a1
Cleans up the code a bit
diegoreymendez 26d6234
Implements NetworkProtectionLogger to unify logging logic
diegoreymendez b2b000e
Merge pull request #4 from more-duckduckgo-org/diego/fix-netp-configu…
diegoreymendez f33462a
Merge branch 'network-protection' into diego/implement-netp-status-menu
diegoreymendez 46f619a
Makes an IUO a proper optional
diegoreymendez 87696e7
Fixes some issue with the VPN setup
diegoreymendez d055a60
Fixes some configuration issues with NetP
diegoreymendez 80e0016
Removes some unnecessary lines of code
diegoreymendez 74743d0
Fixes some issues with Network Protection
diegoreymendez eb5048c
Merge pull request #5 from more-duckduckgo-org/diego/implement-netp-s…
diegoreymendez fe80204
Merge remote-tracking branch 'upstream/develop' into network-protection
samsymons c51a687
Resolve post-merge build errors.
samsymons 207fde6
Add Network Protection to BrowserServicesKit (#6)
samsymons 9420f99
Merges the latest from upstream
diegoreymendez 6b7a008
NetP Status View (#7)
diegoreymendez 07f0581
Merges the latest from upstream
diegoreymendez c3d4e7e
Show status view in status bar menu (#8)
diegoreymendez 20abd96
Add system extension support for NetP. (#10)
diegoreymendez 58a1c7a
Adds a 'Share Feedback' link within NetP (#11)
diegoreymendez 9ef6e39
Fixes the timer text jumping around (#12)
diegoreymendez 0936d6c
Addresses design feedback for NetP's status view (#13)
diegoreymendez 55c144c
Adds several unit tests for NetworkProtection (#9)
diegoreymendez 9b8d7d6
Fixes the color of a field in NetP's status view (#14)
diegoreymendez 9e03580
Backend integration (#15)
samsymons e3b1eed
Update the feedback URL to open in the current window. (#17)
samsymons badedc8
Import upstream IP address crash fix (#20)
samsymons ad4b99d
Network Protection: reconnect after interruption (#22)
diegoreymendez 1de64c7
Present an alert to users when running the app outside of the Applica…
samsymons bd68149
Sparkle support (#21)
samsymons d69f7b0
Update BSK revision. (#19)
samsymons ad21e35
Internal beta preparation (#23)
samsymons f8b408d
Improve error logging (#24)
diegoreymendez 4f923bf
Update app version and use correct version for sysex.
samsymons fb12cea
Design review & fixes (#28)
diegoreymendez dff6f0b
Updates the NetP icon to show and hide the lock. Fixes unit tests. (#25)
diegoreymendez b981749
Set version to 1.0.3.
samsymons 572fcaf
Open NetP's feedback form in the default browser (#29)
diegoreymendez 7ec4841
More resilient connection logic (#30)
diegoreymendez 52c9bd0
Merges the latest from upstream. (#27)
diegoreymendez 48e5f3c
More resilient connection logic #2 (#31)
diegoreymendez 4612795
More resilient connection logic 3 (#32)
diegoreymendez f81bd5e
Implement rekey logic (#33)
diegoreymendez 2619a97
Change DNS settings (#37)
diegoreymendez 7b45100
Added exclusion routes for ipv4 (#36)
diegoreymendez dd16567
Implements rekey triggers. (#38)
diegoreymendez 8df5d48
Fixes the notification login item (#41)
diegoreymendez e8bc92c
Adds underlying error details to NetworkProtectionClientError.failedT…
diegoreymendez ee42389
Improved the code that handles stopping the tester when going into sl…
diegoreymendez 2f798c6
Fixes pixels and adds rekeying pixel (#39)
diegoreymendez af762fa
Keep the connection timer in sync with the system one (#42)
diegoreymendez c81f22c
Add active usage pixels, and support daily/continuous pixel formats (…
samsymons 891e191
Update Sparkle URL for appcast2.
samsymons f216268
Update version number.
samsymons f46d316
Bump version to 1.0.4 manually.
samsymons c085157
Fixes and improvements (#44)
diegoreymendez 0d7f126
Disabled the rekey validity menu option from non DEBUG builds, since …
diegoreymendez 38b59e4
Fix an issue where the dailyAndContinuous case would not fire daily p…
samsymons c9bdaad
Update to version 1.0.5.
samsymons be7e237
Update backend URL (#45)
samsymons 6e11cac
Improves logging and removes exit call when stopping the tunnel (#48)
diegoreymendez 899cd42
Fix version number.
samsymons d4a1f06
Fix the updater URL.
samsymons ab107de
Status Menu #1: Implement error simulation for testing (#50)
diegoreymendez 9a8590a
Status Menu #2: Implement VPN controller for Login Item (#51)
diegoreymendez bd19464
Status Menu #3: Move code to NetworkProtection package. (#52)
diegoreymendez 9f1bd42
Remove BSK from the NetP system extension. (#56)
samsymons f0d1d9d
latency reporting (#57)
mallexxx c91cb52
Enable automatic updates (#55)
samsymons c70468c
Remove the `NETP` build flag and add NetP files to the main app targe…
samsymons df28248
Set version to 1.0.6.
samsymons 8869b84
Restore the debug menu.
samsymons c057284
Status Menu #4: Add Agent bundle IDs (#60)
diegoreymendez e5bc205
Remove an unused directory.
samsymons 84f8bf4
Status Menu #5: standalone Status Menu (#53)
diegoreymendez f5f5a98
Status Menu #6: Implement Status View changes (#54)
diegoreymendez d3d06a3
Update NetP icons and make NetP pinnable to the navigation bar (#61)
diegoreymendez ee01bc0
NetP invite codes (#62)
graeme 310e6c5
Migrates the Agent app VPN controller to the symlink solution (#63)
diegoreymendez 1f0fba0
Resolve status menu refresh issues (#64)
diegoreymendez 1f66c9c
Fix a versioning issue.
samsymons 346e382
Forces the update of the login items on launch (#65)
diegoreymendez fc663d7
Set version to 1.0.8.
samsymons 8ab9756
Improves the coloring of the menu items in NetP's status view
diegoreymendez 7763bb1
Organize the project file (#66)
samsymons 160674e
Merge branch ‘develop’ into sam/merge-upstream-into-netp
samsymons 5b8f02f
macOS: status menu enhancements design review (#68)
diegoreymendez c06da10
Address feedback by alex (#67)
diegoreymendez 9186364
Kills the NetP connection and login item if a new version of the app …
diegoreymendez c2dca30
Move the NetP packages and add them to Xcode.
samsymons c7b45db
Get the app building (but not yet running).
samsymons eab4995
The NetP status menu is now hidden if the app is started without an i…
diegoreymendez 1deb022
Fixes the NetP menu item selection animation (#70)
diegoreymendez 70246b1
NetP Invite dialog design review feedback (#72)
graeme 0006ca4
NetP's Share-Feedback option now opens in the current browser instead…
diegoreymendez 40c34df
Increased the NetP version number to .10
diegoreymendez ace4b72
Remove the NetP Info.plist.
samsymons a7b53cc
Recreate the notifications target
samsymons da05783
Recreate the system extension target
samsymons 712c4f3
Add the system extension to the input files checker
samsymons d094c71
Make sure the Developer ID target can run again.
samsymons 9b808cc
Fix up the main menu.
samsymons 7e1b772
Update the input files checker.
samsymons ea3a3ac
Rebuild the agent target
samsymons 16059f0
Get the notification agent running
samsymons ee42526
Fixes a refresh issue with NetP's nav bar icon (#75)
diegoreymendez 50d054c
Work on moving NetP logic into the main app targets.
samsymons a766bfd
Run dev-id build from Applications directory scripts (#73)
mallexxx 0629ed6
Fix unit test compilation.
samsymons 23f1569
Update DuckDuckGoAppStore entitlements to add the packet tunnel provi…
samsymons d20d3c5
Work on cleaning up config files.
samsymons 6730e18
Continue cleaning up bundle IDs, configs, entitlements etc
samsymons d088093
Add the startVPN app back to the project
samsymons b96d402
Add the stopVPN app back to the project
samsymons be7e682
Standardize the bundle IDs
samsymons 3ef2d0a
Fix the main app deployment target
samsymons 6a47dce
Remove the custom NetP icon
samsymons 93649a7
Resets lastErrorMessage when the NetP sysex is allowed by the user (#77)
diegoreymendez 635eaec
Fix issues with the input files checker
samsymons 16962b2
Fix more code signing issues.
samsymons 0292fe1
Fix the extension not found issue
samsymons 2e6bcce
Add the app groups
samsymons 7ccb2ef
Fix an entitlements issue that was preventing the app from saving a V…
samsymons 01a462c
Provides a script to fix the embed system extension build step for Ne…
diegoreymendez cafd3de
Merge branch 'network-protection' into sam/merge-upstream-into-netp
samsymons 5d26eb7
Fix an issue with the merge missing one file.
samsymons 303b421
Clean up the MoreOptionsMenu imports.
samsymons 2e9e1c3
Fix some issues with the MainMenu.swift merge.
samsymons 9f0e00a
Remove spaces in file paths.
samsymons 4213f79
Remove old internal user files that came over in the merge accidentally.
samsymons f0847d2
Remove some files that were duplicated during the merge.
samsymons 6162d74
Restore SwiftLint and fix it. Next the file_header rule will be re-en…
samsymons 8ee0392
Resolve all remaining SwiftLint warnings
samsymons c22d8d8
Fixes IPC, improves xcconfig configurations sharing (#82)
diegoreymendez f2c2446
Add @MainActor back to the app delegate.
samsymons 512c60c
Reset the state of PasswordManager.storyboard.
samsymons 3e80769
Fix the paths of the network protection tests. However, these files d…
samsymons b15d535
Remove two unused NetP files.
samsymons 092210e
Remove the unused networkProtectionScheme global.
samsymons 2ee416a
Change the notification target product name to `DuckDuckGo Notificati…
samsymons 5fdabd9
Fixes the NetPUI unit tests (#83)
diegoreymendez 31e104c
Add the proper app icon back to the Agent target’s asset catalog.
samsymons e71dd4d
Commit a scheme change related to the Notifications target.
samsymons d4b4026
Fixes a build setting
diegoreymendez ef5c46b
Merge branch 'diego/test' into sam/merge-upstream-into-netp
diegoreymendez dcf70a4
Avoid checking for spaces on non-source or resource files
samsymons df8d4a2
Remove a GitHub workflow that was removed upstream.
samsymons 08fa59f
Remove a function that was only used for early testers.
samsymons 7ee5668
Remove old internal channel icons that were added back.
samsymons c316eb8
Take the 12.3 deployment target out of the Dev ID xcconfig file.
samsymons 7004b4c
Add empty line back to Common.xcconfig
samsymons e3d4780
Set the pr.yml file back to the upstream state.
samsymons b9acc8e
Remove an alert extension that is no longer used
samsymons 6950536
Remove a duplicate build tool plugin.
samsymons f6b6a08
Merge branch 'upstream_develop' into sam/merge-upstream-into-netp
samsymons df00058
Update the NetworkProtection BSK version
samsymons b2103ce
code cleanup (#78)
mallexxx 89e120c
Fixes vendor options being nil when starting the VPN from the system …
diegoreymendez bd13366
Merge branch 'upstream_develop' into sam/merge-upstream-into-netp
samsymons 595e3d4
Merge branch 'network-protection' into sam/merge-upstream-into-netp
samsymons e44282d
Improve a test case.
samsymons cccd0c0
Pull upstream changes into the NetP branch (#81)
samsymons 02f9f42
Revert "Pull upstream changes into the NetP branch (#81)" (#92)
samsymons a2e9a9b
Merge branch 'network-protection' into sam/merge-upstream-into-netp
samsymons ab40365
Merge pull request #93 from duckduckgo/sam/merge-upstream-into-netp
samsymons 1bc3a31
Replace a TODO with a comment for now.
samsymons 058cd74
add LSUIElement to Start/Stop agent (#88)
mallexxx 4c8d087
Improved keychain management for NetP (#97)
diegoreymendez d3ec67a
Warning cleanup (#95)
samsymons 3ff8b5d
Fix SwiftLint violation.
samsymons a705af9
Display NetP and Autofill popovers on mouse down (#86)
mallexxx 8d4d61d
Clean up project configuration (#101)
samsymons 6f35d50
Cheat a little bit and circumvent SwiftLint.
samsymons 3170c5b
Use no provisioning profile by default, to allow the CI configuration…
samsymons 2b9b515
Remove two unused files.
samsymons 70f3141
Fix the Appcast URL.
samsymons aaf0b4d
Replace the local WireGuard framework with a remote package (#104)
samsymons 6e50482
Configuration file clean-up (#106)
samsymons 4d2a398
Launch login items using NSWorkspace if failed to launch (#100)
mallexxx f4a42b7
Update the invite code flow and feature visibility (#107)
samsymons 66e2a28
Set xcode deploy destination to /Applications/DEBUG (#108)
mallexxx 64dc475
Update one of the Swift tools version entries.
samsymons 81b13e7
Merge branch 'upstream_develop' into network-protection
samsymons 7a5dad8
Make sure that assertion failures caused during CI runs don’t kill th…
samsymons 6f357fb
Address some warnings in the project.
samsymons 24c6fe4
Update the WireGuard package URL
samsymons 0668fef
Merge branch 'upstream_develop' into network-protection
samsymons 2d31668
Update the NetP BSK version.
samsymons cb098b4
Reset the tests-server.xcscheme state, as we no longer use this scrip…
samsymons 5728136
Revert some unnecessary changes from the NetP work.
samsymons 305febd
Remove NetP from the App Store target (#110)
samsymons b3370e3
bundle libswift_Concurrency.dylib in SysEx (#109)
mallexxx c644735
Lower the Swift Concurrency checking level temporarily.
samsymons 11e4f71
Update unit tests to account for non-NetP builds.
samsymons 1ce1d0c
Simplify the system extension bundle ID.
samsymons 98a2ecb
Remove the network extension entitlement from the App Store target.
samsymons 5cce11b
Delete FileManager+Extension.
samsymons ce4c724
Disabling login items should not throw exceptions, because we're not …
diegoreymendez 3a7a69e
Some small fixes from PR feedback
diegoreymendez 2592164
Fixed a typo in a file name and updated the name in the file header
diegoreymendez daf9f68
Rolled back a change that broke SYSEX_BUNDLE_ID
diegoreymendez 874a60f
Added a comment to clarify an unclear choice
diegoreymendez 429e9ed
Merge branch 'upstream_develop' into network-protection
samsymons be219af
Fix a post-merge issue.
samsymons 3d3c881
Turn off all NetP logging by default.
samsymons 6f400d3
Merge branch 'upstream_develop' into network-protection
samsymons c78eeaf
Update the BSK version in NetworkProtection, and add a comment.
samsymons 458b599
Restore the original Common.xcconfig settings.
samsymons b055a89
Fix a typo.
samsymons File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
62 changes: 62 additions & 0 deletions
62
Configuration/App/NetworkProtection/DuckDuckGoAgent.xcconfig
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| // Copyright © 2023 DuckDuckGo. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| #include "../AppTargetsBase.xcconfig" | ||
| #include "../../NetworkProtectionDeveloperID.xcconfig" | ||
|
|
||
| BUNDLE_IDENTIFIER_PREFIX = $(AGENT_BUNDLE_ID) | ||
|
|
||
| // Override AppTargetsBase.xcconfig until we resolve bundle IDs. | ||
| PRODUCT_BUNDLE_IDENTIFIER[sdk=*] = $(BUNDLE_IDENTIFIER_PREFIX) | ||
| PRODUCT_BUNDLE_IDENTIFIER[config=Debug][sdk=*] = $(BUNDLE_IDENTIFIER_PREFIX) | ||
| PRODUCT_BUNDLE_IDENTIFIER[config=CI][sdk=*] = $(BUNDLE_IDENTIFIER_PREFIX) | ||
| PRODUCT_BUNDLE_IDENTIFIER[config=Review][sdk=*] = $(BUNDLE_IDENTIFIER_PREFIX) | ||
|
|
||
| INFOPLIST_FILE = DuckDuckGoAgent/Info.plist | ||
| GENERATE_INFOPLIST_FILE = YES | ||
| INFOPLIST_KEY_LSUIElement = YES | ||
| INFOPLIST_KEY_NSPrincipalClass = Application | ||
|
|
||
| // Just make sure to override anything set by the AppTargetBase.xcconfig | ||
| //CODE_SIGN_STYLE[config=Debug][sdk=*] = Manual | ||
| //CODE_SIGN_STYLE[config=Release][sdk=*] = Manual | ||
|
|
||
| // Left empty intentionally as we currently only support debug and release builds | ||
| CODE_SIGN_ENTITLEMENTS[config=Review][sdk=macosx*] = | ||
| CODE_SIGN_ENTITLEMENTS[config=CI][sdk=macosx*] = | ||
| CODE_SIGN_ENTITLEMENTS[config=Debug][sdk=macosx*] = DuckDuckGoAgent/DuckDuckGoAgent.entitlements | ||
| CODE_SIGN_ENTITLEMENTS[config=Release][sdk=macosx*] = DuckDuckGoAgent/DuckDuckGoAgent.entitlements | ||
|
|
||
| CODE_SIGN_IDENTITY[sdk=macosx*] = Developer ID Application | ||
| CODE_SIGN_IDENTITY[config=Debug][sdk=macosx*] = Apple Development | ||
| CODE_SIGN_IDENTITY[config=CI][sdk=macosx*] = | ||
|
|
||
| PRODUCT_NAME = $(AGENT_PRODUCT_NAME) | ||
|
|
||
| PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] = | ||
| PROVISIONING_PROFILE_SPECIFIER[config=Review][sdk=macosx*] = macOS Network Protection Agent App Product Review | ||
| PROVISIONING_PROFILE_SPECIFIER[config=Release][sdk=macosx*] = macOS Network Protection Agent App (Distribution) | ||
|
|
||
| FEATURE_FLAGS[arch=*][sdk=*] = NETP_SYSTEM_EXTENSION | ||
| FEATURE_FLAGS[config=CI][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION | ||
| FEATURE_FLAGS[config=Debug][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION | ||
| FEATURE_FLAGS[config=Review][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION | ||
|
|
||
| ENABLE_APP_SANDBOX = YES | ||
| SWIFT_OBJC_BRIDGING_HEADER = | ||
| SKIP_INSTALL = YES | ||
| ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = | ||
|
|
||
| #include? "../../../LocalOverrides.xcconfig" |
62 changes: 62 additions & 0 deletions
62
Configuration/App/NetworkProtection/DuckDuckGoAgentAppStore.xcconfig
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| // Copyright © 2023 DuckDuckGo. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| #include "../AppTargetsBase.xcconfig" | ||
| #include "../../AppStore.xcconfig" | ||
|
|
||
| BUNDLE_IDENTIFIER_PREFIX = HKE973VLUW.com.duckduckgo.macos.browser.network-protection.agent | ||
|
|
||
| // Override AppTargetsBase.xcconfig until we resolve bundle IDs. | ||
| PRODUCT_BUNDLE_IDENTIFIER[sdk=*] = $(BUNDLE_IDENTIFIER_PREFIX) | ||
| PRODUCT_BUNDLE_IDENTIFIER[config=Debug][sdk=*] = $(BUNDLE_IDENTIFIER_PREFIX).debug | ||
| PRODUCT_BUNDLE_IDENTIFIER[config=CI][sdk=*] = $(BUNDLE_IDENTIFIER_PREFIX).debug | ||
| PRODUCT_BUNDLE_IDENTIFIER[config=Review][sdk=*] = $(BUNDLE_IDENTIFIER_PREFIX).review | ||
|
|
||
| INFOPLIST_FILE = DuckDuckGoAgent/Info-AppStore.plist | ||
| GENERATE_INFOPLIST_FILE = YES | ||
| INFOPLIST_KEY_LSUIElement = YES | ||
| INFOPLIST_KEY_NSPrincipalClass = Application | ||
|
|
||
| // Just make sure to override anything set by the AppTargetBase.xcconfig | ||
| //CODE_SIGN_STYLE[config=Debug][sdk=*] = Manual | ||
| //CODE_SIGN_STYLE[config=Release][sdk=*] = Manual | ||
|
|
||
| // Left empty intentionally as we currently only support debug and release builds | ||
| CODE_SIGN_ENTITLEMENTS[config=Review][sdk=macosx*] = | ||
| CODE_SIGN_ENTITLEMENTS[config=CI][sdk=macosx*] = | ||
| CODE_SIGN_ENTITLEMENTS[config=Debug][sdk=macosx*] = DuckDuckGoAgent/DuckDuckGoAgentAppStore.entitlements | ||
| CODE_SIGN_ENTITLEMENTS[config=Release][sdk=macosx*] = DuckDuckGoAgent/DuckDuckGoAgentAppStore.entitlements | ||
|
|
||
| CODE_SIGN_IDENTITY[sdk=macosx*] = 3rd Party Mac Developer Application | ||
| CODE_SIGN_IDENTITY[config=Review][sdk=macosx*] = Developer ID Application | ||
| CODE_SIGN_IDENTITY[config=Debug][sdk=macosx*] = Apple Development | ||
| CODE_SIGN_IDENTITY[config=CI][sdk=macosx*] = | ||
|
|
||
| PRODUCT_NAME = $(AGENT_PRODUCT_NAME) | ||
|
|
||
| PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] = | ||
| PROVISIONING_PROFILE_SPECIFIER[config=Release][sdk=macosx*] = Mac Browser NetP Developer ID Not. (Distribution) | ||
|
|
||
| FEATURE_FLAGS[arch=*][sdk=*] = | ||
| FEATURE_FLAGS[config=CI][arch=*][sdk=*] = | ||
| FEATURE_FLAGS[config=Debug][arch=*][sdk=*] = | ||
| FEATURE_FLAGS[config=Review][arch=*][sdk=*] = | ||
|
|
||
| ENABLE_APP_SANDBOX = YES | ||
| SWIFT_OBJC_BRIDGING_HEADER = | ||
| SKIP_INSTALL = YES | ||
| ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = | ||
|
|
||
| #include? "../../../LocalOverrides.xcconfig" |
58 changes: 58 additions & 0 deletions
58
Configuration/App/NetworkProtection/DuckDuckGoNotifications.xcconfig
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| // Copyright © 2023 DuckDuckGo. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| #include "../AppTargetsBase.xcconfig" | ||
| #include "../../NetworkProtectionDeveloperID.xcconfig" | ||
|
|
||
| BUNDLE_IDENTIFIER_PREFIX = $(NOTIFICATIONS_AGENT_BUNDLE_ID) | ||
|
|
||
| // Override AppTargetsBase.xcconfig until we resolve bundle IDs. | ||
| PRODUCT_BUNDLE_IDENTIFIER[sdk=*] = $(BUNDLE_IDENTIFIER_PREFIX) | ||
| PRODUCT_BUNDLE_IDENTIFIER[config=Debug][sdk=*] = $(BUNDLE_IDENTIFIER_PREFIX) | ||
| PRODUCT_BUNDLE_IDENTIFIER[config=CI][sdk=*] = $(BUNDLE_IDENTIFIER_PREFIX) | ||
| PRODUCT_BUNDLE_IDENTIFIER[config=Review][sdk=*] = $(BUNDLE_IDENTIFIER_PREFIX) | ||
|
|
||
| INFOPLIST_FILE = DuckDuckGoNotifications/Info.plist | ||
| GENERATE_INFOPLIST_FILE = YES | ||
| INFOPLIST_KEY_LSUIElement = YES | ||
| INFOPLIST_KEY_NSPrincipalClass = Application | ||
|
|
||
| // Left empty intentionally as we currently only support debug and release builds | ||
| CODE_SIGN_ENTITLEMENTS[config=Review][sdk=macosx*] = | ||
| CODE_SIGN_ENTITLEMENTS[config=CI][sdk=macosx*] = | ||
| CODE_SIGN_ENTITLEMENTS[config=Debug][sdk=macosx*] = DuckDuckGoNotifications/DuckDuckGoNotifications.entitlements | ||
| CODE_SIGN_ENTITLEMENTS[config=Release][sdk=macosx*] = DuckDuckGoNotifications/DuckDuckGoNotifications.entitlements | ||
|
|
||
| CODE_SIGN_IDENTITY[sdk=macosx*] = Developer ID Application | ||
| CODE_SIGN_IDENTITY[config=Debug][sdk=macosx*] = Apple Development | ||
| CODE_SIGN_IDENTITY[config=CI][sdk=macosx*] = | ||
|
|
||
| PRODUCT_NAME_PREFIX = $(NOTIFICATIONS_AGENT_PRODUCT_NAME) | ||
| PRODUCT_NAME[config=Review][arch=*][sdk=*] = $(NOTIFICATIONS_AGENT_PRODUCT_NAME) | ||
|
|
||
| PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] = | ||
| PROVISIONING_PROFILE_SPECIFIER[config=Review][sdk=macosx*] = MacOS Browser NetP Notifications Product Review | ||
| PROVISIONING_PROFILE_SPECIFIER[config=Release][sdk=macosx*] = Mac Browser NetP Developer ID Not. (Distribution) | ||
|
|
||
| FEATURE_FLAGS[arch=*][sdk=*] = NETP_SYSTEM_EXTENSION | ||
| FEATURE_FLAGS[config=CI][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION | ||
| FEATURE_FLAGS[config=Debug][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION | ||
| FEATURE_FLAGS[config=Review][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION | ||
|
|
||
| SWIFT_OBJC_BRIDGING_HEADER = | ||
| SKIP_INSTALL = YES | ||
| ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = | ||
|
|
||
| #include? "../../../LocalOverrides.xcconfig" |
82 changes: 82 additions & 0 deletions
82
Configuration/App/NetworkProtection/NetworkProtectionStartStopVPNBase.xcconfig
samsymons marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| // Copyright © 2023 DuckDuckGo. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| #include "../../Common.xcconfig" | ||
|
|
||
| ALWAYS_SEARCH_USER_PATHS=NO | ||
| ASSETCATALOG_COMPILER_APPICON_NAME=AppIcon | ||
|
|
||
| CODE_SIGN_ENTITLEMENTS=DuckDuckGo/NetworkProtectionVPNController.entitlements | ||
| CODE_SIGN_IDENTITY[sdk=macosx*] = Developer ID Application | ||
| CODE_SIGN_IDENTITY[config=CI][sdk=macosx*] = | ||
| CODE_SIGN_IDENTITY[config=Debug][sdk=macosx*] = Apple Development | ||
|
|
||
| CODE_SIGN_STYLE[sdk=*] = Manual | ||
| CODE_SIGN_STYLE[config=Debug][sdk=*] = Automatic | ||
|
|
||
| COMBINE_HIDPI_IMAGES=YES | ||
| COPY_PHASE_STRIP=NO | ||
|
|
||
| DEBUG_INFORMATION_FORMAT[config=CI]=dwarf-with-dsym | ||
| DEBUG_INFORMATION_FORMAT[config=Debug]=dwarf | ||
| DEBUG_INFORMATION_FORMAT[config=Release]=dwarf-with-dsym | ||
| DEBUG_INFORMATION_FORMAT[config=Review]=dwarf-with-dsym | ||
|
|
||
| ENABLE_HARDENED_RUNTIME=YES | ||
| ENABLE_NS_ASSERTIONS[config=CI]=NO | ||
| ENABLE_NS_ASSERTIONS[config=Release]=NO | ||
| ENABLE_NS_ASSERTIONS[config=Review]=NO | ||
| ENABLE_PREVIEWS=YES | ||
| ENABLE_STRICT_OBJC_MSGSEND=YES | ||
| ENABLE_TESTABILITY[config=Debug]=YES | ||
|
|
||
| GCC_C_LANGUAGE_STANDARD=gnu11 | ||
| GCC_DYNAMIC_NO_PIC[config=Debug]=NO | ||
| GCC_NO_COMMON_BLOCKS=YES | ||
| GCC_OPTIMIZATION_LEVEL[config=Debug]=0 | ||
| GCC_PREPROCESSOR_DEFINITIONS[config=Debug]=DEBUG=1 $(inherited) | ||
| GCC_WARN_64_TO_32_BIT_CONVERSION=YES | ||
| GCC_WARN_ABOUT_RETURN_TYPE=YES_ERROR | ||
| GCC_WARN_UNDECLARED_SELECTOR=YES | ||
| GCC_WARN_UNINITIALIZED_AUTOS=YES_AGGRESSIVE | ||
| GCC_WARN_UNUSED_FUNCTION=YES | ||
| GCC_WARN_UNUSED_VARIABLE=YES | ||
| GENERATE_INFOPLIST_FILE=YES | ||
|
|
||
| INFOPLIST_KEY_LSUIElement=YES | ||
| INFOPLIST_KEY_NSHumanReadableCopyright=Copyright © 2023 DuckDuckGo. All rights reserved. | ||
|
|
||
| LD_RUNPATH_SEARCH_PATHS[config=CI]=$(inherited) @executable_path/../Frameworks | ||
| LD_RUNPATH_SEARCH_PATHS[config=Debug]=$(inherited) @executable_path/../Frameworks | ||
| LD_RUNPATH_SEARCH_PATHS[config=Release]=$(inherited) @executable_path/../Frameworks | ||
| LD_RUNPATH_SEARCH_PATHS[config=Review]=$(inherited) @executable_path/../Frameworks | ||
|
|
||
| MTL_ENABLE_DEBUG_INFO[config=CI]=NO | ||
| MTL_ENABLE_DEBUG_INFO[config=Debug]=INCLUDE_SOURCE | ||
| MTL_ENABLE_DEBUG_INFO[config=Release]=NO | ||
| MTL_ENABLE_DEBUG_INFO[config=Review]=NO | ||
| MTL_FAST_MATH=YES | ||
|
|
||
| ONLY_ACTIVE_ARCH[config=Debug]=YES | ||
| PRODUCT_NAME=$(TARGET_NAME) | ||
| SDKROOT=macosx | ||
|
|
||
| SKIP_INSTALL=YES | ||
|
|
||
| SWIFT_ACTIVE_COMPILATION_CONDITIONS[config=Debug]=DEBUG | ||
| SWIFT_COMPILATION_MODE[config=CI]=wholemodule | ||
| SWIFT_COMPILATION_MODE[config=Release]=wholemodule | ||
| SWIFT_COMPILATION_MODE[config=Review]=wholemodule | ||
| SWIFT_EMIT_LOC_STRINGS=YES |
23 changes: 23 additions & 0 deletions
23
Configuration/App/NetworkProtection/NetworkProtectionStartVPN.xcconfig
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| // Copyright © 2023 DuckDuckGo. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| #include "NetworkProtectionStartStopVPNBase.xcconfig" | ||
|
|
||
| PRODUCT_BUNDLE_IDENTIFIER=com.duckduckgo.macos.browser.network-protection.start-vpn | ||
|
|
||
| PROVISIONING_PROFILE_SPECIFIER[config=Debug][sdk=macosx*] = | ||
| PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] = | ||
| PROVISIONING_PROFILE_SPECIFIER[config=Release][sdk=macosx*] = MacOS Browser NetP - Start VPN | ||
| PROVISIONING_PROFILE_SPECIFIER[config=Review][sdk=macosx*] = MacOS Browser NetP - Start VPN |
23 changes: 23 additions & 0 deletions
23
Configuration/App/NetworkProtection/NetworkProtectionStopVPN.xcconfig
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| // Copyright © 2023 DuckDuckGo. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| #include "NetworkProtectionStartStopVPNBase.xcconfig" | ||
|
|
||
| PRODUCT_BUNDLE_IDENTIFIER=com.duckduckgo.macos.browser.network-protection.stop-vpn | ||
|
|
||
| PROVISIONING_PROFILE_SPECIFIER[config=Debug][sdk=macosx*] = | ||
| PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] = | ||
| PROVISIONING_PROFILE_SPECIFIER[config=Release][sdk=macosx*] = MacOS Browser NetP - Stop VPN | ||
| PROVISIONING_PROFILE_SPECIFIER[config=Review][sdk=macosx*] = MacOS Browser NetP - Stop VPN |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.