Changeset 20384 for branches/version-2_5-dev/data/class/helper/SC_Helper_Session.php

Timestamp:

2011/02/24 18:40:55 (15 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:20383

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/class/SC_Customer.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Customer.php
data/class/SC_Session.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Session.php
data/class/helper/SC_Helper_Session.php 15277@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_Session.php
data/class/pages/LC_Page.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2FLC_Page.php
data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php 15673@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fcontents%2FLC_Page_Admin_Contents_FileManager.php
data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php 15660@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fcontents%2FLC_Page_Admin_Contents_Recommend.php
data/class/pages/admin/customer/LC_Page_Admin_Customer.php 15568@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fcustomer%2FLC_Page_Admin_Customer.php
data/class/pages/admin/customer/LC_Page_Admin_Customer_SearchCustomer.php 18068@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2Fpages%2Fadmin%2Fcustomer%2FLC_Page_Admin_Customer_SearchCustomer.php
data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php 17293@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2Fpages%2Fadmin%2Forder%2FLC_Page_Admin_Order_ProductSelect.php
data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php 15557@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_ProductSelect.php
data/class/pages/shopping/LC_Page_Shopping_Payment.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Payment.php

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

[email protected]

bzr:revno:

3112

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/class/SC_Customer.php [email protected]
data/class/SC_Session.php [email protected]
data/class/helper/SC_Helper_Session.php [email protected]
data/class/pages/LC_Page.php [email protected]
data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php [email protected]
data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php [email protected]
data/class/pages/admin/customer/LC_Page_Admin_Customer.php [email protected]
data/class/pages/admin/customer/LC_Page_Admin_Customer_SearchCustomer.php [email protected]
data/class/pages/shopping/LC_Page_Shopping_Payment.php [email protected]

bzr:timestamp:

2011-02-24 18:40:51.378000021 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-02-24T09:40:51.378000Z

Message:

#812(トランザクションIDの自動生成/自動検証)

• トークンの生成タイミングを POST ごとから, 1セッションごとに修正

File:

• branches/version-2_5-dev/data/class/helper/SC_Helper_Session.php (modified) (2 diffs)

branches/version-2_5-dev/data/class/helper/SC_Helper_Session.php

@@ -171 +171 @@
      * トランザクショントークンの妥当性をチェックする.
      *
-     * 前画面で生成されたトランザクショントークンの妥当性をチェックする.
+     * 生成されたトランザクショントークンの妥当性をチェックする.
      * この関数を使用するためには, 前画面のページクラスで LC_Page::getToken()
      * を呼んでおく必要がある.
      *
+     * トランザクショントークンは, SC_Helper_Session::getToken() が呼ばれた際に
+     * 生成される.
+     * 引数 $is_unset が false の場合は, トークンの妥当性検証が不正な場合か,
+     * セッションが破棄されるまで, トークンを保持する.
+     * 引数 $is_unset が true の場合は, 妥当性検証後に破棄される.
+     *
      * @access protected
-     * @param boolean $is_unset TODO: nanasessさんが作り変えているらしいですが暫定対応で
+     * @param boolean $is_unset 妥当性検証後, トークンを unset する場合 true;
+     *                          デフォルト値は false
      * @return boolean トランザクショントークンが有効な場合 true
      */
-    function isValidToken($is_unset = true) {
+    function isValidToken($is_unset = false) {
 
         $checkToken = "";
@@ -195 +202 @@
         // token の妥当性チェック
         if ($checkToken === $_SESSION[TRANSACTION_ID_NAME]) {
-
             $ret = true;
         }
-        if ($is_unset) {
-            unset($_SESSION[TRANSACTION_ID_NAME]);
+        if ($is_unset || $ret === false) {
+            SC_Helper_Session_Ex::destroyToken();
         }
         return $ret;
+    }
+
+    /**
+     * トランザクショントークンを破棄する.
+     *
+     * @return void
+     */
+    function destroyToken() {
+        unset($_SESSION[TRANSACTION_ID_NAME]);
     }