websocket-driver 0.3.3-java → 0.3.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71d2ed02ffe991eaaf9791b5c82e7aafb0e53c85
-  data.tar.gz: a534e7f241320d24d535835616bed14016d15de4
+  metadata.gz: a95faba3e6a6ba244a0fdb087f48f709b546b40e
+  data.tar.gz: 68e765d5b8dbca5b77a82818fb8ee891fee11b54
 SHA512:
-  metadata.gz: 16a8b8bc4b8cc384574f8675381f2f6bd5fd71ac9c387ba93b65f175dc9680e18aad85f897e39f771e79db4e3b56a96bf96cb15ba1ff10a61e82b7f6bcee0431
-  data.tar.gz: 5251701e7f6493a3077855d35e827046334f2c67cbaa09dcedc1e703c271597809cff8ab030c7570235f559894ac2b60353001d4b61148f69608f9d1624b6513
+  metadata.gz: 3f43b4a03042db308914fc58c2e5dfc27ef511c3978886364d0ff84e0e6d1b22c230676bc1728d2ce4ade0e823f9bbf363f4be952fc9c4931c814fd08f417354
+  data.tar.gz: 2f0b1b1d51722b04e6e43e37f125a3eab3a40cc3e1741d9565a664371319911d526b9143965efbd88413f54c07c9b78fc105cd7be1f0deb87c553d505cabd7f6

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 0.3.4 / 2014-07-06
+
+* Don't hold references to frame buffers after a message has been emitted
+* Make sure that `protocol` and `version` are exposed properly by the TCP driver
+* Correct HTTP header parsing based on RFC 7230; header names cannot contain backslashes
+
 ### 0.3.3 / 2014-04-24
 
 * Fix problems with loading C and Java native extension code
@@ -45,4 +51,3 @@
 * First release
 * Proof of concept for people to try out
 * Might be unstable
-

data/README.md

@@ -327,4 +327,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-

data/examples/tcp_server.rb

@@ -24,4 +24,3 @@ end
 EM.run {
   EM.start_server('127.0.0.1', ARGV[0], Connection)
 }
-

data/ext/websocket-driver/WebsocketMaskService.java

