Hello community, here is the log from the commit of package rubygem-websocket for openSUSE:Factory checked in at 2015-04-25 09:53:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-websocket (Old) and /work/SRC/openSUSE:Factory/.rubygem-websocket.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-websocket" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-websocket/rubygem-websocket.changes 2015-02-11 16:45:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-websocket.new/rubygem-websocket.changes 2015-04-25 11:25:42.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Apr 23 08:09:36 UTC 2015 - [email protected] + +- updated to version 1.2.2 + see installed CHANGELOG.md + + ## 1.2.2 + + - fix handshake for draft 11+ sending Sec-WebSocket-Origin instead of Origin + +------------------------------------------------------------------- Old: ---- websocket-1.2.1.gem New: ---- websocket-1.2.2.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-websocket.spec ++++++ --- /var/tmp/diff_new_pack.6vfWKj/_old 2015-04-25 11:25:43.000000000 +0200 +++ /var/tmp/diff_new_pack.6vfWKj/_new 2015-04-25 11:25:43.000000000 +0200 @@ -24,7 +24,7 @@ # Name: rubygem-websocket -Version: 1.2.1 +Version: 1.2.2 Release: 0 %define mod_name websocket %define mod_full_name %{mod_name}-%{version} ++++++ websocket-1.2.1.gem -> websocket-1.2.2.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/.travis.yml new/.travis.yml --- old/.travis.yml 2014-09-02 11:36:26.000000000 +0200 +++ new/.travis.yml 2015-04-17 09:42:09.000000000 +0200 @@ -2,9 +2,9 @@ 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHANGELOG.md new/CHANGELOG.md --- old/CHANGELOG.md 2014-09-02 11:36:26.000000000 +0200 +++ new/CHANGELOG.md 2015-04-17 09:42:09.000000000 +0200 @@ -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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/README.md new/README.md --- old/README.md 2014-09-02 11:36:26.000000000 +0200 +++ new/README.md 2015-04-17 09:42:09.000000000 +0200 @@ -40,7 +40,7 @@ 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 @@ # 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== Files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/websocket/handshake/client.rb new/lib/websocket/handshake/client.rb --- old/lib/websocket/handshake/client.rb 2014-09-02 11:36:26.000000000 +0200 +++ new/lib/websocket/handshake/client.rb 2015-04-17 09:42:09.000000000 +0200 @@ -12,7 +12,7 @@ # # 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 @@ 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/websocket/handshake/handler/client11.rb new/lib/websocket/handshake/handler/client11.rb --- old/lib/websocket/handshake/handler/client11.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/lib/websocket/handshake/handler/client11.rb 2015-04-17 09:42:09.000000000 +0200 @@ -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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/websocket/handshake/handler.rb new/lib/websocket/handshake/handler.rb --- old/lib/websocket/handshake/handler.rb 2014-09-02 11:36:26.000000000 +0200 +++ new/lib/websocket/handshake/handler.rb 2015-04-17 09:42:09.000000000 +0200 @@ -7,6 +7,7 @@ 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" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/websocket/handshake/server.rb new/lib/websocket/handshake/server.rb --- old/lib/websocket/handshake/server.rb 2014-09-02 11:36:26.000000000 +0200 +++ new/lib/websocket/handshake/server.rb 2015-04-17 09:42:09.000000000 +0200 @@ -11,7 +11,7 @@ # 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 @@ # 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 @@ @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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/websocket/version.rb new/lib/websocket/version.rb --- old/lib/websocket/version.rb 2014-09-02 11:36:26.000000000 +0200 +++ new/lib/websocket/version.rb 2015-04-17 09:42:09.000000000 +0200 @@ -1,3 +1,3 @@ module WebSocket - VERSION = '1.2.1' + VERSION = '1.2.2' end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2014-09-02 11:36:26.000000000 +0200 +++ new/metadata 2015-04-17 09:42:09.000000000 +0200 @@ -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 @@ - 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 @@ - 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 @@ - 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 @@ 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 @@ - 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/handshake/client_11_spec.rb new/spec/handshake/client_11_spec.rb --- old/spec/handshake/client_11_spec.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/spec/handshake/client_11_spec.rb 2015-04-17 09:42:09.000000000 +0200 @@ -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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/support/handshake_requests.rb new/spec/support/handshake_requests.rb --- old/spec/support/handshake_requests.rb 2014-09-02 11:36:26.000000000 +0200 +++ new/spec/support/handshake_requests.rb 2015-04-17 09:42:09.000000000 +0200 @@ -70,3 +70,20 @@ \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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/websocket.gemspec new/websocket.gemspec --- old/websocket.gemspec 2014-09-02 11:36:26.000000000 +0200 +++ new/websocket.gemspec 2015-04-17 09:42:09.000000000 +0200 @@ -9,8 +9,9 @@ s.authors = ["Bernard Potocki"] s.email = ["[email protected]"] 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")
