em-websocket 0.5.0 → 0.5.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 623f09b2677a73143c0f625ba3b516a00219103e
+  data.tar.gz: 0ebcdd8490811e0b69a64262b2a63daeb8d6aa14
+SHA512:
+  metadata.gz: aad00490beaf8c9ae3606dc506d111c7d60c1f83c6b08c93ebbafd9d877f3c7a7ec2273cbb0a3d97f59d7fb749e4a6f157cdc1a53f4bab88c21cb6eb99605435
+  data.tar.gz: 002ff0471519223522a43a3e865272af61c033960d4a74506080b551d8b01f3cc73471c4b19d677b7c3f90c76b8022c34aa5fbb0b4a3b348b37102b1a3ad597e

data/CHANGELOG.rdoc

@@ -1,5 +1,24 @@
 = Changelog
 
+== 0.5.1 / 2014-04-23
+
+- new features:
+  - Support for receiving binary messages
+
+- changed:
+  - Allow additional close codes to be sent by apps
+  - Raise better errors on missing Sec-WebSocket-Key2
+  - Updated http_parser.rb dependency to 0.6.0
+
+- bug fixes:
+  - Abort if HTTP request URI is invalid
+  - Force close connections that have been sent a close handshake after a timeout
+
+- improved spec compliance on:
+  - Missing continuation frames
+  - Fragmented control frames
+  - Close behaviour after protocol errors
+
 == 0.5.0 / 2013-03-05
 
 - new features:

data/Gemfile

@@ -1,3 +1,9 @@
 source "http://rubygems.org"
 
 gemspec
+
+gem "em-websocket-client", git: "git@github.com:movitto/em-websocket-client.git", branch: "expose-websocket-api"
+gem "em-spec", "~> 0.2.6"
+gem "em-http-request", "~> 1.1.1"
+gem "rspec", "~> 2.12.0"
+gem "rake"

data/README.md

@@ -1,8 +1,9 @@
 # EM-WebSocket
 
