Skip to content

Customize: Don't let hardcoded regex override customize_allowed_urls filter #11459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abhi3315 wants to merge 2 commits into
base: trunk
Choose a base branch
from
Open

Customize: Don't let hardcoded regex override customize_allowed_urls filter #11459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54a0191
Customize: Don't let hardcoded regex override customize_allowed_urls …
abhi3315 Apr 7, 2026
9c6eb3a
Customize: Initialize matchedAllowedPath to empty string to avoid ter…
abhi3315 Apr 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/js/_enqueues/wp/customize/controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6574,15 +6574,10 @@
*/

previewer.add( 'previewUrl', params.previewUrl ).setter( function( to ) {
var result = null, urlParser, queryParams, parsedAllowedUrl, parsedCandidateUrls = [];
var result = null, urlParser, queryParams, parsedAllowedUrl, matchedAllowedPath = '', parsedCandidateUrls = [];
urlParser = document.createElement( 'a' );
urlParser.href = to;

// Abort if URL is for admin or (static) files in wp-includes or wp-content.
if ( /\/wp-(admin|includes|content)(\/|$)/.test( urlParser.pathname ) ) {
return null;
}

// Remove state query params.
if ( urlParser.search.length > 1 ) {
queryParams = api.utils.parseQueryString( urlParser.search.substr( 1 ) );
Expand Down Expand Up @@ -6613,12 +6608,18 @@
return ! _.isUndefined( _.find( previewer.allowedUrls, function( allowedUrl ) {
parsedAllowedUrl.href = allowedUrl;
if ( urlParser.protocol === parsedAllowedUrl.protocol && urlParser.host === parsedAllowedUrl.host && 0 === urlParser.pathname.indexOf( parsedAllowedUrl.pathname.replace( /\/$/, '' ) ) ) {
matchedAllowedPath = parsedAllowedUrl.pathname.replace( /\/$/, '' );
result = parsedCandidateUrl.href;
return true;
}
} ) );
} );

// Disallow links to admin, includes, and content, unless the matching allowed URL itself contains such a path.
if ( result && /\/wp-(admin|includes|content)(\/|$)/.test( urlParser.pathname.substring( matchedAllowedPath.length ) ) ) {
return null;
}

return result;
});

Expand Down
11 changes: 7 additions & 4 deletions src/js/_enqueues/wp/customize/preview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@
* @return {boolean} Is appropriate for changeset link.
*/
api.isLinkPreviewable = function isLinkPreviewable( element, options ) {
var matchesAllowedUrl, parsedAllowedUrl, args, elementHost;
var matchesAllowedUrl, matchedAllowedPath = '', parsedAllowedUrl, args, elementHost;

args = _.extend( {}, { allowAdminAjax: false }, options || {} );

Expand All @@ -298,7 +298,10 @@
parsedAllowedUrl = document.createElement( 'a' );
matchesAllowedUrl = ! _.isUndefined( _.find( api.settings.url.allowed, function( allowedUrl ) {
parsedAllowedUrl.href = allowedUrl;
return parsedAllowedUrl.protocol === element.protocol && parsedAllowedUrl.host.replace( /:(80|443)$/, '' ) === elementHost && 0 === element.pathname.indexOf( parsedAllowedUrl.pathname.replace( /\/$/, '' ) );
if ( parsedAllowedUrl.protocol === element.protocol && parsedAllowedUrl.host.replace( /:(80|443)$/, '' ) === elementHost && 0 === element.pathname.indexOf( parsedAllowedUrl.pathname.replace( /\/$/, '' ) ) ) {
matchedAllowedPath = parsedAllowedUrl.pathname.replace( /\/$/, '' );
return true;
}
} ) );
if ( ! matchesAllowedUrl ) {
return false;
Expand All @@ -314,8 +317,8 @@
return args.allowAdminAjax;
}

// Disallow links to admin, includes, and content.
if ( /\/wp-(admin|includes|content)(\/|$)/.test( element.pathname ) ) {
// Disallow links to admin, includes, and content, unless the matching allowed URL itself contains such a path.
if ( /\/wp-(admin|includes|content)(\/|$)/.test( element.pathname.substring( matchedAllowedPath.length ) ) ) {
return false;
}

Expand Down
Loading