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.

Sign up for GitHub

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

Move VPN ownership to menu agent #1690

Merged
merged 74 commits into from
Oct 22, 2023
Merged

Move VPN ownership to menu agent #1690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
9d57490
Adds sysex to menu app, and builds
diegoreymendez Sep 19, 2023
38aaf40
Removes a file that's no longer needed
diegoreymendez Sep 19, 2023
59db7b6
Got the prototype building
diegoreymendez Sep 21, 2023
469cf7d
Prevents some UI updating code to run in the background
diegoreymendez Sep 21, 2023
f12b4cf
Initial building prototype, still not working
diegoreymendez Sep 28, 2023
a138fbe
Merges the latest from develop
diegoreymendez Sep 29, 2023
250c419
WIP
diegoreymendez Sep 29, 2023
1082990
WIP
diegoreymendez Sep 29, 2023
4644cc8
Comments out pixels so that the app builds
diegoreymendez Oct 2, 2023
921ac51
The agent app now connects
diegoreymendez Oct 3, 2023
59609bf
Connecting through IPC works
diegoreymendez Oct 3, 2023
d7409a1
Pushes several improvements
diegoreymendez Oct 4, 2023
f810be3
Several improvements to the code
diegoreymendez Oct 4, 2023
ada544c
Adds IPC status support for status updates
diegoreymendez Oct 4, 2023
13ad7c6
Improved IPC communication, and servers are updating
diegoreymendez Oct 5, 2023
bb326c7
Fix invalid Package.swift test target references.
samsymons Oct 5, 2023
320a16d
Implements registration of an XPC client to request the initial conne…
diegoreymendez Oct 6, 2023
d47b6a5
Renames some protocols
diegoreymendez Oct 6, 2023
639df55
Implements tunnel error handling through IPC
diegoreymendez Oct 6, 2023
1e21bdc
Merges the latest from develop
diegoreymendez Oct 7, 2023
f5d9bc2
Adds Intercom and NetworkProtectionMac
diegoreymendez Oct 7, 2023
736771a
Fixes several mistakes in my previous commit
diegoreymendez Oct 7, 2023
2dc13fc
Corrects a documentation comment
diegoreymendez Oct 7, 2023
0050236
Corrects a documentation comment
diegoreymendez Oct 7, 2023
dd8f7b7
Removes an unnecessary file
diegoreymendez Oct 7, 2023
6fde574
Merges the latest from diego/add-intercom-and-networkprotection-ipc
diegoreymendez Oct 8, 2023
d0bfe95
Enable pixels to send from the NetP VPN agent (#1733)
samsymons Oct 8, 2023
344ea5a
Fixes resetAllState()
diegoreymendez Oct 9, 2023
08b0f2b
Fixes an issue with onboarding
diegoreymendez Oct 9, 2023
6646cad
Removes an unnecessary todo
diegoreymendez Oct 9, 2023
580c522
WIP
diegoreymendez Oct 10, 2023
e3ecd26
Rolls back some unintentional changes
diegoreymendez Oct 10, 2023
a98c62f
Addresses PR feedback
diegoreymendez Oct 10, 2023
251729e
Preparing to merge the latest from develop
diegoreymendez Oct 10, 2023
62523be
Merges the latest from develop
diegoreymendez Oct 10, 2023
46f4377
Fixes distributed notifications
diegoreymendez Oct 10, 2023
20b3db8
Updates the provisioning profiles for review builds
diegoreymendez Oct 10, 2023
fc255c2
Fixes the Privacy Pro target so that it builds
diegoreymendez Oct 11, 2023
ceebb5c
Fixes NetP's nav bar button
diegoreymendez Oct 11, 2023
806cc07
Re-implements server selection
diegoreymendez Oct 14, 2023
e06e7c6
Reimplements enforceRoutes through IPC
diegoreymendez Oct 15, 2023
073c6f8
Starts the tunnel with the correct server selected
diegoreymendez Oct 15, 2023
acafbb8
Adds support for includeAllNetworks through IPC
diegoreymendez Oct 15, 2023
e6055a3
Reorders the NetP menu
diegoreymendez Oct 16, 2023
3ca38d2
Notifications are working again
diegoreymendez Oct 16, 2023
6d968e8
WIP
diegoreymendez Oct 16, 2023
74b11c2
Fixes some refresh issues related to IPC
diegoreymendez Oct 17, 2023
baa64ae
Merges the latest from develop
diegoreymendez Oct 17, 2023
68a197b
Removes some unused code
diegoreymendez Oct 17, 2023
9cbabb9
Small fixes to old code
diegoreymendez Oct 17, 2023
bf30d43
Removes some commented code
diegoreymendez Oct 17, 2023
40d41cc
swiftlint --fix
diegoreymendez Oct 17, 2023
3bad595
Removes some unused code
diegoreymendez Oct 17, 2023
748d93a
Removes some unused code
diegoreymendez Oct 17, 2023
55df97c
Updates BSK
diegoreymendez Oct 17, 2023
9889585
Updates BSK and fixes some small mistakes
diegoreymendez Oct 17, 2023
d44e67a
Updates BSK
diegoreymendez Oct 17, 2023
4f73b62
Updates BSK
diegoreymendez Oct 17, 2023
db253e6
Removed a file that wasn't removed by mistake
diegoreymendez Oct 18, 2023
57a58ed
Implements a mechanism for NetP to update the logint agent and extens…
diegoreymendez Oct 19, 2023
c0fb742
Fixed the provisioning profiles for NetP
diegoreymendez Oct 19, 2023
b9d50f6
Update DuckDuckGo/Common/Localizables/UserText+NetworkProtection.swift
diegoreymendez Oct 20, 2023
91bffbf
Removed an unnecessary assertion
diegoreymendez Oct 20, 2023
432cb56
Removes some TODOs and adds details
diegoreymendez Oct 20, 2023
1ee50ef
Partial merge up to 597bc96939c6d15d92b048f16ea89e8e630f5683 to get c…
diegoreymendez Oct 20, 2023
886a68c
Merges the latest from develop
diegoreymendez Oct 20, 2023
c2ea6a5
Fixes a line that was disabled momentarily
diegoreymendez Oct 20, 2023
f22e416
Removed a todo
diegoreymendez Oct 20, 2023
0d06426
Resolves a swiftlint violation
diegoreymendez Oct 20, 2023
c774363
Add suport for making release builds for NetP with updated SysEx and …
ayoy Oct 20, 2023
d01c27f
Fixes the app store build unit tests so that they build
diegoreymendez Oct 20, 2023
665e60f
Updates BSK
diegoreymendez Oct 20, 2023
e8055d4
Updates BSK
diegoreymendez Oct 22, 2023
123815e
Merge branch 'develop' into diego/feature/change-netp-vpn-ownership-p…
diegoreymendez Oct 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions .github/actions/install-certs-and-profiles/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,6 @@ inputs:
NETP_NOTIFICATIONS_REVIEW_PROVISION_PROFILE_BASE64:
required: true
type: string
NETP_START_VPN_PROVISION_PROFILE_BASE64:
required: true
type: string
NETP_STOP_VPN_PROVISION_PROFILE_BASE64:
required: true
type: string
NETP_ENABLE_ON_DEMAND_PROVISION_PROFILE_BASE64:
required: true
type: string
Comment on lines -37 to -45
Copy link
Collaborator

Choose a reason for hiding this comment

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

🙌

access-token:
description: "Asana access token"
required: true
Expand Down Expand Up @@ -70,9 +61,6 @@ runs:
NETP_AGENT_REVIEW_PP_PATH=$RUNNER_TEMP/netp_agent_review_pp.provisionprofile
NETP_NOTIFICATIONS_RELEASE_PP_PATH=$RUNNER_TEMP/netp_notifications_release_pp.provisionprofile
NETP_NOTIFICATIONS_REVIEW_PP_PATH=$RUNNER_TEMP/netp_notifications_review_pp.provisionprofile
NETP_START_VPN_PP_PATH=$RUNNER_TEMP/netp_start_vpn_pp.provisionprofile
NETP_STOP_VPN_PP_PATH=$RUNNER_TEMP/netp_stop_vpn_pp.provisionprofile
NETP_ENABLE_ON_DEMAND_PP_PATH=$RUNNER_TEMP/netp_enable_on_demand_pp.provisionprofile

# import certificate from secrets
echo -n "${{ inputs.BUILD_CERTIFICATE_BASE64 }}" | base64 --decode -o $CERTIFICATE_PATH
Expand All @@ -84,9 +72,6 @@ runs:
echo -n "${{ inputs.NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64 }}" | base64 --decode -o $NETP_AGENT_REVIEW_PP_PATH
echo -n "${{ inputs.NETP_NOTIFICATIONS_RELEASE_PROVISION_PROFILE_BASE64 }}" | base64 --decode -o $NETP_NOTIFICATIONS_RELEASE_PP_PATH
echo -n "${{ inputs.NETP_NOTIFICATIONS_REVIEW_PROVISION_PROFILE_BASE64 }}" | base64 --decode -o $NETP_NOTIFICATIONS_REVIEW_PP_PATH
echo -n "${{ inputs.NETP_START_VPN_PROVISION_PROFILE_BASE64 }}" | base64 --decode -o $NETP_START_VPN_PP_PATH
echo -n "${{ inputs.NETP_STOP_VPN_PROVISION_PROFILE_BASE64 }}" | base64 --decode -o $NETP_STOP_VPN_PP_PATH
echo -n "${{ inputs.NETP_ENABLE_ON_DEMAND_PROVISION_PROFILE_BASE64 }}" | base64 --decode -o $NETP_ENABLE_ON_DEMAND_PP_PATH

# create temporary keychain
security create-keychain -p "${{ inputs.KEYCHAIN_PASSWORD }}" $KEYCHAIN_PATH
Expand All @@ -107,8 +92,5 @@ runs:
$NETP_AGENT_REVIEW_PP_PATH \
$NETP_NOTIFICATIONS_RELEASE_PP_PATH \
$NETP_NOTIFICATIONS_REVIEW_PP_PATH \
$NETP_START_VPN_PP_PATH \
$NETP_STOP_VPN_PP_PATH \
$NETP_ENABLE_ON_DEMAND_PP_PATH \
~/Library/MobileDevice/Provisioning\ Profiles
shell: bash
25 changes: 8 additions & 17 deletions .github/workflows/build_notarized.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,24 +49,18 @@ on:
required: true
RELEASE_PROVISION_PROFILE_BASE64:
required: true
NETP_SYSEX_RELEASE_PROVISION_PROFILE_BASE64:
NETP_SYSEX_RELEASE_PROVISION_PROFILE_BASE64_V2:
required: true
NETP_SYSEX_REVIEW_PROVISION_PROFILE_BASE64:
NETP_SYSEX_REVIEW_PROVISION_PROFILE_BASE64_V2:
required: true
NETP_AGENT_RELEASE_PROVISION_PROFILE_BASE64:
NETP_AGENT_RELEASE_PROVISION_PROFILE_BASE64_V2:
required: true
NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64:
NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64_V2:
required: true
NETP_NOTIFICATIONS_RELEASE_PROVISION_PROFILE_BASE64:
required: true
NETP_NOTIFICATIONS_REVIEW_PROVISION_PROFILE_BASE64:
required: true
NETP_START_VPN_PROVISION_PROFILE_BASE64:
required: true
NETP_STOP_VPN_PROVISION_PROFILE_BASE64:
required: true
NETP_ENABLE_ON_DEMAND_PROVISION_PROFILE_BASE64:
required: true
SSH_PRIVATE_KEY_FIND_IN_PAGE:
required: true
APPLE_API_KEY_BASE64:
Expand Down Expand Up @@ -121,15 +115,12 @@ jobs:
KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.REVIEW_PROVISION_PROFILE_BASE64 }}
RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.RELEASE_PROVISION_PROFILE_BASE64 }}
NETP_SYSEX_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_SYSEX_RELEASE_PROVISION_PROFILE_BASE64 }}
NETP_SYSEX_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_SYSEX_REVIEW_PROVISION_PROFILE_BASE64 }}
NETP_AGENT_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_AGENT_RELEASE_PROVISION_PROFILE_BASE64 }}
NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64 }}
NETP_SYSEX_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_SYSEX_RELEASE_PROVISION_PROFILE_BASE64_V2 }}
NETP_SYSEX_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_SYSEX_REVIEW_PROVISION_PROFILE_BASE64_V2 }}
NETP_AGENT_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_AGENT_RELEASE_PROVISION_PROFILE_BASE64_V2 }}
NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64_V2 }}
NETP_NOTIFICATIONS_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_NOTIFICATIONS_RELEASE_PROVISION_PROFILE_BASE64 }}
NETP_NOTIFICATIONS_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_NOTIFICATIONS_REVIEW_PROVISION_PROFILE_BASE64 }}
NETP_START_VPN_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_START_VPN_PROVISION_PROFILE_BASE64 }}
NETP_STOP_VPN_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_STOP_VPN_PROVISION_PROFILE_BASE64 }}
NETP_ENABLE_ON_DEMAND_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_ENABLE_ON_DEMAND_PROVISION_PROFILE_BASE64 }}

