bayserver-core 3.0.3 → 3.3.2

data/lib/baykit/bayserver/docker/send_file/send_file_docker.rb

@@ -3,6 +3,7 @@ require 'baykit/bayserver/tours/package'
 require 'baykit/bayserver/docker/base/club_base'
 require 'baykit/bayserver/docker/send_file/file_content_handler'
 require 'baykit/bayserver/docker/send_file/directory_train'
+require 'baykit/bayserver/docker/send_file/file_store'
 
 require 'baykit/bayserver/util/string_util'
 
@@ -17,6 +18,7 @@ module Baykit
           include Baykit::BayServer::Tours
 
           attr :list_files
+          attr :file_store
 
           ######################################################
           # Implements DockerBase
@@ -57,14 +59,20 @@ module Baykit
 
               real = "#{tur.town.location}/#{rel_path}"
 
-              if File.directory?(real) && @list_files
-                train = DirectoryTrain.new(tur, real)
-                train.start_tour()
+              if File.directory?(real)
+                if @list_files
+                  train = DirectoryTrain.new(tur, real)
+                  train.start_tour()
+                else
+                  raise HttpException.new(HttpStatus::FORBIDDEN, "Directory scan is prohibited")
+                end
               else
-                handler = FileContentHandler.new(real)
+                if BayServer.harbor.enable_cache() && @file_store == nil
+                  @file_store = FileStore.new(BayServer.harbor.cache_lifespan_sec, BayServer.harbor.cache_size_mb * 1024 * 1024)
+                end
+                handler = FileContentHandler.new(tur, @file_store, real, tur.res.charset)
                 tur.req.set_content_handler(handler)
               end
-
             end
 
           end

data/lib/baykit/bayserver/docker/send_file/send_file_ship.rb

@@ -8,6 +8,8 @@ module Baykit
           include Baykit::BayServer::Tours::ReqContentHandler   # implements
 
           attr :file_wrote_len
+
+          attr :file_content
           attr :tour
           attr :tour_id
 
@@ -19,11 +21,12 @@ module Baykit
           attr :path
           attr :abortable
 
-          def init(rd, tp, tur)
+          def init(rd, tp, tur, file_content)
             super(tur.ship.agent_id, rd, tp)
             @file_wrote_len = 0
             @tour = tur
             @tour_id = tur.tour_id
+            @file_content = file_content
           end
 
           ######################################################
@@ -48,6 +51,12 @@ module Baykit
             begin
               available = @tour.res.send_res_content(@tour_id, buf, 0, buf.length)
 
+              if @file_content != nil
+                #BayLog.debug("buf=%s target=%s", buf, @file_content.content)
+                @file_content.content << buf
+                @file_content.bytes_loaded += buf.length
+              end
+
               if available
                 return NextSocketAction::CONTINUE
               else
@@ -73,7 +82,7 @@ module Baykit
             begin
               @tour.res.end_res_content(@tour_id)
             rescue IOError => e
-              BayLog.debug_e(ex)
+              BayLog.debug_e(e)
             end
             return NextSocketAction::CLOSE
           end

data/lib/baykit/bayserver/docker/send_file/wait_file_ship.rb

