Skip to content

swift: fix proxy settings #36

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
barnstar merged 1 commit into from
May 2, 2025
Merged

swift: fix proxy settings #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion swift/Examples/TailscaleKitHello/HelloFromTailscale/HelloFromTailscaleApp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import SwiftUI

@main
struct HelloFromTailscaleApp: App {
let manager = HelloManager()
let manager = HelloManager.shared

var body: some Scene {
WindowGroup {
Expand Down
5 changes: 4 additions & 1 deletion swift/Examples/TailscaleKitHello/HelloFromTailscale/HelloManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ protocol Dialer: Actor {
actor HelloManager: Dialer {
var node: TailscaleNode?

static let shared = HelloManager()

let logger = Logger()

let config: Configuration
Expand Down Expand Up @@ -110,7 +112,8 @@ actor HelloManager: Dialer {

// Request a resource from the tailnet...
let url = URL(string: Settings.tailnetServer)!
let req = URLRequest(url: url)
var req = URLRequest(url: url)


let (data, _) = try await session.data(for: req)
await setMessage("\(Settings.tailnetServer) says:\n \(String(data: data, encoding: .utf8) ?? "(crickets!)")")
Expand Down
13 changes: 4 additions & 9 deletions swift/TailscaleKit/URLSession+Tailscale.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,16 @@ public extension URLSessionConfiguration {
}


var config: [CFString: Any] = [
let config: [CFString: Any] = [
kCFProxyTypeKey: kCFProxyTypeSOCKS,
kCFProxyUsernameKey: "tsnet",
kCFProxyPasswordKey: proxyConfig.proxyCredential,
kCFNetworkProxiesHTTPEnable: true,
kCFNetworkProxiesHTTPProxy: ip,
kCFNetworkProxiesHTTPPort: port,
kCFProxyHostNameKey: ip,
kCFProxyPortNumberKey: port
]

#if os(macOS)
config[kCFNetworkProxiesHTTPSEnable] = true
#endif

self.connectionProxyDictionary = config

return proxyConfig
}

Expand Down
Loading