From 6f21059ff85bf615bc87e777c822eeda7d0d5830 Mon Sep 17 00:00:00 2001 From: Erik Date: Sat, 11 Jun 2016 12:37:50 -0400 Subject: [PATCH 1/7] work on experimental manager --- .../project.pbxproj | 8 ++ SocketIO-MacTests/SocketObjectiveCTest.m | 6 ++ SocketIO-MacTests/SocketSideEffectTest.swift | 12 +++ Source/SocketClientManager.swift | 82 +++++++++++++++++++ Source/SocketIOClient.swift | 2 +- 5 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 Source/SocketClientManager.swift diff --git a/Socket.IO-Client-Swift.xcodeproj/project.pbxproj b/Socket.IO-Client-Swift.xcodeproj/project.pbxproj index 3ff316f..7d543f1 100644 --- a/Socket.IO-Client-Swift.xcodeproj/project.pbxproj +++ b/Socket.IO-Client-Swift.xcodeproj/project.pbxproj @@ -122,6 +122,9 @@ 74B4AD231D09A6190062A523 /* SSLSecurity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74B4AD201D09A6190062A523 /* SSLSecurity.swift */; }; 74B4AD241D09A6450062A523 /* WebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74B4AD1C1D09A5D80062A523 /* WebSocket.swift */; }; 74B4AD251D09A6490062A523 /* WebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74B4AD1C1D09A5D80062A523 /* WebSocket.swift */; }; + 74BC45AB1D0C6675008CC431 /* SocketClientManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74BC45AA1D0C6675008CC431 /* SocketClientManager.swift */; }; + 74BC45AC1D0C6675008CC431 /* SocketClientManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74BC45AA1D0C6675008CC431 /* SocketClientManager.swift */; }; + 74BC45AD1D0C6675008CC431 /* SocketClientManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74BC45AA1D0C6675008CC431 /* SocketClientManager.swift */; }; 74F124F01BC574CF002966F4 /* SocketBasicPacketTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74F124EF1BC574CF002966F4 /* SocketBasicPacketTest.swift */; }; 74F124F11BC574CF002966F4 /* SocketBasicPacketTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74F124EF1BC574CF002966F4 /* SocketBasicPacketTest.swift */; }; CEBA56961CDA0B7700BA0389 /* NSCharacterSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEBA56951CDA0B7700BA0389 /* NSCharacterSet.swift */; }; @@ -195,6 +198,7 @@ 74ABF7761C3991C10078C657 /* SocketIOClientSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SocketIOClientSpec.swift; path = Source/SocketIOClientSpec.swift; sourceTree = ""; }; 74B4AD1C1D09A5D80062A523 /* WebSocket.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = WebSocket.swift; path = Source/WebSocket/WebSocket.swift; sourceTree = ""; }; 74B4AD201D09A6190062A523 /* SSLSecurity.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SSLSecurity.swift; path = Source/WebSocket/SSLSecurity.swift; sourceTree = ""; }; + 74BC45AA1D0C6675008CC431 /* SocketClientManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SocketClientManager.swift; path = Source/SocketClientManager.swift; sourceTree = ""; }; 74F124EF1BC574CF002966F4 /* SocketBasicPacketTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SocketBasicPacketTest.swift; sourceTree = ""; }; CEBA56951CDA0B7700BA0389 /* NSCharacterSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = NSCharacterSet.swift; path = Source/NSCharacterSet.swift; sourceTree = ""; }; CEBA56991CDA0B8200BA0389 /* String.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = String.swift; path = Source/String.swift; sourceTree = ""; }; @@ -336,6 +340,7 @@ 74171E501C10CD240062D398 /* SocketAckEmitter.swift */, 74171E511C10CD240062D398 /* SocketAckManager.swift */, 74171E521C10CD240062D398 /* SocketAnyEvent.swift */, + 74BC45AA1D0C6675008CC431 /* SocketClientManager.swift */, 74171E531C10CD240062D398 /* SocketEngine.swift */, 74171E541C10CD240062D398 /* SocketEngineClient.swift */, 74171E551C10CD240062D398 /* SocketEnginePacketType.swift */, @@ -632,6 +637,7 @@ 74171E811C10CD240062D398 /* SocketEnginePacketType.swift in Sources */, 74171E6F1C10CD240062D398 /* SocketAnyEvent.swift in Sources */, 74171E9F1C10CD240062D398 /* SocketIOClientOption.swift in Sources */, + 74BC45AB1D0C6675008CC431 /* SocketClientManager.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -689,6 +695,7 @@ 74171E831C10CD240062D398 /* SocketEnginePacketType.swift in Sources */, 74171E711C10CD240062D398 /* SocketAnyEvent.swift in Sources */, 74171EA11C10CD240062D398 /* SocketIOClientOption.swift in Sources */, + 74BC45AC1D0C6675008CC431 /* SocketClientManager.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -734,6 +741,7 @@ 74171E851C10CD240062D398 /* SocketEnginePacketType.swift in Sources */, 74171E731C10CD240062D398 /* SocketAnyEvent.swift in Sources */, 74171EA31C10CD240062D398 /* SocketIOClientOption.swift in Sources */, + 74BC45AD1D0C6675008CC431 /* SocketClientManager.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/SocketIO-MacTests/SocketObjectiveCTest.m b/SocketIO-MacTests/SocketObjectiveCTest.m index f3f70e3..20ee20f 100644 --- a/SocketIO-MacTests/SocketObjectiveCTest.m +++ b/SocketIO-MacTests/SocketObjectiveCTest.m @@ -44,4 +44,10 @@ [self.socket off:@"test"]; } +- (void)testSocketManager { + SocketClientManager* manager = [SocketClientManager sharedManager]; + [manager addSocket:self.socket labeledAs:@"test"]; + [manager removeSocketWithLabel:@"test"]; +} + @end diff --git a/SocketIO-MacTests/SocketSideEffectTest.swift b/SocketIO-MacTests/SocketSideEffectTest.swift index 9c5b503..bae130b 100644 --- a/SocketIO-MacTests/SocketSideEffectTest.swift +++ b/SocketIO-MacTests/SocketSideEffectTest.swift @@ -153,4 +153,16 @@ class SocketSideEffectTest: XCTestCase { socket.parseBinaryData(data2) waitForExpectationsWithTimeout(3, handler: nil) } + + func testSocketManager() { + let manager = SocketClientManager.sharedManager + manager["test"] = socket + + XCTAssert(manager["test"] === socket, "failed to get socket") + + manager["test"] = nil + + XCTAssert(manager["test"] == nil, "socket not removed") + + } } diff --git a/Source/SocketClientManager.swift b/Source/SocketClientManager.swift new file mode 100644 index 0000000..3cf1c34 --- /dev/null +++ b/Source/SocketClientManager.swift @@ -0,0 +1,82 @@ +// +// SocketClientManager.swift +// Socket.IO-Client-Swift +// +// Created by Erik Little on 6/11/16. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +import Foundation + +/** + Experimental socket manager. + + API subject to change. + + Can be used to persist sockets across ViewControllers. + + Sockets are strongly stored, so be sure to remove them once they are no + longer needed. + + Example usage: + ``` + let manager = SocketClientManager.sharedManager + manager["room1"] = socket1 + manager["room2"] = socket2 + manager.removeSocket(socket: socket2) + manager["room1"]?.emit("hello") + ``` + */ +public final class SocketClientManager : NSObject { + public static let sharedManager = SocketClientManager() + + private var sockets = [String: SocketIOClient]() + + public subscript(string: String) -> SocketIOClient? { + get { + return sockets[string] + } + + set(socket) { + sockets[string] = socket + } + } + + public func addSocket(socket: SocketIOClient, labeledAs label: String) { + sockets[label] = socket + } + + public func removeSocket(withLabel label: String) -> SocketIOClient? { + return sockets.removeValueForKey(label) + } + + public func removeSocket(socket socket: SocketIOClient) -> SocketIOClient? { + var returnSocket: SocketIOClient? + + for (label, dictSocket) in sockets where dictSocket === socket { + returnSocket = sockets.removeValueForKey(label) + } + + return returnSocket + } + + public func removeSockets() { + sockets.removeAll() + } +} diff --git a/Source/SocketIOClient.swift b/Source/SocketIOClient.swift index 70c6f22..30f110e 100644 --- a/Source/SocketIOClient.swift +++ b/Source/SocketIOClient.swift @@ -274,7 +274,7 @@ public final class SocketIOClient : NSObject, SocketEngineClient, SocketParsable } else if !reconnecting { reconnecting = true tryReconnectWithReason(reason) - } + } } /// error From 2c059e1a6e1ccb01da9761a8e465b1ff565cea38 Mon Sep 17 00:00:00 2001 From: Erik Date: Tue, 14 Jun 2016 09:38:35 -0400 Subject: [PATCH 2/7] log server --- Source/SocketEngine.swift | 2 +- Source/SocketIOClient.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/SocketEngine.swift b/Source/SocketEngine.swift index ac1a864..c7b93e9 100644 --- a/Source/SocketEngine.swift +++ b/Source/SocketEngine.swift @@ -180,7 +180,7 @@ public final class SocketEngine : NSObject, SocketEnginePollable, SocketEngineWe disconnect("reconnect") } - DefaultSocketLogger.Logger.log("Starting engine", type: logType) + DefaultSocketLogger.Logger.log("Starting engine. Server: %@", type: logType, args: url) DefaultSocketLogger.Logger.log("Handshaking", type: logType) resetEngine() diff --git a/Source/SocketIOClient.swift b/Source/SocketIOClient.swift index 30f110e..70c6f22 100644 --- a/Source/SocketIOClient.swift +++ b/Source/SocketIOClient.swift @@ -274,7 +274,7 @@ public final class SocketIOClient : NSObject, SocketEngineClient, SocketParsable } else if !reconnecting { reconnecting = true tryReconnectWithReason(reason) - } + } } /// error From e163598ee6e6535cad73b7a8f0e2962ff2542f0e Mon Sep 17 00:00:00 2001 From: Erik Date: Tue, 14 Jun 2016 16:11:37 -0400 Subject: [PATCH 3/7] add option for sslsecurity --- Source/SocketEngine.swift | 4 ++++ Source/SocketIOClientOption.swift | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/Source/SocketEngine.swift b/Source/SocketEngine.swift index c7b93e9..80443ec 100644 --- a/Source/SocketEngine.swift +++ b/Source/SocketEngine.swift @@ -76,6 +76,7 @@ public final class SocketEngine : NSObject, SocketEnginePollable, SocketEngineWe private var pongsMissedMax = 0 private var probeWait = ProbeWaitQueue() private var secure = false + private var security: SSLSecurity? private var selfSigned = false private var voipEnabled = false @@ -105,6 +106,8 @@ public final class SocketEngine : NSObject, SocketEnginePollable, SocketEngineWe voipEnabled = enable case let .Secure(secure): self.secure = secure + case let .Security(security): + self.security = security case let .SelfSigned(selfSigned): self.selfSigned = selfSigned default: @@ -265,6 +268,7 @@ public final class SocketEngine : NSObject, SocketEnginePollable, SocketEngineWe ws?.voipEnabled = voipEnabled ws?.delegate = self ws?.selfSignedSSL = selfSigned + ws?.security = security ws?.connect() } diff --git a/Source/SocketIOClientOption.swift b/Source/SocketIOClientOption.swift index 93626f5..d7a0d8d 100644 --- a/Source/SocketIOClientOption.swift +++ b/Source/SocketIOClientOption.swift @@ -45,6 +45,7 @@ public enum SocketIOClientOption : ClientOption { case ReconnectAttempts(Int) case ReconnectWait(Int) case Secure(Bool) + case Security(SSLSecurity) case SelfSigned(Bool) case SessionDelegate(NSURLSessionDelegate) case VoipEnabled(Bool) @@ -85,6 +86,8 @@ public enum SocketIOClientOption : ClientOption { description = "reconnectWait" case .Secure: description = "secure" + case .Security: + description = "security" case .SelfSigned: description = "selfSigned" case .SessionDelegate: @@ -136,6 +139,8 @@ public enum SocketIOClientOption : ClientOption { value = wait case let .Secure(secure): value = secure + case let .Security(security): + value = security case let .SelfSigned(signed): value = signed case let .SessionDelegate(delegate): @@ -195,6 +200,8 @@ extension NSDictionary { return .ReconnectWait(wait) case let ("secure", secure as Bool): return .Secure(secure) + case let ("security", security as SSLSecurity): + return .Security(security) case let ("selfSigned", selfSigned as Bool): return .SelfSigned(selfSigned) case let ("sessionDelegate", delegate as NSURLSessionDelegate): From b9e3de2d50103aad8c3cb21e446e7601e8b6d6a1 Mon Sep 17 00:00:00 2001 From: Erik Date: Tue, 14 Jun 2016 16:13:01 -0400 Subject: [PATCH 4/7] add documentation --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 056b0f5..94d0a3c 100644 --- a/README.md +++ b/README.md @@ -165,6 +165,7 @@ case ReconnectAttempts(Int) // How many times to reconnect. Default is `-1` (inf case ReconnectWait(Int) // Amount of time to wait between reconnects. Default is `10` case SessionDelegate(NSURLSessionDelegate) // Sets an NSURLSessionDelegate for the underlying engine. Useful if you need to handle self-signed certs. Default is nil. case Secure(Bool) // If the connection should use TLS. Default is false. +case Security(SSLSecurity) // Allows you to set which certs are valid. Useful for SSL pinning. case SelfSigned(Bool) // Sets WebSocket.selfSignedSSL (Don't do this, iOS will yell at you) case VoipEnabled(Bool) // Only use this option if you're using the client with VoIP services. Changes the way the WebSocket is created. Default is false ``` From d8826a9db30b3e5098b06830e3ad3e631c74318e Mon Sep 17 00:00:00 2001 From: Erik Date: Tue, 14 Jun 2016 16:19:40 -0400 Subject: [PATCH 5/7] allow access from objective-c --- SocketIO-MacTests/SocketObjectiveCTest.m | 2 +- Source/WebSocket/SSLSecurity.swift | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/SocketIO-MacTests/SocketObjectiveCTest.m b/SocketIO-MacTests/SocketObjectiveCTest.m index 20ee20f..b2f7832 100644 --- a/SocketIO-MacTests/SocketObjectiveCTest.m +++ b/SocketIO-MacTests/SocketObjectiveCTest.m @@ -47,7 +47,7 @@ - (void)testSocketManager { SocketClientManager* manager = [SocketClientManager sharedManager]; [manager addSocket:self.socket labeledAs:@"test"]; - [manager removeSocketWithLabel:@"test"]; + [manager removeSocketWithLabel:@"test"]; } @end diff --git a/Source/WebSocket/SSLSecurity.swift b/Source/WebSocket/SSLSecurity.swift index b5d03ef..968e4eb 100644 --- a/Source/WebSocket/SSLSecurity.swift +++ b/Source/WebSocket/SSLSecurity.swift @@ -23,7 +23,7 @@ import Foundation import Security -public class SSLCert { +public class SSLCert : NSObject { var certData: NSData? var key: SecKeyRef? @@ -50,7 +50,7 @@ public class SSLCert { } } -public class SSLSecurity { +public class SSLSecurity : NSObject { public var validatedDN = true //should the domain name be validated? var isReady = false //is the key processing done? @@ -88,6 +88,8 @@ public class SSLSecurity { - returns: a representation security object to be used with */ public init(certs: [SSLCert], usePublicKeys: Bool) { + super.init() + self.usePublicKeys = usePublicKeys if self.usePublicKeys { From bfa163f3c2e85776d8bcf0c24eca65b7398f403d Mon Sep 17 00:00:00 2001 From: Erik Date: Tue, 14 Jun 2016 19:37:27 -0400 Subject: [PATCH 6/7] swift 2.3 --- Source/SocketEngine.swift | 4 ++-- Source/SocketIOClient.swift | 2 +- Source/WebSocket/SSLSecurity.swift | 20 ++++++++++---------- Source/WebSocket/WebSocket.swift | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Source/SocketEngine.swift b/Source/SocketEngine.swift index 80443ec..717e9ef 100644 --- a/Source/SocketEngine.swift +++ b/Source/SocketEngine.swift @@ -218,8 +218,8 @@ public final class SocketEngine : NSObject, SocketEnginePollable, SocketEngineWe return (NSURL(), NSURL()) } - let urlPolling = NSURLComponents(string: url.absoluteString)! - let urlWebSocket = NSURLComponents(string: url.absoluteString)! + let urlPolling = NSURLComponents(string: url.absoluteString!)! + let urlWebSocket = NSURLComponents(string: url.absoluteString!)! var queryString = "" urlWebSocket.path = socketPath diff --git a/Source/SocketIOClient.swift b/Source/SocketIOClient.swift index 70c6f22..68bac0e 100644 --- a/Source/SocketIOClient.swift +++ b/Source/SocketIOClient.swift @@ -70,7 +70,7 @@ public final class SocketIOClient : NSObject, SocketEngineClient, SocketParsable self.options = options self.socketURL = socketURL - if socketURL.absoluteString.hasPrefix("https://") { + if socketURL.absoluteString!.hasPrefix("https://") { self.options.insertIgnore(.Secure(true)) } diff --git a/Source/WebSocket/SSLSecurity.swift b/Source/WebSocket/SSLSecurity.swift index 968e4eb..aa2990a 100644 --- a/Source/WebSocket/SSLSecurity.swift +++ b/Source/WebSocket/SSLSecurity.swift @@ -141,9 +141,9 @@ public class SSLSecurity : NSObject { } var policy: SecPolicyRef if self.validatedDN { - policy = SecPolicyCreateSSL(true, domain) + policy = SecPolicyCreateSSL(true, domain)! } else { - policy = SecPolicyCreateBasicX509() + policy = SecPolicyCreateBasicX509()! } SecTrustSetPolicies(trust,policy) if self.usePublicKeys { @@ -164,10 +164,10 @@ public class SSLSecurity : NSObject { collect.append(SecCertificateCreateWithData(nil,cert)!) } SecTrustSetAnchorCertificates(trust,collect) - var result: SecTrustResultType = 0 - SecTrustEvaluate(trust,&result) - let r = Int(result) - if r == kSecTrustResultUnspecified || r == kSecTrustResultProceed { + var result = SecTrustResultType(rawValue: 0) + SecTrustEvaluate(trust, &result!) + let r = Int(result!.rawValue) + if r == Int(SecTrustResultType.Unspecified.rawValue) || r == Int(SecTrustResultType.Proceed.rawValue) { var trustedCount = 0 for serverCert in serverCerts { for cert in certs { @@ -195,7 +195,7 @@ public class SSLSecurity : NSObject { func extractPublicKey(data: NSData) -> SecKeyRef? { guard let cert = SecCertificateCreateWithData(nil, data) else { return nil } - return extractPublicKeyFromCert(cert, policy: SecPolicyCreateBasicX509()) + return extractPublicKeyFromCert(cert, policy: SecPolicyCreateBasicX509()!) } /** @@ -211,7 +211,7 @@ public class SSLSecurity : NSObject { guard let trust = possibleTrust else { return nil } - var result: SecTrustResultType = 0 + var result = SecTrustResultType(rawValue:0)! SecTrustEvaluate(trust, &result) return SecTrustCopyPublicKey(trust) } @@ -246,7 +246,7 @@ public class SSLSecurity : NSObject { let keys = (0.. [SecKeyRef] in var keys = keys let cert = SecTrustGetCertificateAtIndex(trust, index) - if let key = extractPublicKeyFromCert(cert!, policy: policy) { + if let key = extractPublicKeyFromCert(cert!, policy: policy!) { keys.append(key) } @@ -257,4 +257,4 @@ public class SSLSecurity : NSObject { } -} \ No newline at end of file +} diff --git a/Source/WebSocket/WebSocket.swift b/Source/WebSocket/WebSocket.swift index 1204a78..5ec5625 100644 --- a/Source/WebSocket/WebSocket.swift +++ b/Source/WebSocket/WebSocket.swift @@ -227,7 +227,7 @@ public class WebSocket : NSObject, NSStreamDelegate { var port = url.port if port == nil { - if ["wss", "https"].contains(url.scheme) { + if ["wss", "https"].contains(url.scheme!) { port = 443 } else { port = 80 @@ -285,7 +285,7 @@ public class WebSocket : NSObject, NSStreamDelegate { guard let inStream = inputStream, let outStream = outputStream else { return } inStream.delegate = self outStream.delegate = self - if ["wss", "https"].contains(url.scheme) { + if ["wss", "https"].contains(url.scheme!) { inStream.setProperty(NSStreamSocketSecurityLevelNegotiatedSSL, forKey: NSStreamSocketSecurityLevelKey) outStream.setProperty(NSStreamSocketSecurityLevelNegotiatedSSL, forKey: NSStreamSocketSecurityLevelKey) } else { From 6fd3294fbae98b12178e7bcb03cc031f6942af34 Mon Sep 17 00:00:00 2001 From: Erik Date: Tue, 14 Jun 2016 19:41:18 -0400 Subject: [PATCH 7/7] Revert "swift 2.3" This reverts commit bfa163f3c2e85776d8bcf0c24eca65b7398f403d. --- Source/SocketEngine.swift | 4 ++-- Source/SocketIOClient.swift | 2 +- Source/WebSocket/SSLSecurity.swift | 20 ++++++++++---------- Source/WebSocket/WebSocket.swift | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Source/SocketEngine.swift b/Source/SocketEngine.swift index 717e9ef..80443ec 100644 --- a/Source/SocketEngine.swift +++ b/Source/SocketEngine.swift @@ -218,8 +218,8 @@ public final class SocketEngine : NSObject, SocketEnginePollable, SocketEngineWe return (NSURL(), NSURL()) } - let urlPolling = NSURLComponents(string: url.absoluteString!)! - let urlWebSocket = NSURLComponents(string: url.absoluteString!)! + let urlPolling = NSURLComponents(string: url.absoluteString)! + let urlWebSocket = NSURLComponents(string: url.absoluteString)! var queryString = "" urlWebSocket.path = socketPath diff --git a/Source/SocketIOClient.swift b/Source/SocketIOClient.swift index 68bac0e..70c6f22 100644 --- a/Source/SocketIOClient.swift +++ b/Source/SocketIOClient.swift @@ -70,7 +70,7 @@ public final class SocketIOClient : NSObject, SocketEngineClient, SocketParsable self.options = options self.socketURL = socketURL - if socketURL.absoluteString!.hasPrefix("https://") { + if socketURL.absoluteString.hasPrefix("https://") { self.options.insertIgnore(.Secure(true)) } diff --git a/Source/WebSocket/SSLSecurity.swift b/Source/WebSocket/SSLSecurity.swift index aa2990a..968e4eb 100644 --- a/Source/WebSocket/SSLSecurity.swift +++ b/Source/WebSocket/SSLSecurity.swift @@ -141,9 +141,9 @@ public class SSLSecurity : NSObject { } var policy: SecPolicyRef if self.validatedDN { - policy = SecPolicyCreateSSL(true, domain)! + policy = SecPolicyCreateSSL(true, domain) } else { - policy = SecPolicyCreateBasicX509()! + policy = SecPolicyCreateBasicX509() } SecTrustSetPolicies(trust,policy) if self.usePublicKeys { @@ -164,10 +164,10 @@ public class SSLSecurity : NSObject { collect.append(SecCertificateCreateWithData(nil,cert)!) } SecTrustSetAnchorCertificates(trust,collect) - var result = SecTrustResultType(rawValue: 0) - SecTrustEvaluate(trust, &result!) - let r = Int(result!.rawValue) - if r == Int(SecTrustResultType.Unspecified.rawValue) || r == Int(SecTrustResultType.Proceed.rawValue) { + var result: SecTrustResultType = 0 + SecTrustEvaluate(trust,&result) + let r = Int(result) + if r == kSecTrustResultUnspecified || r == kSecTrustResultProceed { var trustedCount = 0 for serverCert in serverCerts { for cert in certs { @@ -195,7 +195,7 @@ public class SSLSecurity : NSObject { func extractPublicKey(data: NSData) -> SecKeyRef? { guard let cert = SecCertificateCreateWithData(nil, data) else { return nil } - return extractPublicKeyFromCert(cert, policy: SecPolicyCreateBasicX509()!) + return extractPublicKeyFromCert(cert, policy: SecPolicyCreateBasicX509()) } /** @@ -211,7 +211,7 @@ public class SSLSecurity : NSObject { guard let trust = possibleTrust else { return nil } - var result = SecTrustResultType(rawValue:0)! + var result: SecTrustResultType = 0 SecTrustEvaluate(trust, &result) return SecTrustCopyPublicKey(trust) } @@ -246,7 +246,7 @@ public class SSLSecurity : NSObject { let keys = (0.. [SecKeyRef] in var keys = keys let cert = SecTrustGetCertificateAtIndex(trust, index) - if let key = extractPublicKeyFromCert(cert!, policy: policy!) { + if let key = extractPublicKeyFromCert(cert!, policy: policy) { keys.append(key) } @@ -257,4 +257,4 @@ public class SSLSecurity : NSObject { } -} +} \ No newline at end of file diff --git a/Source/WebSocket/WebSocket.swift b/Source/WebSocket/WebSocket.swift index 5ec5625..1204a78 100644 --- a/Source/WebSocket/WebSocket.swift +++ b/Source/WebSocket/WebSocket.swift @@ -227,7 +227,7 @@ public class WebSocket : NSObject, NSStreamDelegate { var port = url.port if port == nil { - if ["wss", "https"].contains(url.scheme!) { + if ["wss", "https"].contains(url.scheme) { port = 443 } else { port = 80 @@ -285,7 +285,7 @@ public class WebSocket : NSObject, NSStreamDelegate { guard let inStream = inputStream, let outStream = outputStream else { return } inStream.delegate = self outStream.delegate = self - if ["wss", "https"].contains(url.scheme!) { + if ["wss", "https"].contains(url.scheme) { inStream.setProperty(NSStreamSocketSecurityLevelNegotiatedSSL, forKey: NSStreamSocketSecurityLevelKey) outStream.setProperty(NSStreamSocketSecurityLevelNegotiatedSSL, forKey: NSStreamSocketSecurityLevelKey) } else {