Skip to content

feat: add XPC communication to Network Extension #29

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

Merged
merged 20 commits into from
Jan 30, 2025
Merged

feat: add XPC communication to Network Extension #29

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d8ad698
feat: add XPC communication to Network Extension
coadler Jan 23, 2025
12e803c
fixup
coadler Jan 23, 2025
38a9388
fmt
coadler Jan 23, 2025
90e352d
fix xpc target
coadler Jan 23, 2025
61e0a29
fix xpc module
coadler Jan 23, 2025
c0e5813
change to framework
coadler Jan 23, 2025
11a79a9
test
coadler Jan 23, 2025
a5305cd
Merge branch 'main' into colin/xpc
coadler Jan 23, 2025
dc56a96
XPC fixes
coadler Jan 23, 2025
b43a407
fixes
coadler Jan 23, 2025
a48b691
add app group entitlement
ethanndickson Jan 24, 2025
a439536
Merge branch 'main' into colin/xpc
coadler Jan 24, 2025
c4c9f3f
working now
coadler Jan 30, 2025
e3eba6b
Merge branch 'main' into colin/xpc
coadler Jan 30, 2025
7724bc6
lint
coadler Jan 30, 2025
44f191f
remove unused import
coadler Jan 30, 2025
31f0b3b
fix import
ethanndickson Jan 30, 2025
deb773a
Merge branch 'main' into colin/xpc
ethanndickson Jan 30, 2025
207da24
force review
ethanndickson Jan 30, 2025
139157d
fixup
ethanndickson Jan 30, 2025
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
209 changes: 205 additions & 4 deletions Coder Desktop/Coder Desktop.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
objects = {

/* Begin PBXBuildFile section */
3B0916A92D41CFD50064DEA8 /* VPNXPC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B0916A12D41CFD50064DEA8 /* VPNXPC.framework */; };
3B0916AA2D41CFD50064DEA8 /* VPNXPC.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B0916A12D41CFD50064DEA8 /* VPNXPC.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
961679332CFF117300B2B6DF /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 961679322CFF117300B2B6DF /* NetworkExtension.framework */; };
9616793D2CFF117300B2B6DF /* com.coder.Coder-Desktop.VPN.systemextension in Embed System Extensions */ = {isa = PBXBuildFile; fileRef = 961679302CFF117300B2B6DF /* com.coder.Coder-Desktop.VPN.systemextension */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
AA3B3DA92D2D23860099996A /* VPNLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA3B3DA12D2D23860099996A /* VPNLib.framework */; };
Expand All @@ -27,6 +29,13 @@
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
3B0916A72D41CFD50064DEA8 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 961678F42CFF100D00B2B6DF /* Project object */;
proxyType = 1;
remoteGlobalIDString = 3B0916A02D41CFD50064DEA8;
remoteInfo = VPNXPC;
};
961679102CFF100E00B2B6DF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 961678F42CFF100D00B2B6DF /* Project object */;
Expand Down Expand Up @@ -107,6 +116,27 @@
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
3B0916622D41B9690064DEA8 /* Embed XPC Services */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "$(CONTENTS_FOLDER_PATH)/XPCServices";
dstSubfolderSpec = 16;
files = (
);
name = "Embed XPC Services";
runOnlyForDeploymentPostprocessing = 0;
};
3B0916872D41C8010064DEA8 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
3B0916AA2D41CFD50064DEA8 /* VPNXPC.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
961679422CFF117300B2B6DF /* Embed System Extensions */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -132,6 +162,7 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
3B0916A12D41CFD50064DEA8 /* VPNXPC.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = VPNXPC.framework; sourceTree = BUILT_PRODUCTS_DIR; };
961678FC2CFF100D00B2B6DF /* Coder Desktop.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Coder Desktop.app"; sourceTree = BUILT_PRODUCTS_DIR; };
9616790F2CFF100E00B2B6DF /* Coder DesktopTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Coder DesktopTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
961679192CFF100E00B2B6DF /* Coder DesktopUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Coder DesktopUITests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
Expand All @@ -144,6 +175,13 @@
/* End PBXFileReference section */

/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
3B0916AB2D41CFD50064DEA8 /* Exceptions for "VPNXPC" folder in "VPNXPC" target */ = {
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
publicHeaders = (
VPNXPC.h,
);
target = 3B0916A02D41CFD50064DEA8 /* VPNXPC */;
};
AA3B3DB62D2D23860099996A /* Exceptions for "VPNLib" folder in "VPNLib" target */ = {
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
membershipExceptions = (
Expand Down Expand Up @@ -171,6 +209,14 @@
/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */

/* Begin PBXFileSystemSynchronizedRootGroup section */
3B0916A22D41CFD50064DEA8 /* VPNXPC */ = {
isa = PBXFileSystemSynchronizedRootGroup;
exceptions = (
3B0916AB2D41CFD50064DEA8 /* Exceptions for "VPNXPC" folder in "VPNXPC" target */,
);
path = VPNXPC;
sourceTree = "<group>";
};
961678FE2CFF100D00B2B6DF /* Coder Desktop */ = {
isa = PBXFileSystemSynchronizedRootGroup;
path = "Coder Desktop";
Expand Down Expand Up @@ -223,13 +269,21 @@
/* End PBXFileSystemSynchronizedRootGroup section */

/* Begin PBXFrameworksBuildPhase section */
3B09169E2D41CFD50064DEA8 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
961678F92CFF100D00B2B6DF /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
AA3B40A42D2FC8560099996A /* CoderSDK.framework in Frameworks */,
AA8BC4CF2D00A4B700E1ABAA /* KeychainAccess in Frameworks */,
AA8BC33F2D0061F200E1ABAA /* FluidMenuBarExtra in Frameworks */,
3B0916A92D41CFD50064DEA8 /* VPNXPC.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -308,6 +362,7 @@
AA3B3DAE2D2D23860099996A /* VPNLibTests */,
AA3B40922D2FC8560099996A /* CoderSDK */,
AA3B409E2D2FC8560099996A /* CoderSDKTests */,
3B0916A22D41CFD50064DEA8 /* VPNXPC */,
961679312CFF117300B2B6DF /* Frameworks */,
961678FD2CFF100D00B2B6DF /* Products */,
);
Expand All @@ -324,6 +379,7 @@
AA3B3DA82D2D23860099996A /* VPNLibTests.xctest */,
AA3B40912D2FC8560099996A /* CoderSDK.framework */,
AA3B40982D2FC8560099996A /* CoderSDKTests.xctest */,
3B0916A12D41CFD50064DEA8 /* VPNXPC.framework */,
);
name = Products;
sourceTree = "<group>";
Expand All @@ -339,6 +395,13 @@
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
3B09169C2D41CFD50064DEA8 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
AA3B3D9C2D2D23860099996A /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -356,6 +419,29 @@
/* End PBXHeadersBuildPhase section */

/* Begin PBXNativeTarget section */
3B0916A02D41CFD50064DEA8 /* VPNXPC */ = {
isa = PBXNativeTarget;
buildConfigurationList = 3B0916AC2D41CFD50064DEA8 /* Build configuration list for PBXNativeTarget "VPNXPC" */;
buildPhases = (
3B09169C2D41CFD50064DEA8 /* Headers */,
3B09169D2D41CFD50064DEA8 /* Sources */,
3B09169E2D41CFD50064DEA8 /* Frameworks */,
3B09169F2D41CFD50064DEA8 /* Resources */,
);
buildRules = (
);
dependencies = (
);
fileSystemSynchronizedGroups = (
3B0916A22D41CFD50064DEA8 /* VPNXPC */,
);
name = VPNXPC;
packageProductDependencies = (
);
productName = VPNXPC;
productReference = 3B0916A12D41CFD50064DEA8 /* VPNXPC.framework */;
productType = "com.apple.product-type.framework";
};
961678FB2CFF100D00B2B6DF /* Coder Desktop */ = {
isa = PBXNativeTarget;
buildConfigurationList = 961679232CFF100F00B2B6DF /* Build configuration list for PBXNativeTarget "Coder Desktop" */;
Expand All @@ -364,13 +450,16 @@
961678F92CFF100D00B2B6DF /* Frameworks */,
961678FA2CFF100D00B2B6DF /* Resources */,
961679422CFF117300B2B6DF /* Embed System Extensions */,
3B0916622D41B9690064DEA8 /* Embed XPC Services */,
3B0916872D41C8010064DEA8 /* Embed Frameworks */,
);
buildRules = (
);
dependencies = (
AA8BC33C2D0060E700E1ABAA /* PBXTargetDependency */,
9616793C2CFF117300B2B6DF /* PBXTargetDependency */,
AA3B40A32D2FC8560099996A /* PBXTargetDependency */,
3B0916A82D41CFD50064DEA8 /* PBXTargetDependency */,
);
fileSystemSynchronizedGroups = (
961678FE2CFF100D00B2B6DF /* Coder Desktop */,
Expand Down Expand Up @@ -566,6 +655,10 @@
LastSwiftUpdateCheck = 1620;
LastUpgradeCheck = 1620;
TargetAttributes = {
3B0916A02D41CFD50064DEA8 = {
CreatedOnToolsVersion = 16.2;
LastSwiftMigration = 1620;
};
961678FB2CFF100D00B2B6DF = {
CreatedOnToolsVersion = 16.1;
};
Expand Down Expand Up @@ -626,11 +719,19 @@
AA3B3DA72D2D23860099996A /* VPNLibTests */,
AA3B40902D2FC8560099996A /* CoderSDK */,
AA3B40972D2FC8560099996A /* CoderSDKTests */,
3B0916A02D41CFD50064DEA8 /* VPNXPC */,
);
};
/* End PBXProject section */

/* Begin PBXResourcesBuildPhase section */
3B09169F2D41CFD50064DEA8 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
961678FA2CFF100D00B2B6DF /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -690,6 +791,13 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
3B09169D2D41CFD50064DEA8 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
961678F82CFF100D00B2B6DF /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -749,6 +857,11 @@
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
3B0916A82D41CFD50064DEA8 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 3B0916A02D41CFD50064DEA8 /* VPNXPC */;
targetProxy = 3B0916A72D41CFD50064DEA8 /* PBXContainerItemProxy */;
};
961679112CFF100E00B2B6DF /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 961678FB2CFF100D00B2B6DF /* Coder Desktop */;
Expand Down Expand Up @@ -811,6 +924,83 @@
/* End PBXTargetDependency section */

