websocket 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1abaa63e74cec12f6ac238b27501082a869a80e9
-  data.tar.gz: ff59280d0bb38c24bed57aca2b32b312770ec52d
+  metadata.gz: 7ca690c7a42466b8cb035271b77010bdc7bf8a19
+  data.tar.gz: 206ca9afa7b5606cb08b85ef66a8f186342d37b3
 SHA512:
-  metadata.gz: 4e55e294a520f621923af31e70c6f919fc8da3b84d86a312cfc3aa581415a8123a587891732429140fe7b3e7718ad997baa9bd33b4448b268e4a2af3b44c88a2
-  data.tar.gz: f083f50a27c58a4065cd685d5906186cd07d35da5f6577a1d14dd0b36cd21f287a012b5faef818bd9345331d4d91ed1367bdcdb97c58a0029d27f7c5d435bb54
+  metadata.gz: 6b846fa2663e5f85415adc35e2aa39e0e7b21f844b444546c432a6b630c79d4aa4aabf5dbaf996c6334b80e1296b81a35a0935a51a9d0cfa55d6a748fb1762b7
+  data.tar.gz: cbf090a638401a094b7432f7a634ba7bc2f8fcd77b06e0407a8d2490f3236858368d619a6acf17296a715824c239b1c51beb5577597af91133e6c6472338c659

data/.travis.yml

@@ -2,9 +2,9 @@ language: ruby
 script: "bundle exec rake spec"
 rvm:
   - 1.9.3
-  - 2.0.0
-  - 2.1.1
-  - 2.1.2
+  - 2.0
+  - 2.1
+  - 2.2
   - rbx-2
   - jruby-19mode
   - ruby-head

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.2.2
+
+- fix handshake for draft 11+ sending Sec-WebSocket-Origin instead of Origin
+
 ## 1.2.1
 
 - fix error for draft 76 when leftovers are empty

data/README.md

@@ -40,7 +40,7 @@ GET /demo HTTP/1.1\r
 Upgrade: websocket\r
 Connection: Upgrade\r
 Host: example.com\r
-Sec-WebSocket-Origin: http://example.com\r
+Origin: http://example.com\r
 Sec-WebSocket-Version: 13\r
 Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r
 \r
@@ -70,7 +70,7 @@ EOF
                 # Connection: Upgrade
                 # Host: example.com
                 # Cookie: SESSIONID=1234
-                # Sec-WebSocket-Origin: http://example.com
+                # Origin: http://example.com
                 # Sec-WebSocket-Version: 13
                 # Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
 

data/lib/websocket/handshake/client.rb

@@ -12,7 +12,7 @@ module WebSocket
     #                   # Upgrade: websocket
     #                   # Connection: Upgrade
     #                   # Host: example.com
-    #                   # Sec-WebSocket-Origin: http://example.com
+    #                   # Origin: http://example.com
     #                   # Sec-WebSocket-Version: 13
     #                   # Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
     #
@@ -117,7 +117,8 @@ module WebSocket
           when 75 then Handler::Client75.new(self)
           when 76, 0 then Handler::Client76.new(self)
           when 1..3  then Handler::Client01.new(self)
-          when 4..13 then Handler::Client04.new(self)
+          when 4..10 then Handler::Client04.new(self)
+          when 11..17 then Handler::Client11.new(self)
           else raise WebSocket::Error::Handshake::UnknownVersion
         end
       end

data/lib/websocket/handshake/handler.rb

@@ -7,6 +7,7 @@ module WebSocket
       autoload :Client,   "#{::WebSocket::ROOT}/websocket/handshake/handler/client"
       autoload :Client01, "#{::WebSocket::ROOT}/websocket/handshake/handler/client01"
       autoload :Client04, "#{::WebSocket::ROOT}/websocket/handshake/handler/client04"
+      autoload :Client11, "#{::WebSocket::ROOT}/websocket/handshake/handler/client11"
       autoload :Client75, "#{::WebSocket::ROOT}/websocket/handshake/handler/client75"
       autoload :Client76, "#{::WebSocket::ROOT}/websocket/handshake/handler/client76"
 

data/lib/websocket/handshake/handler/client11.rb

@@ -0,0 +1,22 @@
+module WebSocket
+  module Handshake
+    module Handler
+      class Client11 < Client04
+
+        private
+
+        # @see WebSocket::Handshake::Handler::Base#handshake_keys
+        def handshake_keys
+          super.collect do |key_pair|
+            if key_pair[0] == 'Sec-WebSocket-Origin'
+              ['Origin', key_pair[1]]
+            else
+              key_pair
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/websocket/handshake/server.rb

@@ -11,7 +11,7 @@ module WebSocket
     #   Upgrade: websocket\r
     #   Connection: Upgrade\r
     #   Host: example.com\r
-    #   Sec-WebSocket-Origin: http://example.com\r
+    #   Origin: http://example.com\r
     #   Sec-WebSocket-Version: 13\r
     #   Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r
     #   \r
