Changeset 225

Timestamp:

09/26/2007 03:52:10 (14 months ago)

Author:

zimbatm

Message:

Working on Sessions and database :

• FIX: Session table was always created
  
• FIX: Sessions weren't stored correctly because of the custom
  non-autoincrement id. Using SQL injection to bypass the forced "id" :-]
  (aka. where opinionated software is not always good)
  
• ENHANCEMENT: Added index for sessions's hashid for faster lookup
  
• FIX: 'sqlite3_api' was loaded after the connection.
  

Location:

trunk/lib/camping

Files:

• db.rb (modified) (1 diff)
• reloader.rb (modified) (2 diffs)
• session.rb (modified) (6 diffs)

trunk/lib/camping/db.rb

@@ -75 +75 @@
 Camping::S.sub! /def\s*Y[;\s]*self[;\s]*end/, $AR_EXTRAS
 Object.constants.map{|c|Object.const_get(c)}.each do |c|
-  c::Models.module_eval $AR_EXTRAS if c.respond_to?(:run)
+  c::Models.module_eval $AR_EXTRAS if c.respond_to?(:goes)
 end

trunk/lib/camping/reloader.rb

@@ -137 +137 @@
             # If database models are present, `autoload?` will return nil.
             unless Camping::Models.autoload? :Base
-                require 'logger'
-                require 'camping/session'
-                Camping::Models::Base.establish_connection @database if @database
-
-                case @log
-                when Logger
-                    Camping::Models::Base.logger = @log
-                when String
-                    Camping::Models::Base.logger = Logger.new(@log == "-" ? STDOUT : @log)
-                end
-
-                Camping::Models::Session.create_schema
-
                 if @database and @database[:adapter] == 'sqlite3'
                     begin
@@ -158 +145 @@
                     end
                 end
+
+                case @log
+                when Logger
+                    Camping::Models::Base.logger = @log
+                when String
+                    require 'logger'
+                    Camping::Models::Base.logger = Logger.new(@log == "-" ? STDOUT : @log)
+                end
+
+                Camping::Models::Base.establish_connection @database if @database
+
+                if Camping::Models.const_defined?(:Session)
+                  Camping::Models::Session.create_schema
+                end
             end
         end

trunk/lib/camping/session.rb

@@ -12 +12 @@
 # For a basic tutorial, see the *Getting Started* section of the Camping::Session module.
 require 'camping'
+require 'camping/db'
 
 module Camping::Models
@@ -18 +19 @@
 class Session < Base
     serialize :ivars
+    # SQL injection to bypass id field checks
+    set_primary_key '"="" OR "'
+
     def []=(k, v) # :nodoc:
         self.ivars[k] = v
@@ -39 +43 @@
     # If none is found, generates a new session.
     def self.persist cookies
+        session = nil
         if cookies.camping_sid
             session = Camping::Models::Session.find_by_hashid cookies.camping_sid
@@ -64 +69 @@
             ActiveRecord::Schema.define do
                 create_table :sessions, :force => true, :id => false do |t|
-                    t.column :hashid,      :string,  :limit => 32
+                    t.column :hashid,      :string,  :limit => 32, :null => false
                     t.column :created_at,  :datetime
                     t.column :ivars,       :text
                 end
+                add_index :sessions, [:hashid], :unique => true
             end
             reset_column_information
@@ -109 +115 @@
         @state = (session[app] ||= Camping::H[])
         hash_before = Marshal.dump(@state).hash
-        s = super(*a)
+        return super(*a)
+    ensure
         if session
             hash_after = Marshal.dump(@state).hash
@@ -117 +124 @@
             end
         end
-        s
     end
 end