<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[20882] trunk: Theme Customizer: Improve accuracy of identifying internal urls.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/20882">20882</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-05-24 19:17:49 +0000 (Thu, 24 May 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Theme Customizer: Improve accuracy of identifying internal urls. see <a href="http://core.trac.wordpress.org/ticket/20507">#20507</a>, <a href="http://core.trac.wordpress.org/ticket/19910">#19910</a>.
The 'customize_preview_link' filter has been replaced by 'customize_allowed_urls'.
Improved accuracy when checking for wp-admin.
Improved accuracy when attempting to match the schemes of the control and preview frames.
Improved accuracy of internal link whitelist.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincustomizephp">trunk/wp-admin/customize.php</a></li>
<li><a href="#trunkwpincludesjscustomizecontrolsdevjs">trunk/wp-includes/js/customize-controls.dev.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincustomizephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/customize.php (20881 => 20882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/customize.php 2012-05-24 18:05:36 UTC (rev 20881)
+++ trunk/wp-admin/customize.php 2012-05-24 19:17:49 UTC (rev 20882)
</span><span class="lines">@@ -101,15 +101,17 @@
</span><span class="cx"> // preview over ssl if the customizer is being loaded over ssl. This avoids
</span><span class="cx"> // insecure content warnings. This is not attempted if the admin and frontend
</span><span class="cx"> // are on different domains to avoid the case where the frontend doesn't have
</span><del>- // ssl certs. Domain mapping plugins can force ssl in these conditions using
- // the customize_preview_link filter.
</del><ins>+ // ssl certs. Domain mapping plugins can allow other urls in these conditions
+ // using the customize_allowed_urls filter.
+
+ $allowed_urls = array( home_url('/') );
</ins><span class="cx"> $admin_origin = parse_url( admin_url() );
</span><del>- $home_origin = parse_url( home_url() );
- $scheme = null;
</del><ins>+ $home_origin = parse_url( home_url() );
+
</ins><span class="cx"> if ( is_ssl() && ( $admin_origin[ 'host' ] == $home_origin[ 'host' ] ) )
</span><del>- $scheme = 'https';
</del><ins>+ $allowed_urls[] = home_url( '/', 'https' );
</ins><span class="cx">
</span><del>- $preview_url = apply_filters( 'customize_preview_link', home_url( '/', $scheme ) );
</del><ins>+ $allowed_urls = array_unique( apply_filters( 'customize_allowed_urls', $allowed_urls ) );
</ins><span class="cx">
</span><span class="cx"> $settings = array(
</span><span class="cx"> 'theme' => array(
</span><span class="lines">@@ -117,9 +119,10 @@
</span><span class="cx"> 'active' => $wp_customize->is_theme_active(),
</span><span class="cx"> ),
</span><span class="cx"> 'url' => array(
</span><del>- 'preview' => esc_url( $preview_url ),
</del><ins>+ 'preview' => esc_url( home_url( '/' ) ),
</ins><span class="cx"> 'parent' => esc_url( admin_url() ),
</span><span class="cx"> 'ajax' => esc_url( admin_url( 'admin-ajax.php', 'relative' ) ),
</span><ins>+ 'allowed' => array_map( 'esc_url', $allowed_urls ),
</ins><span class="cx"> ),
</span><span class="cx"> 'settings' => array(),
</span><span class="cx"> 'controls' => array(),
</span></span></pre></div>
<a id="trunkwpincludesjscustomizecontrolsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/customize-controls.dev.js (20881 => 20882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/customize-controls.dev.js 2012-05-24 18:05:36 UTC (rev 20881)
+++ trunk/wp-includes/js/customize-controls.dev.js 2012-05-24 19:17:49 UTC (rev 20882)
</span><span class="lines">@@ -272,7 +272,8 @@
</span><span class="cx"> * - url - the URL of preview frame
</span><span class="cx"> */
</span><span class="cx"> initialize: function( params, options ) {
</span><del>- var self = this;
</del><ins>+ var self = this,
+ rscheme = /^https?/;
</ins><span class="cx">
</span><span class="cx"> $.extend( this, options || {} );
</span><span class="cx">
</span><span class="lines">@@ -314,7 +315,8 @@
</span><span class="cx"> };
</span><span class="cx"> })( this );
</span><span class="cx">
</span><del>- this.container = api.ensure( params.container );
</del><ins>+ this.container = api.ensure( params.container );
+ this.allowedUrls = params.allowedUrls;
</ins><span class="cx">
</span><span class="cx"> api.Messenger.prototype.initialize.call( this, params.url );
</span><span class="cx">
</span><span class="lines">@@ -322,13 +324,42 @@
</span><span class="cx"> // to the current window's location, not the url's.
</span><span class="cx"> this.origin.unlink( this.url ).set( window.location.href );
</span><span class="cx">
</span><ins>+ this.add( 'scheme', this.origin() ).link( this.origin ).setter( function( to ) {
+ var match = to.match( rscheme );
+ return match ? match[0] : '';
+ });
+
</ins><span class="cx"> // Limit the URL to internal, front-end links.
</span><ins>+ //
+ // If the frontend and the admin are served from the same domain, load the
+ // preview over ssl if the customizer is being loaded over ssl. This avoids
+ // insecure content warnings. This is not attempted if the admin and frontend
+ // are on different domains to avoid the case where the frontend doesn't have
+ // ssl certs.
+
</ins><span class="cx"> this.url.setter( function( to ) {
</span><del>- // Bail if we're navigating to a different origin or wp-admin.
- if ( 0 !== to.indexOf( self.origin() + '/' ) || -1 !== to.indexOf( 'wp-admin' ) )
</del><ins>+ var result;
+
+ // Check for URLs that include "/wp-admin/" or end in "/wp-admin".
+ // Strip hashes and query strings before testing.
+ if ( /\/wp-admin(\/|$)/.test( to.replace(/[#?].*$/, '') ) )
</ins><span class="cx"> return null;
</span><span class="cx">
</span><del>- return to;
</del><ins>+ // Attempt to match the URL to the control frame's scheme
+ // and check if it's allowed. If not, try the original URL.
+ $.each([ to.replace( rscheme, self.scheme() ), to ], function( i, url ) {
+ $.each( self.allowedUrls, function( i, allowed ) {
+ if ( 0 === url.indexOf( allowed ) ) {
+ result = url;
+ return false;
+ }
+ });
+ if ( result )
+ return false;
+ });
+
+ // If we found a matching result, return it. If not, bail.
+ return result ? result : null;
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> // Refresh the preview when the URL is changed.
</span><span class="lines">@@ -422,9 +453,10 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> previewer = new api.Previewer({
</span><del>- container: '#customize-preview',
- form: '#customize-controls',
- url: api.settings.url.preview
</del><ins>+ container: '#customize-preview',
+ form: '#customize-controls',
+ url: api.settings.url.preview,
+ allowedUrls: api.settings.url.allowed
</ins><span class="cx"> }, {
</span><span class="cx"> query: function() {
</span><span class="cx"> return {
</span></span></pre>
</div>
</div>
</body>
</html>