Merge pull request bcit-ci#24 from joelcox/issue-165c

Phil Sturgeon · Phil Sturgeon · commit 866a23fd3ff7 · 2011-07-16T20:29:28.000-07:00
CSRF field for internal POST only. Issue bcit-ci#165
diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
@@ -64,8 +64,8 @@ function form_open($action = '', $attributes = '', $hidden = array())
 
 		$form .= '>';
 
-		// CSRF
-		if ($CI->config->item('csrf_protection') === TRUE)
+		// Add CSRF field if enabled, but leave it out for GET requests and requests to external websites	
+		if ($CI->config->item('csrf_protection') === TRUE AND ! (strpos($action, $CI->config->site_url()) === FALSE OR strpos($form, 'method="get"')))	
 		{
 			$hidden[$CI->security->get_csrf_token_name()] = $CI->security->get_csrf_hash();
 		}
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
@@ -80,6 +80,7 @@ <h2>Version 2.0.3</h2>
 	<li>Helpers
 		<ul>
 			<li>Added an optional third parameter to <samp>heading()</samp> which allows adding html attributes to the rendered heading tag.</li>
+			<li class="reactor"><kbd>form_open()</kbd> now only adds a hidden (Cross-site Reference Forgery) protection field when the form's action is internal and is set to the post method. (Reactor #165)</li>
 		</ul>
 	</li>
 	<li>Libraries

Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,8 @@ function form_open($action = '', $attributes = '', $hidden = array())`
`64`	`64`
`65`	`65`	`$form .= '>';`
`66`	`66`
`67`		`- // CSRF`
`68`		`- if ($CI->config->item('csrf_protection') === TRUE)`
	`67`	`+ // Add CSRF field if enabled, but leave it out for GET requests and requests to external websites`
	`68`	`+ if ($CI->config->item('csrf_protection') === TRUE AND ! (strpos($action, $CI->config->site_url()) === FALSE OR strpos($form, 'method="get"')))`
`69`	`69`	`{`
`70`	`70`	`$hidden[$CI->security->get_csrf_token_name()] = $CI->security->get_csrf_hash();`
`71`	`71`	`}`