@@ -0,0 +1,92 @@
+require 'baykit/bayserver/tours/tour'
+require 'baykit/bayserver/common/read_only_ship'
+
+module Baykit
+  module BayServer
+    module Docker
+      module SendFile
+        class WaitFileShip < Baykit::BayServer::Common::ReadOnlyShip
+
+          include Baykit::BayServer::Agent
+          include Baykit::BayServer::Tours
+
+          attr :file_content
+          attr :handler
+
+          attr :tour
+          attr :tour_id
+          def initialize()
+            @file_content = nil
+            @handler = nil
+          end
+
+          def init(rd, tp, tur, file_content, handler)
+            super(tur.ship.agent_id, rd, tp)
+            @tour = tur
+            @tour_id = tur.tour_id
+            @file_content = file_content
+            @handler = handler
+          end
+
+          def to_s
+            return "agt#" + @agent_id.to_s + " wait_file#" + @ship_id.to_s + "/" + @object_id.to_s
+          end
+
+          ######################################################
+          # Implements Reusable
+          ######################################################
+
+          def reset
+            super
+            @file_content = nil
+            @tour_id = 0
+            @tour = nil
+          end
+
+          ######################################################
+          # Implements ReadOnlyShip
+          ######################################################
+
+          def notify_read(buf)
+
+            BayLog.debug("%s file read completed", self)
+
+            begin
+              @handler.send_file_from_cache
+            rescue HttpException => e
+              begin
+                @tour.res.send_error(Tour::TOUR_ID_NOCHECK, e.status, e.message)
+                rescue IOError => ex
+                  notify_error(ex)
+                  return NextSocketAction::CLOSE
+              end
+            end
+
+            return NextSocketAction::CONTINUE
+          end
+
+          def notify_error(e)
+            BayLog.debug_e(e, "%s Error notified", self)
+            begin
+              @tour.res.send_error(@tour_id, HttpStatus.INTERNAL_SERVER_ERROR, null, e)
+            rescue IOError => ex
+              BayLog.debug_e(ex)
+            end
+          end
+
+          def notify_eof()
+            raise Sink.new
+          end
+
+          def notify_close
+          end
+
+          def check_timeout(duration_sec)
+            return false
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/baykit/bayserver/mem_usage.rb

@@ -5,6 +5,7 @@ require 'baykit/bayserver/protocol/protocol_handler_store'
 require 'baykit/bayserver/protocol/packet_store'
 require 'baykit/bayserver/tours/tour_store'
 require 'baykit/bayserver/common/inbound_ship_store'
+require 'baykit/bayserver/common/rudder_state_store'
 require 'baykit/bayserver/docker/base/warp_base'
 
 require 'baykit/bayserver/util/string_util'
@@ -52,6 +53,7 @@ module Baykit
         PacketStore.get_stores(@agent_id).each do |store|
           store.print_usage(indent+1)
         end
+        RudderStateStore.get_store(@agent_id).print_usage(indent+1)
         TourStore.get_store(@agent_id).print_usage(indent+1);
         BayServer.cities.cities.each do |city|
           print_city_usage(nil, city, indent)

data/lib/baykit/bayserver/protocol/packet.rb

@@ -43,7 +43,8 @@ module Baykit
         end
 
         def expand
-          @buf = StringUtil.realloc(@buf, @buf.length * 2)
+          new_len = if @buf.length == 0 then 128 else @buf.length * 2 end
+          @buf << "\0" * new_len
         end
 
         def new_header_accessor()

data/lib/baykit/bayserver/protocol/packet_part_accessor.rb

@@ -29,9 +29,9 @@ module Baykit
         def put_bytes(buf, ofs=0, len=buf.length)
           if len > 0
             check_write(len)
-            #while(@start + @pos + len > @packet.buf.length)
-            #  packet.expand()
-            #end
+            while @start + @pos + len > @packet.buf.length
+              packet.expand
+            end
             begin
               @packet.buf[@start + @pos, len] = buf[ofs, len]
             rescue IndexError => e
@@ -68,9 +68,10 @@ module Baykit
         end
 
         def get_byte
-          buf = StringUtil.alloc(1)
-          get_bytes(buf, 0, 1)
-          buf[0].codepoints[0]
+          check_read(1)
+          b = @packet.buf[@start + @pos]
+          @pos += 1
+          return b.codepoints[0]
         end
 
         def get_bytes(buf, ofs=0, len=buf.length)
@@ -100,13 +101,13 @@ module Baykit
         def check_read(len)
           max_len = (@max_len >= 0) ? @max_len : (@packet.buf_len - @start)
           if @pos + len > max_len
-            raise Sink.new("Invalid array index")
+            raise IOError.new("Invalid array index: @pos=#{@pos} @max=#{@max_len} len=#{len}")
           end
         end
 
         def check_write(len)
           if @max_len > 0 && @pos + len > @max_len
-            raise Sink.new("Buffer overflow")
+            raise IOError.new("Buffer overflow: @pos=#{@pos} @max=#{@max_len} len=#{len}")
           end
         end
 