@@ -39,6 +39,10 @@ public class WebsocketMaskService implements BasicLibraryService {
 
     @JRubyMethod
     public IRubyObject mask(ThreadContext context, IRubyObject payload, IRubyObject mask) {
+      if (mask.isNil() || ((RubyArray)mask).getLength() == 0) {
+        return payload;
+      }
+
       int n = ((RubyArray)payload).getLength(), i;
       long p, m;
       RubyArray unmasked = RubyArray.newArray(runtime, n);

data/ext/websocket-driver/extconf.rb

@@ -2,4 +2,3 @@ require 'mkmf'
 extension_name = 'websocket_mask'
 dir_config(extension_name)
 create_makefile(extension_name)
-

data/ext/websocket-driver/websocket_mask.c

@@ -13,6 +13,10 @@ void Init_websocket_mask() {
 }
 
 VALUE method_websocket_mask(VALUE self, VALUE payload, VALUE mask) {
+  if (mask == Qnil || RARRAY_LEN(mask) == 0) {
+    return payload;
+  }
+
   int n = RARRAY_LEN(payload), i, p, m;
   VALUE unmasked = rb_ary_new2(n);
 
@@ -30,4 +34,3 @@ VALUE method_websocket_mask(VALUE self, VALUE payload, VALUE mask) {
   }
   return unmasked;
 }
-

data/lib/websocket/driver.rb

@@ -170,7 +170,6 @@ module WebSocket
     end
 
     def self.websocket?(env)
-      return false unless env['REQUEST_METHOD'] == 'GET'
       connection = env['HTTP_CONNECTION'] || ''
       upgrade    = env['HTTP_UPGRADE']    || ''
 
@@ -181,4 +180,3 @@ module WebSocket
 
   end
 end
-

data/lib/websocket/driver/client.rb

@@ -114,4 +114,3 @@ module WebSocket
 
   end
 end
-

data/lib/websocket/driver/draft75.rb

@@ -98,4 +98,3 @@ module WebSocket
 
   end
 end
-

data/lib/websocket/driver/draft76.rb

@@ -95,4 +95,3 @@ module WebSocket
 
   end
 end
-

data/lib/websocket/driver/event_emitter.rb

@@ -44,4 +44,3 @@ module WebSocket
 
   end
 end
-

data/lib/websocket/driver/headers.rb

@@ -39,4 +39,3 @@ module WebSocket
 
   end
 end
-

data/lib/websocket/driver/hybi.rb

@@ -52,14 +52,20 @@ module WebSocket
         super
         reset
 
-        @reader    = StreamReader.new
-        @stage     = 0
-        @masking   = options[:masking]
-        @protocols = options[:protocols] || []
-        @protocols = @protocols.strip.split(/\s*,\s*/) if String === @protocols
-
+        @reader          = StreamReader.new
+        @stage           = 0
+        @masking         = options[:masking]
+        @protocols       = options[:protocols] || []
+        @protocols       = @protocols.strip.split(/\s*,\s*/) if String === @protocols
         @require_masking = options[:require_masking]
         @ping_callbacks  = {}
+
+        return unless @socket.respond_to?(:env)
+
+        if protos = @socket.env['HTTP_SEC_WEBSOCKET_PROTOCOL']
+          protos = protos.split(/\s*,\s*/) if String === protos
+          @protocol = protos.find { |p| @protocols.include?(p) }
+        end
       end
 
       def version
@@ -95,7 +101,7 @@ module WebSocket
               buffer = @reader.read(@length)
               if buffer
                 @payload = buffer
-                emit_frame
+                emit_frame(buffer)
                 @stage = 0
               end
 
@@ -195,25 +201,15 @@ module WebSocket
         sec_key = @socket.env['HTTP_SEC_WEBSOCKET_KEY']
         return '' unless String === sec_key
 
-        accept    = Hybi.generate_accept(sec_key)
-        protos    = @socket.env['HTTP_SEC_WEBSOCKET_PROTOCOL']
-        supported = @protocols
-        proto     = nil
-
         headers = [
           "HTTP/1.1 101 Switching Protocols",
           "Upgrade: websocket",
           "Connection: Upgrade",
-          "Sec-WebSocket-Accept: #{accept}"
+          "Sec-WebSocket-Accept: #{Hybi.generate_accept(sec_key)}"
         ]
 
-        if protos
-          protos = protos.split(/\s*,\s*/) if String === protos
-          proto = protos.find { |p| supported.include?(p) }
-          if proto
-            @protocol = proto
-            headers << "Sec-WebSocket-Protocol: #{proto}"
-          end
+        if @protocol
+          headers << "Sec-WebSocket-Protocol: #{@protocol}"
         end
 
         (headers + [@headers.to_s, '']).join("\r\n")
@@ -243,8 +239,6 @@ module WebSocket
 
         @final   = (data & FIN) == FIN
         @opcode  = (data & OPCODE)
-        @mask    = []
-        @payload = []
 
         unless OPCODES.values.include?(@opcode)
           return fail(:protocol_error, "Unrecognized frame opcode: #{@opcode}")
@@ -299,14 +293,18 @@ module WebSocket
         end
       end
 
-      def emit_frame
-        payload = @masked ? Mask.mask(@payload, @mask) : @payload
+      def emit_frame(buffer)
+        payload  = Mask.mask(buffer, @mask)
+        is_final = @final
+        opcode   = @opcode
 
-        case @opcode
+        @final = @opcode = @length = @length_size = @masked = @mask = nil
+
+        case opcode
           when OPCODES[:continuation] then
             return fail(:protocol_error, 'Received unexpected continuation frame') unless @mode
             @buffer.concat(payload)
-            if @final
+            if is_final
               message = @buffer
               message = Driver.encode(message, :utf8) if @mode == :text
               reset
@@ -318,7 +316,7 @@ module WebSocket
             end
 
           when OPCODES[:text] then
-            if @final
+            if is_final
               message = Driver.encode(payload, :utf8)
               if message
                 emit(:message, MessageEvent.new(message))
@@ -331,7 +329,7 @@ module WebSocket
             end
 
           when OPCODES[:binary] then
-            if @final
+            if is_final
               emit(:message, MessageEvent.new(payload))
             else
               @mode = :binary
@@ -383,4 +381,3 @@ module WebSocket
 
   end
 end
-

data/lib/websocket/driver/hybi/stream_reader.rb

@@ -27,4 +27,3 @@ module WebSocket
 
   end
 end
-

data/lib/websocket/driver/server.rb

@@ -33,6 +33,12 @@ module WebSocket
         end
       end
 
+      %w[protocol version].each do |method|
+        define_method(method) do
+          @delegate && @delegate.__send__(method)
+        end
+      end
+
       def parse(buffer)
         return @delegate.parse(buffer) if @delegate
 
@@ -70,4 +76,3 @@ module WebSocket
 
   end
 end
-

data/lib/websocket/driver/utf8_match.rb

@@ -4,4 +4,3 @@ module WebSocket
     UTF8_MATCH = /^([\x00-\x7F]|[\xC2-\xDF][\x80-\xBF]|\xE0[\xA0-\xBF][\x80-\xBF]|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}|\xED[\x80-\x9F][\x80-\xBF]|\xF0[\x90-\xBF][\x80-\xBF]{2}|[\xF1-\xF3][\x80-\xBF]{3}|\xF4[\x80-\x8F][\x80-\xBF]{2})*$/
   end
 end
-

data/lib/websocket/http.rb

@@ -13,4 +13,3 @@ module WebSocket
 
   end
 end
-

data/lib/websocket/http/headers.rb

@@ -6,7 +6,34 @@ module WebSocket
       CR = 0x0D
       LF = 0x0A
 
-      HEADER_LINE = /^([!#\$%&'\*\+\-\.\\\^_`\|~0-9a-z]+):\s*([\x20-\x7e]*?)\s*$/i
+      # RFC 2616 grammar rules:
+      #
+      #       CHAR           = <any US-ASCII character (octets 0 - 127)>
+      #
+      #       CTL            = <any US-ASCII control character
+      #                        (octets 0 - 31) and DEL (127)>
+      #
+      #       SP             = <US-ASCII SP, space (32)>
+      #
+      #       HT             = <US-ASCII HT, horizontal-tab (9)>
+      #
+      #       token          = 1*<any CHAR except CTLs or separators>
+      #
+      #       separators     = "(" | ")" | "<" | ">" | "@"
+      #                      | "," | ";" | ":" | "\" | <">
+      #                      | "/" | "[" | "]" | "?" | "="
+      #                      | "{" | "}" | SP | HT
+      #
+      # Or, as redefined in RFC 7230:
+      #
+      #       token          = 1*tchar
+      #
+      #       tchar          = "!" / "#" / "$" / "%" / "&" / "'" / "*"
+      #                      / "+" / "-" / "." / "^" / "_" / "`" / "|" / "~"
+      #                      / DIGIT / ALPHA
+      #                      ; any VCHAR, except delimiters
+
+      HEADER_LINE = /^([!#\$%&'\*\+\-\.\^_`\|~0-9a-z]+):\s*([\x20-\x7e]*?)\s*$/i
 
       attr_reader :headers
 
@@ -74,4 +101,3 @@ module WebSocket
 
   end
 end
-

data/lib/websocket/http/request.rb

@@ -43,4 +43,3 @@ module WebSocket
 
   end
 end
-

data/lib/websocket/http/response.rb

@@ -27,4 +27,3 @@ module WebSocket
 
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: websocket-driver
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: java
 authors:
 - James Coglan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine