websocket-driver 0.6.2-java → 0.6.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c901112b6c0a993b2d8ef9aefb403a35f48ece9a
-  data.tar.gz: 4a2060e078501b09e32e25ce468572cc8510573d
+  metadata.gz: 7a9a3b19bd45673c1f7802c01d1108331f2c49bf
+  data.tar.gz: 5db37f196e48222a6544aa8313b86c276a8d7df6
 SHA512:
-  metadata.gz: ec00c1ae96b5c0e6ffdcb3511a142e53426bbdbee00c91ce1832b77259026bf029d62cbcdbf735e2b3b955bdaefc6b0ae4bf2144438bb004ba3322ac159216a1
-  data.tar.gz: b56f747f1de4c2876e6929a23fcea02621cb5e24679442f0623d7a0ae414da4dcc2b491ecc58c10dd955be88e77b3599649594534e144357a317c6fdea8f34da
+  metadata.gz: af8a11bc2a93a6863d888ae590c2114fa85851bc3fe1cd2a7449cafdb1a8c4207bf45f3879df92d08c84a2b6fc8e11705ae59bf7b4c93d717755577a1c51b052
+  data.tar.gz: 42bbe9765306e54553d9dc717def5f0308e04910b49fcaafa696c82a599d0b4a2edbb2bdf16cd3667f8c53935aa4f927f76a4d0fe926052b6b3f96eb83edd025

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 0.6.3 / 2015-11-06
+
+* Reject draft-76 handshakes if their Sec-WebSocket-Key headers are invalid
+* Throw a more helpful error if a client is created with an invalid URL
+
 ### 0.6.2 / 2015-07-18
 
 * When the peer sends a close frame with no error code, emit 1000

data/ext/websocket-driver/websocket_mask.c

@@ -20,7 +20,7 @@ method_websocket_mask(VALUE self,
                       VALUE mask)
 {
   char *payload_s, *mask_s, *unmasked_s;
-  int i, n;
+  long i, n;
   VALUE unmasked;
 
   if (mask == Qnil || RSTRING_LEN(mask) != 4) {

data/lib/websocket/driver.rb

@@ -46,6 +46,7 @@ module WebSocket
     CloseEvent   = Struct.new(:code, :reason)
 
     ProtocolError      = Class.new(StandardError)
+    URIError           = Class.new(ArgumentError)
     ConfigurationError = Class.new(ArgumentError)
 
     autoload :Client,       root + '/client'

data/lib/websocket/driver/client.rb

@@ -2,6 +2,8 @@ module WebSocket
   class Driver
 
     class Client < Hybi
+      VALID_SCHEMES = %w[ws wss]
+
       def self.generate_key
         Base64.strict_encode64(SecureRandom.random_bytes(16))
       end
@@ -16,7 +18,11 @@ module WebSocket
         @accept      = Hybi.generate_accept(@key)
         @http        = HTTP::Response.new
 
-        uri       = URI.parse(@socket.url)
+        uri = URI.parse(@socket.url)
+        unless VALID_SCHEMES.include?(uri.scheme)
+          raise URIError, "#{socket.url} is not a valid WebSocket URL"
+        end
+
         host      = uri.host + (uri.port ? ":#{uri.port}" : '')
         path      = (uri.path == '') ? '/' : uri.path
         @pathname = path + (uri.query ? '?' + uri.query : '')

data/lib/websocket/driver/draft76.rb

@@ -38,6 +38,24 @@ module WebSocket
     private
 
       def handshake_response
+        env     = @socket.env
+
+        key1    = env['HTTP_SEC_WEBSOCKET_KEY1']
+        number1 = number_from_key(key1)
+        spaces1 = spaces_in_key(key1)
+
+        key2    = env['HTTP_SEC_WEBSOCKET_KEY2']
+        number2 = number_from_key(key2)
+        spaces2 = spaces_in_key(key2)
+
+        if number1 % spaces1 != 0 or number2 % spaces2 != 0
+          emit(:error, ProtocolError.new('Client sent invalid Sec-WebSocket-Key headers'))
+          close
+          return nil
+        end
+
+        @key_values = [number1 / spaces1, number2 / spaces2]
+
         start   = 'HTTP/1.1 101 WebSocket Protocol Handshake'
         headers = [start, @headers.to_s, '']
         headers.join("\r\n")
@@ -46,14 +64,8 @@ module WebSocket
       def handshake_signature
         return nil unless @body.bytesize >= BODY_SIZE
 
-        head   = @body[0...BODY_SIZE]
-        env    = @socket.env
-        key1   = env['HTTP_SEC_WEBSOCKET_KEY1']
-        value1 = number_from_key(key1) / spaces_in_key(key1)
-        key2   = env['HTTP_SEC_WEBSOCKET_KEY2']
-        value2 = number_from_key(key2) / spaces_in_key(key2)
-
-        Digest::MD5.digest([value1, value2, head].pack('N2A*'))
+        head = @body[0...BODY_SIZE]
+        Digest::MD5.digest((@key_values + [head]).pack('N2A*'))
       end
 
       def send_handshake_body

data/lib/websocket/driver/server.rb

@@ -7,6 +7,7 @@ module WebSocket
       def initialize(socket, options = {})
         super
         @http = HTTP::Request.new
+        @delegate = nil
       end
 
       def env

metadata

@@ -1,25 +1,25 @@
 --- !ruby/object:Gem::Specification
 name: websocket-driver
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: java
 authors:
 - James Coglan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-18 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-extensions
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
   prerelease: false
@@ -28,12 +28,12 @@ dependencies:
   name: eventmachine
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   prerelease: false
@@ -42,12 +42,12 @@ dependencies:
   name: permessage_deflate
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   prerelease: false
@@ -56,12 +56,12 @@ dependencies:
   name: rake-compiler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
   prerelease: false
@@ -70,12 +70,12 @@ dependencies:
   name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   prerelease: false
@@ -118,20 +118,20 @@ licenses:
 metadata: {}
 post_install_message:
 rdoc_options:
-- --main
+- "--main"
 - README.md
-- --markup
+- "--markup"
 - markdown
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []