Changeset 3817

Timestamp:

03/08/06 16:53:34 (3 years ago)

Author:

minam

Message:

Fix problem with unloaded ARStore sessions being loaded when they are garbage collected, causing problems if there were AR objects in the session.

Files:

• trunk/actionpack/lib/action_controller/session/active_record_store.rb (modified) (4 diffs)
• trunk/actionpack/test/activerecord/active_record_store_test.rb (modified) (3 diffs)

trunk/actionpack/lib/action_controller/session/active_record_store.rb

@@ -60 +60 @@
-        self.data_column_name = 'data'
-
-
-
-
-
+
+
-
-        class << self
@@ -123 +121 @@
-        end
-
+        # Has the session been loaded yet?
+        def loaded?
+          !! @data
+        end
+
-        private
-          attr_writer :data
-
-          def marshal_data!
+            return false if !loaded?
-            write_attribute(@@data_column_name, self.class.marshal(self.data))
-          end
-
-          # Has the session been loaded yet?
-          def loaded?
-            !! @data
-          end
-
@@ -139 +138 @@
-          # ActionController::SessionOverflowError.
-          def raise_on_session_data_overflow!
+            return false if !loaded?
-            limit = self.class.data_column_size_limit
-            if loaded? and limit and read_attribute(@@data_column_name).size > limit
@@ -233 +233 @@
-        end
-
+        def loaded?
+          !! @data
+        end
+
-        def save
+          return false if !loaded?
-          marshaled_data = self.class.marshal(data)
-

trunk/actionpack/test/activerecord/active_record_store_test.rb

@@ -63 +63 @@
-  end
-
+  def session_id_column
+    "session_id"
+  end
+
-  def setup
-    session_class.create_table!
@@ -83 +87 @@
-    assert_kind_of CGI::Session::ActiveRecordStore::Session, @new_session.model
-    assert_equal({ 'foo' => 'bar' }, @new_session.model.data)
+  end
+
+  def test_save_unloaded_session
+    c = session_class.connection
+    bogus_class = c.quote(Base64.encode64("\004\010o:\vBlammo\000"))
+    c.insert("INSERT INTO #{session_class.table_name} ('#{session_id_column}', 'data') VALUES ('abcdefghijklmnop', #{bogus_class})")
+
+    sess = session_class.find_by_session_id('abcdefghijklmnop')
+    assert_not_nil sess
+    assert !sess.loaded?
+
+    # because the session is not loaded, the save should be a no-op. If it
+    # isn't, this'll try and unmarshall the bogus class, and should get an error.
+    assert_nothing_raised { sess.save }
-  end
-
@@ -111 +129 @@
-
-class DeprecatedActiveRecordStoreTest < ActiveRecordStoreTest
+  def session_id_column
+    "sessid"
+  end
+
-  def setup
-    session_class.connection.execute 'create table old_sessions (id integer primary key, sessid text unique, data text)'