midori.rb 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6d14d7e6c7a05f01d72029dc8d09ad83c37328d392d8c745b938025181d9812
-  data.tar.gz: dc2d8754f72ff25354f33fd0a15a0e23a1617eaa4a82ec94b21f9e47b2ed5eda
+  metadata.gz: 2adfa1f5075c05406725691e2e254c7ac1e0f3ff9aba2e8787d9567323681654
+  data.tar.gz: f6f22a1df53862dbc956f53b188a7e4b023c6ef85e58f879c4fcdaefb0539e38
 SHA512:
-  metadata.gz: 0f4bf5b25cb38d3f5b8cf2a8f685956086d920ccc9cee3c838cc1fc3a94c1e482576f193d4d6c03505104b32d403a959da924e7243105f87b5faebc5d2d17b3e
-  data.tar.gz: cc1e70247c020875415d73e2bba4190c9f33c3ad52dacff0574eb89b5a6f3e1ee2c68efbbd330e4af83e9b86270d64fb26ac27133a30a8ebe68ed0cbbfbffd07
+  metadata.gz: ab4f42932ef1851b8529c6eaa3d3a10d8a21cdd97e3702e94717a0bb8076ab981cd352d275e700f93203f4c790b75993b066e7c59f6b2c4fa6aa39f5479bd210
+  data.tar.gz: cab7f16b86eaa3e532ab5d40265e057c7b998d4122d002db14690e78e243191c2888795a77364a45bcd3112f6524ef194e71eb239b44026831a4ce789dd5381b

data/ext/midori/websocket.c

@@ -2,57 +2,85 @@
 #include <ruby/encoding.h>
 
 VALUE Midori = Qnil;
+VALUE MidoriException = Qnil;
 VALUE MidoriWebSocket = Qnil;
 
+VALUE ContinousFrameException = Qnil;
+VALUE OpCodeException = Qnil;
+VALUE NotMaskedException = Qnil;
+
 void Init_midori_ext();
-VALUE method_midori_websocket_mask(VALUE self, VALUE payload, VALUE mask);
-VALUE method_midori_websocket_mask_str(VALUE self, VALUE payload, VALUE mask);
+VALUE method_midori_websocket_decode(VALUE self, VALUE data);
 
 void Init_midori_ext()
 {
   Midori = rb_define_module("Midori");
   MidoriWebSocket = rb_define_class_under(Midori, "WebSocket", rb_cObject);
-  rb_define_protected_method(MidoriWebSocket, "mask", method_midori_websocket_mask, 2);
-  rb_define_protected_method(MidoriWebSocket, "mask_str", method_midori_websocket_mask_str, 2);
+  MidoriException = rb_define_module_under(Midori, "Exception");
+  ContinousFrameException = rb_const_get(MidoriException, rb_intern("ContinuousFrame"));
+  OpCodeException = rb_const_get(MidoriException, rb_intern("OpCodeError"));
+  NotMaskedException = rb_const_get(MidoriException, rb_intern("NotMasked"));
+  rb_define_method(MidoriWebSocket, "decode", method_midori_websocket_decode, 1);
 }
 
-VALUE method_midori_websocket_mask(VALUE self, VALUE payload, VALUE mask)
+VALUE method_midori_websocket_decode(VALUE self, VALUE data)
 {
-  long n = RARRAY_LEN(payload), i, p, m;
-  VALUE unmasked = rb_ary_new2(n);
+  int byte, opcode, i, n, fin;
+  char *result;
+  int *mask_array;
+  ID getbyte = rb_intern("getbyte");
+  ID close = rb_intern("close");
 
-  int mask_array[] = {
-      NUM2INT(rb_ary_entry(mask, 0)),
-      NUM2INT(rb_ary_entry(mask, 1)),
-      NUM2INT(rb_ary_entry(mask, 2)),
-      NUM2INT(rb_ary_entry(mask, 3))};
+  byte = NUM2INT(rb_funcall(data, getbyte, 0));
+  fin = byte & 0x80;
+  opcode = byte & 0x0f;
 
-  for (i = 0; i < n; i++)
+  if (fin != 0x80)
+    rb_raise(ContinousFrameException, "Continous Frame hasn't been implemented yet");
+
+  rb_iv_set(self, "@opcode", INT2NUM(opcode));
+  if (opcode != 0x1 && opcode != 0x2 && opcode != 0x8 && opcode != 0x9 && opcode != 0xA)
+    rb_raise(OpCodeException, "OpCode %d not supported", opcode);
+
+  if (opcode == 0x8)
   {
-    p = NUM2INT(rb_ary_entry(payload, i));
-    m = mask_array[i % 4];
-    rb_ary_store(unmasked, i, INT2NUM(p ^ m));
+    rb_funcall(self, close, 0);
   }
-  return unmasked;
-}
 
-VALUE method_midori_websocket_mask_str(VALUE self, VALUE payload, VALUE mask)
-{
-  long n = RARRAY_LEN(payload), i, p, m;
-  char result[n];
+  byte = NUM2INT(rb_funcall(data, getbyte, 0));
+  if ((byte & 0x80) != 0x80)
+  {
+    rb_raise(NotMaskedException, "Messages from client MUST be masked");
+  }
 
-  int mask_array[] = {
-      NUM2INT(rb_ary_entry(mask, 0)),
-      NUM2INT(rb_ary_entry(mask, 1)),
-      NUM2INT(rb_ary_entry(mask, 2)),
-      NUM2INT(rb_ary_entry(mask, 3))};
+  n = byte & 0x7f;
+  result = (char *)xmalloc(n);
+  mask_array = (int *)xmalloc(4);
+
+  for (i = 0; i < 4; i++) {
+    mask_array[i] = NUM2INT(rb_funcall(data, getbyte, 0));
+  }
 
   for (i = 0; i < n; i++)
   {
-    p = NUM2INT(rb_ary_entry(payload, i));
-    m = mask_array[i % 4];
-    result[i] = p ^ m;
+    result[i] = NUM2INT(rb_funcall(data, getbyte, 0)) ^ mask_array[i % 4];
+  }
+
+  if (opcode == 0x1 || opcode == 0x9 || opcode == 0xA)
+  {
+    rb_iv_set(self, "@msg", rb_enc_str_new(result, n, rb_utf8_encoding()));
+  }
+  else
+  {
+    VALUE result_arr = rb_ary_new2(n);
+    for (i = 0; i < n; i++)
+    {
+      rb_ary_store(result_arr, i, INT2NUM(result[i]));
+    }
+    rb_iv_set(self, "@msg", result_arr);
   }
 
-  return rb_enc_str_new(result, n, rb_utf8_encoding());
+  xfree(mask_array);
+  xfree(result);
+  return Qnil;
 }

data/lib/midori.rb

@@ -3,12 +3,11 @@ require 'digest/sha1'
 require 'stringio'
 require 'fiber'
 require 'logger'
-require 'http/parser'
+require 'mizu'
 require 'mustermann'
 require 'murasaki'
 require 'socket'
 
-require_relative 'midori_ext'
 require_relative 'midori/core_ext/configurable'
 require_relative 'midori/core_ext/define_class'
 require_relative 'midori/core_ext/http_header'
@@ -37,3 +36,4 @@ require_relative 'midori/configure'
 require_relative 'midori/runner'
 require_relative 'midori/logger'
 
+require_relative 'midori_ext'

data/lib/midori/eventsource.rb

@@ -14,6 +14,7 @@ class Midori::EventSource
   # @param [String] data data to be sent
   def send(data)
     raise Midori::Exception::EventSourceTypeError unless data.is_a? String
+    # TODO: implement envents by standard
     @connection.send_data(data.split("\n").map {|str| "data: #{str}\n"}.join + "\n")
     @connection.close_connection_after_writing
   end

data/lib/midori/request.rb

@@ -26,15 +26,15 @@ class Midori::Request
     @body_parsed = false
     @is_websocket = false
     @is_eventsource = false
-    @parser = Http::Parser.new
+    @parser = Mizu::Parser.new
     @params = {}
     @query_params = Hash.new(Array.new)
     @cookie = {}
     @body = ''
-    @parser.on_headers_complete = proc do
-      @protocol = @parser.http_version
-      @method = @parser.http_method
-      @path = @parser.request_url
+    @parser.on_complete do
+      @protocol = @parser.version
+      @method = @parser.method
+      @path = @parser.path
       # Turn header into case-insensitive due to RFC 2.6 Chapter 4.2
       # https://www.ietf.org/rfc/rfc2616.txt
       @parser.headers.each { |key, value| @header[key] = value }
@@ -50,10 +50,22 @@ class Midori::Request
       @path.gsub!(/\?(.*?)$/, '')
       @method = @method.to_sym
       @parsed = true
-      :stop
     end
   end
 
+  def reset!
+    @header = HTTPHeader.new
+    @parsed = false
+    @body_parsed = false
+    @is_websocket = false
+    @is_eventsource = false
+    @parser.reset!
+    @params = {}
+    @query_params = Hash.new(Array.new)
+    @cookie = {}
+    @body = ''
+  end
+
   # Init an request with String data
   # @param [String] data
   # @return [nil] nil
@@ -62,8 +74,8 @@ class Midori::Request
     if @parsed
       @body += data
     else
-      offset = @parser << data
-      @body += data[offset..-1] if @parsed
+      @parser << data
+      @body += data[@parser.offset..-1] if @parsed
     end
 
     # Set body parsed if body reaches content length

