Editor: Prevent adding `javascript:` and `data:` URLs through the inline link dialog.

Merge of [41393] to the 4.5 branch.

Built from https://develop.svn.wordpress.org/branches/4.5@41403


git-svn-id: http://core.svn.wordpress.org/branches/4.5@41236 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2017-09-19 10:17:14 +00:00
parent 030d6166f9
commit 0d5353afbc
5 changed files with 25 additions and 4 deletions

View File

@ -4,7 +4,7 @@
renderHtml: function() { renderHtml: function() {
return ( return (
'<div id="' + this._id + '" class="wp-link-preview">' + '<div id="' + this._id + '" class="wp-link-preview">' +
'<a href="' + this.url + '" target="_blank" tabindex="-1">' + this.url + '</a>' + '<a href="' + this.url + '" target="_blank" rel="noopener" tabindex="-1">' + this.url + '</a>' +
'</div>' '</div>'
); );
}, },
@ -217,6 +217,13 @@
text = inputInstance.getLinkText(); text = inputInstance.getLinkText();
editor.focus(); editor.focus();
var parser = document.createElement( 'a' );
parser.href = href;
if ( 'javascript:' === parser.protocol || 'data:' === parser.protocol ) { // jshint ignore:line
href = '';
}
if ( ! href ) { if ( ! href ) {
editor.dom.remove( linkNode, true ); editor.dom.remove( linkNode, true );
return; return;

File diff suppressed because one or more lines are too long

View File

@ -313,7 +313,7 @@ var wpLink;
var html = '<a href="' + attrs.href + '"'; var html = '<a href="' + attrs.href + '"';
if ( attrs.target ) { if ( attrs.target ) {
html += ' target="' + attrs.target + '"'; html += ' rel="noopener" target="' + attrs.target + '"';
} }
return html + '>'; return html + '>';
@ -338,6 +338,13 @@ var wpLink;
attrs = wpLink.getAttrs(); attrs = wpLink.getAttrs();
text = inputs.text.val(); text = inputs.text.val();
var parser = document.createElement( 'a' );
parser.href = attrs.href;
if ( 'javascript:' === parser.protocol || 'data:' === parser.protocol ) { // jshint ignore:line
attrs.href = '';
}
// If there's no href, return. // If there's no href, return.
if ( ! attrs.href ) { if ( ! attrs.href ) {
return; return;
@ -395,6 +402,13 @@ var wpLink;
editor.windowManager.wplinkBookmark = null; editor.windowManager.wplinkBookmark = null;
} }
var parser = document.createElement( 'a' );
parser.href = attrs.href;
if ( 'javascript:' === parser.protocol || 'data:' === parser.protocol ) { // jshint ignore:line
attrs.href = '';
}
if ( ! attrs.href ) { if ( ! attrs.href ) {
editor.execCommand( 'unlink' ); editor.execCommand( 'unlink' );
wpLink.close(); wpLink.close();

File diff suppressed because one or more lines are too long