knjappserver 0.0.19 → 0.0.20

data/VERSION

@@ -1 +1 @@
-0.0.19
+0.0.20

data/knjappserver.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjappserver}
-  s.version = "0.0.19"
+  s.version = "0.0.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-03-04}
+  s.date = %q{2012-03-16}
   s.description = %q{Which supports a lot of undocumented stuff.}
   s.email = %q{k@spernj.org}
   s.executables = ["check_running.rb", "knjappserver_start.rb"]
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     "bin/knjappserver_start.rb",
     "knjappserver.gemspec",
     "lib/conf/README",
+    "lib/conf/apache2_cgi_rhtml_conf.conf",
     "lib/conf/conf_example.rb",
     "lib/conf/conf_vars_example.rb",
     "lib/files/database_schema.rb",

data/lib/conf/apache2_cgi_rhtml_conf.conf

@@ -0,0 +1,11 @@
+ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
+
+<Files *.fcgi>
+	Options ExecCGI
+	AddHandler fastcgi-script .fcgi
+</Files>
+
+<Files *.rhtml>
+        AddType application/x-httpd-knj .rhtml
+        Action application/x-httpd-knj "/cgi-bin/knjappserver_cgi.rb"
+</Files>

data/lib/files/database_schema.rb

@@ -14,6 +14,8 @@ class Knjappserver
           {"name" => "cookie_values_data_id", "type" => "bigint"},
           {"name" => "meta_keys_data_id", "type" => "bigint"},
           {"name" => "meta_values_data_id", "type" => "bigint"},
+          {"name" => "session_keys_data_id", "type" => "bigint"},
+          {"name" => "session_values_data_id", "type" => "bigint"},
           {"name" => "tag_data_id", "type" => "bigint"},
           {"name" => "comment_data_id", "type" => "bigint"}
         ],
@@ -91,7 +93,7 @@ class Knjappserver
           {"name" => "idhash", "type" => "varchar"},
           {"name" => "sess_data", "type" => "text"},
           {"name" => "date_added", "type" => "datetime"},
-          {"name" => "date_lastused", "type" => "datetime", "on_created" => proc{|d| d["db"].query("UPDATE Session SET date_lastused = '#{Knj::Datet.new.dbstr}")}},
+          {"name" => "date_lastused", "type" => "datetime", "on_created" => proc{|d| d["db"].query("UPDATE Session SET date_lastused = '#{Knj::Datet.new.dbstr}'")}},
           {"name" => "ip", "type" => "varchar", "maxlength" => 15},
           {"name" => "user_agent", "type" => "text"},
           {"name" => "remember", "type" => "enum", "maxlength" => "'0','1'", "default" => 0, "comment" => "If the session should be remembered or not."}

data/lib/include/class_httpserver.rb

@@ -28,10 +28,13 @@ class Knjappserver::Httpserver
             self.spawn_httpsession(@server.accept)
             STDOUT.print "Starting new HTTP-request.\n" if @debug
           rescue => e
-            STDOUT.puts e.inspect
-            STDOUT.puts e.backtrace
-            STDOUT.print "\n"
-            STDOUT.print "Could not accept HTTP-request - waiting 1 sec and then trying again.\n"
+            if @debug
+              STDOUT.puts e.inspect
+              STDOUT.puts e.backtrace
+              STDOUT.print "\n"
+              STDOUT.print "Could not accept HTTP-request - waiting 1 sec and then trying again.\n"
+            end
+            
             sleep 1
           end
         end

data/lib/include/class_httpsession_contentgroup.rb

@@ -70,7 +70,7 @@ class Knjappserver::Httpsession::Contentgroup
   def write_begin
     begin
       @resp.write if @httpsession.meta["METHOD"] != "HEAD"
-    rescue Errno::ECONNRESET, Errno::ENOTCONN, Errno::EPIPE, Timeout::Error
+    rescue Errno::ECONNRESET, Errno::ENOTCONN, Errno::EPIPE
       #Ignore - the user probaly left.
     end
   end

data/lib/include/class_knjappserver_logging.rb

@@ -195,11 +195,20 @@ class Knjappserver
 	
 	#Writes a custom log to the database.
 	def log(msg, objs, args = {})
