websocket-driver 0.7.7-java → 0.8.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5ffeea6159c872d68b58d9eed70a8ed87e43bd1e5903f7921757cacb05ef052
-  data.tar.gz: dcba2e45aaaad54eae0cc9963bef8f2e10c8d789879d5880279dc4db223b644a
+  metadata.gz: 51fb8d62186b84c908b815c0ece5099d0d951a3f2a74850f70b58ba2aa5165e5
+  data.tar.gz: 3d899c1487db01b89577d2cd29751bf982056ef95e8ee7b651aedee083a174e4
 SHA512:
-  metadata.gz: 90870f5824fee414c6827a78a8590a67bc7d62c09aee40ba141a4041eb18d8e24ff960d0a06ca5d49001c20950bf7db759ce773ba3cb2e03036e9f1645e04703
-  data.tar.gz: 9cbc5fe58827d684b8c2ada9bc40953c4ff02a17d9d61ff48a2346e125413623cd6a122b0d90e28554f710a7345bc63197f594fc06b8ade20d25be8b1338c11c
+  metadata.gz: 2df1d2e57d32a7dbb5d8d49a6ef987a4544a1ae01bcd28cc9ebce8bbd984bcb2a3455117850dc1d681ffeddc31578d9ca86ce4b0a55ae148d27f77234480aa16
+  data.tar.gz: 23a6a91922d289e12ca9333576016ff8194435aef939806ac927f699ead5b639264161809b7a92e9eccbc27b1b79d3ab07729017fe884f2e04345214f131fdb0

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+### 0.8.1 / 2026-06-04
+
+- Close a draft-75/76 connection if a length header grows to exceed the
+  configured max length
+- Fail the connection if a message is larger than the configured max length
+  after extension processing
+- Limit the total HTTP request line and headers size to 32K
+
+### 0.8.0 / 2025-05-25
+
+- Emit binary message as a string with `Encoding::BINARY` instead of an array
+- Add the option `:binary_data_format` to force the previous behaviour
+
 ### 0.7.7 / 2025-01-04
 
 - Add `base64` gem to the dependencies to support Ruby 3.4

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright 2010-2025 James Coglan
+Copyright 2010-2026 James Coglan
 
 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

data/README.md

