WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More robust wp_safe_redirect(). Introducing wp_sanitize_redirect() for use in wp_redirect() and wp_safe_redirect(). fixes #4606 

git-svn-id: http://svn.automattic.com/wordpress/trunk@6134 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2007-09-19 03:47:37 +00:00
parent deb7701a85
commit 3c89a5c5d7
1 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
wp-includes/pluggable.php
View File

@ -373,6 +373,24 @@ function wp_redirect($location, $status = 302) {
if ( !$location ) // allows the wp_redirect filter to cancel a redirect if ( !$location ) // allows the wp_redirect filter to cancel a redirect
return false; return false;
$location = wp_sanitize_redirect($location);
if ( $is_IIS ) {
header("Refresh: 0;url=$location");
} else {
if ( php_sapi_name() != 'cgi-fcgi' )
status_header($status); // This causes problems on IIS and some FastCGI setups
header("Location: $location");
}
}
endif;
if ( !function_exists('wp_sanitize_redirect') ) :
/**
* sanitizes a URL for use in a redirect
* @return string redirect-sanitized URL
**/
function wp_sanitize_redirect($location) {
$location = preg_replace('|[^a-z0-9-~+_.?#=&;,/:%]|i', '', $location); $location = preg_replace('|[^a-z0-9-~+_.?#=&;,/:%]|i', '', $location);
$location = wp_kses_no_null($location); $location = wp_kses_no_null($location);
@ -388,14 +406,7 @@ function wp_redirect($location, $status = 302) {
} }
} }
} }
return $location;
if ( $is_IIS ) {
header("Refresh: 0;url=$location");
} else {
if ( php_sapi_name() != 'cgi-fcgi' )
status_header($status); // This causes problems on IIS and some FastCGI setups
header("Location: $location");
}
} }
endif; endif;
@ -405,13 +416,19 @@ if ( !function_exists('wp_safe_redirect') ) :
* @return void * @return void
**/ **/
function wp_safe_redirect($location, $status = 302) { function wp_safe_redirect($location, $status = 302) {
if ( $location{0} == '/' ) {
if ( $location{1} == '/' ) // Need to look at the URL the way it will end up in wp_redirect()
$location = get_option('home') . '/'; $location = wp_sanitize_redirect($location);
} else {
if ( substr($location, 0, strlen(get_option('home'))) != get_option('home') ) // browsers will assume 'http' is your protocol, and will obey a redirect to a URL starting with '//'
$location = get_option('home') . '/'; if ( substr($location, 0, 2) == '//' )
} $location = 'http:' . $location;
$lp = parse_url($location);
$wpp = parse_url(get_option('home'));
if ( isset($lp['host']) && $lp['host'] != $wpp['host'] )
$location = get_option('siteurl') . '/wp-admin/';
wp_redirect($location, $status); wp_redirect($location, $status);
} }