Skip to content

Commit

Permalink
Includes the VPN proxy in all builds (#3393)
Browse files Browse the repository at this point in the history
Task/Issue URL: https://app.asana.com/0/1207603085593419/1208543229974056/f

Description

The VPN proxy has been embedded a long time ago into the app and recently it was enabled for the domain exclusions feature. Unfortunately for our App Store builds, the proxy was only included in DEBUG builds.

This was done because Apple usually rejects builds that include components that cannot be used, so we needed to keep it out of release builds until it was used.

During development this was missed as the DEBUG builds include the proxy.
  • Loading branch information
diegoreymendez authored Oct 14, 2024
1 parent 4d2f84a commit c9b7e08
Showing 1 changed file with 2 additions and 20 deletions.
22 changes: 2 additions & 20 deletions DuckDuckGo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1716,6 +1716,7 @@
7B7F5D242C52725A00826256 /* AddExcludedDomainButtonsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B7F5D232C52725A00826256 /* AddExcludedDomainButtonsView.swift */; };
7B7F5D252C52725A00826256 /* AddExcludedDomainButtonsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B7F5D232C52725A00826256 /* AddExcludedDomainButtonsView.swift */; };
7B8594192B5B26230007EB3E /* UDSHelper in Frameworks */ = {isa = PBXBuildFile; productRef = 7B8594182B5B26230007EB3E /* UDSHelper */; };
7B874BD62CBD7E8D009C6C63 /* VPNProxyExtension.appex in Embed Network Extensions */ = {isa = PBXBuildFile; fileRef = 7BDA36E52B7E037100AD5388 /* VPNProxyExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
7B8DB31A2B504D7500EC16DA /* VPNAppEventsHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B8DB3192B504D7500EC16DA /* VPNAppEventsHandler.swift */; };
7B934C412A866DD400FC8F9C /* UserDefaults+NetworkProtectionShared.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B934C402A866DD400FC8F9C /* UserDefaults+NetworkProtectionShared.swift */; };
7B97CD592B7E0B57004FEF43 /* NetworkProtectionProxy in Frameworks */ = {isa = PBXBuildFile; productRef = 7B97CD582B7E0B57004FEF43 /* NetworkProtectionProxy */; };
Expand Down Expand Up @@ -3160,6 +3161,7 @@
dstPath = "";
dstSubfolderSpec = 13;
files = (
7B874BD62CBD7E8D009C6C63 /* VPNProxyExtension.appex in Embed Network Extensions */,
4BA7C4E12B3F6F8600AFE511 /* NetworkProtectionAppExtension.appex in Embed Network Extensions */,
);
name = "Embed Network Extensions";
Expand Down Expand Up @@ -9464,7 +9466,6 @@
4B2D06672A13318400DE1F49 /* Resources */,
4B2D067D2A13341200DE1F49 /* ShellScript */,
4BA7C4E02B3F6F7500AFE511 /* Embed Network Extensions */,
7B557F2A2B8CA2A400099746 /* Embed Debug-only Network Extensions */,
);
buildRules = (
);
Expand Down Expand Up @@ -10386,25 +10387,6 @@
shellPath = /bin/sh;
shellScript = "if [[ -z \"${SYSEX_BUNDLE_ID}\" ]]; then\n echo \"Required build settings are not defined, please check xcconfig files\"\n exit 1\nfi\n\n\necho \"ditto ${BUILT_PRODUCTS_DIR}/${SYSEX_BUNDLE_ID}.systemextension $BUILT_PRODUCTS_DIR/${CONTENTS_FOLDER_PATH}/Library/SystemExtensions/${SYSEX_BUNDLE_ID}.systemextension\"\n\nditto \"${BUILT_PRODUCTS_DIR}/${SYSEX_BUNDLE_ID}.systemextension\" \"$BUILT_PRODUCTS_DIR/${CONTENTS_FOLDER_PATH}/Library/SystemExtensions/${SYSEX_BUNDLE_ID}.systemextension\" || exit 1\n";
};
7B557F2A2B8CA2A400099746 /* Embed Debug-only Network Extensions */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Embed Debug-only Network Extensions";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# Support for embedding debug-only extensions (https://stackoverflow.com/a/76948057/712306)\nfunction embedExtensions() {\n for extension in $1\n do\n rsync -r --copy-links \"${CONFIGURATION_BUILD_DIR}/${extension}.appex\" \"${CONFIGURATION_BUILD_DIR}/${PLUGINS_FOLDER_PATH}\"\n done\n}\n\ndebug_extensions=(\"VPNProxyExtension\")\n\nif [ \"${CONFIGURATION}\" != \"Release\" ]\nthen\n embedExtensions $debug_extensions\nfi\n";
};
7BB34F502AD98394005691AE /* Copy Swift Package resources */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
Expand Down

0 comments on commit c9b7e08

Please sign in to comment.