websocket-driver 0.3.0 → 0.3.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.3.1 / 2013-12-03
+
+* Add a `max_length` option to limit allowed frame size
+
 ### 0.3.0 / 2013-09-09
 
 * Support client URLs with Basic Auth credentials

data/README.md

@@ -212,6 +212,8 @@ enabled on outgoing frames.
 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.
 * `: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/hybi.rb

@@ -32,6 +32,8 @@ 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,
@@ -52,11 +54,12 @@ module WebSocket
         super
         reset
 
-        @reader    = StreamReader.new
-        @stage     = 0
-        @masking   = options[:masking]
-        @protocols = options[:protocols] || []
-        @protocols = @protocols.strip.split(/\s*,\s*/) if String === @protocols
+        @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
 
         @require_masking = options[:require_masking]
         @ping_callbacks  = {}
@@ -280,6 +283,10 @@ 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
+
         @stage  = @masked ? 3 : 4
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: websocket-driver
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -88,7 +88,8 @@ files:
 - lib/websocket/driver/event_emitter.rb
 - lib/websocket/driver/draft76.rb
 homepage: http://github.com/faye/websocket-driver-ruby
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options:
 - --main