data/lib/midori/response.rb

@@ -21,7 +21,7 @@ class Midori::Response
   # Generate header string from hash
   # @return [String] generated string
   def generate_header
-    @header['Content-Length'] = @body.bytesize if @header['Content-Length'].nil? && !@body.empty?
+    @header['Content-Length'] = @body.bytesize if @header['Content-Length'].nil? && @header['Upgrade'].nil? && @header['Content-Type'] != 'text/event-stream'
     @header.map do |key, value|
       "#{key}: #{value}\r\n"
     end.join

data/lib/midori/server.rb

@@ -59,7 +59,7 @@ module Midori::Server
       start_time = Time.now
       @response = @api.receive(request, self)
       now_time = Time.now
-      @logger.info "#{@request.ip} - - \"#{@request.method} #{@request.path} HTTP/#{@request.protocol.join('.')}\" #{@response.status} #{sprintf("%.6f", now_time.to_f - start_time.to_f)}".green
+      @logger.info "#{@request.ip} - - \"#{@request.method} #{@request.path} HTTP/#{@request.protocol}\" #{@response.status} #{sprintf("%.6f", now_time.to_f - start_time.to_f)}".green
       call_event(:open) if @request.websocket?
     rescue Midori::Exception::NotFound => e
       @response = Midori::Sandbox.capture(e)
@@ -125,6 +125,6 @@ module Midori::Server
     end
     EventLoop.add_timer(@keep_alive_timer)
     # Reset request
-    @request = Midori::Request.new
+    @request.reset!
   end
 end

data/lib/midori/version.rb

@@ -1,5 +1,5 @@
 # Midori Module
 module Midori
   # Current Version Code
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.7.1'.freeze
 end

data/lib/midori/websocket.rb

@@ -15,43 +15,6 @@ class Midori::WebSocket
     @connection = connection
   end
 
-  # Decode raw data send from client
-  # @param [StringIO] data raw data
-  def decode(data)
-    # Fin and Opcode
-    byte_tmp = data.getbyte
-    fin = byte_tmp & 0b10000000
-    @opcode = byte_tmp & 0b00001111
-    # NOT Support Multiple Fragments
-    raise Midori::Exception::ContinuousFrame unless fin
-    raise Midori::Exception::OpCodeError unless [0x1, 0x2, 0x8, 0x9, 0xA].include? @opcode
-    close if @opcode == 0x8 # Close Frame
-    # return if @opcode == 0x9 || @opcode == 0xA # Ping Pong
-    decode_mask(data)
-  end
-
-  # Decode masked message send from client
-  # @param [StringIO] data raw data
-  def decode_mask(data)
-    # Mask
-    byte_tmp = data.getbyte
-    is_masked = byte_tmp & 0b10000000
-    raise Midori::Exception::NotMasked unless is_masked == 128
-    # Payload
-    payload = byte_tmp & 0b01111111
-    mask = Array.new(4) { data.getbyte }
-    # Message
-    masked_msg = Array.new(payload) { data.getbyte }
-    if [0x1, 0x9, 0xA].include? opcode
-      @msg = mask_str(masked_msg, mask)
-    else # [0x2]
-      @msg = mask(masked_msg, mask)
-    end
-    # For debug
-    #  data.rewind
-    #  data.bytes {|byte| puts byte.to_s(16)}
-  end
-
   # API definition for events
   # @param [Symbol] event event name(open, message, close, ping, pong)
   # @yield what to do after event matched
@@ -69,11 +32,27 @@ class Midori::WebSocket
   # @param [Array<Integer>, String] msg data to send
   def send(msg)
     output = []
+    payload_length = []
+    if msg.size < 126
+      payload_length << msg.size
+    elsif msg.size < 65_536
+      payload_length << 126
+      payload_length.concat([msg.size].pack('n').unpack('C*'))
+    elsif msg.size < 2**63
+      payload_length << 127
+      payload_length.concat([msg.size >> 32, msg.size & 0xFFFFFFFF].pack('NN').unpack('C*'))
+    else
+      raise Midori::Exception::ContinuousFrame
+    end
+
     if msg.is_a?String
-      output << 0b10000001 << msg.size << msg
-      @connection.send_data(output.pack("CCA#{msg.size}"))
+      output << 0b10000001
+      output.concat payload_length
+      output.concat msg.unpack('C*')
+      @connection.send_data(output.pack('C*'))
     elsif msg.is_a? Array
-      output << 0b10000010 << msg.size
+      output << 0b10000010
+      output.concat payload_length
       output.concat msg
       @connection.send_data(output.pack('C*'))
     else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: midori.rb
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - HeckPsi Lab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-10 00:00:00.000000000 Z
+date: 2019-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: murasaki
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: midori_http_parser
+  name: mizu
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -132,8 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: High performance ruby web framework