Bump Network Extension Version (#227)

* macos: improve logging

* macos: bump network extension version

Author: mhils

mitmproxy-macos/redirector/macos-redirector.xcodeproj/project.pbxproj

@@ -437,7 +437,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.mitmproxy.macos-redirector";
 				PRODUCT_NAME = "Mitmproxy Redirector";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -472,7 +472,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.mitmproxy.macos-redirector";
 				PRODUCT_NAME = "Mitmproxy Redirector";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -502,7 +502,7 @@
 					"@executable_path/../Frameworks",
 					"@executable_path/../../../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.mitmproxy.macos-redirector.network-extension";
 				PRODUCT_NAME = "$(inherited)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -534,7 +534,7 @@
 					"@executable_path/../Frameworks",
 					"@executable_path/../../../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.mitmproxy.macos-redirector.network-extension";
 				PRODUCT_NAME = "$(inherited)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

mitmproxy-macos/redirector/macos-redirector/app.swift

@@ -11,7 +11,8 @@ let networkExtensionIdentifier = "org.mitmproxy.macos-redirector.network-extensi
 @main
 struct App {
     static func main() async throws {
-        log.debug("app starting with \(CommandLine.arguments, privacy: .public)")
+        let version = Bundle.main.infoDictionary!["CFBundleShortVersionString"] as! String
+        log.debug("starting mitmproxy redirector app \(version, privacy: .public) with \(CommandLine.arguments, privacy: .public)")
 
         if #unavailable(macOS 12.0) {
             exitModal("This application only works on macOS 12 or above.")
@@ -65,7 +66,7 @@ class SystemExtensionInstaller: NSObject, OSSystemExtensionRequestDelegate {
         actionForReplacingExtension existing: OSSystemExtensionProperties,
         withExtension ext: OSSystemExtensionProperties
     ) -> OSSystemExtensionRequest.ReplacementAction {
-        log.debug("requesting to replace existing network extension")
+        log.debug("requesting to replace existing network extension \(existing.bundleShortVersion, privacy: .public) with \(ext.bundleShortVersion, privacy: .public)")
         return .replace
     }
 
@@ -74,15 +75,15 @@ class SystemExtensionInstaller: NSObject, OSSystemExtensionRequestDelegate {
     }
 
     func request(_ request: OSSystemExtensionRequest, didFailWithError error: Error) {
-        log.debug("system extension install failed: \(error)")
+        log.debug("system extension install failed: \(error, privacy: .public)")
         continuation?.resume(throwing: error)
     }
 
     func request(
         _ request: OSSystemExtensionRequest,
         didFinishWithResult result: OSSystemExtensionRequest.Result
     ) {
-        log.debug("system extension install succeeded: {} \(result.rawValue)")
+        log.debug("system extension install succeeded: {} \(result.rawValue, privacy: .public)")
         continuation?.resume()
     }
 }

mitmproxy-macos/redirector/network-extension/main.swift

@@ -6,7 +6,8 @@ let log = Logger(subsystem: "org.mitmproxy.macos-redirector", category: "extensi
 let networkExtensionIdentifier = "org.mitmproxy.macos-redirector.network-extension"
 
 autoreleasepool {
-    log.error("starting system extension")
+    let version = Bundle.main.infoDictionary!["CFBundleShortVersionString"] as! String
+    log.error("starting mitmproxy redirector \(version, privacy: .public) system extension")
     log.debug("debug-level logging active")
     NEProvider.startSystemExtensionMode()
 }