- name: Install xcbeautify
if: runner.debug != '1'
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/create_variants.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,12 @@ jobs:
KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.REVIEW_PROVISION_PROFILE_BASE64 }}
RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.RELEASE_PROVISION_PROFILE_BASE64 }}
NETP_SYSEX_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_SYSEX_RELEASE_PROVISION_PROFILE_BASE64 }}
NETP_SYSEX_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_SYSEX_REVIEW_PROVISION_PROFILE_BASE64 }}
NETP_AGENT_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_AGENT_RELEASE_PROVISION_PROFILE_BASE64 }}
NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64 }}
NETP_SYSEX_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_SYSEX_RELEASE_PROVISION_PROFILE_BASE64_V2 }}
NETP_SYSEX_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_SYSEX_REVIEW_PROVISION_PROFILE_BASE64_V2 }}
NETP_AGENT_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_AGENT_RELEASE_PROVISION_PROFILE_BASE64_V2 }}
NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64_V2 }}
NETP_NOTIFICATIONS_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_NOTIFICATIONS_RELEASE_PROVISION_PROFILE_BASE64 }}
NETP_NOTIFICATIONS_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_NOTIFICATIONS_REVIEW_PROVISION_PROFILE_BASE64 }}
NETP_START_VPN_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_START_VPN_PROVISION_PROFILE_BASE64 }}
NETP_STOP_VPN_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_STOP_VPN_PROVISION_PROFILE_BASE64 }}
NETP_ENABLE_ON_DEMAND_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_ENABLE_ON_DEMAND_PROVISION_PROFILE_BASE64 }}

