- session removal fix (CSRF)

Marius Cramer · Marius Cramer · commit c8b685ac0522 · 2015-05-21T11:32:59.000+02:00
diff --git a/interface/lib/classes/tform_base.inc.php b/interface/lib/classes/tform_base.inc.php
@@ -714,8 +714,8 @@ protected function _encode($record, $tab, $dbencode = true, $api = false) {
 					unset($_POST);
 					unset($record);
 				}
-				$_SESSION['_csrf'][$_csrf_id] = ' ';
-				$_SESSION['_csrf_timeout'][$_csrf_id] = ' ';
+				$_SESSION['_csrf'][$_csrf_id] = null;
+				$_SESSION['_csrf_timeout'][$_csrf_id] = null;
 				unset($_SESSION['_csrf'][$_csrf_id]);
 				unset($_SESSION['_csrf_timeout'][$_csrf_id]);
 				
@@ -725,6 +725,8 @@ protected function _encode($record, $tab, $dbencode = true, $api = false) {
 						if($timeout < time()) $to_unset[] = $_csrf_id;
 					}
 					foreach($to_unset as $_csrf_id) {
+						$_SESSION['_csrf'][$_csrf_id] = null;
+						$_SESSION['_csrf_timeout'][$_csrf_id] = null;
 						unset($_SESSION['_csrf'][$_csrf_id]);
 						unset($_SESSION['_csrf_timeout'][$_csrf_id]);
 					}

Original file line number	Diff line number	Diff line change
`@@ -714,8 +714,8 @@ protected function _encode($record, $tab, $dbencode = true, $api = false) {`
`714`	`714`	`unset($_POST);`
`715`	`715`	`unset($record);`
`716`	`716`	`}`
`717`		`- $_SESSION['_csrf'][$_csrf_id] = ' ';`
`718`		`- $_SESSION['_csrf_timeout'][$_csrf_id] = ' ';`
	`717`	`+ $_SESSION['_csrf'][$_csrf_id] = null;`
	`718`	`+ $_SESSION['_csrf_timeout'][$_csrf_id] = null;`
`719`	`719`	`unset($_SESSION['_csrf'][$_csrf_id]);`
`720`	`720`	`unset($_SESSION['_csrf_timeout'][$_csrf_id]);`
`721`	`721`
`@@ -725,6 +725,8 @@ protected function _encode($record, $tab, $dbencode = true, $api = false) {`
`725`	`725`	`if($timeout < time()) $to_unset[] = $_csrf_id;`
`726`	`726`	`}`
`727`	`727`	`foreach($to_unset as $_csrf_id) {`
	`728`	`+ $_SESSION['_csrf'][$_csrf_id] = null;`
	`729`	`+ $_SESSION['_csrf_timeout'][$_csrf_id] = null;`
`728`	`730`	`unset($_SESSION['_csrf'][$_csrf_id]);`
`729`	`731`	`unset($_SESSION['_csrf_timeout'][$_csrf_id]);`
`730`	`732`	`}`