Force Proxy to any Windows/MacOS/Linux Application TCP and UDP traffic
C ccybersecurityhttp3httpproxylinuxlinux-proxymacosmacos-appmacos-proxyproxifierproxifier-alternativeproxyclienttcpthick-clientudpwindivertwindows
#100 - added rule and config name for macos
AnoF-Cyberb1f3cea0f5bd
diff --git a/MacOS/ProxyBridge/ProxyBridge/ProxyBridgeViewModel.swift b/MacOS/ProxyBridge/ProxyBridge/ProxyBridgeViewModel.swiftindex ea2431c..d0915a8 100644--- a/MacOS/ProxyBridge/ProxyBridge/ProxyBridgeViewModel.swift+++ b/MacOS/ProxyBridge/ProxyBridge/ProxyBridgeViewModel.swift@@ -31,22 +31,39 @@ class ProxyBridgeViewModel: NSObject, ObservableObject {struct ProxyConfig: Identifiable, Codable {let id: String+ var name: Stringlet type: Stringlet host: Stringlet port: Intlet username: String?let password: String?- var displayName: String { "\(type.uppercased()) \(host):\(port)" }+ // name is optional, show type and host:port either way+ var displayName: String {+ let server = "\(type.uppercased()) \(host):\(port)"+ return name.isEmpty ? server : "\(name) — \(server)"+ }- init(id: String = UUID().uuidString, type: String, host: String, port: Int, username: String?, password: String?) {+ init(id: String = UUID().uuidString, name: String = "", type: String, host: String, port: Int, username: String?, password: String?) {self.id = id+ self.name = nameself.type = typeself.host = hostself.port = portself.username = usernameself.password = password}++ init(from decoder: Decoder) throws {+ let c = try decoder.container(keyedBy: CodingKeys.self)+ self.id = try c.decode(String.self, forKey: .id)+ self.name = try c.decodeIfPresent(String.self, forKey: .name) ?? ""+ self.type = try c.decode(String.self, forKey: .type)+ self.host = try c.decode(String.self, forKey: .host)+ self.port = try c.decode(Int.self, forKey: .port)+ self.username = try c.decodeIfPresent(String.self, forKey: .username)+ self.password = try c.decodeIfPresent(String.self, forKey: .password)+ }}struct ConnectionLog: Identifiable {@@ -150,7 +167,7 @@ class ProxyBridgeViewModel: NSObject, ObservableObject {if changed {UserDefaults.standard.set(saved, forKey: "proxyRules")if let session = tunnelSession {- RuleManager.loadRulesFromUserDefaults(session: session) { _, _ in }+ RuleManager.resyncRules(session: session) { _, _ in }}}}diff --git a/MacOS/ProxyBridge/ProxyBridge/ProxyRulesView.swift b/MacOS/ProxyBridge/ProxyBridge/ProxyRulesView.swiftindex bf1cf79..df35047 100644--- a/MacOS/ProxyBridge/ProxyBridge/ProxyRulesView.swift+++ b/MacOS/ProxyBridge/ProxyBridge/ProxyRulesView.swift@@ -4,15 +4,21 @@ import UniformTypeIdentifiersimport AppKitstruct ProxyRule: Identifiable, Codable {- let id: UInt32+ var localId: String+ var name: Stringlet processNames: Stringlet targetHosts: Stringlet targetPorts: Stringlet ruleProtocol: Stringlet action: Stringvar enabled: Bool-++ // localId is the stable gui side identity, ruleId in the extension is not stable+ var id: String { localId }+enum CodingKeys: String, CodingKey {+ case localId+ case namecase processNamescase targetHostscase targetPorts@@ -20,30 +26,34 @@ struct ProxyRule: Identifiable, Codable {case actioncase enabled}-+init(from decoder: Decoder) throws {- let container = try decoder.container(keyedBy: CodingKeys.self)- self.id = 0- self.processNames = try container.decode(String.self, forKey: .processNames)- self.targetHosts = try container.decode(String.self, forKey: .targetHosts)- self.targetPorts = try container.decode(String.self, forKey: .targetPorts)- self.ruleProtocol = try container.decode(String.self, forKey: .ruleProtocol)- self.action = try container.decode(String.self, forKey: .action)- self.enabled = try container.decode(Bool.self, forKey: .enabled)+ let c = try decoder.container(keyedBy: CodingKeys.self)+ self.localId = try c.decodeIfPresent(String.self, forKey: .localId) ?? UUID().uuidString+ self.name = try c.decodeIfPresent(String.self, forKey: .name) ?? ""+ self.processNames = try c.decode(String.self, forKey: .processNames)+ self.targetHosts = try c.decode(String.self, forKey: .targetHosts)+ self.targetPorts = try c.decode(String.self, forKey: .targetPorts)+ self.ruleProtocol = try c.decode(String.self, forKey: .ruleProtocol)+ self.action = try c.decode(String.self, forKey: .action)+ self.enabled = try c.decodeIfPresent(Bool.self, forKey: .enabled) ?? true}-+func encode(to encoder: Encoder) throws {- var container = encoder.container(keyedBy: CodingKeys.self)- try container.encode(processNames, forKey: .processNames)- try container.encode(targetHosts, forKey: .targetHosts)- try container.encode(targetPorts, forKey: .targetPorts)- try container.encode(ruleProtocol, forKey: .ruleProtocol)- try container.encode(action, forKey: .action)- try container.encode(enabled, forKey: .enabled)+ var c = encoder.container(keyedBy: CodingKeys.self)+ // drop localId on export so imported rules get fresh ids+ try c.encode(name, forKey: .name)+ try c.encode(processNames, forKey: .processNames)+ try c.encode(targetHosts, forKey: .targetHosts)+ try c.encode(targetPorts, forKey: .targetPorts)+ try c.encode(ruleProtocol, forKey: .ruleProtocol)+ try c.encode(action, forKey: .action)+ try c.encode(enabled, forKey: .enabled)}-- init(id: UInt32, processNames: String, targetHosts: String, targetPorts: String, ruleProtocol: String, action: String, enabled: Bool) {- self.id = id++ init(localId: String = UUID().uuidString, name: String = "", processNames: String, targetHosts: String, targetPorts: String, ruleProtocol: String, action: String, enabled: Bool) {+ self.localId = localId+ self.name = nameself.processNames = processNamesself.targetHosts = targetHostsself.targetPorts = targetPorts@@ -51,15 +61,39 @@ struct ProxyRule: Identifiable, Codable {self.action = actionself.enabled = enabled}++ // UserDefaults stores rules as plain dictionaries, these bridge to that+ init(dict: [String: Any]) {+ self.localId = dict["localId"] as? String ?? UUID().uuidString+ self.name = dict["name"] as? String ?? ""+ self.processNames = dict["processNames"] as? String ?? ""+ self.targetHosts = dict["targetHosts"] as? String ?? ""+ self.targetPorts = dict["targetPorts"] as? String ?? ""+ self.ruleProtocol = dict["protocol"] as? String ?? "BOTH"+ self.action = dict["action"] as? String ?? "DIRECT"+ self.enabled = dict["enabled"] as? Bool ?? true+ }++ func toDict() -> [String: Any] {+ return [+ "localId": localId,+ "name": name,+ "processNames": processNames,+ "targetHosts": targetHosts,+ "targetPorts": targetPorts,+ "protocol": ruleProtocol,+ "action": action,+ "enabled": enabled+ ]+ }}struct ProxyRulesView: View {@ObservedObject var viewModel: ProxyBridgeViewModel@State private var rules: [ProxyRule] = []- @State private var selectedRuleIds: Set<UInt32> = []+ @State private var selectedRuleIds: Set<String> = []@State private var showAddRule = false@State private var editingRule: ProxyRule?- @State private var isLoading = falsevar body: some View {VStack(spacing: 0) {@@ -117,12 +151,7 @@ struct ProxyRulesView: View {}.padding()- if isLoading {- Spacer()- ProgressView()- .scaleEffect(1.5)- Spacer()- } else if rules.isEmpty {+ if rules.isEmpty {Spacer()VStack(spacing: 12) {Image(systemName: "list.bullet.rectangle")@@ -185,10 +214,16 @@ struct ProxyRulesView: View {.width(140)TableColumn("SR") { rule in- Text("\(rule.id)")+ Text("\((rules.firstIndex(where: { $0.id == rule.id }) ?? 0) + 1)")}- .width(50)-+ .width(40)++ TableColumn("Name") { rule in+ Text(rule.name.isEmpty ? "—" : rule.name)+ .foregroundColor(rule.name.isEmpty ? .secondary : .primary)+ }+ .width(140)+TableColumn("Bundle ID") { rule inText(rule.processNames.isEmpty ? "Any" : rule.processNames)}@@ -224,10 +259,10 @@ struct ProxyRulesView: View {loadRules()}.sheet(isPresented: $showAddRule) {- RuleEditorView(viewModel: viewModel, onSave: { loadRules() })+ RuleEditorView(viewModel: viewModel, onCommit: { commitRule($0) })}.sheet(item: $editingRule) { rule in- RuleEditorView(viewModel: viewModel, existingRule: rule, onSave: { loadRules() })+ RuleEditorView(viewModel: viewModel, existingRule: rule, onCommit: { commitRule($0) })}}@@ -256,47 +291,39 @@ struct ProxyRulesView: View {}}+ // rules live in UserDefaults on the gui side, the extension is just a mirrorprivate func loadRules() {- guard let session = viewModel.tunnelSession else { return }-- isLoading = true- RuleManager.listRules(session: session) { [self] success, rulesList in- DispatchQueue.main.async {- isLoading = false- if success {- rules = rulesList.map(mapToProxyRule)- RuleManager.saveRulesToUserDefaults(rulesList)- }- }+ let dicts = UserDefaults.standard.array(forKey: "proxyRules") as? [[String: Any]] ?? []+ rules = dicts.map { ProxyRule(dict: $0) }+ }++ // persist the current list and push it to the extension if the tunnel is up+ private func saveAndSync() {+ UserDefaults.standard.set(rules.map { $0.toDict() }, forKey: "proxyRules")+ if let session = viewModel.tunnelSession {+ RuleManager.resyncRules(session: session) { _, _ in }}}-- private func mapToProxyRule(_ dict: [String: Any]) -> ProxyRule {- ProxyRule(- id: dict["ruleId"] as? UInt32 ?? 0,- processNames: dict["processNames"] as? String ?? "",- targetHosts: dict["targetHosts"] as? String ?? "",- targetPorts: dict["targetPorts"] as? String ?? "",- ruleProtocol: dict["protocol"] as? String ?? "BOTH",- action: dict["action"] as? String ?? "DIRECT",- enabled: dict["enabled"] as? Bool ?? true- )++ func commitRule(_ rule: ProxyRule) {+ if let index = rules.firstIndex(where: { $0.localId == rule.localId }) {+ rules[index] = rule+ } else {+ rules.append(rule)+ }+ saveAndSync()}-+private func deleteRule(_ rule: ProxyRule) {- guard let session = viewModel.tunnelSession else { return }-- RuleManager.removeRule(session: session, ruleId: rule.id) { [self] success, _ in- if success { loadRules() }- }+ rules.removeAll { $0.localId == rule.localId }+ selectedRuleIds.remove(rule.localId)+ saveAndSync()}-+private func toggleRule(_ rule: ProxyRule, enabled: Bool) {- guard let session = viewModel.tunnelSession else { return }-- RuleManager.toggleRule(session: session, ruleId: rule.id, enabled: enabled) { [self] _, _ in- loadRules()- }+ guard let index = rules.firstIndex(where: { $0.localId == rule.localId }) else { return }+ rules[index].enabled = enabled+ saveAndSync()}private func getSelectedRules() -> [ProxyRule] {@@ -343,28 +370,12 @@ struct ProxyRulesView: View {}private func importRules(from url: URL) {- guard let session = viewModel.tunnelSession else { return }-do {let data = try Data(contentsOf: url)- let decoder = JSONDecoder()- let importedRules = try decoder.decode([ProxyRule].self, from: data)-- for rule in importedRules {- RuleManager.addRule(- session: session,- processNames: rule.processNames,- targetHosts: rule.targetHosts,- targetPorts: rule.targetPorts,- protocol: rule.ruleProtocol,- action: rule.action,- enabled: rule.enabled- ) { _, _, _ in }- }-- DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {- loadRules()- }+ let importedRules = try JSONDecoder().decode([ProxyRule].self, from: data)+ // decode drops localId so each imported rule already has a fresh one+ rules.append(contentsOf: importedRules)+ saveAndSync()} catch {print("Failed to import rules: \(error)")}@@ -374,25 +385,25 @@ struct ProxyRulesView: View {struct RuleEditorView: View {@ObservedObject var viewModel: ProxyBridgeViewModelvar existingRule: ProxyRule?- var onSave: () -> Void+ var onCommit: (ProxyRule) -> Void@Environment(\.dismiss) private var dismiss+ @State private var ruleName: String@State private var processNames: String@State private var targetHosts: String@State private var targetPorts: String@State private var selectedProtocol: String@State private var selectedAction: String- @State private var saveError: String = ""- @State private var isSaving = falseprivate var isEditMode: Bool { existingRule != nil }-- init(viewModel: ProxyBridgeViewModel, existingRule: ProxyRule? = nil, onSave: @escaping () -> Void) {++ init(viewModel: ProxyBridgeViewModel, existingRule: ProxyRule? = nil, onCommit: @escaping (ProxyRule) -> Void) {self.viewModel = viewModelself.existingRule = existingRule- self.onSave = onSave+ self.onCommit = onCommit+ _ruleName = State(initialValue: existingRule?.name ?? "")_processNames = State(initialValue: existingRule?.processNames ?? "*")_targetHosts = State(initialValue: existingRule?.targetHosts ?? "*")_targetPorts = State(initialValue: existingRule?.targetPorts ?? "*")@@ -401,15 +412,22 @@ struct RuleEditorView: View {let defaultAction = existingRule?.action ?? viewModel.proxyConfigs.first?.id ?? "DIRECT"_selectedAction = State(initialValue: defaultAction)}-+var body: some View {VStack(spacing: 20) {Text(isEditMode ? "Edit Rule" : "Add Rule").font(.title2).fontWeight(.semibold)-+Form {Section {+ formField(+ label: "Rule Name",+ placeholder: "Optional, e.g. Work traffic",+ text: $ruleName,+ hint: "Shown in the rules list. Leave empty if you don't need one."+ )+formField(label: "Bundle Identifier (Package Name)",placeholder: "*",@@ -483,28 +501,19 @@ struct RuleEditorView: View {dismiss()}.keyboardShortcut(.cancelAction)-+Spacer()-- Button(isSaving ? "Saving…" : "Save Rule") {++ Button("Save Rule") {saveRule()}.keyboardShortcut(.defaultAction).buttonStyle(.borderedProminent)- .disabled(isSaving)}.padding(.horizontal)-- if !saveError.isEmpty {- HStack(spacing: 6) {- Image(systemName: "exclamationmark.triangle.fill").foregroundColor(.red)- Text(saveError).font(.caption).foregroundColor(.red)- }- .padding(.horizontal)- }}.padding()- .frame(width: 600, height: 580)+ .frame(width: 600, height: 620)}@ViewBuilder@@ -521,54 +530,18 @@ struct RuleEditorView: View {}private func saveRule() {- guard let session = viewModel.tunnelSession else {- saveError = "Proxy is not running. Start the proxy before saving rules."- return- }- saveError = ""- isSaving = true- if let existing = existingRule {- updateExistingRule(session: session, ruleId: existing.id)- } else {- addNewRule(session: session)- }- }-- private func updateExistingRule(session: NETunnelProviderSession, ruleId: UInt32) {- RuleManager.updateRule(- session: session,- ruleId: ruleId,+ let rule = ProxyRule(+ localId: existingRule?.localId ?? UUID().uuidString,+ name: ruleName.trimmingCharacters(in: .whitespaces),processNames: processNames,targetHosts: targetHosts,targetPorts: targetPorts,- protocol: selectedProtocol,+ ruleProtocol: selectedProtocol,action: selectedAction,- enabled: true- ) { [self] success, _ in- DispatchQueue.main.async {- isSaving = false- if success { onSave(); dismiss() }- else { saveError = "Extension rejected the update. Check the proxy is running." }- }- }- }-- private func addNewRule(session: NETunnelProviderSession) {- RuleManager.addRule(- session: session,- processNames: processNames,- targetHosts: targetHosts,- targetPorts: targetPorts,- protocol: selectedProtocol,- action: selectedAction,- enabled: true- ) { [self] success, _, _ in- DispatchQueue.main.async {- isSaving = false- if success { onSave(); dismiss() }- else { saveError = "Extension rejected the rule. Check the proxy is running." }- }- }+ enabled: existingRule?.enabled ?? true+ )+ onCommit(rule)+ dismiss()}}diff --git a/MacOS/ProxyBridge/ProxyBridge/ProxySettingsView.swift b/MacOS/ProxyBridge/ProxyBridge/ProxySettingsView.swiftindex 633e24c..cc2f43c 100644--- a/MacOS/ProxyBridge/ProxyBridge/ProxySettingsView.swift+++ b/MacOS/ProxyBridge/ProxyBridge/ProxySettingsView.swift@@ -19,7 +19,7 @@ struct ProxySettingsView: View {Divider()footerButtons}- .frame(minWidth: 760, idealWidth: 760, maxWidth: .infinity, minHeight: 440, idealHeight: 480, maxHeight: .infinity)+ .frame(minWidth: 880, idealWidth: 880, maxWidth: .infinity, minHeight: 440, idealHeight: 480, maxHeight: .infinity).alert("Delete Proxy?", isPresented: Binding(get: { deletingConfig != nil },set: { if !$0 { deletingConfig = nil } }@@ -85,6 +85,12 @@ struct ProxySettingsView: View {Spacer()} else {Table(viewModel.proxyConfigs) {+ TableColumn("Name") { config in+ Text(config.name.isEmpty ? "—" : config.name)+ .foregroundColor(config.name.isEmpty ? .secondary : .primary)+ }+ .width(140)+TableColumn("Type") { config inText(config.type.uppercased()).foregroundColor(typeColor(config.type))@@ -198,6 +204,7 @@ struct ProxyConfigEditorView: View {var existing: ProxyBridgeViewModel.ProxyConfig?@Environment(\.dismiss) private var dismiss+ @State private var configName = ""@State private var proxyType = "socks5"@State private var proxyHost = ""@State private var proxyPort = ""@@ -228,6 +235,8 @@ struct ProxyConfigEditorView: View {Form {Section {+ formTextField(label: "Name", placeholder: "Optional, e.g. Home SOCKS", text: $configName)+VStack(alignment: .leading, spacing: 8) {HStack { Text("Proxy Type").fontWeight(.medium); Text("*").foregroundColor(.red) }Picker("Select proxy type", selection: $proxyType) {@@ -278,6 +287,7 @@ struct ProxyConfigEditorView: View {.frame(width: 500, height: 520).onAppear {if let e = existing {+ configName = e.nameproxyType = e.typeproxyHost = e.hostproxyPort = String(e.port)@@ -331,6 +341,7 @@ struct ProxyConfigEditorView: View {guard let port = Int(proxyPort) else { return }let config = ProxyBridgeViewModel.ProxyConfig(id: existing?.id ?? UUID().uuidString,+ name: configName.trimmingCharacters(in: .whitespaces),type: proxyType,host: proxyHost,port: port,diff --git a/MacOS/ProxyBridge/ProxyBridge/RuleManager.swift b/MacOS/ProxyBridge/ProxyBridge/RuleManager.swiftindex 4d5c266..fa24e10 100644--- a/MacOS/ProxyBridge/ProxyBridge/RuleManager.swift+++ b/MacOS/ProxyBridge/ProxyBridge/RuleManager.swift@@ -193,6 +193,17 @@ struct RuleManager {UserDefaults.standard.set(rulesToSave, forKey: "proxyRules")}+ // wipe the extension rules then push the current UserDefaults set back+ // used after any edit so ids stay in sync and we never double up rules+ static func resyncRules(+ session: NETunnelProviderSession,+ completion: @escaping (Bool, Int) -> Void+ ) {+ clearRules(session: session) { _, _ in+ loadRulesFromUserDefaults(session: session, completion: completion)+ }+ }+static func loadRulesFromUserDefaults(session: NETunnelProviderSession,completion: @escaping (Bool, Int) -> Void