WordPress.org

Make WordPress Core

Changeset 45981


Ignore:
Timestamp:
09/04/2019 05:12:11 PM (3 months ago)
Author:
SergeyBiryukov
Message:

Improve URL validation in wp_validate_redirect().

Merges [45971] to the 4.4 branch.
Props vortfu, whyisjake, peterwilsoncc.

Location:
branches/4.4
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/4.4

  • branches/4.4/src/wp-includes/pluggable.php

    r40187 r45981  
    13401340    if ( isset($lp['scheme']) && !('http' == $lp['scheme'] || 'https' == $lp['scheme']) )
    13411341        return $default;
     1342
     1343    if ( ! isset( $lp['host'] ) && ! empty( $lp['path'] ) && '/' !== $lp['path'][0] ) {
     1344        $path = '';
     1345        if ( ! empty( $_SERVER['REQUEST_URI'] ) ) {
     1346            $path = dirname( parse_url( 'http://placeholder' . $_SERVER['REQUEST_URI'], PHP_URL_PATH ) . '?' );
     1347        }
     1348        $location = '/' . ltrim( $path . '/', '/' ) . $location;
     1349    }
    13421350
    13431351    // Reject if certain components are set but host is not. This catches urls like https:host.com for which parse_url does not set the host field.
Note: See TracChangeset for help on using the changeset viewer.