-
Notifications
You must be signed in to change notification settings - Fork 94
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #109 from ivpn/feature/dns-over-https-tls-inside-vpn
DNS over HTTPS/TLS inside VPN tunnel
- Loading branch information
Showing
12 changed files
with
310 additions
and
116 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| // | ||
| // DNSProtocolType.swift | ||
| // IVPN iOS app | ||
| // https://github.com/ivpn/ios-app | ||
| // | ||
| // Created by Juraj Hilje on 2021-03-10. | ||
| // Copyright (c) 2021 Privatus Limited. | ||
| // | ||
| // This file is part of the IVPN iOS app. | ||
| // | ||
| // The IVPN iOS app is free software: you can redistribute it and/or | ||
| // modify it under the terms of the GNU General Public License as published by the Free | ||
| // Software Foundation, either version 3 of the License, or (at your option) any later version. | ||
| // | ||
| // The IVPN iOS app is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY | ||
| // or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more | ||
| // details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License | ||
| // along with the IVPN iOS app. If not, see <https://www.gnu.org/licenses/>. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| enum DNSProtocolType: String { | ||
|
|
||
| case doh | ||
| case dot | ||
| case plain | ||
|
|
||
| static func getServerURL(address: String) -> String? { | ||
| var serverURL = address | ||
|
|
||
| if !address.hasPrefix("https://") { | ||
| serverURL = "https://\(serverURL)" | ||
| } | ||
|
|
||
| if !address.hasSuffix("/dns-query") { | ||
| serverURL = "\(serverURL)/dns-query" | ||
| } | ||
|
|
||
| return serverURL | ||
| } | ||
|
|
||
| static func getServerName(address: String) -> String { | ||
| var serverName = address | ||
|
|
||
| if !address.hasPrefix("https://") { | ||
| serverName = "https://\(serverName)" | ||
| } | ||
|
|
||
| if let serverURL = URL.init(string: serverName) { | ||
| if let host = serverURL.host { | ||
| do { | ||
| let ipAddress = try CIDRAddress(stringRepresentation: host) | ||
| return ipAddress?.ipAddress ?? address | ||
| } catch {} | ||
| } | ||
|
|
||
| return serverURL.getTopLevelDomain() | ||
| } | ||
|
|
||
| return address | ||
| } | ||
|
|
||
| static func preferred() -> DNSProtocolType { | ||
| guard !UserDefaults.shared.isAntiTracker else { | ||
| return .plain | ||
| } | ||
|
|
||
| return DNSProtocolType.init(rawValue: UserDefaults.shared.customDNSProtocol) ?? .plain | ||
| } | ||
|
|
||
| static func save(preferred: DNSProtocolType) { | ||
| UserDefaults.shared.setValue(preferred.rawValue, forKey: UserDefaults.Key.customDNSProtocol) | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.