Changeset 10426

Timestamp:

07/22/08 17:03:31 (4 months ago)

Author:

nicolas

Message:

[1.2] closes #4053 - fixed regenerated session id wasn't reflected in database based session storage handlers

Files:

• branches/1.2/lib/storage/sfDatabaseSessionStorage.class.php (modified) (2 diffs)
• branches/1.2/lib/storage/sfMySQLSessionStorage.class.php (modified) (5 diffs)
• branches/1.2/lib/storage/sfPDOSessionStorage.class.php (modified) (3 diffs)
• branches/1.2/lib/storage/sfPostgreSQLSessionStorage.class.php (modified) (2 diffs)
• branches/1.2/lib/storage/sfSessionStorage.class.php (modified) (2 diffs)

branches/1.2/lib/storage/sfDatabaseSessionStorage.class.php

@@ -103 +103 @@
-    $this->db = $database->getResource();
-    $this->con = $database->getConnection();
+    
-    if (is_null($this->db) && is_null($this->con))
-    {
@@ -157 +158 @@
-
-  /**
+   * Regenerates id that represents this storage.
+   *
+   * @param  boolean $destroy Destroy session when regenerating?
+   *
+   * @return boolean True if session regenerated, false if error
+   *
+   */
+  public function regenerate($destroy = false)
+  {
+    if (self::$sessionIdRegenerated)
+    {
+      return;
+    }
+
+    $currentId = session_id();
+
+    parent::regenerate($destroy);
+
+    $newId = session_id();
+
+    $this->updateSessionId($currentId, $newId);
+  }
+
+  /**
+   * Updates the session id.
+   *
+   * @param  string   $currentId The current session id
+   * @param  string   $newId     The new current id
+   * 
+   * @return Boolean  True if the session id was successfully regenerated
+   * @throws sfDatabaseException if an error occured while regenrating the session id
+   */
+  abstract protected function updateSessionId($currentId, $newId);
+
+  /**
-   * Executes the shutdown procedure.
-   *

branches/1.2/lib/storage/sfMySQLSessionStorage.class.php

@@ -86 +86 @@
-   * @param  string $id  A session ID
-   *
-bool true, if the session was rea
+string      The session data if the session was read or create
-   *
-   * @throws <b>sfDatabaseException</b> If the session cannot be read
@@ -161 +161 @@
-  }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-   *
-   * @param  string $query  The query to execute
@@ -172 +203 @@
-  }
-
-!
-
+*
+s
-   *
-   * @param  string $string  The string to escape
@@ -183 +214 @@
-  }
-
-!
-
+*
+s
-   *
-   * @param  resource $result  Result of a query
@@ -194 +225 @@
-  }
-
-!
-
+*
+s
-   *
-   * @param  resource $result  Result of a query

branches/1.2/lib/storage/sfPDOSessionStorage.class.php

@@ -52 +52 @@
-      throw new sfDatabaseException(sprintf('PDOException was thrown when trying to manipulate session data. Message: %s', $e->getMessage()));
-    }
+    
+    return true;
-  }
-
@@ -89 +91 @@
-   * @param  string $id  A session ID
-   *
-bool true, if the session was rea
+string      The session data if the session was read or create
-   *
-   * @throws <b>DatabaseException</b> If the session cannot be read
@@ -165 +167 @@
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-}

branches/1.2/lib/storage/sfPostgreSQLSessionStorage.class.php

@@ -84 +84 @@
-   * @param  string $id  A session ID
-   *
-bool true, if the session was rea
+string      The session data if the session was read or create
-   *
-   * @throws <b>sfDatabaseException</b> If the session cannot be read
@@ -159 +159 @@
-    throw new sfDatabaseException(sprintf('sfPostgreSQLSessionStorage cannot write session data for id "%s".', $id));
-  }
+
+  /**
+   * Updates the session id.
+   *
+   * @param  string   $currentId The current session id
+   * @param  string   $newId     The new current id
+   * 
+   * @return Boolean  True if the session id was successfully regenerated
+   * @throws sfDatabaseException if an error occured while regenrating the session id
+   */
+  protected function updateSessionId($currentId, $newId)
+  {
+    // get table/column
+    $db_table    = $this->options['db_table'];
+    $db_id_col   = $this->options['db_id_col'];
+
+    // cleanup the session id and data, just in case
+    $currentId = addslashes($currentId);
+    $newId     = addslashes($newId);
+
+    // update the session id
+    $sql = "UPDATE $db_table SET $db_id_col=? WHERE $db_id_col=?";
+
+    if (@pg_query($this->db, $sql))
+    {
+      return true;
+    }
+
+    // failed to write session data
+    throw new sfDatabaseException(sprintf('% cannot update session id from "%s" to "%s".', get_class($this), $currentId, $newId));
+  }
-}

branches/1.2/lib/storage/sfSessionStorage.class.php

@@ -27 +27 @@
-{
-  static protected
-
+
+
-
-  /**
@@ -163 +164 @@
-  public function regenerate($destroy = false)
-  {
-
+
+
+
+
+
+
-    session_regenerate_id($destroy);
+
+    self::$sessionIdRegenerated = true;
-  }
-