bayserver-core 3.0.2 → 3.3.1

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
@@ -100,13 +100,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

@@ -17,10 +17,11 @@ module Baykit
         class TourState
           UNINITIALIZED = 0
           PREPARING = 1
-          RUNNING = 2
-          ABORTED = 3
-          ENDED = 4
-          ZOMBIE = 5
+          READING = 2
+          RUNNING = 3
+          ABORTED = 4
+          ENDED = 5
+          ZOMBIE = 6
         end
 
         # class variables
@@ -65,7 +66,7 @@ module Baykit
         end
 
         def to_s()
-          return "#{@ship} tours##{@tour_id}/#{@obj_id}[key=#{@req.key}]"
+          return "#{@ship} tur##{@tour_id}/#{@obj_id}[key=#{@req.key}]"
         end
 
         ######################################################
@@ -110,7 +111,11 @@ module Baykit
         end
 
         def go
-          change_state(TOUR_ID_NOCHECK, TourState::RUNNING)
+          if(req.headers.content_length > 0)
+            change_state(TOUR_ID_NOCHECK, TourState::READING)
+          else
+            change_state(TOUR_ID_NOCHECK, TourState::RUNNING)
+          end
 
           city = @ship.port_docker.find_city(@req.req_host)
           if city == nil
@@ -121,23 +126,23 @@ 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
 
         def valid?()
-          return @state == TourState::PREPARING || @state == TourState::RUNNING
+          return @state == TourState::PREPARING || @state == TourState::READING || @state == TourState::RUNNING
         end
 
         def preparing?()
           return @state == TourState::PREPARING
         end
 
+        def reading?()
+          return @state == TourState::READING
+        end
+
+
         def running?()
           return @state == TourState::RUNNING
         end

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

@@ -8,6 +8,7 @@ module Baykit
       class TourReq
         include Baykit::BayServer::Util::Reusable # implements
 
+        include Baykit::BayServer
         include Baykit::BayServer::Protocol
         include Baykit::BayServer::Util
 
@@ -123,8 +124,12 @@ module Baykit
           @tour.check_tour_id(check_id)
 
           data_passed = false
-          if !@tour.running?
-            BayLog.debug("%s tour is not running.", @tour)
+          if  @tour.error != nil
+            # If has error, only read content. (Do not call content handler)
+            BayLog.debug("%s tour has error.", @tour)
+
+          elsif !@tour.reading?
+            raise HttpException.new(HttpStatus.BAD_REQUEST, "%s tour is not reading.", @tour)
 
           elsif @content_handler == nil
             BayLog.warn("%s content read, but no content handler", tour)
@@ -132,17 +137,13 @@ module Baykit
           elsif @bytes_posted + len > @bytes_limit
             raise ProtocolException.new("Read data exceed content-length: %d/%d", @bytes_posted + len, @bytes_limit)
 
-          elsif  @tour.error != nil
-            # If has error, only read content. (Do not call content handler)
-            BayLog.debug("%s tour has error.", @tour)
-
           else
             @content_handler.on_read_req_content(@tour, data, start, len, &callback)
             data_passed = true
           end
 
           @bytes_posted += len
-          BayLog.debug("%s read content: len=%d posted=%d limit=%d consumed=%d",
+          BayLog.debug("%s post req content: len=%d posted=%d limit=%d consumed=%d",
                        @tour, len, @bytes_posted, @bytes_limit, @bytes_consumed)
 
           if !data_passed
@@ -166,6 +167,7 @@ module Baykit
           if @ended
             raise Sink.new("#{@tour} Request content is already ended")
           end
+          @tour.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::RUNNING)
 
           if @bytes_limit >= 0 && @bytes_posted != @bytes_limit
             raise ProtocolException.new("Read data exceed content-length: #{@bytes_posted}/#{@bytes_limit}")
@@ -203,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)
@@ -225,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
@@ -124,7 +117,42 @@ module Baykit
           end
 
           begin
-            @tour.ship.send_headers(@tour.ship_id, @tour)
+            handled = false
+            if !@tour.error_handling && @tour.res.headers.status >= 400
+              trouble = BayServer.harbor.trouble
+              if trouble != nil
+                cmd = trouble.find(tur.res.headers.status)
+                if cmd != nil
+                  err_tour = get_error_tour
+                  err_tour.req.uri = cmd.target
+                  @tour.req.headers.copy_to(err_tour.req.headers)
+                  @tour.res.headers.copy_to(err_tour.res.headers)
+                  err_tour.req.remote_port = @tour.req.remote_port
+                  err_tour.req.remote_address = @tour.req.remote_address
+                  err_tour.req.server_address = @tour.req.server_address
+                  err_tour.req.server_port = @tour.req.server_port
+                  err_tour.req.server_name = @tour.req.server_name
+                  err_tour.res.header_sent = @tour.res.header_sent
+                  @tour.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ZOMBIE)
+                  case cmd.method
+                  when :GUIDE
+                    err_tour.go
+                  when :TEXT
+                    @protocol_handler.send_headers(err_tour)
+                    data = cmd.target
+                    err_tour.res.send_res_content(Tour::TOUR_ID_NOCHECK, data, 0, data.length)
+                    err_tour.end_res_content(Tour::TOUR_ID_NOCHECK)
+                  when :REROUTE
+                    err_tour.res.send_http_exception(Tour::TOUR_ID_NOCHECK, HttpException.moved_temp(cmd.target))
+                  end
+                  handled = true
+                end
+              end
+            end
+
+            if !handled
+              @tour.ship.send_headers(@tour.ship_id, @tour)
+            end
           rescue IOError => e
             BayLog.debug_e(e, "%s abort: %s", @tour, e)
             @tour.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ABORTED)
@@ -149,7 +177,7 @@ module Baykit
               raise e
             ensure
               @header_sent = true
-              end_content(chk_tour_id)
+              end_res_content(chk_tour_id)
             end
           end
 
@@ -162,10 +190,6 @@ module Baykit
           @available = true
         end
 
-        def detach_consume_listener
-          @res_consume_listener = nil
-        end
-
         def send_res_content(chk_tour_id, buf, ofs, len)
           @tour.check_tour_id(chk_tour_id)
           BayLog.debug("%s sendContent len=%d", @tour, len)
@@ -281,6 +305,9 @@ module Baykit
 
         def consumed(check_id, length)
           @tour.check_tour_id(check_id)
+          if @res_consume_listener == nil
+            raise Sink.new("Response consume listener is null")
+          end
 
           @bytes_consumed += length
 
@@ -297,12 +324,8 @@ module Baykit
             resume = true
           end
 
-          if !@tour.zombie?
-            if @res_consume_listener == nil
-              BayLog.debug("%s Consume listener is null, so can not invoke callback", self)
-            else
-              @res_consume_listener.call(length, resume)
-            end
+          if @tour.running?
+            @res_consume_listener.call(length, resume)
           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