@@ -275,6 +275,10 @@ keys:
 - `: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.
+- `:binary_data_format` - in older versions of this library, binary messages
+  were represented as arrays of bytes, whereas they're now represented as
+  strings with `Encoding::BINARY` for performance reasons. Set this option to
+  `:array` to restore the old behaviour.
 
 All drivers respond to the following API methods, but some of them are no-ops
 depending on whether the client supports the behaviour.
@@ -290,8 +294,8 @@ Adds a callback block to execute when the socket becomes open.
 #### `driver.on :message, -> (event) {}`
 
 Adds a callback block to execute when a message is received. `event` will have a
-`data` attribute containing either a string in the case of a text message or an
-array of integers in the case of a binary message.
+`data` attribute whose value is a string with the encoding `Encoding::UTF_8` for
+text message, and `Encoding::BINARY` for binary message.
 
 #### `driver.on :error, -> (event) {}`
 
@@ -346,11 +350,12 @@ Sends a text message over the socket. If the socket handshake is not yet
 complete, the message will be queued until it is. Returns `true` if the message
 was sent or queued, and `false` if the socket can no longer send messages.
 
-#### `driver.binary(array)`
+#### `driver.binary(buffer)`
 
-Takes an array of byte-sized integers and sends them as a binary message. Will
-queue and return `true` or `false` the same way as the `text` method. It will
-also return `false` if the driver does not support binary messages.
+Takes either a string with encoding `Encoding::BINARY`, or an array of
+byte-sized integers, and sends it as a binary message. Will queue and return
+`true` or `false` the same way as the `text` method. It will also return `false`
+if the driver does not support binary messages.
 
 #### `driver.ping(string = '', &callback)`
 

data/lib/websocket/driver/draft75.rb

@@ -41,6 +41,7 @@ module WebSocket
 
             when 1 then
               @length = (octet & 0x7F) + 128 * @length
+              return close if @length > @max_length
 
               if @closing and @length.zero?
                 return close

data/lib/websocket/driver/hybi.rb

@@ -163,11 +163,13 @@ module WebSocket
         message = Message.new
         frame   = Frame.new
 
-        message.rsv1   = message.rsv2 = message.rsv3 = false
-        message.opcode = OPCODES[type || (String === buffer ? :text : :binary)]
+        is_binary = (Array === buffer or buffer.encoding == Encoding::BINARY)
+        payload   = Driver.encode(buffer, is_binary ? nil : Encoding::UTF_8)
+        payload   = [code, payload].pack('S>a*') if code
+        type    ||= is_binary ? :binary : :text
 
-        payload = Driver.encode(buffer)
-        payload = [code, payload].pack('S>a*') if code
+        message.rsv1 = message.rsv2 = message.rsv3 = false
+        message.opcode = OPCODES[type]
         message.data = payload
 
         if MESSAGE_OPCODES.include?(message.opcode)
@@ -398,12 +400,20 @@ module WebSocket
 
         payload = message.data
 
+        if payload.bytesize > @max_length
+          return fail(:too_large, 'WebSocket frame length too large')
+        end
+
         case message.opcode
           when OPCODES[:text] then
             payload = Driver.encode(payload, Encoding::UTF_8)
             payload = nil unless payload.valid_encoding?
           when OPCODES[:binary]
-            payload = payload.bytes.to_a
+            if @binary_data_format == :array
+              payload = payload.bytes.to_a
+            else
+              payload = Driver.encode(payload, Encoding::BINARY)
+            end
         end
 
         if payload

data/lib/websocket/driver.rb

@@ -71,7 +71,7 @@ module WebSocket
 
     def initialize(socket, options = {})
       super()
-      Driver.validate_options(options, [:max_length, :masking, :require_masking, :protocols])
+      Driver.validate_options(options, [:max_length, :masking, :require_masking, :protocols, :binary_data_format])
 
       @socket      = socket
       @reader      = StreamReader.new
@@ -80,6 +80,8 @@ module WebSocket
       @headers     = Headers.new
       @queue       = []
       @ready_state = 0
+
+      @binary_data_format = options[:binary_data_format] || :string
     end
 
     def state
@@ -197,17 +199,18 @@ module WebSocket
 
     def self.encode(data, encoding = nil)
       if Array === data
+        data = data.pack('C*')
         encoding ||= Encoding::BINARY
-        return data.pack('C*').force_encoding(encoding)
       end
 
-      encoding ||= Encoding::UTF_8
-
-      return data if data.encoding == encoding
-      return data.encode(encoding) unless data.encoding == Encoding::BINARY
+      return data if encoding.nil? or data.encoding == encoding
 
-      data = data.dup if data.frozen?
-      data.force_encoding(encoding)
+      if data.encoding == Encoding::BINARY
+        data = data.dup if data.frozen?
+        data.force_encoding(encoding)
+      else
+        data.encode(encoding)
+      end
     end
 
     def self.host_header(uri)
@@ -224,6 +227,12 @@ module WebSocket
           raise ConfigurationError, "Unrecognized option: #{ key.inspect }"
         end
       end
+
+      if options[:binary_data_format]
+        unless [:array, :string].include?(options[:binary_data_format])
+          raise ConfigurationError, "Invalid :binary_data_format: #{options[:binary_data_format].inspect}"
+        end
+      end
     end
 
     def self.websocket?(env)

data/lib/websocket/http/headers.rb

@@ -2,7 +2,7 @@ module WebSocket
   module HTTP
 
     module Headers
-      MAX_LINE_LENGTH = 4096
+      MAX_REQUEST_SIZE = 32768
       CR = 0x0D
       LF = 0x0A
 
@@ -38,6 +38,7 @@ module WebSocket
       attr_reader :headers
 
       def initialize
+        @size    = 0
         @buffer  = []
         @env     = {}
         @headers = {}
@@ -54,6 +55,9 @@ module WebSocket
 
       def parse(chunk)
         chunk.each_byte do |octet|
+          @size += 1
+          return error if @size > MAX_REQUEST_SIZE
+
           if octet == LF and @stage < 2
             @buffer.pop if @buffer.last == CR
             if @buffer.empty?
@@ -71,9 +75,8 @@ module WebSocket
               end
             end
             @buffer = []
-          else
-            @buffer << octet if @stage >= 0
-            error if @stage < 2 and @buffer.size > MAX_LINE_LENGTH
+          elsif @stage >= 0
+            @buffer << octet
           end
         end
         @env['rack.input'] = StringIO.new(string_buffer)

metadata

@@ -1,22 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: websocket-driver
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.8.1
 platform: java
 authors:
 - James Coglan
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-04 00:00:00.000000000 Z
+date: 2026-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: base64
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: base64
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -25,12 +24,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: websocket-extensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
-  name: websocket-extensions
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -39,12 +38,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
+  name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: eventmachine
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -53,12 +52,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: permessage_deflate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: permessage_deflate
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -67,12 +66,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rake-compiler
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -81,12 +80,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rspec
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -94,7 +93,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email: jcoglan@gmail.com
 executables: []
 extensions: []
@@ -129,8 +127,8 @@ files:
 homepage: https://github.com/faye/websocket-driver-ruby
 licenses:
 - Apache-2.0
-metadata: {}
-post_install_message:
+metadata:
+  changelog_uri: https://github.com/faye/websocket-driver-ruby/blob/main/CHANGELOG.md
 rdoc_options:
 - "--main"
 - README.md
@@ -149,8 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: WebSocket protocol handler with pluggable I/O
 test_files: []