-EventMachine based, async, Ruby WebSocket server. Take a look at examples directory, or check out the blog post below:
+[![Gem Version](https://badge.fury.io/rb/em-websocket.png)](http://rubygems.org/gems/em-websocket)
+[![Analytics](https://ga-beacon.appspot.com/UA-71196-10/em-websocket/readme)](https://github.com/igrigorik/ga-beacon)
 
-* [Ruby & Websockets: TCP for the Web](http://www.igvita.com/2009/12/22/ruby-websockets-tcp-for-the-browser/)
+EventMachine based, async, Ruby WebSocket server. Take a look at examples directory, or check out the blog post: [Ruby & Websockets: TCP for the Web](http://www.igvita.com/2009/12/22/ruby-websockets-tcp-for-the-browser/).
 
 ## Simple server example
 

data/lib/em-websocket/close03.rb

@@ -5,6 +5,7 @@ module EventMachine
         # TODO: Ideally send body data and check that it matches in ack
         send_frame(:close, '')
         @state = :closing
+        start_close_timeout
       end
 
       def supports_close_codes?; false; end

data/lib/em-websocket/close05.rb

@@ -5,6 +5,7 @@ module EventMachine
         # TODO: Ideally send body data and check that it matches in ack
         send_frame(:close, "\x53")
         @state = :closing
+        start_close_timeout
       end
 
       def supports_close_codes?; false; end

data/lib/em-websocket/close06.rb

@@ -10,6 +10,7 @@ module EventMachine
           send_frame(:close, '')
         end
         @state = :closing
+        start_close_timeout
       end
 
       def supports_close_codes?; true; end

data/lib/em-websocket/connection.rb

@@ -10,12 +10,16 @@ module EventMachine
       def onclose(&blk);    @onclose = blk;   end
       def onerror(&blk);    @onerror = blk;   end
       def onmessage(&blk);  @onmessage = blk; end
+      def onbinary(&blk);   @onbinary = blk; end
       def onping(&blk);     @onping = blk;    end
       def onpong(&blk);     @onpong = blk;    end
 
       def trigger_on_message(msg)
         @onmessage.call(msg) if defined? @onmessage
       end
+      def trigger_on_binary(msg)
+        @onbinary.call(msg) if defined? @onbinary
+      end
       def trigger_on_open(handshake)
         @onopen.call(handshake) if defined? @onopen
       end
@@ -40,6 +44,7 @@ module EventMachine
         @secure = options[:secure] || false
         @secure_proxy = options[:secure_proxy] || false
         @tls_options = options[:tls_options] || {}
+        @close_timeout = options[:close_timeout]
 
         @handler = nil
 
@@ -72,10 +77,6 @@ module EventMachine
         else
           dispatch(data)
         end
-      rescue WSProtocolError => e
-        debug [:error, e]
-        trigger_on_error(e)
-        close_websocket_private(e.code, e.message)
       rescue => e
         debug [:error, e]
 
@@ -247,6 +248,10 @@ module EventMachine
         defined?(@max_frame_size) ? @max_frame_size : WebSocket.max_frame_size
       end
 
+      def close_timeout
+        @close_timeout || WebSocket.close_timeout
+      end
+
       private
 
       # As definited in draft 06 7.2.2, some failures require that the server
@@ -265,13 +270,39 @@ module EventMachine
         end
       end
 
-      # Accept 1000, 3xxx or 4xxx
+      # Allow applications to close with 1000, 1003, 1008, 1011, 3xxx or 4xxx.
+      #
+      # em-websocket uses a few other codes internally which should not be
+      # used by applications
+      #
+      # Browsers generally allow connections to be closed with code 1000,
+      # 3xxx, and 4xxx. em-websocket allows closing with a few other codes
+      # which seem reasonable (for discussion see
+      # https://github.com/igrigorik/em-websocket/issues/98)
+      #
+      # Usage from the rfc:
+      #
+      # 1000 indicates a normal closure
+      #
+      # 1003 indicates that an endpoint is terminating the connection
+      # because it has received a type of data it cannot accept
+      #
+      # 1008 indicates that an endpoint is terminating the connection because
+      # it has received a message that violates its policy
+      #
+      # 1011 indicates that a server is terminating the connection because it
+      # encountered an unexpected condition that prevented it from fulfilling
+      # the request
+      #
+      # Status codes in the range 3000-3999 are reserved for use by libraries,
+      # frameworks, and applications
+      #
+      # Status codes in the range 4000-4999 are reserved for private use and
+      # thus can't be registered
       #
-      # This is consistent with the spec and what browsers have implemented
-      # Frameworks should use 3xxx while applications should use 4xxx
       def acceptable_close_code?(code)
         case code
-        when 1000, (3000..4999)
+        when 1000, 1003, 1008, 1011, (3000..4999)
           true
         else
           false

data/lib/em-websocket/framing03.rb

@@ -9,7 +9,7 @@ module EventMachine
         @frame_type = nil
       end
       
-      def process_data(newdata)
+      def process_data
         error = false
 
         while !error && @data.size > 1

data/lib/em-websocket/framing05.rb

@@ -9,7 +9,7 @@ module EventMachine
         @frame_type = nil
       end
       
-      def process_data(newdata)
+      def process_data
         error = false
 
         while !error && @data.size > 5 # mask plus first byte present

data/lib/em-websocket/framing07.rb

@@ -10,7 +10,7 @@ module EventMachine
         @frame_type = nil
       end
       
-      def process_data(newdata)
+      def process_data
         error = false
 
         while !error && @data.size >= 2
@@ -87,8 +87,19 @@ module EventMachine
 
           frame_type = opcode_to_type(opcode)
 
-          if frame_type == :continuation && !@frame_type
-            raise WSProtocolError, 'Continuation frame not expected'
+          if frame_type == :continuation
+            if !@frame_type
+              raise WSProtocolError, 'Continuation frame not expected'
+            end
+          else # Not a continuation frame
+            if @frame_type && data_frame?(frame_type)
+              raise WSProtocolError, "Continuation frame expected"
+            end
+          end
+
+          # Validate that control frames are not fragmented
+          if !fin && !data_frame?(frame_type)
+            raise WSProtocolError, 'Control frames must not be fragmented'
           end
 
           if !fin

data/lib/em-websocket/framing76.rb

@@ -7,7 +7,7 @@ module EventMachine
         @data = ''
       end
       
-      def process_data(newdata)
+      def process_data
         debug [:message, @data]
 
         # This algorithm comes straight from the spec
@@ -71,9 +71,6 @@ module EventMachine
               raise WSMessageTooBigError, "Frame length too long (#{@data.size} bytes)"
             end
 
-            # Optimization to avoid calling slice! unnecessarily
-            error = true and next unless newdata =~ /\xff/
-
             msg = @data.slice!(/\A\x00[^\xff]*\xff/)
             if msg
               msg.gsub!(/\A\x00|\xff\z/, '')

data/lib/em-websocket/handler.rb

@@ -38,27 +38,49 @@ module EventMachine
         @connection = connection
         @debug = debug
         @state = :connected
+        @close_timer = nil
         initialize_framing
       end
 
       def receive_data(data)
         @data << data
-        process_data(data)
+        process_data
+      rescue WSProtocolError => e
+        fail_websocket(e)
       end
 
       def close_websocket(code, body)
         # Implemented in subclass
       end
 
+      # Used to avoid un-acked and unclosed remaining open indefinitely
+      def start_close_timeout
+        @close_timer = EM::Timer.new(@connection.close_timeout) {
+          @connection.close_connection
+          e = WSProtocolError.new("Close handshake un-acked after #{@connection.close_timeout}s, closing tcp connection")
+          @connection.trigger_on_error(e)
+        }
+      end
+
+      # This corresponds to "Fail the WebSocket Connection" in the spec.
+      def fail_websocket(e)
+        debug [:error, e]
+        close_websocket(e.code, e.message)
+        @connection.close_connection_after_writing
+        @connection.trigger_on_error(e)
+      end
+
       def unbind
         @state = :closed
 
+        @close_timer.cancel if @close_timer
+
         @close_info = defined?(@close_info) ? @close_info : {
           :code => 1006,
           :was_clean => false,
         }
 
-        @connection.trigger_on_close(@close_info )
+        @connection.trigger_on_close(@close_info)
       end
 
       def ping

data/lib/em-websocket/handshake.rb

@@ -1,4 +1,5 @@
 require "http/parser"
+require "uri"
 
 module EventMachine
   module WebSocket
@@ -48,12 +49,12 @@ module EventMachine
       # Returns the request path (excluding any query params)
       #
       def path
-        @parser.request_path
+        @path
       end
 
       # Returns the query params as a string foo=bar&baz=...
       def query_string
-        @parser.query_string
+        @query_string
       end
 
       def query
@@ -77,13 +78,27 @@ module EventMachine
           raise HandshakeError, "Must be GET request"
         end
 
+        # Validate request path
+        #
+        # According to http://tools.ietf.org/search/rfc2616#section-5.1.2, an
+        # invalid Request-URI should result in a 400 status code, but
+        # HandshakeError's currently result in a WebSocket abort. It's not
+        # clear which should take precedence, but an abort will do just fine.
+        begin
+          uri = URI.parse(@parser.request_url)
+          @path = uri.path
+          @query_string = uri.query || ""
+        rescue URI::InvalidURIError
+          raise HandshakeError, "Invalid request URI: #{@parser.request_url}"
+        end
+
         # Validate Upgrade
         unless @parser.upgrade?
           raise HandshakeError, "Not an upgrade request"
         end
         upgrade = @headers['upgrade']
         unless upgrade.kind_of?(String) && upgrade.downcase == 'websocket'
-          raise HandshakeError, "Invalid upgrade header: #{upgrade}"
+          raise HandshakeError, "Invalid upgrade header: #{upgrade.inspect}"
         end
 
         # Determine version heuristically

data/lib/em-websocket/handshake76.rb

@@ -39,6 +39,10 @@ module EventMachine::WebSocket
       end
 
       def numbers_over_spaces(string)
+        unless string
+          raise HandshakeError, "WebSocket key1 or key2 is missing"
+        end
+
         numbers = string.scan(/[0-9]/).join.to_i
 
         spaces = string.scan(/ /).size

data/lib/em-websocket/message_processor_03.rb

@@ -34,7 +34,7 @@ module EventMachine
           end
           @connection.trigger_on_message(application_data)
         when :binary
-          @connection.trigger_on_message(application_data)
+          @connection.trigger_on_binary(application_data)
         end
       end
 

data/lib/em-websocket/message_processor_06.rb

@@ -51,7 +51,7 @@ module EventMachine
           end
           @connection.trigger_on_message(application_data)
         when :binary
-          @connection.trigger_on_message(application_data)
+          @connection.trigger_on_binary(application_data)
         end
       end
 

data/lib/em-websocket/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   module Websocket
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

data/lib/em-websocket/websocket.rb

@@ -2,8 +2,11 @@ module EventMachine
   module WebSocket
     class << self
       attr_accessor :max_frame_size
+      attr_accessor :close_timeout
     end
     @max_frame_size = 10 * 1024 * 1024 # 10MB
+    # Connections are given 60s to close after being sent a close handshake
+    @close_timeout = 60
 
     # All errors raised by em-websocket should descend from this class
     class WebSocketError < RuntimeError; end

data/spec/helper.rb

@@ -6,6 +6,10 @@ require 'em-spec/rspec'
 require 'em-http'
 
 require 'em-websocket'
+require 'em-websocket-client'
+
+require 'integration/shared_examples'
+require 'integration/gte_03_examples'
 
 RSpec.configure do |c|
   c.mock_with :rspec
@@ -101,7 +105,7 @@ class Draft07FakeWebSocketClient < Draft05FakeWebSocketClient
   end
 end
 
-# Wrap EM:HttpRequest in a websocket like interface so that it can be used in the specs with the same interface as FakeWebSocketClient
+# Wrapper around em-websocket-client
 class Draft75WebSocketClient
   def onopen(&blk);     @onopen = blk;    end
   def onclose(&blk);    @onclose = blk;   end
@@ -109,18 +113,17 @@ class Draft75WebSocketClient
   def onmessage(&blk);  @onmessage = blk; end
 
   def initialize
-    @ws = EventMachine::HttpRequest.new('ws://127.0.0.1:12345/').get({
-      :timeout => 0,
-      :origin => 'http://example.com',
-    })
-    @ws.errback { @onerror.call if defined? @onerror }
+    @ws = EventMachine::WebSocketClient.connect('ws://127.0.0.1:12345/',
+                                                :version => 75,
+                                                :origin => 'http://example.com')
+    @ws.errback { |err| @onerror.call if defined? @onerror }
     @ws.callback { @onopen.call if defined? @onopen }
     @ws.stream { |msg| @onmessage.call(msg) if defined? @onmessage }
     @ws.disconnect { @onclose.call if defined? @onclose }
   end
 
   def send(message)
-    @ws.send(message)
+    @ws.send_msg(message)
   end
 
   def close_connection
@@ -128,6 +131,12 @@ class Draft75WebSocketClient
   end
 end
 
+def start_server(opts = {})
+  EM::WebSocket.run({:host => "0.0.0.0", :port => 12345}.merge(opts)) { |ws|
+    yield ws if block_given?
+  }
+end
+
 def format_request(r)
   data = "#{r[:method]} #{r[:path]} HTTP/1.1\r\n"
   header_lines = r[:headers].map { |k,v| "#{k}: #{v}" }

data/spec/integration/common_spec.rb

@@ -6,12 +6,6 @@ describe "WebSocket server" do
   include EM::SpecHelper
   default_timeout 1
 
-  def start_server
-    EM::WebSocket.run(:host => "0.0.0.0", :port => 12345) { |ws|
-      yield ws if block_given?
-    }
-  end
-
   it "should fail on non WebSocket requests" do
     em {
       EM.add_timer(0.1) do
@@ -27,25 +21,22 @@ describe "WebSocket server" do
   it "should expose the WebSocket request headers, path and query params" do
     em {
       EM.add_timer(0.1) do
-        http = EM::HttpRequest.new('ws://127.0.0.1:12345/').get :timeout => 0
-        http.errback { fail }
-        http.callback {
-          http.response_header.status.should == 101
-          http.close_connection
-        }
-        http.stream { |msg| }
+        ws = EventMachine::WebSocketClient.connect('ws://127.0.0.1:12345/',
+                                                   :origin => 'http://example.com')
+        ws.errback { fail }
+        ws.callback { ws.close_connection }
+        ws.stream { |msg| }
       end
 
       start_server do |ws|
         ws.onopen { |handshake|
           headers = handshake.headers
-          headers["User-Agent"].should == "EventMachine HttpClient"
           headers["Connection"].should == "Upgrade"
-          headers["Upgrade"].should == "WebSocket"
+          headers["Upgrade"].should == "websocket"
           headers["Host"].to_s.should == "127.0.0.1:12345"
           handshake.path.should == "/"
           handshake.query.should == {}
-          handshake.origin.should == "127.0.0.1"
+          handshake.origin.should == 'http://example.com'
         }
         ws.onclose {
           ws.state.should == :closed
@@ -58,16 +49,12 @@ describe "WebSocket server" do
   it "should expose the WebSocket path and query params when nonempty" do
     em {
       EM.add_timer(0.1) do
-        http = EM::HttpRequest.new('ws://127.0.0.1:12345/hello').get({
-          :query => {'foo' => 'bar', 'baz' => 'qux'},
-          :timeout => 0
-        })
-        http.errback { fail }
-        http.callback {
-          http.response_header.status.should == 101
-          http.close_connection
+        ws = EventMachine::WebSocketClient.connect('ws://127.0.0.1:12345/hello?foo=bar&baz=qux')
+        ws.errback { fail }
+        ws.callback {
+          ws.close_connection
         }
-        http.stream { |msg| }
+        ws.stream { |msg| }
       end
 
       start_server do |ws|
@@ -104,18 +91,15 @@ describe "WebSocket server" do
   it "should allow the server to be started inside an existing EM" do
     em {
       EM.add_timer(0.1) do
-        http = EM::HttpRequest.new('ws://127.0.0.1:12345/').get :timeout => 0
-        http.errback { fail }
-        http.callback {
-          http.response_header.status.should == 101
-          http.close_connection
-        }
-        http.stream { |msg| }
+        http = EM::HttpRequest.new('http://127.0.0.1:12345/').get :timeout => 0
+        http.errback { |e| done }
+        http.callback { fail }
       end
 
       start_server do |ws|
         ws.onopen { |handshake|
-          handshake.headers["User-Agent"].should == "EventMachine HttpClient"
+          headers = handshake.headers
+          headers["Host"].to_s.should == "127.0.0.1:12345"
         }
         ws.onclose {
           ws.state.should == :closed

data/spec/integration/draft03_spec.rb

@@ -1,5 +1,4 @@
 require 'helper'
-require 'integration/shared_examples'
 
 describe "draft03" do
   include EM::SpecHelper
@@ -35,12 +34,6 @@ describe "draft03" do
     }
   end
 
-  def start_server
-    EM::WebSocket.run(:host => "0.0.0.0", :port => 12345) { |ws|
-      yield ws if block_given?
-    }
-  end
-
   def start_client
     client = EM.connect('0.0.0.0', 12345, Draft03FakeWebSocketClient)
     client.send_data(format_request(@request))
@@ -52,6 +45,10 @@ describe "draft03" do
     let(:version) { 3 }
   end
 
+  it_behaves_like "a WebSocket server drafts 3 and above" do
+    let(:version) { 3 }
+  end
+
   # These examples are straight from the spec
   # http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-03#section-4.6
   describe "examples from the spec" do
@@ -114,7 +111,8 @@ describe "draft03" do
         data = "a" * 256
         
         start_server { |ws|
-          ws.onmessage { |msg|
+          ws.onbinary { |msg|
+            msg.encoding.should == Encoding.find("BINARY") if defined?(Encoding)
             msg.should == data
             done
           }
@@ -134,7 +132,8 @@ describe "draft03" do
         data = "a" * 65536
         
         start_server { |ws|
-          ws.onmessage { |msg|
+          ws.onbinary { |msg|
+            msg.encoding.should == Encoding.find("BINARY") if defined?(Encoding)
             msg.should == data
             done
           }

data/spec/integration/draft05_spec.rb

@@ -1,5 +1,4 @@
 require 'helper'
-require 'integration/shared_examples'
 
 describe "draft05" do
   include EM::SpecHelper
@@ -21,12 +20,6 @@ describe "draft05" do
       }
     }
   end
-  
-  def start_server
-    EM::WebSocket.run(:host => "0.0.0.0", :port => 12345) { |ws|
-      yield ws if block_given?
-    }
-  end
 
   def start_client
     client = EM.connect('0.0.0.0', 12345, Draft05FakeWebSocketClient)
@@ -39,6 +32,10 @@ describe "draft05" do
     let(:version) { 5 }
   end
 
+  it_behaves_like "a WebSocket server drafts 3 and above" do
+    let(:version) { 5 }
+  end
+
   it "should report that close codes are not supported" do
     em {
       start_server { |ws|

data/spec/integration/draft06_spec.rb

@@ -1,5 +1,4 @@
 require 'helper'
-require 'integration/shared_examples'
 
 describe "draft06" do
   include EM::SpecHelper
@@ -30,12 +29,6 @@ describe "draft06" do
       }
     }
   end
-  
-  def start_server
-    EM::WebSocket.run(:host => "0.0.0.0", :port => 12345) { |ws|
-      yield ws if block_given?
-    }
-  end
 
   def start_client
     client = EM.connect('0.0.0.0', 12345, Draft05FakeWebSocketClient)
@@ -48,6 +41,10 @@ describe "draft06" do
     let(:version) { 6 }
   end
 
+  it_behaves_like "a WebSocket server drafts 3 and above" do
+    let(:version) { 6 }
+  end
+
   it "should open connection" do
     em {
       start_server { |server|

data/spec/integration/draft13_spec.rb

@@ -1,7 +1,6 @@
 # encoding: BINARY
 
 require 'helper'
-require 'integration/shared_examples'
 
 describe "draft13" do
   include EM::SpecHelper
@@ -33,12 +32,6 @@ describe "draft13" do
     }
   end
 
-  def start_server
-    EM::WebSocket.run(:host => "0.0.0.0", :port => 12345) { |ws|
-      yield ws if block_given?
-    }
-  end
-
   def start_client
     client = EM.connect('0.0.0.0', 12345, Draft07FakeWebSocketClient)
     client.send_data(format_request(@request))
@@ -50,6 +43,10 @@ describe "draft13" do
     let(:version) { 13 }
   end
 
+  it_behaves_like "a WebSocket server drafts 3 and above" do
+    let(:version) { 13 }
+  end
+
   it "should send back the correct handshake response" do
     em {
       start_server

data/spec/integration/draft75_spec.rb

@@ -1,5 +1,4 @@
 require 'helper'
-require 'integration/shared_examples'
 
 # These integration tests are older and use a different testing style to the 
 # integration tests for newer drafts. They use EM::HttpRequest which happens 
@@ -9,12 +8,6 @@ describe "WebSocket server draft75" do
   include EM::SpecHelper
   default_timeout 1
 
-  def start_server
-    EM::WebSocket.run(:host => "0.0.0.0", :port => 12345) { |ws|
-      yield ws if block_given?
-    }
-  end
-
   def start_client
     client = Draft75WebSocketClient.new
     yield client if block_given?
@@ -29,12 +22,12 @@ describe "WebSocket server draft75" do
     em {
       MSG = "Hello World!"
       EventMachine.add_timer(0.1) do
-        http = EventMachine::HttpRequest.new('ws://127.0.0.1:12345/').get :timeout => 0
-        http.errback { fail }
-        http.callback { http.response_header.status.should == 101 }
+        ws = EventMachine::WebSocketClient.connect('ws://127.0.0.1:12345/')
+        ws.errback { fail }
+        ws.callback { }
 
-        http.stream { |msg|
-          msg.should == MSG
+        ws.stream { |msg|
+          msg.data.should == MSG
           EventMachine.stop
         }
       end
@@ -53,13 +46,12 @@ describe "WebSocket server draft75" do
       received = []
 
       EventMachine.add_timer(0.1) do
-        http = EventMachine::HttpRequest.new('ws://127.0.0.1:12345/').get :timeout => 0
-        http.errback { fail }
-        http.stream {|msg|}
-        http.callback {
-          http.response_header.status.should == 101
-          http.send messages[0]
-          http.send messages[1]
+        ws = EventMachine::WebSocketClient.connect('ws://127.0.0.1:12345/')
+        ws.errback { fail }
+        ws.stream {|msg|}
+        ws.callback {
+          ws.send_msg messages[0]
+          ws.send_msg messages[1]
         }
       end
 
@@ -79,13 +71,12 @@ describe "WebSocket server draft75" do
   it "should call onclose callback when client closes connection" do
     em {
       EventMachine.add_timer(0.1) do
-        http = EventMachine::HttpRequest.new('ws://127.0.0.1:12345/').get :timeout => 0
-        http.errback { fail }
-        http.callback {
-          http.response_header.status.should == 101
-          http.close_connection
+        ws = EventMachine::WebSocketClient.connect('ws://127.0.0.1:12345/')
+        ws.errback { fail }
+        ws.callback {
+          ws.close_connection
         }
-        http.stream{|msg|}
+        ws.stream{|msg|}
       end
 
       start_server { |ws|
@@ -101,8 +92,8 @@ describe "WebSocket server draft75" do
   it "should call onerror callback with raised exception and close connection on bad handshake" do
     em {
       EventMachine.add_timer(0.1) do
-        http = EventMachine::HttpRequest.new('http://127.0.0.1:12345/').get :timeout => 0
-        http.errback { http.response_header.status.should == 0 }
+        http = EM::HttpRequest.new('http://127.0.0.1:12345/').get
+        http.errback { }
         http.callback { fail }
       end
 

data/spec/integration/draft76_spec.rb

@@ -1,7 +1,6 @@
 # encoding: BINARY
 
 require 'helper'
-require 'integration/shared_examples'
 
 describe "WebSocket server draft76" do
   include EM::SpecHelper
@@ -35,12 +34,6 @@ describe "WebSocket server draft76" do
       :body => "8jKS\'y:G*Co,Wxa-"
     }
   end
-  
-  def start_server
-    EM::WebSocket.run(:host => "0.0.0.0", :port => 12345) { |ws|
-      yield ws if block_given?
-    }
-  end
 
   def start_client
     client = EM.connect('0.0.0.0', 12345, FakeWebSocketClient)
@@ -178,7 +171,7 @@ describe "WebSocket server draft76" do
       start_server { |server|
         server.onerror { |error|
           error.should be_an_instance_of EM::WebSocket::HandshakeError
-          error.message.should == "Invalid HTTP header: Could not parse data entirely"
+          error.message.should == "Invalid HTTP header: Could not parse data entirely (1 != 29)"
           done
         }
       }

data/spec/integration/gte_03_examples.rb

@@ -0,0 +1,42 @@
+shared_examples_for "a WebSocket server drafts 3 and above" do
+  it "should force close connections after a timeout if close handshake is not sent by the client" do
+    em {
+      server_onerror_fired = false
+      server_onclose_fired = false
+      client_got_close_handshake = false
+      
+      start_server(:close_timeout => 0.1) { |ws|
+        ws.onopen {
+          # 1: Send close handshake to client
+          EM.next_tick { ws.close(4999, "Close message") }
+        }
+        
+        ws.onerror { |e|
+          # 3: Client should receive onerror
+          e.class.should == EM::WebSocket::WSProtocolError
+          e.message.should == "Close handshake un-acked after 0.1s, closing tcp connection"
+          server_onerror_fired = true
+        }
+        
+        ws.onclose {
+          server_onclose_fired = true
+        }
+      }
+      start_client { |client|
+        client.onmessage { |msg|
+          # 2: Client does not respond to close handshake (the fake client 
+          # doesn't understand them at all hence this is in onmessage)
+          msg.should =~ /Close message/ if version >= 6
+          client_got_close_handshake = true
+        }
+        
+        client.onclose {
+          server_onerror_fired.should == true
+          server_onclose_fired.should == true
+          client_got_close_handshake.should == true
+          done
+        }
+      }
+    }
+  end
+end

data/spec/unit/framing_spec.rb

@@ -15,7 +15,7 @@ describe EM::WebSocket::Framing03 do
 
     def <<(data)
       @data << data
-      process_data(data)
+      process_data
     end
     
     def debug(*args); end
@@ -140,7 +140,7 @@ describe EM::WebSocket::Framing04 do
 
     def <<(data)
       @data << data
-      process_data(data)
+      process_data
     end
 
     def debug(*args); end
@@ -209,7 +209,7 @@ describe EM::WebSocket::Framing07 do
 
     def <<(data)
       @data << data
-      process_data(data)
+      process_data
     end
 
     def debug(*args); end
@@ -276,5 +276,23 @@ describe EM::WebSocket::Framing07 do
       @f << "\x00\x02lo"
       @f << "\x80\x06 world"
     end
+
+    it "should raise if non-fin frame is followed by a non-continuation data frame (continuation frame would be expected)" do
+      lambda {
+        @f << 0b00000001 # Not fin, text
+        @f << 0b00000001 # Length 1
+        @f << 'f'
+        @f << 0b10000001 # fin, text (continutation expected)
+        @f << 0b00000001 # Length 1
+        @f << 'b'
+      }.should raise_error(EM::WebSocket::WebSocketError, 'Continuation frame expected')
+    end
+
+    it "should raise on non-fin control frames (control frames must not be fragmented)" do
+      lambda {
+        @f << 0b00001010 # Not fin, pong (opcode 10)
+        @f << 0b00000000 # Length 1
+      }.should raise_error(EM::WebSocket::WebSocketError, 'Control frames must not be fragmented')
+    end
   end
 end

data/spec/unit/handshake_spec.rb

@@ -126,6 +126,23 @@ describe EM::WebSocket::Handshake do
     end
   end
   
+  it "should raise error if Sec-WebSocket-Key1 is missing" do
+    @request[:headers].delete("Sec-WebSocket-Key1")
+
+    # The error message isn't correct since key1 is used to heuristically
+    # determine the protocol version in use, however this test at least checks
+    # that the handshake does correctly fail
+    handshake(@request).
+      should fail_with_error(EM::WebSocket::HandshakeError, 'Extra bytes after header')
+  end
+
+  it "should raise error if Sec-WebSocket-Key2 is missing" do
+    @request[:headers].delete("Sec-WebSocket-Key2")
+
+    handshake(@request).
+      should fail_with_error(EM::WebSocket::HandshakeError, 'WebSocket key1 or key2 is missing')
+  end
+
   it "should raise error if spaces do not divide numbers in Sec-WebSocket-Key* " do
     @request[:headers]['Sec-WebSocket-Key2'] = '12998 5 Y3 1.P00'
 
@@ -138,7 +155,7 @@ describe EM::WebSocket::Handshake do
     handshake.receive_data("\r\n\r\nfoobar")
     
     handshake.
-      should fail_with_error(EM::WebSocket::HandshakeError, 'Invalid HTTP header: Could not parse data entirely')
+      should fail_with_error(EM::WebSocket::HandshakeError, 'Invalid HTTP header: Could not parse data entirely (4 != 10)')
   end
 
   # This might seems crazy, but very occasionally we saw multiple "Upgrade:
@@ -190,4 +207,10 @@ describe EM::WebSocket::Handshake do
     
     handshake(@request).should succeed_with_upgrade(@response)
   end
+
+  it "should fail if the request URI is invalid" do
+    @request[:path] = "/%"
+    handshake(@request).should \
+      fail_with_error(EM::WebSocket::HandshakeError, 'Invalid request URI: /%')
+  end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-websocket
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+  version: 0.5.1
 platform: ruby
 authors:
 - Ilya Grigorik
@@ -10,120 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.9
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
-- !ruby/object:Gem::Dependency
-  name: em-spec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.6
-- !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: em-http-request
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.6
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.12.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.12.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
 description: EventMachine based WebSocket server
 email:
 - ilya@igvita.com
@@ -132,7 +47,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.rdoc
 - Gemfile
 - README.md
@@ -180,39 +95,33 @@ files:
 - spec/integration/draft13_spec.rb
 - spec/integration/draft75_spec.rb
 - spec/integration/draft76_spec.rb
+- spec/integration/gte_03_examples.rb
 - spec/integration/shared_examples.rb
 - spec/unit/framing_spec.rb
 - spec/unit/handshake_spec.rb
 - spec/unit/masking_spec.rb
 homepage: http://github.com/igrigorik/em-websocket
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3271699693430314189
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3271699693430314189
 requirements: []
 rubyforge_project: em-websocket
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: EventMachine based WebSocket server
 test_files:
 - spec/helper.rb
@@ -223,6 +132,7 @@ test_files:
 - spec/integration/draft13_spec.rb
 - spec/integration/draft75_spec.rb
 - spec/integration/draft76_spec.rb
+- spec/integration/gte_03_examples.rb
 - spec/integration/shared_examples.rb
 - spec/unit/framing_spec.rb
 - spec/unit/handshake_spec.rb