Refactor ParseSSURL as ServerProfile initializer
This commit is contained in:
@ -8,26 +8,74 @@
|
||||
|
||||
import Cocoa
|
||||
|
||||
|
||||
|
||||
class ServerProfile: NSObject {
|
||||
var uuid: String
|
||||
|
||||
|
||||
var serverHost: String = ""
|
||||
var serverPort: uint16 = 8379
|
||||
var method:String = "aes-128-cfb"
|
||||
var password:String = ""
|
||||
var remark:String = ""
|
||||
var ota: Bool = false // onetime authentication
|
||||
|
||||
|
||||
override init() {
|
||||
uuid = UUID().uuidString
|
||||
}
|
||||
|
||||
|
||||
init(uuid: String) {
|
||||
self.uuid = uuid
|
||||
}
|
||||
|
||||
|
||||
convenience init?(url: URL?) {
|
||||
self.init()
|
||||
|
||||
func padBase64(string: String) -> String {
|
||||
var length = string.characters.count
|
||||
if length % 4 == 0 {
|
||||
return string
|
||||
} else {
|
||||
length = 4 - length % 4 + length
|
||||
return string.padding(toLength: length, withPad: "=", startingAt: 0)
|
||||
}
|
||||
}
|
||||
|
||||
func decodeUrl(url: URL?) -> String? {
|
||||
guard let encodedStr = url?.host else {
|
||||
return nil
|
||||
}
|
||||
guard let data = Data(base64Encoded: padBase64(string: encodedStr)) else {
|
||||
return url?.absoluteString
|
||||
}
|
||||
guard let decoded = String(data: data, encoding: String.Encoding.utf8) else {
|
||||
return nil
|
||||
}
|
||||
return "ss://\(decoded)"
|
||||
}
|
||||
|
||||
guard let decodedUrl = decodeUrl(url: url) else {
|
||||
return nil
|
||||
}
|
||||
guard var parsedUrl = URLComponents(string: decodedUrl) else {
|
||||
return nil
|
||||
}
|
||||
guard let host = parsedUrl.host, let port = parsedUrl.port,
|
||||
let method = parsedUrl.user, let password = parsedUrl.password else {
|
||||
return nil
|
||||
}
|
||||
|
||||
self.serverHost = host
|
||||
self.serverPort = UInt16(port)
|
||||
self.method = method
|
||||
self.password = password
|
||||
|
||||
remark = parsedUrl.queryItems?
|
||||
.filter({ $0.name == "Remark" }).first?.value ?? ""
|
||||
if let otaStr = parsedUrl.queryItems?
|
||||
.filter({ $0.name == "OTA" }).first?.value {
|
||||
ota = NSString(string: otaStr).boolValue
|
||||
}
|
||||
}
|
||||
|
||||
static func fromDictionary(_ data:[String: Any?]) -> ServerProfile {
|
||||
let cp = {
|
||||
(profile: ServerProfile) in
|
||||
@ -42,7 +90,7 @@ class ServerProfile: NSObject {
|
||||
profile.ota = ota as! Bool
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if let id = data["Id"] as? String {
|
||||
let profile = ServerProfile(uuid: id)
|
||||
cp(profile)
|
||||
@ -53,7 +101,7 @@ class ServerProfile: NSObject {
|
||||
return profile
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
func toDictionary() -> [String:AnyObject] {
|
||||
var d = [String:AnyObject]()
|
||||
d["Id"] = uuid as AnyObject?
|
||||
@ -65,28 +113,28 @@ class ServerProfile: NSObject {
|
||||
d["OTA"] = ota as AnyObject?
|
||||
return d
|
||||
}
|
||||
|
||||
|
||||
func toJsonConfig() -> [String: AnyObject] {
|
||||
var conf: [String: AnyObject] = ["server": serverHost as AnyObject,
|
||||
"server_port": NSNumber(value: serverPort as UInt16),
|
||||
"password": password as AnyObject,
|
||||
"method": method as AnyObject,]
|
||||
|
||||
|
||||
let defaults = UserDefaults.standard
|
||||
conf["local_port"] = NSNumber(value: UInt16(defaults.integer(forKey: "LocalSocks5.ListenPort")) as UInt16)
|
||||
conf["local_address"] = defaults.string(forKey: "LocalSocks5.ListenAddress") as AnyObject?
|
||||
conf["timeout"] = NSNumber(value: UInt32(defaults.integer(forKey: "LocalSocks5.Timeout")) as UInt32)
|
||||
conf["auth"] = NSNumber(value: ota as Bool)
|
||||
|
||||
|
||||
return conf
|
||||
}
|
||||
|
||||
|
||||
func isValid() -> Bool {
|
||||
func validateIpAddress(_ ipToValidate: String) -> Bool {
|
||||
|
||||
|
||||
var sin = sockaddr_in()
|
||||
var sin6 = sockaddr_in6()
|
||||
|
||||
|
||||
if ipToValidate.withCString({ cstring in inet_pton(AF_INET6, cstring, &sin6.sin6_addr) }) == 1 {
|
||||
// IPv6 peer.
|
||||
return true
|
||||
@ -95,31 +143,31 @@ class ServerProfile: NSObject {
|
||||
// IPv4 peer.
|
||||
return true
|
||||
}
|
||||
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
func validateDomainName(_ value: String) -> Bool {
|
||||
let validHostnameRegex = "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\\-]*[A-Za-z0-9])$"
|
||||
|
||||
|
||||
if (value.range(of: validHostnameRegex, options: .regularExpression) != nil) {
|
||||
return true
|
||||
} else {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if !(validateIpAddress(serverHost) || validateDomainName(serverHost)){
|
||||
return false
|
||||
}
|
||||
|
||||
|
||||
if password.isEmpty {
|
||||
return false
|
||||
}
|
||||
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
|
||||
func URL() -> Foundation.URL? {
|
||||
var url = URLComponents()
|
||||
|
||||
|
Reference in New Issue
Block a user