From 97801c4ee6527124f3d0d67293427cd8e47dc05b Mon Sep 17 00:00:00 2001 From: Rainux Luo Date: Sat, 7 Jan 2017 04:08:28 +0800 Subject: [PATCH 1/7] Add tests for ParseSSURL() --- ShadowsocksX-NG.xcodeproj/project.pbxproj | 6 ++ ShadowsocksX-NGTests/UtilsTests.swift | 109 ++++++++++++++++++++++ 2 files changed, 115 insertions(+) create mode 100644 ShadowsocksX-NGTests/UtilsTests.swift diff --git a/ShadowsocksX-NG.xcodeproj/project.pbxproj b/ShadowsocksX-NG.xcodeproj/project.pbxproj index 2a78063..74c6442 100755 --- a/ShadowsocksX-NG.xcodeproj/project.pbxproj +++ b/ShadowsocksX-NG.xcodeproj/project.pbxproj @@ -59,6 +59,7 @@ C6E28E951DA79705004F8330 /* HTTPPreferencesWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = C6E28E971DA79705004F8330 /* HTTPPreferencesWindowController.xib */; }; C8E42A6C1D4F270A0074C7EA /* UserRulesController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8E42A6A1D4F270A0074C7EA /* UserRulesController.swift */; }; C8E42A6E1D4F2CAF0074C7EA /* UserRulesController.xib in Resources */ = {isa = PBXBuildFile; fileRef = C8E42A701D4F2CAF0074C7EA /* UserRulesController.xib */; }; + D829DB3F1E20262300FB5E1E /* UtilsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D829DB3E1E20262300FB5E1E /* UtilsTests.swift */; }; E0E57CCA7EB34B90F9D340F2 /* Pods_ShadowsocksX_NGTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 388120F062D7EB7DD0D8DDCA /* Pods_ShadowsocksX_NGTests.framework */; }; F0809FF1595BE2966343D3C7 /* libPods-proxy_conf_helper.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1E7783AEDB4A3BDDC9FF16AC /* libPods-proxy_conf_helper.a */; }; /* End PBXBuildFile section */ @@ -176,6 +177,7 @@ C8E42A6A1D4F270A0074C7EA /* UserRulesController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserRulesController.swift; sourceTree = ""; }; C8E42A6F1D4F2CAF0074C7EA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UserRulesController.xib; sourceTree = ""; }; C8E42A721D4F2CB10074C7EA /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/UserRulesController.strings"; sourceTree = ""; }; + D829DB3E1E20262300FB5E1E /* UtilsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UtilsTests.swift; sourceTree = ""; }; E9E9FB3855DA55D0710EE7BD /* Pods-ShadowsocksX-NG.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShadowsocksX-NG.release.xcconfig"; path = "Pods/Target Support Files/Pods-ShadowsocksX-NG/Pods-ShadowsocksX-NG.release.xcconfig"; sourceTree = ""; }; FE3237E9FB24D9B924A0E630 /* Pods-ShadowsocksX-NG.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShadowsocksX-NG.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ShadowsocksX-NG/Pods-ShadowsocksX-NG.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -309,6 +311,7 @@ 9B0BFFF71D0460A70040E62B /* ShadowsocksX-NGTests */ = { isa = PBXGroup; children = ( + D829DB3E1E20262300FB5E1E /* UtilsTests.swift */, 9B0BFFF81D0460A70040E62B /* ShadowsocksX_NGTests.swift */, 9B0BFFFA1D0460A70040E62B /* Info.plist */, ); @@ -666,6 +669,7 @@ buildActionMask = 2147483647; files = ( 9B0BFFF91D0460A70040E62B /* ShadowsocksX_NGTests.swift in Sources */, + D829DB3F1E20262300FB5E1E /* UtilsTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -905,6 +909,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.qiuyuzhou.ShadowsocksX-NGTests"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "ShadowsocksX-NG/ShadowsocksX-NG-Bridging-Header.h"; SWIFT_VERSION = 3.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ShadowsocksX-NG.app/Contents/MacOS/ShadowsocksX-NG"; }; @@ -920,6 +925,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.qiuyuzhou.ShadowsocksX-NGTests"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "ShadowsocksX-NG/ShadowsocksX-NG-Bridging-Header.h"; SWIFT_VERSION = 3.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ShadowsocksX-NG.app/Contents/MacOS/ShadowsocksX-NG"; }; diff --git a/ShadowsocksX-NGTests/UtilsTests.swift b/ShadowsocksX-NGTests/UtilsTests.swift new file mode 100644 index 0000000..765cd57 --- /dev/null +++ b/ShadowsocksX-NGTests/UtilsTests.swift @@ -0,0 +1,109 @@ +// +// UtilsTests.swift +// ShadowsocksX-NG +// +// Created by Rainux Luo on 07/01/2017. +// Copyright © 2017 qiuyuzhou. All rights reserved. +// + +import XCTest + +class UtilsTests: XCTestCase { + + override func setUp() { + super.setUp() + // Put setup code here. This method is called before the invocation of each test method in the class. + } + + override func tearDown() { + // Put teardown code here. This method is called after the invocation of each test method in the class. + super.tearDown() + } + + func testParseSSURLwithPlainURL() { + let url = URL(string: "ss://aes-256-cfb:password@example.com:8388") + + let profile = ParseSSURL(url) + + XCTAssertNotNil(profile) + + XCTAssertEqual(profile?["ServerHost"] as? String, "example.com") + XCTAssertEqual(profile?["ServerPort"] as? UInt16, 8388) + XCTAssertEqual(profile?["Method"] as? String, "aes-256-cfb") + XCTAssertEqual(profile?["Password"] as? String, "password") + } + + func testParseSSURLwithPlainURLandQuery() { + let url = URL(string: "ss://aes-256-cfb:password@example.com:8388?Remark=Prism&OTA=true") + + let profile = ParseSSURL(url) + + XCTAssertNotNil(profile) + + XCTAssertEqual(profile?["ServerHost"] as? String, "example.com") + XCTAssertEqual(profile?["ServerPort"] as? UInt16, 8388) + XCTAssertEqual(profile?["Method"] as? String, "aes-256-cfb") + XCTAssertEqual(profile?["Password"] as? String, "password") + } + + func testParseSSURLwithBase64EncodedURL() { + // "ss://aes-256-cfb:password@example.com:8388" + let url = URL(string: "ss://YWVzLTI1Ni1jZmI6cGFzc3dvcmRAZXhhbXBsZS5jb206ODM4OA") + + let profile = ParseSSURL(url) + + XCTAssertNotNil(profile) + + XCTAssertEqual(profile?["ServerHost"] as? String, "example.com") + XCTAssertEqual(profile?["ServerPort"] as? UInt16, 8388) + XCTAssertEqual(profile?["Method"] as? String, "aes-256-cfb") + XCTAssertEqual(profile?["Password"] as? String, "password") + } + + func testParseSSURLwithBase64EncodedURLandQuery() { + // "ss://aes-256-cfb:password@example.com:8388?Remark=Prism&OTA=true" + let url = URL(string: "ss://YWVzLTI1Ni1jZmI6cGFzc3dvcmRAZXhhbXBsZS5jb206ODM4OD9SZW1hcms9UHJpc20mT1RBPXRydWU") + + let profile = ParseSSURL(url) + + XCTAssertNotNil(profile) + + XCTAssertEqual(profile?["ServerHost"] as? String, "example.com") + XCTAssertEqual(profile?["ServerPort"] as? UInt16, 8388) + XCTAssertEqual(profile?["Method"] as? String, "aes-256-cfb") + XCTAssertEqual(profile?["Password"] as? String, "password") + } + + func testParseSSURLwithEmptyURL() { + let url = URL(string: "ss://") + + let profile = ParseSSURL(url) + + XCTAssertNil(profile) + } + + func testParseSSURLwithInvalidURL() { + let url = URL(string: "ss://invalid url") + + let profile = ParseSSURL(url) + + XCTAssertNil(profile) + } + + func testParseSSURLwithBase64EncodedInvalidURL() { + // "ss://invalid url" + let url = URL(string: "ss://aW52YWxpZCB1cmw") + + let profile = ParseSSURL(url) + + XCTAssertNil(profile) + } + + func testPerformanceExample() { + // This is an example of a performance test case. + self.measure { + // Put the code you want to measure the time of here. + } + } + +} From faf029c7f7ecbf307b2fd77c464bd73710290586 Mon Sep 17 00:00:00 2001 From: Rainux Luo Date: Sat, 7 Jan 2017 06:54:31 +0800 Subject: [PATCH 2/7] Parse SS URL with much cleaner URL struct methods --- ShadowsocksX-NG/Utils.h | 2 - ShadowsocksX-NG/Utils.m | 60 --------------------------- ShadowsocksX-NG/Utils.swift | 35 +++++++++++++++- ShadowsocksX-NGTests/UtilsTests.swift | 1 + 4 files changed, 34 insertions(+), 64 deletions(-) diff --git a/ShadowsocksX-NG/Utils.h b/ShadowsocksX-NG/Utils.h index ea24afd..9e9110f 100644 --- a/ShadowsocksX-NG/Utils.h +++ b/ShadowsocksX-NG/Utils.h @@ -11,6 +11,4 @@ void ScanQRCodeOnScreen(); -NSDictionary* ParseSSURL(NSURL* url); - #endif /* QRCodeUtils_h */ diff --git a/ShadowsocksX-NG/Utils.m b/ShadowsocksX-NG/Utils.m index d6f3402..4d34e31 100644 --- a/ShadowsocksX-NG/Utils.m +++ b/ShadowsocksX-NG/Utils.m @@ -71,63 +71,3 @@ void ScanQRCodeOnScreen() { } ]; } - -// 解析SS URL，如果成功则返回一个与ServerProfile类兼容的dict -NSDictionary* ParseSSURL(NSURL* url) { - if (!url.host) { - return nil; - } - - NSString *urlString = [url absoluteString]; - int i = 0; - NSString *errorReason = nil; - while(i < 2) { - if (i == 1) { - NSString* host = url.host; - if ([host length]%4!=0) { - int n = 4 - [host length]%4; - if (1==n) { - host = [host stringByAppendingString:@"="]; - } else if (2==n) { - host = [host stringByAppendingString:@"=="]; - } - } - NSData *data = [[NSData alloc] initWithBase64EncodedString:host options:0]; - NSString *decodedString = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; - urlString = decodedString; - } - i++; - urlString = [urlString stringByReplacingOccurrencesOfString:@"ss://" withString:@"" options:NSAnchoredSearch range:NSMakeRange(0, urlString.length)]; - NSRange firstColonRange = [urlString rangeOfString:@":"]; - NSRange lastColonRange = [urlString rangeOfString:@":" options:NSBackwardsSearch]; - NSRange lastAtRange = [urlString rangeOfString:@"@" options:NSBackwardsSearch]; - if (firstColonRange.length == 0) { - errorReason = @"colon not found"; - continue; - } - if (firstColonRange.location == lastColonRange.location) { - errorReason = @"only one colon"; - continue; - } - if (lastAtRange.length == 0) { - errorReason = @"at not found"; - continue; - } - if (!((firstColonRange.location < lastAtRange.location) && (lastAtRange.location < lastColonRange.location))) { - errorReason = @"wrong position"; - continue; - } - NSString *method = [urlString substringWithRange:NSMakeRange(0, firstColonRange.location)]; - NSString *password = [urlString substringWithRange:NSMakeRange(firstColonRange.location + 1, lastAtRange.location - firstColonRange.location - 1)]; - NSString *IP = [urlString substringWithRange:NSMakeRange(lastAtRange.location + 1, lastColonRange.location - lastAtRange.location - 1)]; - NSString *port = [urlString substringWithRange:NSMakeRange(lastColonRange.location + 1, urlString.length - lastColonRange.location - 1)]; - - - return @{@"ServerHost": IP, - @"ServerPort": @([port integerValue]), - @"Method": method, - @"Password": password, - }; - } - return nil; -} diff --git a/ShadowsocksX-NG/Utils.swift b/ShadowsocksX-NG/Utils.swift index 74c0f54..509f900 100644 --- a/ShadowsocksX-NG/Utils.swift +++ b/ShadowsocksX-NG/Utils.swift @@ -8,14 +8,12 @@ import Foundation - extension String { var localized: String { return NSLocalizedString(self, tableName: nil, bundle: Bundle.main, value: "", comment: "") } } - extension Data { func sha1() -> String { let data = self @@ -25,3 +23,36 @@ extension Data { return hexBytes.joined(separator: "") } } + +func ParseSSURL(_ url: URL?) -> [String: Any?]? { + + func padBase64(string: String) -> String { + var length = string.characters.count + length = 4 - length % 4 + length + return string.padding(toLength: length, withPad: "=", startingAt: 0) + } + + if url?.host == nil { + return nil + } + + var plainUrl: URL! = url + + let data = Data(base64Encoded: padBase64(string: url!.host!), + options: Data.Base64DecodingOptions()) + + if data != nil { + let decoded = String(data: data!, encoding: String.Encoding.utf8) + plainUrl = URL(string: "ss://\(decoded!)") + + if plainUrl == nil { + return nil + } + } + + return ["ServerHost": plainUrl.host, + "ServerPort": UInt16(plainUrl.port!), + "Method": plainUrl.user, + "Password": plainUrl.password, + ] +} diff --git a/ShadowsocksX-NGTests/UtilsTests.swift b/ShadowsocksX-NGTests/UtilsTests.swift index 765cd57..2463b89 100644 --- a/ShadowsocksX-NGTests/UtilsTests.swift +++ b/ShadowsocksX-NGTests/UtilsTests.swift @@ -7,6 +7,7 @@ // import XCTest +@testable import ShadowsocksX_NG class UtilsTests: XCTestCase { From 5e06b4b4f00a67c4b90b3db0e63222ec386fe25c Mon Sep 17 00:00:00 2001 From: Rainux Luo Date: Sat, 7 Jan 2017 08:51:57 +0800 Subject: [PATCH 3/7] Support parse SS URL with query string So we can encode Remark and OTA to query string --- ShadowsocksX-NG/Utils.swift | 17 +++++++++++++++-- ShadowsocksX-NGTests/UtilsTests.swift | 19 +++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/ShadowsocksX-NG/Utils.swift b/ShadowsocksX-NG/Utils.swift index 509f900..0417749 100644 --- a/ShadowsocksX-NG/Utils.swift +++ b/ShadowsocksX-NG/Utils.swift @@ -36,23 +36,36 @@ func ParseSSURL(_ url: URL?) -> [String: Any?]? { return nil } - var plainUrl: URL! = url + var plainUrl: URLComponents! = URLComponents(url: url!, + resolvingAgainstBaseURL: false) let data = Data(base64Encoded: padBase64(string: url!.host!), options: Data.Base64DecodingOptions()) if data != nil { let decoded = String(data: data!, encoding: String.Encoding.utf8) - plainUrl = URL(string: "ss://\(decoded!)") + plainUrl = URLComponents(string: "ss://\(decoded!)") if plainUrl == nil { return nil } } + let remark = plainUrl.queryItems? + .filter({ $0.name == "Remark" }).first?.value + let otaStr = plainUrl.queryItems? + .filter({ $0.name == "OTA" }).first?.value + + var ota: Bool? = nil + if otaStr != nil { + ota = NSString(string: otaStr!).boolValue + } + return ["ServerHost": plainUrl.host, "ServerPort": UInt16(plainUrl.port!), "Method": plainUrl.user, "Password": plainUrl.password, + "Remark": remark, + "OTA": ota, ] } diff --git a/ShadowsocksX-NGTests/UtilsTests.swift b/ShadowsocksX-NGTests/UtilsTests.swift index 2463b89..321e158 100644 --- a/ShadowsocksX-NGTests/UtilsTests.swift +++ b/ShadowsocksX-NGTests/UtilsTests.swift @@ -45,6 +45,23 @@ class UtilsTests: XCTestCase { XCTAssertEqual(profile?["ServerPort"] as? UInt16, 8388) XCTAssertEqual(profile?["Method"] as? String, "aes-256-cfb") XCTAssertEqual(profile?["Password"] as? String, "password") + XCTAssertEqual(profile?["Remark"] as? String, "Prism") + XCTAssertEqual(profile?["OTA"] as? Bool, true) + } + + func testParseSSURLwithPlainURLandAnotherQuery() { + let url = URL(string: "ss://aes-256-cfb:password@example.com:8388?Remark=Prism&OTA=0") + + let profile = ParseSSURL(url) + + XCTAssertNotNil(profile) + + XCTAssertEqual(profile?["ServerHost"] as? String, "example.com") + XCTAssertEqual(profile?["ServerPort"] as? UInt16, 8388) + XCTAssertEqual(profile?["Method"] as? String, "aes-256-cfb") + XCTAssertEqual(profile?["Password"] as? String, "password") + XCTAssertEqual(profile?["Remark"] as? String, "Prism") + XCTAssertEqual(profile?["OTA"] as? Bool, false) } func testParseSSURLwithBase64EncodedURL() { @@ -73,6 +90,8 @@ class UtilsTests: XCTestCase { XCTAssertEqual(profile?["ServerPort"] as? UInt16, 8388) XCTAssertEqual(profile?["Method"] as? String, "aes-256-cfb") XCTAssertEqual(profile?["Password"] as? String, "password") + XCTAssertEqual(profile?["Remark"] as? String, "Prism") + XCTAssertEqual(profile?["OTA"] as? Bool, true) } func testParseSSURLwithEmptyURL() { From 9dafb4fb79465e1a880ad4cf307aeaea0ef63f08 Mon Sep 17 00:00:00 2001 From: Rainux Luo Date: Sat, 7 Jan 2017 09:26:32 +0800 Subject: [PATCH 4/7] Add tests for ServerProfile --- ShadowsocksX-NG.xcodeproj/project.pbxproj | 4 ++ ShadowsocksX-NG/AppDelegate.swift | 2 +- ShadowsocksX-NG/ServerProfile.swift | 2 +- ShadowsocksX-NG/ServerProfileManager.swift | 2 +- ShadowsocksX-NGTests/ServerProfileTests.swift | 57 +++++++++++++++++++ 5 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 ShadowsocksX-NGTests/ServerProfileTests.swift diff --git a/ShadowsocksX-NG.xcodeproj/project.pbxproj b/ShadowsocksX-NG.xcodeproj/project.pbxproj index 74c6442..792c650 100755 --- a/ShadowsocksX-NG.xcodeproj/project.pbxproj +++ b/ShadowsocksX-NG.xcodeproj/project.pbxproj @@ -60,6 +60,7 @@ C8E42A6C1D4F270A0074C7EA /* UserRulesController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8E42A6A1D4F270A0074C7EA /* UserRulesController.swift */; }; C8E42A6E1D4F2CAF0074C7EA /* UserRulesController.xib in Resources */ = {isa = PBXBuildFile; fileRef = C8E42A701D4F2CAF0074C7EA /* UserRulesController.xib */; }; D829DB3F1E20262300FB5E1E /* UtilsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D829DB3E1E20262300FB5E1E /* UtilsTests.swift */; }; + D8E3630B1E2072980027449B /* ServerProfileTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8E3630A1E2072980027449B /* ServerProfileTests.swift */; }; E0E57CCA7EB34B90F9D340F2 /* Pods_ShadowsocksX_NGTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 388120F062D7EB7DD0D8DDCA /* Pods_ShadowsocksX_NGTests.framework */; }; F0809FF1595BE2966343D3C7 /* libPods-proxy_conf_helper.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1E7783AEDB4A3BDDC9FF16AC /* libPods-proxy_conf_helper.a */; }; /* End PBXBuildFile section */ @@ -178,6 +179,7 @@ C8E42A6F1D4F2CAF0074C7EA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UserRulesController.xib; sourceTree = ""; }; C8E42A721D4F2CB10074C7EA /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/UserRulesController.strings"; sourceTree = ""; }; D829DB3E1E20262300FB5E1E /* UtilsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UtilsTests.swift; sourceTree = ""; }; + D8E3630A1E2072980027449B /* ServerProfileTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ServerProfileTests.swift; sourceTree = ""; }; E9E9FB3855DA55D0710EE7BD /* Pods-ShadowsocksX-NG.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShadowsocksX-NG.release.xcconfig"; path = "Pods/Target Support Files/Pods-ShadowsocksX-NG/Pods-ShadowsocksX-NG.release.xcconfig"; sourceTree = ""; }; FE3237E9FB24D9B924A0E630 /* Pods-ShadowsocksX-NG.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShadowsocksX-NG.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ShadowsocksX-NG/Pods-ShadowsocksX-NG.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -311,6 +313,7 @@ 9B0BFFF71D0460A70040E62B /* ShadowsocksX-NGTests */ = { isa = PBXGroup; children = ( + D8E3630A1E2072980027449B /* ServerProfileTests.swift */, D829DB3E1E20262300FB5E1E /* UtilsTests.swift */, 9B0BFFF81D0460A70040E62B /* ShadowsocksX_NGTests.swift */, 9B0BFFFA1D0460A70040E62B /* Info.plist */, @@ -670,6 +673,7 @@ files = ( 9B0BFFF91D0460A70040E62B /* ShadowsocksX_NGTests.swift in Sources */, D829DB3F1E20262300FB5E1E /* UtilsTests.swift in Sources */, + D8E3630B1E2072980027449B /* ServerProfileTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/ShadowsocksX-NG/AppDelegate.swift b/ShadowsocksX-NG/AppDelegate.swift index 6b5545a..0e98f02 100755 --- a/ShadowsocksX-NG/AppDelegate.swift +++ b/ShadowsocksX-NG/AppDelegate.swift @@ -123,7 +123,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele for url in urls { let profielDict = ParseSSURL(url) if let profielDict = profielDict { - let profile = ServerProfile.fromDictionary(profielDict as [String : AnyObject]) + let profile = ServerProfile.fromDictionary(profielDict) mgr.profiles.append(profile) isChanged = true diff --git a/ShadowsocksX-NG/ServerProfile.swift b/ShadowsocksX-NG/ServerProfile.swift index c63085d..853d980 100644 --- a/ShadowsocksX-NG/ServerProfile.swift +++ b/ShadowsocksX-NG/ServerProfile.swift @@ -28,7 +28,7 @@ class ServerProfile: NSObject { self.uuid = uuid } - static func fromDictionary(_ data:[String:AnyObject]) -> ServerProfile { + static func fromDictionary(_ data:[String: Any?]) -> ServerProfile { let cp = { (profile: ServerProfile) in profile.serverHost = data["ServerHost"] as! String diff --git a/ShadowsocksX-NG/ServerProfileManager.swift b/ShadowsocksX-NG/ServerProfileManager.swift index 61b62c7..c3ee9ac 100644 --- a/ShadowsocksX-NG/ServerProfileManager.swift +++ b/ShadowsocksX-NG/ServerProfileManager.swift @@ -21,7 +21,7 @@ class ServerProfileManager: NSObject { let defaults = UserDefaults.standard if let _profiles = defaults.array(forKey: "ServerProfiles") { for _profile in _profiles { - let profile = ServerProfile.fromDictionary(_profile as! [String : AnyObject]) + let profile = ServerProfile.fromDictionary(_profile as! [String: Any]) profiles.append(profile) } } diff --git a/ShadowsocksX-NGTests/ServerProfileTests.swift b/ShadowsocksX-NGTests/ServerProfileTests.swift new file mode 100644 index 0000000..22bedd6 --- /dev/null +++ b/ShadowsocksX-NGTests/ServerProfileTests.swift @@ -0,0 +1,57 @@ +// +// ServerProfileTests.swift +// ShadowsocksX-NG +// +// Created by Rainux Luo on 07/01/2017. +// Copyright © 2017 qiuyuzhou. All rights reserved. +// + +import XCTest +@testable import ShadowsocksX_NG + +class ServerProfileTests: XCTestCase { + + // "ss://aes-256-cfb:password@example.com:8388" + let profileUrl = URL(string: "ss://YWVzLTI1Ni1jZmI6cGFzc3dvcmRAZXhhbXBsZS5jb206ODM4OA") + + // "ss://aes-256-cfb:password@example.com:8388?Remark=Prism&OTA=true" + let profileFullUrl = URL(string: "ss://YWVzLTI1Ni1jZmI6cGFzc3dvcmRAZXhhbXBsZS5jb206ODM4OD9SZW1hcms9UHJpc20mT1RBPXRydWU") + + var profile: ServerProfile! + + override func setUp() { + super.setUp() + + profile = ServerProfile.fromDictionary(["ServerHost": "example.com", + "ServerPort": 8388, + "Method": "aes-256-cfb", + "Password": "password", + "Remark": "Prism", + "OTA": true]) + XCTAssertNotNil(profile) + } + + override func tearDown() { + // Put teardown code here. This method is called after the invocation of each test method in the class. + super.tearDown() + } + + func testServerProfileURL() { + let parsed = ParseSSURL(profile.URL()) + + XCTAssertNotNil(parsed) + + XCTAssertEqual(parsed?["ServerHost"] as? String, profile.serverHost) + XCTAssertEqual(parsed?["ServerPort"] as? UInt16, profile.serverPort) + XCTAssertEqual(parsed?["Method"] as? String, profile.method) + XCTAssertEqual(parsed?["Password"] as? String, profile.password) + } + + func testPerformanceExample() { + // This is an example of a performance test case. + self.measure { + // Put the code you want to measure the time of here. + } + } + +} From c50e18d832d99d74b6391b8ce1fb81e0e2355357 Mon Sep 17 00:00:00 2001 From: Rainux Luo Date: Sat, 7 Jan 2017 12:48:10 +0800 Subject: [PATCH 5/7] Support generate SS URL with Remark and OTA --- ShadowsocksX-NG/ServerProfile.swift | 19 ++++++++++++++++--- ShadowsocksX-NG/Utils.swift | 8 ++++++-- ShadowsocksX-NGTests/ServerProfileTests.swift | 4 +++- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/ShadowsocksX-NG/ServerProfile.swift b/ShadowsocksX-NG/ServerProfile.swift index 853d980..92865c3 100644 --- a/ShadowsocksX-NG/ServerProfile.swift +++ b/ShadowsocksX-NG/ServerProfile.swift @@ -121,9 +121,22 @@ class ServerProfile: NSObject { } func URL() -> Foundation.URL? { - let parts = "\(method):\(password)@\(serverHost):\(serverPort)" - let base64String = parts.data(using: String.Encoding.utf8)? - .base64EncodedString(options: NSData.Base64EncodingOptions()) + var url = URLComponents() + + url.host = serverHost + url.user = method + url.password = password + url.port = Int(serverPort) + + url.queryItems = [URLQueryItem(name: "Remark", value: remark), + URLQueryItem(name: "OTA", value: ota.description)] + + let parts = url.string?.replacingOccurrences( + of: "//", with: "", + options: String.CompareOptions.anchored, range: nil) + + let base64String = parts?.data(using: String.Encoding.utf8)? + .base64EncodedString(options: Data.Base64EncodingOptions()) if var s = base64String { s = s.trimmingCharacters(in: CharacterSet(charactersIn: "=")) return Foundation.URL(string: "ss://\(s)") diff --git a/ShadowsocksX-NG/Utils.swift b/ShadowsocksX-NG/Utils.swift index 0417749..618d638 100644 --- a/ShadowsocksX-NG/Utils.swift +++ b/ShadowsocksX-NG/Utils.swift @@ -28,8 +28,12 @@ func ParseSSURL(_ url: URL?) -> [String: Any?]? { func padBase64(string: String) -> String { var length = string.characters.count - length = 4 - length % 4 + length - return string.padding(toLength: length, withPad: "=", startingAt: 0) + if length % 4 == 0 { + return string + } else { + length = 4 - length % 4 + length + return string.padding(toLength: length, withPad: "=", startingAt: 0) + } } if url?.host == nil { diff --git a/ShadowsocksX-NGTests/ServerProfileTests.swift b/ShadowsocksX-NGTests/ServerProfileTests.swift index 22bedd6..dd58578 100644 --- a/ShadowsocksX-NGTests/ServerProfileTests.swift +++ b/ShadowsocksX-NGTests/ServerProfileTests.swift @@ -26,7 +26,7 @@ class ServerProfileTests: XCTestCase { "ServerPort": 8388, "Method": "aes-256-cfb", "Password": "password", - "Remark": "Prism", + "Remark": "Protoss Prism", "OTA": true]) XCTAssertNotNil(profile) } @@ -45,6 +45,8 @@ class ServerProfileTests: XCTestCase { XCTAssertEqual(parsed?["ServerPort"] as? UInt16, profile.serverPort) XCTAssertEqual(parsed?["Method"] as? String, profile.method) XCTAssertEqual(parsed?["Password"] as? String, profile.password) + XCTAssertEqual(parsed?["Remark"] as? String, profile.remark) + XCTAssertEqual(parsed?["OTA"] as? Bool, profile.ota) } func testPerformanceExample() { From dbc6ee92d5cb884c282ba57dd18af287fe1d1e86 Mon Sep 17 00:00:00 2001 From: Rainux Luo Date: Mon, 9 Jan 2017 21:49:09 +0800 Subject: [PATCH 6/7] Refactor ParseSSURL as ServerProfile initializer --- ShadowsocksX-NG/AppDelegate.swift | 4 +- ShadowsocksX-NG/ServerProfile.swift | 90 ++++++++++++++----- ShadowsocksX-NG/Utils.swift | 50 ----------- ShadowsocksX-NGTests/ServerProfileTests.swift | 13 ++- .../ShadowsocksX_NGTests.swift | 2 +- ShadowsocksX-NGTests/UtilsTests.swift | 16 ++-- 6 files changed, 91 insertions(+), 84 deletions(-) diff --git a/ShadowsocksX-NG/AppDelegate.swift b/ShadowsocksX-NG/AppDelegate.swift index 0e98f02..dc1d6be 100755 --- a/ShadowsocksX-NG/AppDelegate.swift +++ b/ShadowsocksX-NG/AppDelegate.swift @@ -121,9 +121,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele var isChanged = false for url in urls { - let profielDict = ParseSSURL(url) - if let profielDict = profielDict { - let profile = ServerProfile.fromDictionary(profielDict) + if let profile = ServerProfile(url: url) { mgr.profiles.append(profile) isChanged = true diff --git a/ShadowsocksX-NG/ServerProfile.swift b/ShadowsocksX-NG/ServerProfile.swift index 92865c3..57f7ffb 100644 --- a/ShadowsocksX-NG/ServerProfile.swift +++ b/ShadowsocksX-NG/ServerProfile.swift @@ -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() diff --git a/ShadowsocksX-NG/Utils.swift b/ShadowsocksX-NG/Utils.swift index 618d638..e0b8781 100644 --- a/ShadowsocksX-NG/Utils.swift +++ b/ShadowsocksX-NG/Utils.swift @@ -23,53 +23,3 @@ extension Data { return hexBytes.joined(separator: "") } } - -func ParseSSURL(_ url: URL?) -> [String: Any?]? { - - 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) - } - } - - if url?.host == nil { - return nil - } - - var plainUrl: URLComponents! = URLComponents(url: url!, - resolvingAgainstBaseURL: false) - - let data = Data(base64Encoded: padBase64(string: url!.host!), - options: Data.Base64DecodingOptions()) - - if data != nil { - let decoded = String(data: data!, encoding: String.Encoding.utf8) - plainUrl = URLComponents(string: "ss://\(decoded!)") - - if plainUrl == nil { - return nil - } - } - - let remark = plainUrl.queryItems? - .filter({ $0.name == "Remark" }).first?.value - let otaStr = plainUrl.queryItems? - .filter({ $0.name == "OTA" }).first?.value - - var ota: Bool? = nil - if otaStr != nil { - ota = NSString(string: otaStr!).boolValue - } - - return ["ServerHost": plainUrl.host, - "ServerPort": UInt16(plainUrl.port!), - "Method": plainUrl.user, - "Password": plainUrl.password, - "Remark": remark, - "OTA": ota, - ] -} diff --git a/ShadowsocksX-NGTests/ServerProfileTests.swift b/ShadowsocksX-NGTests/ServerProfileTests.swift index dd58578..63b9a50 100644 --- a/ShadowsocksX-NGTests/ServerProfileTests.swift +++ b/ShadowsocksX-NGTests/ServerProfileTests.swift @@ -37,7 +37,7 @@ class ServerProfileTests: XCTestCase { } func testServerProfileURL() { - let parsed = ParseSSURL(profile.URL()) + let parsed = ServerProfile(url: profile.URL())?.toDictionary() XCTAssertNotNil(parsed) @@ -49,6 +49,17 @@ class ServerProfileTests: XCTestCase { XCTAssertEqual(parsed?["OTA"] as? Bool, profile.ota) } + func testServerProfileInitFromURL() { + let newProfile = ServerProfile.init(url: profile.URL()) + + XCTAssertEqual(newProfile?.serverHost, profile.serverHost) + XCTAssertEqual(newProfile?.serverPort, profile.serverPort) + XCTAssertEqual(newProfile?.method, profile.method) + XCTAssertEqual(newProfile?.password, profile.password) + XCTAssertEqual(newProfile?.remark, profile.remark) + XCTAssertEqual(newProfile?.ota, profile.ota) + } + func testPerformanceExample() { // This is an example of a performance test case. self.measure { diff --git a/ShadowsocksX-NGTests/ShadowsocksX_NGTests.swift b/ShadowsocksX-NGTests/ShadowsocksX_NGTests.swift index 4bab66f..58c8fa6 100644 --- a/ShadowsocksX-NGTests/ShadowsocksX_NGTests.swift +++ b/ShadowsocksX-NGTests/ShadowsocksX_NGTests.swift @@ -32,5 +32,5 @@ class ShadowsocksX_NGTests: XCTestCase { // Put the code you want to measure the time of here. } } - + } diff --git a/ShadowsocksX-NGTests/UtilsTests.swift b/ShadowsocksX-NGTests/UtilsTests.swift index 321e158..36297ad 100644 --- a/ShadowsocksX-NGTests/UtilsTests.swift +++ b/ShadowsocksX-NGTests/UtilsTests.swift @@ -24,7 +24,7 @@ class UtilsTests: XCTestCase { func testParseSSURLwithPlainURL() { let url = URL(string: "ss://aes-256-cfb:password@example.com:8388") - let profile = ParseSSURL(url) + let profile = ServerProfile(url: url)?.toDictionary() XCTAssertNotNil(profile) @@ -37,7 +37,7 @@ class UtilsTests: XCTestCase { func testParseSSURLwithPlainURLandQuery() { let url = URL(string: "ss://aes-256-cfb:password@example.com:8388?Remark=Prism&OTA=true") - let profile = ParseSSURL(url) + let profile = ServerProfile(url: url)?.toDictionary() XCTAssertNotNil(profile) @@ -52,7 +52,7 @@ class UtilsTests: XCTestCase { func testParseSSURLwithPlainURLandAnotherQuery() { let url = URL(string: "ss://aes-256-cfb:password@example.com:8388?Remark=Prism&OTA=0") - let profile = ParseSSURL(url) + let profile = ServerProfile(url: url)?.toDictionary() XCTAssertNotNil(profile) @@ -68,7 +68,7 @@ class UtilsTests: XCTestCase { // "ss://aes-256-cfb:password@example.com:8388" let url = URL(string: "ss://YWVzLTI1Ni1jZmI6cGFzc3dvcmRAZXhhbXBsZS5jb206ODM4OA") - let profile = ParseSSURL(url) + let profile = ServerProfile(url: url)?.toDictionary() XCTAssertNotNil(profile) @@ -82,7 +82,7 @@ class UtilsTests: XCTestCase { // "ss://aes-256-cfb:password@example.com:8388?Remark=Prism&OTA=true" let url = URL(string: "ss://YWVzLTI1Ni1jZmI6cGFzc3dvcmRAZXhhbXBsZS5jb206ODM4OD9SZW1hcms9UHJpc20mT1RBPXRydWU") - let profile = ParseSSURL(url) + let profile = ServerProfile(url: url)?.toDictionary() XCTAssertNotNil(profile) @@ -97,7 +97,7 @@ class UtilsTests: XCTestCase { func testParseSSURLwithEmptyURL() { let url = URL(string: "ss://") - let profile = ParseSSURL(url) + let profile = ServerProfile(url: url) XCTAssertNil(profile) } @@ -105,7 +105,7 @@ class UtilsTests: XCTestCase { func testParseSSURLwithInvalidURL() { let url = URL(string: "ss://invalid url") - let profile = ParseSSURL(url) + let profile = ServerProfile(url: url) XCTAssertNil(profile) } @@ -114,7 +114,7 @@ class UtilsTests: XCTestCase { // "ss://invalid url" let url = URL(string: "ss://aW52YWxpZCB1cmw") - let profile = ParseSSURL(url) + let profile = ServerProfile(url: url) XCTAssertNil(profile) } From dfb06cdf7015bf48ec2b9e6f330221e81d82e0c7 Mon Sep 17 00:00:00 2001 From: Rainux Luo Date: Mon, 9 Jan 2017 22:00:34 +0800 Subject: [PATCH 7/7] Refactor tests as well --- ShadowsocksX-NG.xcodeproj/project.pbxproj | 4 - ShadowsocksX-NGTests/ServerProfileTests.swift | 123 ++++++++++++++--- ShadowsocksX-NGTests/UtilsTests.swift | 129 ------------------ 3 files changed, 103 insertions(+), 153 deletions(-) delete mode 100644 ShadowsocksX-NGTests/UtilsTests.swift diff --git a/ShadowsocksX-NG.xcodeproj/project.pbxproj b/ShadowsocksX-NG.xcodeproj/project.pbxproj index 792c650..8bd7cc7 100755 --- a/ShadowsocksX-NG.xcodeproj/project.pbxproj +++ b/ShadowsocksX-NG.xcodeproj/project.pbxproj @@ -59,7 +59,6 @@ C6E28E951DA79705004F8330 /* HTTPPreferencesWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = C6E28E971DA79705004F8330 /* HTTPPreferencesWindowController.xib */; }; C8E42A6C1D4F270A0074C7EA /* UserRulesController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8E42A6A1D4F270A0074C7EA /* UserRulesController.swift */; }; C8E42A6E1D4F2CAF0074C7EA /* UserRulesController.xib in Resources */ = {isa = PBXBuildFile; fileRef = C8E42A701D4F2CAF0074C7EA /* UserRulesController.xib */; }; - D829DB3F1E20262300FB5E1E /* UtilsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D829DB3E1E20262300FB5E1E /* UtilsTests.swift */; }; D8E3630B1E2072980027449B /* ServerProfileTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8E3630A1E2072980027449B /* ServerProfileTests.swift */; }; E0E57CCA7EB34B90F9D340F2 /* Pods_ShadowsocksX_NGTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 388120F062D7EB7DD0D8DDCA /* Pods_ShadowsocksX_NGTests.framework */; }; F0809FF1595BE2966343D3C7 /* libPods-proxy_conf_helper.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1E7783AEDB4A3BDDC9FF16AC /* libPods-proxy_conf_helper.a */; }; @@ -178,7 +177,6 @@ C8E42A6A1D4F270A0074C7EA /* UserRulesController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserRulesController.swift; sourceTree = ""; }; C8E42A6F1D4F2CAF0074C7EA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UserRulesController.xib; sourceTree = ""; }; C8E42A721D4F2CB10074C7EA /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/UserRulesController.strings"; sourceTree = ""; }; - D829DB3E1E20262300FB5E1E /* UtilsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UtilsTests.swift; sourceTree = ""; }; D8E3630A1E2072980027449B /* ServerProfileTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ServerProfileTests.swift; sourceTree = ""; }; E9E9FB3855DA55D0710EE7BD /* Pods-ShadowsocksX-NG.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShadowsocksX-NG.release.xcconfig"; path = "Pods/Target Support Files/Pods-ShadowsocksX-NG/Pods-ShadowsocksX-NG.release.xcconfig"; sourceTree = ""; }; FE3237E9FB24D9B924A0E630 /* Pods-ShadowsocksX-NG.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShadowsocksX-NG.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ShadowsocksX-NG/Pods-ShadowsocksX-NG.debug.xcconfig"; sourceTree = ""; }; @@ -314,7 +312,6 @@ isa = PBXGroup; children = ( D8E3630A1E2072980027449B /* ServerProfileTests.swift */, - D829DB3E1E20262300FB5E1E /* UtilsTests.swift */, 9B0BFFF81D0460A70040E62B /* ShadowsocksX_NGTests.swift */, 9B0BFFFA1D0460A70040E62B /* Info.plist */, ); @@ -672,7 +669,6 @@ buildActionMask = 2147483647; files = ( 9B0BFFF91D0460A70040E62B /* ShadowsocksX_NGTests.swift in Sources */, - D829DB3F1E20262300FB5E1E /* UtilsTests.swift in Sources */, D8E3630B1E2072980027449B /* ServerProfileTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/ShadowsocksX-NGTests/ServerProfileTests.swift b/ShadowsocksX-NGTests/ServerProfileTests.swift index 63b9a50..d942895 100644 --- a/ShadowsocksX-NGTests/ServerProfileTests.swift +++ b/ShadowsocksX-NGTests/ServerProfileTests.swift @@ -11,12 +11,6 @@ import XCTest class ServerProfileTests: XCTestCase { - // "ss://aes-256-cfb:password@example.com:8388" - let profileUrl = URL(string: "ss://YWVzLTI1Ni1jZmI6cGFzc3dvcmRAZXhhbXBsZS5jb206ODM4OA") - - // "ss://aes-256-cfb:password@example.com:8388?Remark=Prism&OTA=true" - let profileFullUrl = URL(string: "ss://YWVzLTI1Ni1jZmI6cGFzc3dvcmRAZXhhbXBsZS5jb206ODM4OD9SZW1hcms9UHJpc20mT1RBPXRydWU") - var profile: ServerProfile! override func setUp() { @@ -36,20 +30,7 @@ class ServerProfileTests: XCTestCase { super.tearDown() } - func testServerProfileURL() { - let parsed = ServerProfile(url: profile.URL())?.toDictionary() - - XCTAssertNotNil(parsed) - - XCTAssertEqual(parsed?["ServerHost"] as? String, profile.serverHost) - XCTAssertEqual(parsed?["ServerPort"] as? UInt16, profile.serverPort) - XCTAssertEqual(parsed?["Method"] as? String, profile.method) - XCTAssertEqual(parsed?["Password"] as? String, profile.password) - XCTAssertEqual(parsed?["Remark"] as? String, profile.remark) - XCTAssertEqual(parsed?["OTA"] as? Bool, profile.ota) - } - - func testServerProfileInitFromURL() { + func testInitWithSelfGeneratedURL() { let newProfile = ServerProfile.init(url: profile.URL()) XCTAssertEqual(newProfile?.serverHost, profile.serverHost) @@ -60,6 +41,108 @@ class ServerProfileTests: XCTestCase { XCTAssertEqual(newProfile?.ota, profile.ota) } + func testInitWithPlainURL() { + let url = URL(string: "ss://aes-256-cfb:password@example.com:8388") + + let profile = ServerProfile(url: url) + + XCTAssertNotNil(profile) + + XCTAssertEqual(profile?.serverHost, "example.com") + XCTAssertEqual(profile?.serverPort, 8388) + XCTAssertEqual(profile?.method, "aes-256-cfb") + XCTAssertEqual(profile?.password, "password") + XCTAssertEqual(profile?.remark, "") + XCTAssertEqual(profile?.ota, false) + } + + func testInitWithPlainURLandQuery() { + let url = URL(string: "ss://aes-256-cfb:password@example.com:8388?Remark=Prism&OTA=true") + + let profile = ServerProfile(url: url) + + XCTAssertNotNil(profile) + + XCTAssertEqual(profile?.serverHost, "example.com") + XCTAssertEqual(profile?.serverPort, 8388) + XCTAssertEqual(profile?.method, "aes-256-cfb") + XCTAssertEqual(profile?.password, "password") + XCTAssertEqual(profile?.remark, "Prism") + XCTAssertEqual(profile?.ota, true) + } + + func testInitWithPlainURLandAnotherQuery() { + let url = URL(string: "ss://aes-256-cfb:password@example.com:8388?Remark=Prism&OTA=0") + + let profile = ServerProfile(url: url) + + XCTAssertNotNil(profile) + + XCTAssertEqual(profile?.serverHost, "example.com") + XCTAssertEqual(profile?.serverPort, 8388) + XCTAssertEqual(profile?.method, "aes-256-cfb") + XCTAssertEqual(profile?.password, "password") + XCTAssertEqual(profile?.remark, "Prism") + XCTAssertEqual(profile?.ota, false) + } + + func testInitWithBase64EncodedURL() { + // "ss://aes-256-cfb:password@example.com:8388" + let url = URL(string: "ss://YWVzLTI1Ni1jZmI6cGFzc3dvcmRAZXhhbXBsZS5jb206ODM4OA") + + let profile = ServerProfile(url: url) + + XCTAssertNotNil(profile) + + XCTAssertEqual(profile?.serverHost, "example.com") + XCTAssertEqual(profile?.serverPort, 8388) + XCTAssertEqual(profile?.method, "aes-256-cfb") + XCTAssertEqual(profile?.password, "password") + XCTAssertEqual(profile?.remark, "") + XCTAssertEqual(profile?.ota, false) + } + + func testInitWithBase64EncodedURLandQuery() { + // "ss://aes-256-cfb:password@example.com:8388?Remark=Prism&OTA=true" + let url = URL(string: "ss://YWVzLTI1Ni1jZmI6cGFzc3dvcmRAZXhhbXBsZS5jb206ODM4OD9SZW1hcms9UHJpc20mT1RBPXRydWU") + + let profile = ServerProfile(url: url) + + XCTAssertNotNil(profile) + + XCTAssertEqual(profile?.serverHost, "example.com") + XCTAssertEqual(profile?.serverPort, 8388) + XCTAssertEqual(profile?.method, "aes-256-cfb") + XCTAssertEqual(profile?.password, "password") + XCTAssertEqual(profile?.remark, "Prism") + XCTAssertEqual(profile?.ota, true) + } + + func testInitWithEmptyURL() { + let url = URL(string: "ss://") + + let profile = ServerProfile(url: url) + + XCTAssertNil(profile) + } + + func testInitWithInvalidURL() { + let url = URL(string: "ss://invalid url") + + let profile = ServerProfile(url: url) + + XCTAssertNil(profile) + } + + func testInitWithBase64EncodedInvalidURL() { + // "ss://invalid url" + let url = URL(string: "ss://aW52YWxpZCB1cmw") + + let profile = ServerProfile(url: url) + + XCTAssertNil(profile) + } + func testPerformanceExample() { // This is an example of a performance test case. self.measure { diff --git a/ShadowsocksX-NGTests/UtilsTests.swift b/ShadowsocksX-NGTests/UtilsTests.swift deleted file mode 100644 index 36297ad..0000000 --- a/ShadowsocksX-NGTests/UtilsTests.swift +++ /dev/null @@ -1,129 +0,0 @@ -// -// UtilsTests.swift -// ShadowsocksX-NG -// -// Created by Rainux Luo on 07/01/2017. -// Copyright © 2017 qiuyuzhou. All rights reserved. -// - -import XCTest -@testable import ShadowsocksX_NG - -class UtilsTests: XCTestCase { - - override func setUp() { - super.setUp() - // Put setup code here. This method is called before the invocation of each test method in the class. - } - - override func tearDown() { - // Put teardown code here. This method is called after the invocation of each test method in the class. - super.tearDown() - } - - func testParseSSURLwithPlainURL() { - let url = URL(string: "ss://aes-256-cfb:password@example.com:8388") - - let profile = ServerProfile(url: url)?.toDictionary() - - XCTAssertNotNil(profile) - - XCTAssertEqual(profile?["ServerHost"] as? String, "example.com") - XCTAssertEqual(profile?["ServerPort"] as? UInt16, 8388) - XCTAssertEqual(profile?["Method"] as? String, "aes-256-cfb") - XCTAssertEqual(profile?["Password"] as? String, "password") - } - - func testParseSSURLwithPlainURLandQuery() { - let url = URL(string: "ss://aes-256-cfb:password@example.com:8388?Remark=Prism&OTA=true") - - let profile = ServerProfile(url: url)?.toDictionary() - - XCTAssertNotNil(profile) - - XCTAssertEqual(profile?["ServerHost"] as? String, "example.com") - XCTAssertEqual(profile?["ServerPort"] as? UInt16, 8388) - XCTAssertEqual(profile?["Method"] as? String, "aes-256-cfb") - XCTAssertEqual(profile?["Password"] as? String, "password") - XCTAssertEqual(profile?["Remark"] as? String, "Prism") - XCTAssertEqual(profile?["OTA"] as? Bool, true) - } - - func testParseSSURLwithPlainURLandAnotherQuery() { - let url = URL(string: "ss://aes-256-cfb:password@example.com:8388?Remark=Prism&OTA=0") - - let profile = ServerProfile(url: url)?.toDictionary() - - XCTAssertNotNil(profile) - - XCTAssertEqual(profile?["ServerHost"] as? String, "example.com") - XCTAssertEqual(profile?["ServerPort"] as? UInt16, 8388) - XCTAssertEqual(profile?["Method"] as? String, "aes-256-cfb") - XCTAssertEqual(profile?["Password"] as? String, "password") - XCTAssertEqual(profile?["Remark"] as? String, "Prism") - XCTAssertEqual(profile?["OTA"] as? Bool, false) - } - - func testParseSSURLwithBase64EncodedURL() { - // "ss://aes-256-cfb:password@example.com:8388" - let url = URL(string: "ss://YWVzLTI1Ni1jZmI6cGFzc3dvcmRAZXhhbXBsZS5jb206ODM4OA") - - let profile = ServerProfile(url: url)?.toDictionary() - - XCTAssertNotNil(profile) - - XCTAssertEqual(profile?["ServerHost"] as? String, "example.com") - XCTAssertEqual(profile?["ServerPort"] as? UInt16, 8388) - XCTAssertEqual(profile?["Method"] as? String, "aes-256-cfb") - XCTAssertEqual(profile?["Password"] as? String, "password") - } - - func testParseSSURLwithBase64EncodedURLandQuery() { - // "ss://aes-256-cfb:password@example.com:8388?Remark=Prism&OTA=true" - let url = URL(string: "ss://YWVzLTI1Ni1jZmI6cGFzc3dvcmRAZXhhbXBsZS5jb206ODM4OD9SZW1hcms9UHJpc20mT1RBPXRydWU") - - let profile = ServerProfile(url: url)?.toDictionary() - - XCTAssertNotNil(profile) - - XCTAssertEqual(profile?["ServerHost"] as? String, "example.com") - XCTAssertEqual(profile?["ServerPort"] as? UInt16, 8388) - XCTAssertEqual(profile?["Method"] as? String, "aes-256-cfb") - XCTAssertEqual(profile?["Password"] as? String, "password") - XCTAssertEqual(profile?["Remark"] as? String, "Prism") - XCTAssertEqual(profile?["OTA"] as? Bool, true) - } - - func testParseSSURLwithEmptyURL() { - let url = URL(string: "ss://") - - let profile = ServerProfile(url: url) - - XCTAssertNil(profile) - } - - func testParseSSURLwithInvalidURL() { - let url = URL(string: "ss://invalid url") - - let profile = ServerProfile(url: url) - - XCTAssertNil(profile) - } - - func testParseSSURLwithBase64EncodedInvalidURL() { - // "ss://invalid url" - let url = URL(string: "ss://aW52YWxpZCB1cmw") - - let profile = ServerProfile(url: url) - - XCTAssertNil(profile) - } - - func testPerformanceExample() { - // This is an example of a performance test case. - self.measure { - // Put the code you want to measure the time of here. - } - } - -}