- name: Set up variant
working-directory: ${{ github.workspace }}/dmg
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,15 +236,12 @@ jobs:
KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.REVIEW_PROVISION_PROFILE_BASE64 }}
RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.RELEASE_PROVISION_PROFILE_BASE64 }}
NETP_SYSEX_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_SYSEX_RELEASE_PROVISION_PROFILE_BASE64 }}
NETP_SYSEX_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_SYSEX_REVIEW_PROVISION_PROFILE_BASE64 }}
NETP_AGENT_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_AGENT_RELEASE_PROVISION_PROFILE_BASE64 }}
NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64 }}
NETP_SYSEX_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_SYSEX_RELEASE_PROVISION_PROFILE_BASE64_V2 }}
NETP_SYSEX_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_SYSEX_REVIEW_PROVISION_PROFILE_BASE64_V2 }}
NETP_AGENT_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_AGENT_RELEASE_PROVISION_PROFILE_BASE64_V2 }}
NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64_V2 }}
NETP_NOTIFICATIONS_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_NOTIFICATIONS_RELEASE_PROVISION_PROFILE_BASE64 }}
NETP_NOTIFICATIONS_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_NOTIFICATIONS_REVIEW_PROVISION_PROFILE_BASE64 }}
NETP_START_VPN_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_START_VPN_PROVISION_PROFILE_BASE64 }}
NETP_STOP_VPN_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_STOP_VPN_PROVISION_PROFILE_BASE64 }}
NETP_ENABLE_ON_DEMAND_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_ENABLE_ON_DEMAND_PROVISION_PROFILE_BASE64 }}

