diff --git a/wp-includes/class-wp.php b/wp-includes/class-wp.php index b363e2d444..46d57e2a50 100644 --- a/wp-includes/class-wp.php +++ b/wp-includes/class-wp.php @@ -15,7 +15,7 @@ class WP { * @access public * @var array */ - public $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots', 'taxonomy', 'term', 'cpage', 'post_type', 'embed' ); + public $public_query_vars = array( 'm', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'pagename', 'page_id', 'error', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots', 'taxonomy', 'term', 'cpage', 'post_type', 'embed' ); /** * Private query variables. diff --git a/wp-includes/functions.php b/wp-includes/functions.php index e596f62a12..1456e18fe9 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -1611,6 +1611,11 @@ function wp_mkdir_p( $target ) { if ( file_exists( $target ) ) return @is_dir( $target ); + // Do not allow path traversals. + if ( false !== strpos( $target, '../' ) || false !== strpos( $target, '..' . DIRECTORY_SEPARATOR ) ) { + return false; + } + // We need to find the permissions of the parent folder that exists and inherit that. $target_parent = dirname( $target ); while ( '.' != $target_parent && ! is_dir( $target_parent ) ) { diff --git a/wp-includes/http.php b/wp-includes/http.php index 23f322df2e..1652bbcc48 100644 --- a/wp-includes/http.php +++ b/wp-includes/http.php @@ -538,8 +538,9 @@ function wp_http_validate_url( $url ) { $ip = $host; } else { $ip = gethostbyname( $host ); - if ( $ip === $host ) // Error condition for gethostbyname() - $ip = false; + if ( $ip === $host ) { // Error condition for gethostbyname() + return false; + } } if ( $ip ) { $parts = array_map( 'intval', explode( '.', $ip ) ); diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php index 3c3d2232ad..a6a9e316bc 100644 --- a/wp-includes/pluggable.php +++ b/wp-includes/pluggable.php @@ -1038,7 +1038,7 @@ if ( !function_exists('check_admin_referer') ) : * 0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago. */ function check_admin_referer( $action = -1, $query_arg = '_wpnonce' ) { - if ( -1 == $action ) + if ( -1 === $action ) _doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '3.2.0' ); $adminurl = strtolower(admin_url()); @@ -1056,7 +1056,7 @@ function check_admin_referer( $action = -1, $query_arg = '_wpnonce' ) { */ do_action( 'check_admin_referer', $action, $result ); - if ( ! $result && ! ( -1 == $action && strpos( $referer, $adminurl ) === 0 ) ) { + if ( ! $result && ! ( -1 === $action && strpos( $referer, $adminurl ) === 0 ) ) { wp_nonce_ays( $action ); die(); } @@ -1081,6 +1081,9 @@ if ( !function_exists('check_ajax_referer') ) : * 0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago. */ function check_ajax_referer( $action = -1, $query_arg = false, $die = true ) { + if ( -1 === $action ) + _doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '3.2.0' ); + $nonce = ''; if ( $query_arg && isset( $_REQUEST[ $query_arg ] ) ) @@ -2459,4 +2462,3 @@ function wp_text_diff( $left_string, $right_string, $args = null ) { return $r; } endif; - diff --git a/wp-includes/query.php b/wp-includes/query.php index 053bd4cac3..24531ce35e 100644 --- a/wp-includes/query.php +++ b/wp-includes/query.php @@ -1416,7 +1416,6 @@ class WP_Query { , 'attachment' , 'attachment_id' , 'name' - , 'static' , 'pagename' , 'page_id' , 'second' @@ -1637,7 +1636,7 @@ class WP_Query { // If year, month, day, hour, minute, and second are set, a single // post is being queried. $this->is_single = true; - } elseif ( '' != $qv['static'] || '' != $qv['pagename'] || !empty($qv['page_id']) ) { + } elseif ( '' != $qv['pagename'] || !empty($qv['page_id']) ) { $this->is_page = true; $this->is_single = false; } else { diff --git a/wp-includes/rest-api.php b/wp-includes/rest-api.php index 13bfa596ec..003a71ac1b 100644 --- a/wp-includes/rest-api.php +++ b/wp-includes/rest-api.php @@ -395,6 +395,9 @@ function rest_send_cors_headers( $value ) { header( 'Access-Control-Allow-Origin: ' . esc_url_raw( $origin ) ); header( 'Access-Control-Allow-Methods: POST, GET, OPTIONS, PUT, DELETE' ); header( 'Access-Control-Allow-Credentials: true' ); + header( 'Vary: Origin', false ); + } elseif ( ! headers_sent() && 'GET' === $_SERVER['REQUEST_METHOD'] && ! is_user_logged_in() ) { + header( 'Vary: Origin', false ); } return $value; diff --git a/wp-includes/theme.php b/wp-includes/theme.php index e71e417e16..ff55af99ed 100644 --- a/wp-includes/theme.php +++ b/wp-includes/theme.php @@ -1374,7 +1374,7 @@ function _custom_background_cb() { $style = $color ? "background-color: #$color;" : ''; if ( $background ) { - $image = " background-image: url('$background');"; + $image = " background-image: url('" . esc_url_raw( $background ) . "');"; $repeat = get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) ); if ( ! in_array( $repeat, array( 'no-repeat', 'repeat-x', 'repeat-y', 'repeat' ) ) )