+    #This can come in handy if migrating logs to appserver-database.
+    if args[:date_saved]
+      date_saved = args[:date_saved]
+    else
+      date_saved = Time.now
+    end
+    
+    objs = [objs] if !objs.is_a?(Array)
+    
 		@logs_mutex.synchronize do
-			objs = [objs] if !objs.is_a?(Array)
 			log_value_id = @ob.static(:Log_data_value, :force_id, msg)
+			
 			ins_data = {
-				:date_saved => Time.now,
+				:date_saved => date_saved,
 				:text_value_id => log_value_id
 			}
 			
@@ -227,6 +236,12 @@ class Knjappserver
         ins_data[:meta_values_data_id] = meta_hash[:values_data_id]
       end
       
+      session_hash = log_hash_ins(_session) if _session
+      if session_hash
+        ins_data[:session_keys_data_id] = session_hash[:keys_data_id]
+        ins_data[:session_values_data_id] = session_hash[:values_data_id]
+      end
+      
       if args[:tag]
         tag_value_id = @ob.static(:Log_data_value, :force_id, args[:tag])
         ins_data[:tag_data_id] = tag_value_id

data/lib/include/class_knjappserver_web.rb

@@ -1,6 +1,10 @@
 class Knjappserver
   #Imports a .rhtml-file and executes it.
   def import(filepath)
+    if filepath.to_s.index("../proc/self") != nil
+      raise Knj::Errors::NoAccess, "Possible attempt to hack the appserver."
+    end
+    
     _httpsession.eruby.import(filepath)
   end
   
@@ -122,6 +126,7 @@ class Knjappserver
   
   #Returns the socket-port the appserver is currently running on.
   def port
+    raise "Http-server not spawned yet. Call Knjappserver#start to spawn it." if !@httpserv
     return @httpserv.server.addr[1]
   end
 end

data/lib/include/class_log.rb

@@ -1,5 +1,9 @@
 class Knjappserver::Log < Knj::Datarow
-	def self.list(d)
+  has_many [
+    {:class => :Log_link, :col => :log_id, :method => :links, :depends => true, :autodelete => true}
+  ]
+  
+	def self.list(d, &block)
 		sql = "SELECT #{table}.* FROM #{table}"
 		
 		if d.args["object_lookup"]
@@ -30,7 +34,7 @@ class Knjappserver::Log < Knj::Datarow
 		sql << ret[:sql_order]
 		sql << ret[:sql_limit]
 		
-		return d.ob.list_bysql(:Log, sql)
+		return d.ob.list_bysql(:Log, sql, &block)
 	end
 	
 	def self.add(d)
@@ -71,6 +75,10 @@ class Knjappserver::Log < Knj::Datarow
     ob.args[:knjappserver].log_data_hash(self[:meta_keys_data_id], self[:meta_values_data_id])
   end
   
+  def session
+    ob.args[:knjappserver].log_data_hash(self[:session_keys_data_id], self[:session_values_data_id])
+  end
+  
   def ip
     meta_d = self.meta
     
@@ -83,10 +91,6 @@ class Knjappserver::Log < Knj::Datarow
 		lines = self.text.to_s.split("\n").first.to_s
 	end
 	
-	def links(args = {})
-		return ob.list(:Log_link, {"log" => self}.merge(args))
-	end
-	
 	def objects_html(ob_use)
 		html = ""
 		first = true

data/lib/include/class_log_data_value.rb

@@ -12,8 +12,7 @@ class Knjappserver::Log_data_value < Knj::Datarow
 	end
 	
 	def self.force_id(d, value)
-    q_val = d.db.select(:Log_data_value, {"value" => value})
-    while d_val = q_val.fetch
+    d.db.select(:Log_data_value, {"value" => value}) do |d_val|
       return d_val[:id].to_i if d_val[:value].to_s == value.to_s #MySQL doesnt take upper/lower-case into consideration because value is a text-column... lame! - knj
     end
     

data/lib/include/class_log_link.rb

@@ -1,9 +1,9 @@
 class Knjappserver::Log_link < Knj::Datarow
   has_one [
-    {:class => :Log, :col => :log_id}
+    {:class => :Log, :col => :log_id, :method => :log}
   ]
   
