websocket-driver 0.3.1-java → 0.3.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b4930cf781e61ead71970d79f9d99536002f9ee
-  data.tar.gz: bcc865c02dbaac4d97745551eb335d0a3fcd926f
+  metadata.gz: 2bec6e8f91e91b51b1cc98336ebcceee6f32e494
+  data.tar.gz: 53c2c5fbacfe1a4d98e3f67c8e0729a75f77070a
 SHA512:
-  metadata.gz: b16704251c817b0e15e783c302ac12868a8e5e891a25e5885449ffff708327bde9f24b0b17abe864e9364689dfdbc1e54a338538131c5ddd76e43a7aead93080
-  data.tar.gz: 88578d8f6adfb1c9e21ea82d89e9868cffffed7330b2fceb2ff3d323a3e2639360790751643bcafca0dfb866d88a276980e5047b77eeb37ab263ae0df82c67a4
+  metadata.gz: bb6c2cddd455a97acab01a17cefd141868210431046c2b99a6ccc5649bb249fae737e7d090039b035b30c22ae871510c0c438a9c7571469d81c02a98d9d420ac
+  data.tar.gz: eaec2701ec99d6fff46d71fd902619382ccd932cd0c53f4e13e68c223b2fd359adfa58ad7b58ee18b02575ea2d87285a42a0cef8fc77eabe407330ae58c82594

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 0.3.2 / 2013-12-29
+
+* Expand `max_length` to cover sequences of continuation frames and `draft-{75,76}`
+* Decrease default maximum frame buffer size to 64MB
+* Stop parsing when the protocol enters a failure mode, to save CPU cycles
+
 ### 0.3.1 / 2013-12-03
 
 * Add a `max_length` option to limit allowed frame size

data/README.md

@@ -213,7 +213,7 @@ The `options` argument is optional, and is a hash. It may contain the following
 keys:
 
 * `:max_length` - the maximum allowed size of incoming message frames, in bytes.
-  The default value is `2^30 - 1`, or 1 byte short of 1GiB.
+  The default value is `2^26 - 1`, or 1 byte short of 64 MiB.
 * `:protocols` - an array of strings representing acceptable subprotocols for
   use over the socket. The driver will negotiate one of these to use via the
   `Sec-WebSocket-Protocol` header if supported by the other peer.

data/lib/websocket/driver.rb

@@ -35,7 +35,8 @@ module WebSocket
       require root + '/utf8_match'
     end
 
-    STATES = [:connecting, :open, :closing, :closed]
+    MAX_LENGTH = 0x3ffffff
+    STATES     = [:connecting, :open, :closing, :closed]
 
     class ConnectEvent < Struct.new(nil) ; end
     class OpenEvent    < Struct.new(nil) ; end
@@ -60,6 +61,7 @@ module WebSocket
 
       @socket      = socket
       @options     = options
+      @max_length  = options[:max_length] || MAX_LENGTH
       @headers     = Headers.new
       @queue       = []
       @ready_state = 0

data/lib/websocket/driver/draft75.rb

@@ -11,7 +11,15 @@ module WebSocket
         'hixie-75'
       end
 
+      def close(reason = nil, code = nil)
+        return false if @ready_state == 3
+        @ready_state = 3
+        emit(:close, CloseEvent.new(nil, nil))
+        true
+      end
+
       def parse(buffer)
+        return if @ready_state > 1
         buffer = buffer.bytes if buffer.respond_to?(:bytes)
 
         buffer.each do |data|
@@ -28,8 +36,7 @@ module WebSocket
               @length = value + 128 * @length
 
               if @closing and @length.zero?
-                @ready_state = 3
-                emit(:close, CloseEvent.new(nil, nil))
+                return close
               elsif (0x80 & data) != 0x80
                 if @length.zero?
                   @stage = 0
@@ -49,6 +56,7 @@ module WebSocket
                   @stage = 0 if @skipped == @length
                 else
                   @buffer << data
+                  return close if @buffer.size > @max_length
                 end
               end
           end

data/lib/websocket/driver/hybi.rb

@@ -32,8 +32,6 @@ module WebSocket
       FRAGMENTED_OPCODES = OPCODES.values_at(:continuation, :text, :binary)
       OPENING_OPCODES    = OPCODES.values_at(:text, :binary)
 
-      MAX_LENGTH = 0x3fffffff
-
       ERRORS = {
         :normal_closure       => 1000,
         :going_away           => 1001,
@@ -54,12 +52,11 @@ module WebSocket
         super
         reset
 
-        @reader     = StreamReader.new
-        @stage      = 0
-        @masking    = options[:masking]
-        @protocols  = options[:protocols] || []
-        @protocols  = @protocols.strip.split(/\s*,\s*/) if String === @protocols
-        @max_length = options[:max_length] || MAX_LENGTH
+        @reader    = StreamReader.new
+        @stage     = 0
+        @masking   = options[:masking]
+        @protocols = options[:protocols] || []
+        @protocols = @protocols.strip.split(/\s*,\s*/) if String === @protocols
 
         @require_masking = options[:require_masking]
         @ping_callbacks  = {}
@@ -101,6 +98,9 @@ module WebSocket
                 emit_frame
                 @stage = 0
               end
+
+            else
+              buffer = nil
           end
         end
       end
@@ -222,6 +222,7 @@ module WebSocket
       def shutdown(code, reason)
         frame(reason, :close, code)
         @ready_state = 3
+        @stage = 5
         emit(:close, CloseEvent.new(code, reason))
       end
 
@@ -268,7 +269,8 @@ module WebSocket
 
         @length = (data & LENGTH)
 
-        if @length <= 125
+        if @length >= 0 and @length <= 125
+          return unless check_frame_length
           @stage = @masked ? 3 : 4
         else
           @length_size = (@length == 126) ? 2 : 8
@@ -283,13 +285,20 @@ module WebSocket
           return fail(:protocol_error, "Received control frame having too long payload: #{@length}")
         end
 
-        if @length > @max_length
-          return fail(:too_large, 'WebSocket frame length too large')
-        end
+        return unless check_frame_length
 
         @stage  = @masked ? 3 : 4
       end
 
+      def check_frame_length
+        if @buffer.size + @length > @max_length
+          fail(:too_large, 'WebSocket frame length too large')
+          false
+        else
+          true
+        end
+      end
+
       def emit_frame
         payload = @masked ? Mask.mask(@payload, @mask) : @payload
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: websocket-driver
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: java
 authors:
 - James Coglan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2013-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine