websocket 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd819fd576b9bc42e42b888bf9407c20e1557d62
-  data.tar.gz: b5a0b3732a0058688c3d2121833dd4909b5d9371
+  metadata.gz: 3d5e949888cd78a33c1418916aa773e1408a9302
+  data.tar.gz: d74a71f238b56bf1711dd7b117cde1d3cf5bc037
 SHA512:
-  metadata.gz: ba657ffa0c0efe8cfbdca9fa5b229bb8aba86eda86a37eca0d7511695a42008e86c18ad8e89280773a97212ad1b08b3b811bdf9219974f1205c6effb1f9d5c90
-  data.tar.gz: 6ed217acb30fd88f14b7007a4df1e4534f7d0f01057c450ed463fe7cdaa94023d2de51ba8c373bc6f383e13e07bacecea731ee079d7102cc7b351d01c26f1049
+  metadata.gz: 5a7e71df6d11c0fc817d094845dd059a0d2ec00586f7373a714bde6d3ee9dbf15e27ecbb94c00aef039f2fc85da34933b21110d767429a8aa2bce35cb192cd9f
+  data.tar.gz: 48e22828b858a469f179bcf08ecc8acbc427f6f863e1cf38a3ca3e5b36a9a4c06a93a72b024e6dd5b7f1b11864cb6abefbef6334c7f789cfbe1451e766c0a0ed

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.1.4
+
+- verify valid close codes according to spec
+- return error on invalid UTF-8 payload
+- expose error message
+
 ## 1.1.3
 
 - fix close code support

data/lib/websocket/error.rb

@@ -47,6 +47,10 @@ module WebSocket
         def message; :unknown_opcode; end
       end
 
+      class UnknownCloseCode < ::WebSocket::Error::Frame
+        def message; :unknown_close_code; end
+      end
+
       class UnknownVersion < ::WebSocket::Error::Frame
         def message; :unknown_protocol_version; end
       end

data/lib/websocket/frame/base.rb

@@ -4,7 +4,7 @@ module WebSocket
     class Base
       include ExceptionHandler
 
-      attr_reader :type, :version
+      attr_reader :type, :version, :error
       attr_accessor :data, :code
 
       # Initialize frame

data/lib/websocket/frame/handler/handler07.rb

@@ -21,6 +21,7 @@ module WebSocket
         def encode_frame
           if @frame.type == :close
             code = @frame.code || 1000
+            raise WebSocket::Error::Frame::UnknownCloseCode unless valid_code?(code)
             @frame.data = Data.new([code].pack('n') + @frame.data.to_s)
             @frame.code = nil
           end
@@ -32,12 +33,26 @@ module WebSocket
           if has_close_code?(result)
             code = result.data.slice!(0..1)
             result.code = code.unpack('n').first
+            raise WebSocket::Error::Frame::UnknownCloseCode unless valid_code?(result.code)
+            raise WebSocket::Error::Frame::InvalidPayloadEncoding unless valid_encoding?(result.data)
           end
           result
         end
 
         private
 
+        def valid_code?(code)
+          [1000,1001,1002,1003,1007,1008,1009,1010,1011].include?(code) || (3000..4999).include?(code)
+        end
+
+        def valid_encoding?(data)
+          return true if data.nil? || !data.respond_to?(:encode)
+          data.encode('UTF-8')
+          true
+        rescue
+          false
+        end
+
         def has_close_code?(frame)
           frame && frame.type == :close && !frame.data.empty?
         end

data/lib/websocket/version.rb

@@ -1,3 +1,3 @@
 module WebSocket
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
 end

data/spec/frame/incoming_07_spec.rb

@@ -21,6 +21,22 @@ describe 'Incoming frame draft 07' do
     it_should_behave_like 'valid_incoming_frame'
   end
 
+  context "should raise error with invalid close code" do
+    let(:encoded_text) { "\x88\x07\x03\xEDHello" }
+    let(:decoded_text) { nil }
+    let(:error) { WebSocket::Error::Frame::UnknownCloseCode }
+
+    it_should_behave_like 'valid_incoming_frame'
+  end
+
+  context "should properly decode close frame with invalid UTF-8 message" do
+    let(:encoded_text) { "\x88\x03\x03\xE8\xE3" }
+    let(:decoded_text) { nil }
+    let(:error) { WebSocket::Error::Frame::InvalidPayloadEncoding }
+
+    it_should_behave_like 'valid_incoming_frame'
+  end
+
   context "should properly decode ping frame" do
     let(:encoded_text) { "\x89\x05" + decoded_text }
     let(:frame_type) { :ping }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: websocket
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Bernard Potocki