knjappserver 0.0.16 → 0.0.17

data/lib/include/class_httpsession_post_multipart.rb

@@ -0,0 +1,117 @@
+#This class parses and handels post-multipart requests.
+class Knjappserver::Httpsession::Post_multipart
+  attr_reader :return
+  
+  def initialize(args)
+    @args = args
+    boundary_regexp = /\A--#{@args["boundary"]}(--)?#{@args["crlf"]}\z/
+    @return = {}
+    @data = nil
+    @mode = nil
+    @headers = {}
+    
+    @args["io"].each do |line|
+      if boundary_regexp =~ line
+        #Finish the data we were writing.
+        self.finish_data if @data
+        
+        @data = ""
+        @mode = "headers"
+      elsif @mode == "headers"
+        if match = line.match(/^(.+?):\s+(.+)#{@args["crlf"]}$/)
+          @headers[match[1].to_s.downcase] = match[2]
+        elsif line == @args["crlf"]
+          @mode = "body"
+        else
+          raise "Could not match header from: '#{line}'."
+        end
+      elsif @mode == "body"
+        @data << line
+      else
+        raise "Invalid mode: '#{@mode}'."
+      end
+    end
+    
+    self.finish_data if @data and @data.to_s.length > 0
+    
+    @data = nil
+    @headers = nil
+    @mode = nil
+    @args = nil
+  end
+  
+  #Add the current treated data to the return-hash.
+  def finish_data
+    @data.chop!
+    name = nil
+    
+    disp = @headers["content-disposition"]
+    raise "No 'content-disposition' was given." if !disp
+    
+    match_name = disp.match(/name=\"(.+?)\"/)
+    raise "Could not match name." if !match_name
+    
+    match_fname = disp.match(/filename=\"(.+?)\"/)
+    
+    if match_fname
+      obj = Knjappserver::Httpsession::Post_multipart::File_upload.new(
+        "fname" => match_fname[1],
+        "headers" => @headers,
+        "data" => @data
+      )
+      @return[match_name[1]] = obj
+      @data = nil
+      @headers = {}
+      @mode = nil
+    else
+      @return[match_name[1]] = @data
+      @data = nil
+      @headers = {}
+      @mode = nil
+    end
+  end
+end
+
+#This is the actual returned object for fileuploads. It is able to do various user-friendly things like save the content to a given path, return the filename, returns the content to a string and more.
+class Knjappserver::Httpsession::Post_multipart::File_upload
+  def initialize(args)
+    @args = args
+  end
+  
+  #Returns the size of the upload.
+  def size
+    return @args["data"].length
+  end
+  
+  #Returns the size of the fileupload.
+  def length
+    return @args["data"].length
+  end
+  
+  #Returns the filename given for the fileupload.
+  def filename
+    return @args["fname"]
+  end
+  
+  #Returns the headers given for the fileupload. Type and more should be here.
+  def headers
+    return @args["headers"]
+  end
+  
+  #Returns the content of the file-upload as a string.
+  def to_s
+    return @args["data"]
+  end
+  
+  #Saves the content of the fileupload to a given path.
+  def save_to(filepath)
+    File.open(filepath, "w") do |fp|
+      fp.write(self.to_s)
+    end
+  end
+  
+  #This methods prevents the object from being converted to JSON. This can make some serious bugs.
+  def to_json(*args)
+    raise "File_upload-objects should not be converted to json."
+  end
+end

data/lib/include/class_knjappserver.rb

@@ -1,26 +1,10 @@
-require "#{File.dirname(__FILE__)}/class_knjappserver_cleaner"
-require "#{File.dirname(__FILE__)}/class_knjappserver_cmdline"
-require "#{File.dirname(__FILE__)}/class_knjappserver_errors"
-require "#{File.dirname(__FILE__)}/class_knjappserver_logging"
-require "#{File.dirname(__FILE__)}/class_knjappserver_mailing"
-require "#{File.dirname(__FILE__)}/class_knjappserver_sessions"
-require "#{File.dirname(__FILE__)}/class_knjappserver_threadding"
-require "#{File.dirname(__FILE__)}/class_knjappserver_threadding_timeout"
-require "#{File.dirname(__FILE__)}/class_knjappserver_translations"
-require "#{File.dirname(__FILE__)}/class_knjappserver_web"
-
-require "timeout"
-require "digest"
-require "erubis"
-require "base64"
-require "stringio"
-require "socket"
-
 class Knjappserver
-  attr_reader :config, :httpserv, :debug, :db, :db_handler, :ob, :translations, :paused, :should_restart, :events, :mod_event, :db_handler, :gettext, :sessions, :logs_access_pending, :threadpool, :vars, :magic_vars, :types, :eruby_cache
+  attr_reader :cio, :config, :httpserv, :debug, :db, :db_handler, :ob, :translations, :paused, :should_restart, :events, :mod_event, :db_handler, :gettext, :sessions, :logs_access_pending, :threadpool, :vars, :magic_procs, :magic_vars, :types, :eruby_cache, :httpsessions_ids
   attr_accessor :served, :should_restart, :should_restart_done
   
-  autoload :ERBHandler, "#{File.dirname(__FILE__)}/class_erbhandler"
+  appsrv_dir = File.dirname(__FILE__)
+  autoload :ERBHandler, "#{appsrv_dir}/class_erbhandler"
+  autoload :Log, "#{appsrv_dir}/class_log.rb"
   
   def initialize(config)
     raise "No arguments given." if !config.is_a?(Hash)
@@ -36,7 +20,6 @@ class Knjappserver
     
     @config[:smtp_args] = {"smtp_host" => "localhost", "smtp_port" => 25} if !@config[:smtp_args]
     @config[:timeout] = 30 if !@config.has_key?(:timeout)
-    @config[:engine_knjengine] = true if !@config[:engine_knjengine] and !@config[:engine_webrick] and !@config[:engine_mongrel]
     raise "No ':doc_root' was given in arguments." if !@config.has_key?(:doc_root)
     
     
@@ -54,6 +37,21 @@ class Knjappserver
       ]
     end
     
+    
+    #Add extra handlers if given.
+    if @config[:handlers_extra]
+      @config[:handlers] += @config[:handlers_extra]
+    end
+    
+    
+    #Setup cache to make .rhtml-calls faster.
+    @config[:handlers_cache] = {}
+    @config[:handlers].each do |handler_info|
+      next if !handler_info[:file_ext] or !handler_info[:callback]
+      @config[:handlers_cache][handler_info[:file_ext]] = handler_info[:callback]
+    end
+    
+    
     @debug = @config[:debug]
     @paused = 0
     @paused_mutex = Mutex.new
@@ -63,6 +61,7 @@ class Knjappserver
     @mod_files = {}
     @sessions = {}
     @eruby_cache = {}
+    @httpsessions_ids = {}
     
     @path_knjappserver = File.dirname(__FILE__)
     if @config[:knjrbfw_path]
@@ -105,37 +104,51 @@ class Knjappserver
       :xml => "text/xml",
       :js => "text/javascript"
     }
-    @types = @types.merge(@config[:filetypes]) if @config.has_key?(:filetypes)
+    @types.merge!(@config[:filetypes]) if @config.has_key?(:filetypes)
     
     
     
     #Load various required files from knjrbfw and stuff in the knjappserver-framework.
     files = [
       "#{@path_knjrbfw}knjrbfw.rb",
-      "#{@path_knjrbfw}knj/arrayext.rb",
-      "#{@path_knjrbfw}knj/event_handler.rb",
-      "#{@path_knjrbfw}knj/errors.rb",
-      "#{@path_knjrbfw}knj/eruby.rb",
-      "#{@path_knjrbfw}knj/hash_methods.rb",
-      "#{@path_knjrbfw}knj/objects.rb",
-      "#{@path_knjrbfw}knj/web.rb",
-      "#{@path_knjrbfw}knj/datarow.rb",
-      "#{@path_knjrbfw}knj/datet.rb",
-      "#{@path_knjrbfw}knj/php.rb",
-      "#{@path_knjrbfw}knj/thread.rb",
-      "#{@path_knjrbfw}knj/threadhandler.rb",
-      "#{@path_knjrbfw}knj/threadpool.rb",
-      "#{@path_knjrbfw}knj/translations.rb",
-      "#{@path_knjrbfw}knj/knjdb/libknjdb.rb",
-      "#{@path_knjappserver}/class_httpresp.rb",
       "#{@path_knjappserver}/class_httpserver.rb",
       "#{@path_knjappserver}/class_httpsession.rb",
-      "#{@path_knjappserver}/class_httpsession_contentgroup.rb",
-      "#{@path_knjappserver}/class_session.rb",
-      "#{@path_knjappserver}/class_log.rb",
-      "#{@path_knjappserver}/class_log_access.rb",
-      "#{@path_knjappserver}/class_log_data_value.rb"
+      "#{@path_knjappserver}/class_knjappserver_errors.rb",
+      "#{@path_knjappserver}/class_knjappserver_logging.rb",
+      "#{@path_knjappserver}/class_knjappserver_mailing.rb",
+      "#{@path_knjappserver}/class_knjappserver_sessions.rb",
+      "#{@path_knjappserver}/class_knjappserver_translations.rb",
+      "#{@path_knjappserver}/class_knjappserver_web.rb"
     ]
+    
+    if @config[:preload]
+      require "timeout"
+      require "digest"
+      require "erubis"
+      require "base64"
+      require "stringio"
+      require "socket"
+      
+      files += [
+        "#{@path_knjrbfw}knj/event_handler.rb",
+        "#{@path_knjrbfw}knj/errors.rb",
+        "#{@path_knjrbfw}knj/eruby.rb",
+        "#{@path_knjrbfw}knj/hash_methods.rb",
+        "#{@path_knjrbfw}knj/objects.rb",
+        "#{@path_knjrbfw}knj/web.rb",
+        "#{@path_knjrbfw}knj/datarow.rb",
+        "#{@path_knjrbfw}knj/datet.rb",
+        "#{@path_knjrbfw}knj/php.rb",
+        "#{@path_knjrbfw}knj/thread.rb",
+        "#{@path_knjrbfw}knj/threadhandler.rb",
+        "#{@path_knjrbfw}knj/threadpool.rb",
+        "#{@path_knjrbfw}knj/translations.rb",
+        "#{@path_knjrbfw}knj/knjdb/libknjdb.rb",
+      ]
+    else
+      files << "#{@path_knjrbfw}knj/autoload.rb"
+    end
+    
     files << "#{@path_knjrbfw}knj/gettext_threadded.rb" if @config[:locales_root]
     files.each do |file|
       STDOUT.print "Loading: '#{file}'.\n" if @debug
@@ -155,18 +168,18 @@ class Knjappserver
     end
     
     
-    print "Updating database.\n" if @debug
-    require "rubygems" if !@config.key?(:knjdbrevision_path)
-    require "#{@config[:knjdbrevision_path]}knjdbrevision"
-    
-    dbschemapath = "#{File.dirname(__FILE__)}/../files/database_schema.rb"
-    raise "'#{dbschemapath}' did not exist." if !File.exists?(dbschemapath)
-    require dbschemapath
-    raise "No schema-variable was spawned." if !DATABASE_SCHEMA
-    
-    dbpath = "#{File.dirname(__FILE__)}/../files/database.sqlite3"
-    dbrev = Knjdbrevision.new
-    dbrev.init_db(DATABASE_SCHEMA, @db)
+    if !@config.key?(:dbrev) or @config[:dbrev]
+      print "Updating database.\n" if @debug
+      require "knj/knjdb/revision.rb"
+      
+      dbschemapath = "#{File.dirname(__FILE__)}/../files/database_schema.rb"
+      raise "'#{dbschemapath}' did not exist." if !File.exists?(dbschemapath)
+      require dbschemapath
+      raise "No schema-variable was spawned." if !Knjappserver::DATABASE_SCHEMA
+      
+      dbrev = Knj::Db::Revision.new
+      dbrev.init_db("schema" => Knjappserver::DATABASE_SCHEMA, "db" => @db)
+    end
     
     
     print "Spawning objects.\n" if @debug
@@ -198,9 +211,7 @@ class Knjappserver
       @gettext = Knj::Gettext_threadded.new("dir" => config[:locales_root])
     end
     
-    if @config[:locales_gettext_funcs]
-      require "#{@path_knjappserver}/gettext_funcs"
-    end
+    require "#{@path_knjappserver}/gettext_funcs" if @config[:locales_gettext_funcs]
     
     if @config[:magic_methods] or !@config.has_key?(:magic_methods)
       print "Loading magic-methods.\n" if @debug
@@ -212,8 +223,8 @@ class Knjappserver
       
       if $stdout.class.name != "Knjappserver::CustomIO"
         require "#{@path_knjappserver}/class_customio.rb"
-        cio = Knjappserver::CustomIO.new
-        $stdout = cio
+        @cio = Knjappserver::CustomIO.new
+        $stdout = @cio
       end
     end
     
@@ -236,56 +247,72 @@ class Knjappserver
     
     
     #Set up various events for the appserver.
-    print "Loading events.\n" if @debug
-    @events = Knj::Event_handler.new
-    @events.add_event(
-      :name => :check_page_access,
-      :connections_max => 1
-    )
-    @events.add_event(
-      :name => :ob,
-      :connections_max => 1
-    )
-    @events.add_event(
-      :name => :trans_no_str,
-      :connections_max => 1
-    )
+    if !@config.key?(:events) or @config[:events]
+      print "Loading events.\n" if @debug
+      @events = Knj::Event_handler.new
+      @events.add_event(
+        :name => :check_page_access,
+        :connections_max => 1
+      )
+      @events.add_event(
+        :name => :ob,
+        :connections_max => 1
+      )
+      @events.add_event(
+        :name => :trans_no_str,
+        :connections_max => 1
+      )
+      @events.add_event(
+        :name => :request_done,
+        :connections_max => 1
+      )
+      @events.add_event(
+        :name => :request_begin,
+        :connections_max => 1
+      )
+    end
     
     #Set up the 'vars'-variable that can be used to set custom global variables for web-requests.
     @vars = Knj::Hash_methods.new
     @magic_vars = {}
+    @magic_procs = {}
     
     
     #Initialize the various feature-modules.
     print "Init sessions.\n" if @debug
-    initialize_sessions
+    self.initialize_sessions
     
-    print "Init threadding.\n" if @debug
-    initialize_threadding
+    if !@config.key?(:threadding) or @config[:threadding]
+      self.loadfile("#{@path_knjappserver}/class_knjappserver_threadding.rb")
+      self.loadfile("#{@path_knjappserver}/class_knjappserver_threadding_timeout.rb")
+      print "Init threadding.\n" if @debug
+      self.initialize_threadding
+    end
     
     print "Init mailing.\n" if @debug
-    initialize_mailing
+    self.initialize_mailing
     
     print "Init errors.\n" if @debug
-    initialize_errors
+    self.initialize_errors
     
     print "Init logging.\n" if @debug
-    initialize_logging
-    
-    print "Init cleaner.\n" if @debug
-    initialize_cleaner
-    
-    print "Init cmdline.\n" if @debug
-    initialize_cmdline
+    self.initialize_logging
     
+    if !@config.key?(:cleaner) or @config[:cleaner]
+      self.loadfile("#{@path_knjappserver}/class_knjappserver_cleaner.rb")
+      print "Init cleaner.\n" if @debug
+      self.initialize_cleaner
+    end
     
-    #Start the appserver.
-    print "Spawning appserver.\n" if @debug
-    @httpserv = Knjappserver::Httpserver.new(self)
+    if !@config.key?(:cmdline) or @config[:cmdline]
+      self.loadfile("#{@path_knjappserver}/class_knjappserver_cmdline.rb")
+      print "Init cmdline.\n" if @debug
+      self.initialize_cmdline
+    end
     
     
     #Clear memory at exit.
-    at_exit do
+    Kernel.at_exit do
       self.stop
     end
     
@@ -300,7 +327,7 @@ class Knjappserver
       return nil
     end
     
-    rpath = Knj::Php.realpath(fpath)
+    rpath = File.realpath(fpath)
     raise "No such filepath: #{fpath}" if !rpath or !File.exists?(rpath)
     
     return true if @mod_files[rpath]
@@ -314,6 +341,18 @@ class Knjappserver
   
   #Starts the HTTP-server and threadpool.
   def start
+    #Start the appserver.
+    print "Spawning appserver.\n" if @debug
+    @httpserv = Knjappserver::Httpserver.new(self)
+    
+    
+    #Start Leakproxy-module if defined in config.
+    if @config[:leakproxy]
+      require "#{File.dirname(__FILE__)}/class_knjappserver_leakproxy_server.rb"
+      @leakproxy_server = Knjappserver::Leakproxy_server.new(:kas => self)
+    end
+    
+    
     STDOUT.print "Starting appserver.\n" if @debug
     Thread.current[:knjappserver] = {:kas => self} if !Thread.current[:knjappserver]
     
@@ -336,15 +375,15 @@ class Knjappserver
   #Stops the entire app and releases join.
   def stop
     proc_stop = proc{
-      #This should be done first to be sure it finishes (else we have a serious bug).
-      STDOUT.print "Flush out loaded sessions.\n" if @debug
-      self.sessions_flush
-      
       STDOUT.print "Stopping appserver for real.\n" if @debug
       @httpserv.stop if @httpserv and @httpserv.respond_to?(:stop)
       
       STDOUT.print "Stopping threadpool.\n" if @debug
       @threadpool.stop if @threadpool
+      
+      #This should be done first to be sure it finishes (else we have a serious bug).
+      STDOUT.print "Flush out loaded sessions.\n" if @debug
+      self.sessions_flush
     }
     
     #If we cant get a paused-execution in 10 secs - we just force the stop.
@@ -431,7 +470,18 @@ class Knjappserver
     if !Object.respond_to?(method_name)
       Object.send(:define_method, method_name) do
         return Thread.current[:knjappserver][:kas].magic_vars[method_name] if Thread.current[:knjappserver] and Thread.current[:knjappserver][:kas]
-        return $knjappserver[:knjappserver].magic_vars[method_name] if $knjappserver and $knjappserver[:knjappserver]
+        raise "Could not figure out the object: '#{method_name}'."
+      end
+    end
+  end
+  
+  def define_magic_proc(method_name, &block)
+    raise "No block given." if !block_given?
+    @magic_procs[method_name] = block
+    
+    if !Object.respond_to?(method_name)
+      Object.send(:define_method, method_name) do
+        return Thread.current[:knjappserver][:kas].magic_procs[method_name].call(:kas => self) if Thread.current[:knjappserver] and Thread.current[:knjappserver][:kas]
         raise "Could not figure out the object: '#{method_name}'."
       end
     end