data/lib/baykit/bayserver/protocol/protocol_exception.rb

@@ -1,3 +1,9 @@
+#
+# ProtocolException is thrown when protocol-level violations are detected,
+# such as invalid packet framing or incorrect packet ordering.
+# (Invalid HTTP headers or content length values result in an HttpException,
+# which causes a 400 Bad Request response to be returned to the client.)
+#
 module Baykit
   module BayServer
     module Protocol
@@ -5,7 +11,7 @@ module Baykit
         def initialize(fmt = nil, *args)
           super(if fmt == nil
                   nil
-                elsif args == nil
+                elsif args.empty?
                   sprintf("%s", fmt)
                 else
                   sprintf(fmt, *args)

data/lib/baykit/bayserver/rudders/io_rudder.rb

@@ -1,10 +1,10 @@
 require 'baykit/bayserver/rudders/rudder'
+require 'baykit/bayserver/rudders/rudder_base'
 
 module Baykit
   module BayServer
     module Rudders
-      class IORudder
-        include Rudder
+      class IORudder < RudderBase
 
         attr :io
         attr :non_blocking

data/lib/baykit/bayserver/rudders/rudder.rb

@@ -23,6 +23,10 @@ module Baykit
         def close
           raise NotImplementedError.new
         end
+
+        def closed?
+          raise NotImplementedError.new
+        end
       end
     end
   end

data/lib/baykit/bayserver/rudders/rudder_base.rb

@@ -0,0 +1,21 @@
+
+module Baykit
+  module BayServer
+    module Rudders
+      class RudderBase
+        include Rudder # implements
+
+        attr :closed
+
+        def close
+          @closed = true
+        end
+
+        def closed?
+          return @closed
+        end
+
+      end
+    end
+  end
+end

data/lib/baykit/bayserver/tours/req_content_handler.rb

@@ -15,26 +15,26 @@ module Baykit
           raise NotImplementedError.new
         end
 
-      end
+        #DEV_NULL = nil
 
-      class DevNullReqContentHandler
-        include ReqContentHandler  # implements
-        def on_read_req_content(tur, buf, start, len)
-        end
+        class DevNullReqContentHandler
+          include ReqContentHandler  # implements
+          def on_read_req_content(tur, buf, start, len)
+          end
 
-        def on_end_req_content(tur)
-        end
+          def on_end_req_content(tur)
+          end
 
-        def on_abort_req(tur)
-          return false
-        end
-      end
+          def on_abort_req(tur)
+            return false
+          end
 
-      module ReqContentHandler
-        DEV_NULL = DevNullReqContentHandler.new()
+        end
       end
     end
   end
 end
 
+Baykit::BayServer::Tours::ReqContentHandler::DEV_NULL = Baykit::BayServer::Tours::ReqContentHandler::DevNullReqContentHandler.new
+
 

data/lib/baykit/bayserver/tours/tour.rb

@@ -126,12 +126,7 @@ module Baykit
           if city == nil
             raise HttpException.new HttpStatus::NOT_FOUND, @req.uri
           else
-            begin
-              city.enter(self)
-            rescue HttpException => e
-              change_state(TOUR_ID_NOCHECK, TourState::ABORTED)
-              raise e
-            end
+            city.enter(self)
           end
         end
 

data/lib/baykit/bayserver/tours/tour_handler.rb

@@ -21,7 +21,7 @@ module Baykit
         end
 
         # Send end of contents to client.
-        def send_end_tour(tur, keep_alive, &lis)
+        def send_end_tour(tur, &lis)
           raise NotImplementedError.new
         end
 

data/lib/baykit/bayserver/tours/tour_req.rb

@@ -205,16 +205,12 @@ module Baykit
             #@tour.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ABORTED)
             return true
 
-          elsif @tour.running?
+          elsif @tour.reading?
             aborted = true
             if @content_handler != nil
               aborted = @content_handler.on_abort_req(@tour)
             end
 
-            #if aborted
-            #  @tour.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ABORTED)
-            #end
-
             return aborted
           else
             BayLog.debug("%s tour is not preparing or not running", @tour)
@@ -227,9 +223,9 @@ module Baykit
           if hnd == nil
             raise Sink.new("nil")
           end
-          if @content_handler != nil
-            raise Sink.new("content handler already set")
-          end
+          #if @content_handler != nil
+          #  raise Sink.new("content handler already set")
+          #end
 
           @content_handler = hnd
         end

data/lib/baykit/bayserver/tours/tour_res.rb

@@ -3,7 +3,6 @@ require 'baykit/bayserver/protocol/protocol_exception'
 require 'baykit/bayserver/agent/multiplexer/plain_transporter'
 require 'baykit/bayserver/taxi/taxi_runner'
 require 'baykit/bayserver/docker/harbor'
-require 'baykit/bayserver/tours/send_file_yacht'
 require 'baykit/bayserver/tours/read_file_taxi'
 require 'baykit/bayserver/tours/content_consume_listener'
 
@@ -22,7 +21,6 @@ module Baykit
         include Baykit::BayServer::Docker
         include Baykit::BayServer::Tours
         include Baykit::BayServer::Taxi
-        include Baykit::BayServer::Agent::Transporter
 
         attr :tour
 
@@ -35,7 +33,6 @@ module Baykit
         attr :res_consume_listener
 
         attr_accessor :header_sent
-        attr :yacht
 
         ###########################
         #  Response Content info
@@ -55,7 +52,6 @@ module Baykit
         end
 
         def init()
-          @yacht = SendFileYacht.new()
         end
 
         def to_s()
@@ -69,9 +65,6 @@ module Baykit
         def reset()
           @charset = nil
           @header_sent = false
-          if @yacht != nil
-            @yacht.reset()
-          end
 
           @available = false
           @res_consume_listener = nil
@@ -184,7 +177,7 @@ module Baykit
               raise e
             ensure
               @header_sent = true
-              end_content(chk_tour_id)
+              end_res_content(chk_tour_id)
             end
           end
 

data/lib/baykit/bayserver/util/cgi_util.rb

@@ -1,3 +1,4 @@
+require 'date'
 require 'baykit/bayserver/util/string_util'
 
 module Baykit
@@ -105,8 +106,12 @@ module Baykit
             end
           end
 
-          add_env(REMOTE_ADDR, tur.req.remote_address, &block)
-          add_env(REMOTE_PORT, tur.req.remote_port, &block)
+          if tur.req.remote_address
+            add_env(REMOTE_ADDR, tur.req.remote_address, &block)
+          end
+          if tur.req.remote_port
+            add_env(REMOTE_PORT, tur.req.remote_port, &block)
+          end
           #add_env(REMOTE_USER, "unknown")
 
           add_env(REQUEST_SCHEME, tur.is_secure ? "https": "http", &block)

data/lib/baykit/bayserver/util/headers.rb

@@ -36,7 +36,7 @@ module Baykit
         CONNECTION_CLOSE = 1
         CONNECTION_KEEP_ALIVE = 2
         CONNECTION_UPGRADE = 3
-        CONNECTION_UNKOWN = 4
+        CONNECTION_UNKNOWN = 4
 
         attr :status
         attr :headers
@@ -185,7 +185,7 @@ module Baykit
           when "upgrade" then
             return CONNECTION_UPGRADE
           else
-            return CONNECTION_UNKOWN
+            return CONNECTION_UNKNOWN
           end
         end
       end

data/lib/baykit/bayserver/util/http_status.rb

@@ -29,6 +29,7 @@ module Baykit
         end
         @status = {}
         @initialized = false
+        @desc_ok = nil
 
         def self.init(bcf_file)
           if(@initialized)
@@ -42,10 +43,16 @@ module Baykit
               @status[kv.key.to_i] = kv.value
             end
           end
+
+          @desc_ok = @status[OK]
           @initialized = true
         end
 
         def self.description(status_code)
+          if status_code == OK
+            return @desc_ok
+          end
+
           desc = @status[status_code]
           if(desc == nil)
             BayLog.error("Status #{status_code} is invalid.")

data/lib/baykit/bayserver/util/http_util.rb

@@ -5,12 +5,14 @@ require 'baykit/bayserver/util/string_util'
 require 'baykit/bayserver/util/char_util'
 require 'baykit/bayserver/util/headers'
 require 'baykit/bayserver/util/http_util'
+require 'baykit/bayserver/protocol/protocol_exception'
 
 module Baykit
   module BayServer
     module Util
       class HttpUtil
         include Baykit::BayServer::Util
+        include Baykit::BayServer::Protocol
 
         MAX_LINE_LEN = 5000
 
@@ -151,6 +153,20 @@ module Baykit
             return nil
           end
         end
+
+        def HttpUtil.check_uri(uri)
+          if uri == nil
+            raise ProtocolException, "path is null"
+          end
+
+          if uri.include?("\x00")
+            raise ProtocolException, "path contains null byte"
+          end
+
+          if uri.each_char.any? { |ch| (ch.ord < 0x20) || (ch.ord == 0x7f) }
+            raise ProtocolException, "path contains control character"
+          end
+        end
       end
     end
   end

data/lib/baykit/bayserver/util/io_util.rb

@@ -18,9 +18,7 @@ module Baykit
         end
 
         def IOUtil.write_int32(io, i)
-          data = [i >> 24, i >> 16 & 0xFF, i >> 8 & 0xFF, i & 0xFF]
-          #print("IOwrite->" + data.to_s)
-          io.write(data.pack("C*"))
+          io.write([i].pack("N"))
         end
 
         def IOUtil.get_sock_recv_buf_size(skt)

data/lib/baykit/bayserver/util/nio_selector.rb

@@ -0,0 +1,103 @@
+require "nio"
+require "thread"
+require 'baykit/bayserver/util/selector'
+
+module Baykit
+  module BayServer
+    module Util
+      class NioSelector < Selector
+
+        attr :selector
+        attr :io_monitor_map
+
+        def initialize
+          super
+
+          @selector = NIO::Selector.new
+          @io_monitor_map = {}      # io -> monitor(:r)
+        end
+        def select(timeout_sec=nil)
+          timeout_sec = 0 if timeout_sec.nil?
+          ready_mon_list = @selector.select(timeout_sec)
+
+          result = {}
+          if ready_mon_list
+            ready_mon_list.each do |mon|
+              io = mon.io
+              if mon.readable?
+                register_read(io, result)
+              end
+              if mon.writable?
+                register_write(io, result)
+              end
+            end
+          end
+          result
+        end
+
+        def count
+          @lock.synchronize { @ops.length }
+        end
+
+        private
+        def register_read(io, io_op)
+
+          if !@io_op_map.key?(io)
+            @io_monitor_map[io] = @selector.register(io, :r)
+          else
+            op = @io_op_map[io]
+            if op & OP_WRITE != 0
+              @io_monitor_map[io].interests = :rw
+            end
+          end
+
+          super  # Update @io_monitor_map
+        end
+
+        def register_write(io, io_op)
+
+          if !@io_op_map.key?(io)
+            @io_monitor_map[io] = @selector.register(io, :w)
+          else
+            op = @io_op_map[io]
+            if op & OP_READ != 0
+              @io_monitor_map[io].interests = :rw
+            end
+          end
+
+          super  # Update @io_monitor_map
+        end
+
+        def unregister_read(io, io_op)
+
+          if @io_op_map.key?(io)
+            op = @io_op_map[io]
+            if op & OP_WRITE != 0
+              @io_monitor_map[io].interests = :w
+            else
+              @selector.deregister(io)
+            end
+          end
+
+          super  # Update @io_monitor_map
+        end
+
+
+        def unregister_write(io, io_op)
+
+          if @io_op_map.key?(io)
+            op = @io_op_map[io]
+            if op & OP_READ != 0
+              @io_monitor_map[io].interests = :r
+            else
+              @selector.deregister(io)
+            end
+          end
+
+          super  # Update @io_monitor_map
+        end
+
+      end
+    end
+  end
+end