@@ -54,7 +54,7 @@ module WebSocket
       #   Upgrade: websocket
       #   Connection: Upgrade
       #   Host: example.com
-      #   Sec-WebSocket-Origin: http://example.com
+      #   Origin: http://example.com
       #   Sec-WebSocket-Version: 13
       #   Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
       #
@@ -156,7 +156,7 @@ module WebSocket
         @handler = case @version
           when 75 then Handler::Server75.new(self)
           when 76, 0..3 then Handler::Server76.new(self)
-          when 4..13 then Handler::Server04.new(self)
+          when 4..17 then Handler::Server04.new(self)
           else raise WebSocket::Error::Handshake::UnknownVersion
         end
       end

data/lib/websocket/version.rb

@@ -1,3 +1,3 @@
 module WebSocket
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

data/spec/handshake/client_11_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+RSpec.describe 'Client draft 11 handshake' do
+  let(:handshake) { WebSocket::Handshake::Client.new({ uri: 'ws://example.com/demo', origin: 'http://example.com', version: version }.merge(@request_params || {})) }
+
+  let(:version) { 11 }
+  let(:client_request) { client_handshake_11({ key: handshake.handler.send(:key), version: version }.merge(@request_params || {})) }
+  let(:server_response) { server_handshake_11({ accept: handshake.handler.send(:accept) }.merge(@request_params || {})) }
+
+  it_should_behave_like 'all client drafts'
+
+  it 'should disallow client with invalid challenge' do
+    @request_params = { accept: 'invalid' }
+    handshake << server_response
+
+    expect(handshake).to be_finished
+    expect(handshake).not_to be_valid
+    expect(handshake.error).to eql(:invalid_handshake_authentication)
+  end
+end

data/spec/support/handshake_requests.rb

@@ -70,3 +70,20 @@ Sec-WebSocket-Accept: #{args[:accept] || 's3pPLMBiTxaQ9kYGzzhZRbK+xOo='}\r
 \r
   EOF
 end
+
+def client_handshake_11(args = {})
+  <<-EOF
+GET #{args[:path] || '/demo'}#{"?#{args[:query]}" if args[:query]} HTTP/1.1\r
+Upgrade: websocket\r
+Connection: Upgrade\r
+Host: #{args[:host] || 'example.com'}#{":#{args[:port]}" if args[:port]}\r
+#{(args[:headers] || {}).map{|key, value| "#{key}: #{value}\r\n"}.join('')}Origin: http://example.com\r
+Sec-WebSocket-Version: #{args[:version] || '4'}\r
+Sec-WebSocket-Key: #{args[:key] || 'dGhlIHNhbXBsZSBub25jZQ=='}\r
+\r
+  EOF
+end
+
+def server_handshake_11(args = {})
+  server_handshake_04(args)
+end

data/websocket.gemspec

@@ -9,8 +9,9 @@ Gem::Specification.new do |s|
   s.authors     = ["Bernard Potocki"]
   s.email       = ["bernard.potocki@imanel.org"]
   s.homepage    = "http://github.com/imanel/websocket-ruby"
-  s.summary     = %q{Universal Ruby library to handle WebSocket protocol}
-  s.description = %q{Universal Ruby library to handle WebSocket protocol}
+  s.summary     = "Universal Ruby library to handle WebSocket protocol"
+  s.description = "Universal Ruby library to handle WebSocket protocol"
+  s.license     = "MIT"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: websocket
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Bernard Potocki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-02 00:00:00.000000000 Z
+date: 2015-04-17 00:00:00.000000000 Z
 dependencies: []
 description: Universal Ruby library to handle WebSocket protocol
 email:
@@ -50,6 +50,7 @@ files:
 - lib/websocket/handshake/handler/client.rb
 - lib/websocket/handshake/handler/client01.rb
 - lib/websocket/handshake/handler/client04.rb
+- lib/websocket/handshake/handler/client11.rb
 - lib/websocket/handshake/handler/client75.rb
 - lib/websocket/handshake/handler/client76.rb
 - lib/websocket/handshake/handler/server.rb
@@ -72,6 +73,7 @@ files:
 - spec/frame/outgoing_75_spec.rb
 - spec/frame/outgoing_common_spec.rb
 - spec/handshake/client_04_spec.rb
+- spec/handshake/client_11_spec.rb
 - spec/handshake/client_75_spec.rb
 - spec/handshake/client_76_spec.rb
 - spec/handshake/server_04_spec.rb
@@ -87,7 +89,8 @@ files:
 - spec/support/overwrites.rb
 - websocket.gemspec
 homepage: http://github.com/imanel/websocket-ruby
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -105,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Universal Ruby library to handle WebSocket protocol
@@ -124,6 +127,7 @@ test_files:
 - spec/frame/outgoing_75_spec.rb
 - spec/frame/outgoing_common_spec.rb
 - spec/handshake/client_04_spec.rb
+- spec/handshake/client_11_spec.rb
 - spec/handshake/client_75_spec.rb
 - spec/handshake/client_76_spec.rb
 - spec/handshake/server_04_spec.rb