- name: Set cache key hash
run: |
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,12 @@ jobs:
KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.REVIEW_PROVISION_PROFILE_BASE64 }}
RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.RELEASE_PROVISION_PROFILE_BASE64 }}
NETP_SYSEX_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_SYSEX_RELEASE_PROVISION_PROFILE_BASE64 }}
NETP_SYSEX_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_SYSEX_REVIEW_PROVISION_PROFILE_BASE64 }}
NETP_AGENT_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_AGENT_RELEASE_PROVISION_PROFILE_BASE64 }}
NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64 }}
NETP_SYSEX_RELEASE_PROVISION_PROFILE_BASE64_V2: ${{ secrets.NETP_SYSEX_RELEASE_PROVISION_PROFILE_BASE64_V2 }}
NETP_SYSEX_REVIEW_PROVISION_PROFILE_BASE64_V2: ${{ secrets.NETP_SYSEX_REVIEW_PROVISION_PROFILE_BASE64_V2 }}
NETP_AGENT_RELEASE_PROVISION_PROFILE_BASE64_V2: ${{ secrets.NETP_AGENT_RELEASE_PROVISION_PROFILE_BASE64_V2 }}
NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64_V2: ${{ secrets.NETP_AGENT_REVIEW_PROVISION_PROFILE_BASE64_V2 }}
NETP_NOTIFICATIONS_RELEASE_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_NOTIFICATIONS_RELEASE_PROVISION_PROFILE_BASE64 }}
NETP_NOTIFICATIONS_REVIEW_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_NOTIFICATIONS_REVIEW_PROVISION_PROFILE_BASE64 }}
NETP_START_VPN_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_START_VPN_PROVISION_PROFILE_BASE64 }}
NETP_STOP_VPN_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_STOP_VPN_PROVISION_PROFILE_BASE64 }}
NETP_ENABLE_ON_DEMAND_PROVISION_PROFILE_BASE64: ${{ secrets.NETP_ENABLE_ON_DEMAND_PROVISION_PROFILE_BASE64 }}
SSH_PRIVATE_KEY_FIND_IN_PAGE: ${{ secrets.SSH_PRIVATE_KEY_FIND_IN_PAGE }}
APPLE_API_KEY_BASE64: ${{ secrets.APPLE_API_KEY_BASE64 }}
APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
Expand Down
14 changes: 0 additions & 14 deletions Configuration/App/DuckDuckGo.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,20 +44,6 @@ SWIFT_ACTIVE_COMPILATION_CONDITIONS[config=CI][arch=*][sdk=*] = NETP_SYSTEM_EXTE
SWIFT_ACTIVE_COMPILATION_CONDITIONS[config=Debug][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION DEBUG $(FEATURE_FLAGS)
SWIFT_ACTIVE_COMPILATION_CONDITIONS[config=Review][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION REVIEW $(FEATURE_FLAGS)

AGENT_BUNDLE_ID[sdk=*] = $(DEVELOPMENT_TEAM).com.duckduckgo.macos.browser.network-protection.system-extension.agent
AGENT_BUNDLE_ID[config=Debug][sdk=*] = $(DEVELOPMENT_TEAM).com.duckduckgo.macos.browser.network-protection.system-extension.agent.debug
AGENT_BUNDLE_ID[config=CI][sdk=*] = $(DEVELOPMENT_TEAM).com.duckduckgo.macos.browser.network-protection.system-extension.agent.debug
AGENT_BUNDLE_ID[config=Review][sdk=*] = $(DEVELOPMENT_TEAM).com.duckduckgo.macos.browser.network-protection.system-extension.agent.review

// We could be tempted to use SYSEX_BUNDLE_ID = $(SYSEX_BUNDLE_ID_BASE).systemextension
// but Xcode is currently not expanding it well. You can check this in the project build
// settings.
SYSEX_BUNDLE_ID[sdk=*] = $(SYSEX_BUNDLE_ID_BASE).systemextension
SYSEX_BUNDLE_ID[config=CI][sdk=*] = $(SYSEX_BUNDLE_ID_BASE).systemextension
SYSEX_BUNDLE_ID[config=Review][sdk=*] = $(SYSEX_BUNDLE_ID_BASE).systemextension
SYSEX_BUNDLE_ID[config=Debug][sdk=*] = $(SYSEX_BUNDLE_ID_BASE).systemextension
SYSEX_BUNDLE_ID[config=Release][sdk=*] = $(SYSEX_BUNDLE_ID_BASE).systemextension

// Install Developer ID build to /Applications/DEBUG/
DEPLOYMENT_LOCATION[config=Debug] = YES;
DSTROOT[config=Debug] = ${BUILT_PRODUCTS_DIR}
Expand Down
22 changes: 11 additions & 11 deletions ...etworkProtection/DuckDuckGoAgent.xcconfig → .../NetworkProtection/DuckDuckGoVPN.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ 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
INFOPLIST_FILE = DuckDuckGoVPN/Info.plist
samsymons marked this conversation as resolved.
Show resolved Hide resolved
GENERATE_INFOPLIST_FILE = YES
INFOPLIST_KEY_LSUIElement = YES
INFOPLIST_KEY_NSPrincipalClass = Application
Expand All @@ -33,10 +33,10 @@ INFOPLIST_KEY_NSPrincipalClass = Application
//CODE_SIGN_STYLE[config=Debug][sdk=*] = Manual
//CODE_SIGN_STYLE[config=Release][sdk=*] = Manual

CODE_SIGN_ENTITLEMENTS[config=Review][sdk=macosx*] = DuckDuckGoAgent/DuckDuckGoAgent.entitlements
CODE_SIGN_ENTITLEMENTS[config=CI][sdk=macosx*] = DuckDuckGoAgent/DuckDuckGoAgent.entitlements
CODE_SIGN_ENTITLEMENTS[config=Debug][sdk=macosx*] = DuckDuckGoAgent/DuckDuckGoAgent.entitlements
CODE_SIGN_ENTITLEMENTS[config=Release][sdk=macosx*] = DuckDuckGoAgent/DuckDuckGoAgent.entitlements
CODE_SIGN_ENTITLEMENTS[config=Review][sdk=macosx*] = DuckDuckGoVPN/DuckDuckGoVPN.entitlements
CODE_SIGN_ENTITLEMENTS[config=CI][sdk=macosx*] = DuckDuckGoVPN/DuckDuckGoVPN.entitlements
CODE_SIGN_ENTITLEMENTS[config=Debug][sdk=macosx*] = DuckDuckGoVPN/DuckDuckGoVPNDebug.entitlements
CODE_SIGN_ENTITLEMENTS[config=Release][sdk=macosx*] = DuckDuckGoVPN/DuckDuckGoVPN.entitlements
Comment on lines -36 to +39
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Agent name changed.


CODE_SIGN_IDENTITY[sdk=macosx*] = Developer ID Application
CODE_SIGN_IDENTITY[config=Debug][sdk=macosx*] = Apple Development
Expand All @@ -45,13 +45,13 @@ 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)
PROVISIONING_PROFILE_SPECIFIER[config=Review][sdk=macosx*] = macOS NetP VPN App - Review (XPC)
PROVISIONING_PROFILE_SPECIFIER[config=Release][sdk=macosx*] = macOS NetP VPN App - Release (XPC)

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
FEATURE_FLAGS[arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_PROTECTION
FEATURE_FLAGS[config=CI][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_PROTECTION
FEATURE_FLAGS[config=Debug][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_PROTECTION
FEATURE_FLAGS[config=Review][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_PROTECTION
Comment on lines +51 to +54
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Need this flag in the VPN app due to some of the code.


SWIFT_OBJC_BRIDGING_HEADER =
SKIP_INSTALL = YES
Expand Down
6 changes: 3 additions & 3 deletions ...otection/DuckDuckGoAgentAppStore.xcconfig → ...Protection/DuckDuckGoVPNAppStore.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ PRODUCT_BUNDLE_IDENTIFIER[config=Debug][sdk=*] = $(BUNDLE_IDENTIFIER_PREFIX).deb
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
INFOPLIST_FILE = DuckDuckGoVPN/Info-AppStore.plist
GENERATE_INFOPLIST_FILE = YES
INFOPLIST_KEY_LSUIElement = YES
INFOPLIST_KEY_NSPrincipalClass = Application
Expand All @@ -36,8 +36,8 @@ 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*] = DuckDuckGoAgent/DuckDuckGoAgentAppStore.entitlements
CODE_SIGN_ENTITLEMENTS[config=Release][sdk=macosx*] = DuckDuckGoAgent/DuckDuckGoAgentAppStore.entitlements
CODE_SIGN_ENTITLEMENTS[config=Debug][sdk=macosx*] = DuckDuckGoVPN/DuckDuckGoVPNAppStore.entitlements
CODE_SIGN_ENTITLEMENTS[config=Release][sdk=macosx*] = DuckDuckGoVPN/DuckDuckGoVPNAppStore.entitlements

CODE_SIGN_IDENTITY[sdk=macosx*] = 3rd Party Mac Developer Application
CODE_SIGN_IDENTITY[config=Review][sdk=macosx*] = Developer ID Application
Expand Down
23 changes: 0 additions & 23 deletions Configuration/App/NetworkProtection/NetworkProtectionEnableOnDemand.xcconfig
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions Configuration/App/NetworkProtection/NetworkProtectionStartVPN.xcconfig
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions Configuration/App/NetworkProtection/NetworkProtectionStopVPN.xcconfig
View file
Open in desktop

This file was deleted.

Loading
Loading