-	def self.list(d)
+	def self.list(d, &block)
 		sql = "SELECT * FROM #{table} WHERE 1=1"
 		
 		ret = list_helper(d)
@@ -22,7 +22,7 @@ class Knjappserver::Log_link < Knj::Datarow
 		sql << ret[:sql_order]
 		sql << ret[:sql_limit]
 		
-		return d.ob.list_bysql(:Log_link, sql)
+		return d.ob.list_bysql(:Log_link, sql, &block)
 	end
 	
 	def self.add(d)

data/lib/include/gettext_funcs.rb

@@ -3,10 +3,20 @@
 def _(str)
 	kas = _kas
 	session = _session
+	locale = nil
 	
-	return str.to_s.encode("utf-8") if !kas or !session
-	session[:locale] = kas.config[:locale_default] if !session[:locale] and kas.config[:locale_default]
-	raise "No locale set for session and ':locale_default' not set in config." if !session[:locale]
-	str = kas.gettext.trans(session[:locale], str)
-	return str.to_s.encode("utf-8")
+	if Thread.current[:locale].to_s.length > 0
+    locale = Thread.current[:locale]
+  elsif session and session[:locale].to_s.strip.length > 0
+    locale = session[:locale]
+  elsif kas and kas.config[:locale_default].to_s.strip.length > 0
+    session[:locale] = kas.config[:locale_default] if session
+    locale = kas.config[:locale_default]
+  elsif !session and !kas
+    return str
+  else
+    raise "No locale set for session and ':locale_default' not set in config."
+  end
+  
+	return kas.gettext.trans(locale, str)
 end

data/lib/scripts/knjappserver_cgi.rb

@@ -6,6 +6,45 @@ time_begin = Time.now
 #Good for programming appserver-supported projects without running an appserver all the time,
 #but really slow because of startup for every request.
 
+class Cgi_is_retarded
+  def env_table
+    return ENV
+  end
+  
+  def request_method
+    return ENV["REQUEST_METHOD"]
+  end
+  
+  def content_type
+    return ENV["CONTENT_TYPE"]
+  end
+  
+  def cgi
+    @cgi = CGI.new if !@cgi
+    return @cgi
+  end
+  
+  def params
+    return self.cgi.params
+  end
+  
+  def print(arg)
+    Kernel.print arg.to_s
+  end
+end
+
+class Knjappserver
+  def self.convert_fcgi_post(params)
+    post_hash = {}
+    
+    params.each do |key, val|
+      post_hash[key] = val.first
+    end
+    
+    return post_hash
+  end
+end
+
 begin
   require "knj/autoload"
   require "#{File.dirname(Knj::Os.realpath(__FILE__))}/../knjappserver.rb"
@@ -19,23 +58,15 @@ begin
     raise "No 'Knjappserver::CGI_CONF'-constant was spawned by '#{ENV["HTTP_KNJAPPSERVER_CGI_CONFIG"]}'."
   end
   
-  
-  headers = {}
-  ENV.each do |key, val|
-    if key[0, 5] == "HTTP_" and key != "HTTP_KNJAPPSERVER_CGI_CONFIG"
-      key = Knj::Php.ucwords(key[5, key.length].gsub("_", " ")).gsub(" ", "-")
-      headers[key] = val
-    end
-  end
-  
-  knjappserver_conf = Knjappserver::CGI_CONF["knjappserver"].merge(
+  #Spawn appserver.
+  knjappserver_conf = {
     :cmdline => false,
     :events => false,
     :cleaner => false,
     :dbrev => false,
     :mail_require => false,
     :port => 0 #Ruby picks random port and we get the actual port after starting the appserver.
-  )
+  }.merge(Knjappserver::CGI_CONF["knjappserver"])
   knjappserver = Knjappserver.new(knjappserver_conf)
   knjappserver.start
   port = knjappserver.port
@@ -44,16 +75,69 @@ begin
   #Make request.
   http = Knj::Http2.new(:host => "localhost", :port => port)
   