/* Begin XCBuildConfiguration section */
3B0916AD2D41CFD50064DEA8 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 4399GN35BJ;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_NSHumanReadableCopyright = "";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
"@loader_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 14.6;
MARKETING_VERSION = 1.0;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
PRODUCT_BUNDLE_IDENTIFIER = "--APPLICATION-IDENTIFIER-.VPNXPC";
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
name = Debug;
};
3B0916AE2D41CFD50064DEA8 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 4399GN35BJ;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_NSHumanReadableCopyright = "";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
"@loader_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 14.6;
MARKETING_VERSION = 1.0;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
PRODUCT_BUNDLE_IDENTIFIER = "--APPLICATION-IDENTIFIER-.VPNXPC";
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_INSTALL_OBJC_HEADER = NO;
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
name = Release;
};
961679212CFF100F00B2B6DF /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
Expand Down Expand Up @@ -1148,7 +1338,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = NO;
ENABLE_MODULE_VERIFIER = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_NSHumanReadableCopyright = "";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
Expand Down Expand Up @@ -1185,7 +1375,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = NO;
ENABLE_MODULE_VERIFIER = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_NSHumanReadableCopyright = "";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
Expand Down Expand Up @@ -1248,6 +1438,7 @@
buildSettings = {
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1;
Expand All @@ -1256,7 +1447,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = NO;
ENABLE_MODULE_VERIFIER = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_NSHumanReadableCopyright = "";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
Expand Down Expand Up @@ -1285,6 +1476,7 @@
buildSettings = {
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1;
Expand All @@ -1293,7 +1485,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = NO;
ENABLE_MODULE_VERIFIER = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_NSHumanReadableCopyright = "";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
Expand Down Expand Up @@ -1354,6 +1546,15 @@
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
3B0916AC2D41CFD50064DEA8 /* Build configuration list for PBXNativeTarget "VPNXPC" */ = {
isa = XCConfigurationList;
buildConfigurations = (
3B0916AD2D41CFD50064DEA8 /* Debug */,
3B0916AE2D41CFD50064DEA8 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
961678F72CFF100D00B2B6DF /* Build configuration list for PBXProject "Coder Desktop" */ = {
isa = XCConfigurationList;
buildConfigurations = (
Expand Down
Loading