diff --git a/Tun/Info.plist b/Tun/Info.plist index 3f03436..63849a8 100644 --- a/Tun/Info.plist +++ b/Tun/Info.plist @@ -2,12 +2,11 @@ - NSAppTransportSecurity - - NSAllowsArbitraryLoads - - - + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + NSExtension NSExtensionPointIdentifier diff --git a/Tun/Tun.entitlements b/Tun/Tun.entitlements index dbbd025..06e563c 100644 --- a/Tun/Tun.entitlements +++ b/Tun/Tun.entitlements @@ -8,6 +8,10 @@ com.apple.security.app-sandbox + com.apple.security.application-groups + + $(TeamIdentifierPrefix) + com.apple.security.network.client com.apple.security.network.server diff --git a/punchnet.xcodeproj/project.pbxproj b/punchnet.xcodeproj/project.pbxproj index d89d99c..1cf9f0a 100644 --- a/punchnet.xcodeproj/project.pbxproj +++ b/punchnet.xcodeproj/project.pbxproj @@ -546,12 +546,13 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = punchnet/punchnet.entitlements; - "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; - CODE_SIGN_STYLE = Automatic; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer"; + CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = "\"punchnet/Preview Content\""; - DEVELOPMENT_TEAM = PF3QG837XS; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=macosx*]" = PF3QG837XS; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; @@ -564,6 +565,8 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.jihe.punchnet; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = jihe_punchnet_macos; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; }; @@ -575,12 +578,13 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = punchnet/punchnet.entitlements; - "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; - CODE_SIGN_STYLE = Automatic; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer"; + CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = "\"punchnet/Preview Content\""; - DEVELOPMENT_TEAM = PF3QG837XS; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=macosx*]" = PF3QG837XS; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; @@ -593,6 +597,8 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.jihe.punchnet; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = jihe_punchnet_macos; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; }; @@ -670,9 +676,11 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_ENTITLEMENTS = Tun/Tun.entitlements; - CODE_SIGN_STYLE = Automatic; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = PF3QG837XS; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=macosx*]" = PF3QG837XS; ENABLE_HARDENED_RUNTIME = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = Tun/Info.plist; @@ -684,8 +692,10 @@ "@executable_path/../../../../Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.jihe.punchnet.Tun; + PRODUCT_BUNDLE_IDENTIFIER = com.jihe.punchnet.tun; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = jihe_punchnet_tun_macos; SKIP_INSTALL = YES; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; @@ -696,9 +706,11 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_ENTITLEMENTS = Tun/Tun.entitlements; - CODE_SIGN_STYLE = Automatic; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = PF3QG837XS; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=macosx*]" = PF3QG837XS; ENABLE_HARDENED_RUNTIME = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = Tun/Info.plist; @@ -710,8 +722,10 @@ "@executable_path/../../../../Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.jihe.punchnet.Tun; + PRODUCT_BUNDLE_IDENTIFIER = com.jihe.punchnet.tun; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = jihe_punchnet_tun_macos; SKIP_INSTALL = YES; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; diff --git a/punchnet.xcodeproj/xcuserdata/anlicheng.xcuserdatad/xcschemes/xcschememanagement.plist b/punchnet.xcodeproj/xcuserdata/anlicheng.xcuserdatad/xcschemes/xcschememanagement.plist index 516c2c6..4e9260e 100644 --- a/punchnet.xcodeproj/xcuserdata/anlicheng.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/punchnet.xcodeproj/xcuserdata/anlicheng.xcuserdatad/xcschemes/xcschememanagement.plist @@ -7,12 +7,12 @@ Tun.xcscheme_^#shared#^_ orderHint - 1 + 0 punchnet.xcscheme_^#shared#^_ orderHint - 0 + 1 diff --git a/punchnet/VPNManager.swift b/punchnet/VPNManager.swift index f59bfff..b8d61ca 100644 --- a/punchnet/VPNManager.swift +++ b/punchnet/VPNManager.swift @@ -83,7 +83,7 @@ class VPNManager: ObservableObject { let protocolConfiguration = NETunnelProviderProtocol() protocolConfiguration.serverAddress = "punchnet" protocolConfiguration.providerConfiguration = [String:AnyObject]() - protocolConfiguration.providerBundleIdentifier = "com.jihe.punchnet.Tun" + protocolConfiguration.providerBundleIdentifier = "com.jihe.punchnet.tun" manager.protocolConfiguration = protocolConfiguration manager.isOnDemandEnabled = false diff --git a/punchnet/punchnet.entitlements b/punchnet/punchnet.entitlements index 5c3964e..f16491e 100644 --- a/punchnet/punchnet.entitlements +++ b/punchnet/punchnet.entitlements @@ -5,14 +5,11 @@ com.apple.developer.networking.networkextension packet-tunnel-provider - dns-proxy com.apple.developer.networking.vpn.api allow-vpn - com.apple.developer.system-extension.install - com.apple.security.app-sandbox com.apple.security.application-groups