-  count = 0
-  http.get(ENV["PATH_INFO"][1, ENV["PATH_INFO"].length], {
-    :default_headers => headers,
-    :cookies => false,
-    :on_content => proc{|line|
-      print line if count > 0
-      count += 1
-    }
-  })
+  
+  #Spawn CGI-variable to emulate FCGI part.
+  cgi = Cgi_is_retarded.new
+  
+  
+  #The rest is copied from the FCGI-part.
+  headers = {}
+  cgi.env_table.each do |key, val|
+    if key[0, 5] == "HTTP_" and key != "HTTP_KNJAPPSERVER_CGI_CONFIG"
+      key = Knj::Php.ucwords(key[5, key.length].gsub("_", " ")).gsub(" ", "-")
+      headers[key] = val
+    end
+  end
+  
+  #Make request.
+  if cgi.env_table["PATH_INFO"].length > 0 and cgi.env_table["PATH_INFO"] != "/"
+    url = cgi.env_table["PATH_INFO"][1, cgi.env_table["PATH_INFO"].length]
+  else
+    url = "index.rhtml"
+  end
+  
+  if cgi.env_table["QUERY_STRING"].to_s.length > 0
+    url << "?#{cgi.env_table["QUERY_STRING"]}"
+  end
+  
+  #cgi.print "Content-Type: text/html\r\n"
+  #cgi.print "\r\n"
+  #cgi.print Knj::Php.print_r(cgi.params, true)
+  
+  if cgi.request_method == "POST" and cgi.content_type.to_s.downcase.index("multipart/form-data") != nil
+    count = 0
+    http.post_multipart(url, Knjappserver.convert_fcgi_post(cgi.params), {
+      :default_headers => headers,
+      :cookies => false,
+      :on_content => proc{|line|
+        cgi.print(line) if count > 0
+        count += 1
+      }
+    })
+  elsif cgi.request_method == "POST"
+    count = 0
+    http.post(url, Knjappserver.convert_fcgi_post(cgi.params), {
+      :default_headers => headers,
+      :cookies => false,
+      :on_content => proc{|line|
+        cgi.print(line) if count > 0
+        count += 1
+      }
+    })
+  else
+    count = 0
+    http.get(url, {
+      :default_headers => headers,
+      :cookies => false,
+      :on_content => proc{|line|
+        cgi.print(line) if count > 0
+        count += 1
+      }
+    })
+  end
 rescue Exception => e
+  knjappserver.stop
+  
   print "Content-Type: text/html\r\n"
   print "\n\n"
   print Knj::Errors.error_str(e, {:html => true})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knjappserver
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-04 00:00:00.000000000 +01:00
+date: 2012-03-16 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knjrbfw
-  requirement: &28196100 !ruby/object:Gem::Requirement
+  requirement: &12366780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *28196100
+  version_requirements: *12366780
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &28195520 !ruby/object:Gem::Requirement
+  requirement: &12365600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *28195520
+  version_requirements: *12365600
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &28194940 !ruby/object:Gem::Requirement
+  requirement: &12365060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *28194940
+  version_requirements: *12365060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &28194360 !ruby/object:Gem::Requirement
+  requirement: &12364340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *28194360
+  version_requirements: *12364340
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &28193840 !ruby/object:Gem::Requirement
+  requirement: &12363160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *28193840
+  version_requirements: *12363160
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &28193300 !ruby/object:Gem::Requirement
+  requirement: &12362140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *28193300
+  version_requirements: *12362140
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &28192780 !ruby/object:Gem::Requirement
+  requirement: &12352800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28192780
+  version_requirements: *12352800
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &28192240 !ruby/object:Gem::Requirement
+  requirement: &12352260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28192240
+  version_requirements: *12352260
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &28190420 !ruby/object:Gem::Requirement
+  requirement: &12351520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,7 +110,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28190420
+  version_requirements: *12351520
 description: Which supports a lot of undocumented stuff.
 email: k@spernj.org
 executables:
@@ -133,6 +133,7 @@ files:
 - bin/knjappserver_start.rb
 - knjappserver.gemspec
 - lib/conf/README
+- lib/conf/apache2_cgi_rhtml_conf.conf
 - lib/conf/conf_example.rb
 - lib/conf/conf_vars_example.rb
 - lib/files/database_schema.rb
@@ -206,7 +207,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2708344382107765429
+      hash: 894779464839235539
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: