forked from daltoniam/Starscream
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of github.com:daltoniam/Starscream
* 'master' of github.com:daltoniam/Starscream: (22 commits) updated podspec the joys of getting all the package manager to play nice Removed Else Clause that would sometimes give a wrong error message updated changelog updated pod spec for compression changes SecTrust object now is conditionally unwrapped spm fix spm fix package manager update fixes daltoniam#309, daltoniam#319, daltoniam#334 make WSResponse values public Add Advanced Delegate and Custom HTTP methods Update README with (trite) grammar changes Include zlib as a module, rather than using `@_silgen_name` and redefinition. This is less verbose and less error-prone. Add information about compression support to README. Other changes based on PR feedback. Avoid unnecessary copying. Confirm Autobahn fuzzing test results are comparable with the autobahn library itself. Fix capture memory leaks in Autobahn tester. Fixes to handle different windowsBits and noContextTakeover. Integrate compression classes. Add compression classes and unit tests. ...
- Loading branch information
Showing
14 changed files
with
641 additions
and
58 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
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,177 @@ | ||
| ////////////////////////////////////////////////////////////////////////////////////////////////// | ||
| // | ||
| // Compression.swift | ||
| // | ||
| // Created by Joseph Ross on 7/16/14. | ||
| // Copyright © 2017 Joseph Ross. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
| ////////////////////////////////////////////////////////////////////////////////////////////////// | ||
|
|
||
| ////////////////////////////////////////////////////////////////////////////////////////////////// | ||
| // | ||
| // Compression implementation is implemented in conformance with RFC 7692 Compression Extensions | ||
| // for WebSocket: https://tools.ietf.org/html/rfc7692 | ||
| // | ||
| ////////////////////////////////////////////////////////////////////////////////////////////////// | ||
|
|
||
| import Foundation | ||
| import CZLib | ||
|
|
||
| class Decompressor { | ||
| private var strm = z_stream() | ||
| private var buffer = [UInt8](repeating: 0, count: 0x2000) | ||
| private var inflateInitialized = false | ||
| private let windowBits:Int | ||
|
|
||
| init?(windowBits:Int) { | ||
| self.windowBits = windowBits | ||
| guard initInflate() else { return nil } | ||
| } | ||
|
|
||
| private func initInflate() -> Bool { | ||
| if Z_OK == inflateInit2_(&strm, -CInt(windowBits), | ||
| ZLIB_VERSION, CInt(MemoryLayout<z_stream>.size)) | ||
| { | ||
| inflateInitialized = true | ||
| return true | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| func reset() throws { | ||
| teardownInflate() | ||
| guard initInflate() else { throw NSError() } | ||
| } | ||
|
|
||
| func decompress(_ data: Data, finish: Bool) throws -> Data { | ||
| return try data.withUnsafeBytes { (bytes:UnsafePointer<UInt8>) -> Data in | ||
| return try decompress(bytes: bytes, count: data.count, finish: finish) | ||
| } | ||
| } | ||
|
|
||
| func decompress(bytes: UnsafePointer<UInt8>, count: Int, finish: Bool) throws -> Data { | ||
| var decompressed = Data() | ||
| try decompress(bytes: bytes, count: count, out: &decompressed) | ||
|
|
||
| if finish { | ||
| let tail:[UInt8] = [0x00, 0x00, 0xFF, 0xFF] | ||
| try decompress(bytes: tail, count: tail.count, out: &decompressed) | ||
| } | ||
|
|
||
| return decompressed | ||
|
|
||
| } | ||
|
|
||
| private func decompress(bytes: UnsafePointer<UInt8>, count: Int, out:inout Data) throws { | ||
| var res:CInt = 0 | ||
| strm.next_in = UnsafeMutablePointer<UInt8>(mutating: bytes) | ||
| strm.avail_in = CUnsignedInt(count) | ||
|
|
||
| repeat { | ||
| strm.next_out = UnsafeMutablePointer<UInt8>(&buffer) | ||
| strm.avail_out = CUnsignedInt(buffer.count) | ||
|
|
||
| res = inflate(&strm, 0) | ||
|
|
||
| let byteCount = buffer.count - Int(strm.avail_out) | ||
| out.append(buffer, count: byteCount) | ||
| } while res == Z_OK && strm.avail_out == 0 | ||
|
|
||
| guard (res == Z_OK && strm.avail_out > 0) | ||
| || (res == Z_BUF_ERROR && Int(strm.avail_out) == buffer.count) | ||
| else { | ||
| throw NSError(domain: WebSocket.ErrorDomain, code: Int(WebSocket.InternalErrorCode.compressionError.rawValue), userInfo: nil) | ||
| } | ||
| } | ||
|
|
||
| private func teardownInflate() { | ||
| if inflateInitialized, Z_OK == inflateEnd(&strm) { | ||
| inflateInitialized = false | ||
| } | ||
| } | ||
|
|
||
| deinit { | ||
| teardownInflate() | ||
| } | ||
| } | ||
|
|
||
| class Compressor { | ||
| private var strm = z_stream() | ||
| private var buffer = [UInt8](repeating: 0, count: 0x2000) | ||
| private var deflateInitialized = false | ||
| private let windowBits:Int | ||
|
|
||
| init?(windowBits: Int) { | ||
| self.windowBits = windowBits | ||
| guard initDeflate() else { return nil } | ||
| } | ||
|
|
||
| private func initDeflate() -> Bool { | ||
| if Z_OK == deflateInit2_(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED, | ||
| -CInt(windowBits), 8, Z_DEFAULT_STRATEGY, | ||
| ZLIB_VERSION, CInt(MemoryLayout<z_stream>.size)) | ||
| { | ||
| deflateInitialized = true | ||
| return true | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| func reset() throws { | ||
| teardownDeflate() | ||
| guard initDeflate() else { throw NSError() } | ||
| } | ||
|
|
||
| func compress(_ data: Data) throws -> Data { | ||
| var compressed = Data() | ||
| var res:CInt = 0 | ||
| data.withUnsafeBytes { (ptr:UnsafePointer<UInt8>) -> Void in | ||
| strm.next_in = UnsafeMutablePointer<UInt8>(mutating: ptr) | ||
| strm.avail_in = CUnsignedInt(data.count) | ||
|
|
||
| repeat { | ||
| strm.next_out = UnsafeMutablePointer<UInt8>(&buffer) | ||
| strm.avail_out = CUnsignedInt(buffer.count) | ||
|
|
||
| res = deflate(&strm, Z_SYNC_FLUSH) | ||
|
|
||
| let byteCount = buffer.count - Int(strm.avail_out) | ||
| compressed.append(buffer, count: byteCount) | ||
| } | ||
| while res == Z_OK && strm.avail_out == 0 | ||
|
|
||
| } | ||
|
|
||
| guard res == Z_OK && strm.avail_out > 0 | ||
| || (res == Z_BUF_ERROR && Int(strm.avail_out) == buffer.count) | ||
| else { | ||
| throw NSError(domain: WebSocket.ErrorDomain, code: Int(WebSocket.InternalErrorCode.compressionError.rawValue), userInfo: nil) | ||
| } | ||
|
|
||
| compressed.removeLast(4) | ||
| return compressed | ||
| } | ||
|
|
||
| private func teardownDeflate() { | ||
| if deflateInitialized, Z_OK == deflateEnd(&strm) { | ||
| deflateInitialized = false | ||
| } | ||
| } | ||
|
|
||
| deinit { | ||
| teardownDeflate() | ||
| } | ||
| } | ||
|
|
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.