Skip to content
Permalink
Browse files

Core: Preserve CSP nonce on scripts with src attribute in DOM manipul…

…ation

Fixes gh-4323
Closes gh-4328
  • Loading branch information...
buddh4 authored and mgol committed Mar 19, 2019
1 parent fe5f04d commit 005040379d8b64aacbe54941d878efa6e86df1cc
@@ -199,7 +199,9 @@ function domManip( collection, args, callback, ignored ) {

// Optional AJAX dependency, but won't run scripts if not present
if ( jQuery._evalUrl && !node.noModule ) {
jQuery._evalUrl( node.src );
jQuery._evalUrl( node.src, {
nonce: node.nonce || node.getAttribute( "nonce" )
} );
}
} else {
DOMEval( node.textContent.replace( rcleanScript, "" ), node, doc );
@@ -4,7 +4,7 @@ define( [

"use strict";

jQuery._evalUrl = function( url ) {
jQuery._evalUrl = function( url, options ) {
return jQuery.ajax( {
url: url,

@@ -22,7 +22,7 @@ jQuery._evalUrl = function( url ) {
"text script": function() {}
},
dataFilter: function( response ) {
jQuery.globalEval( response );
jQuery.globalEval( response, options );
}
} );
};
@@ -0,0 +1,13 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>CSP nonce via jQuery.globalEval Test Page</title>
<script nonce="jquery+hardcoded+nonce" src="../jquery.js"></script>
<script nonce="jquery+hardcoded+nonce" src="iframeTest.js"></script>
<script nonce="jquery+hardcoded+nonce" src="csp-nonce-external.js"></script>
</head>
<body>
<p>CSP nonce for external script Test Page</p>
</body>
</html>
@@ -0,0 +1,5 @@
/* global startIframeTest */

jQuery( function() {
$( "body" ).append( "<script nonce='jquery+hardcoded+nonce' src='csp-nonce.js'></script>" );
} );
@@ -2894,6 +2894,29 @@ testIframe(
QUnit[ /\bedge\/|iphone os [789]|android 4\./i.test( navigator.userAgent ) ? "skip" : "test" ]
);

testIframe(
"Check if CSP nonce is preserved for external scripts with src attribute",
"mock.php?action=cspNonce&test=external",
function( assert, jQuery, window, document ) {
var done = assert.async();

assert.expect( 1 );

supportjQuery.get( baseURL + "support/csp.log" ).done( function( data ) {
assert.equal( data, "", "No log request should be sent" );
supportjQuery.get( baseURL + "mock.php?action=cspClean" ).done( done );
} );
},

// Support: Edge 18+, iOS 7-9 only, Android 4.0-4.4 only
// Edge doesn't support nonce in non-inline scripts.
// See https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/13246371/
// Old iOS & Android Browser versions support script-src but not nonce, making this test
// impossible to run. Browsers not supporting CSP at all are not a problem as they'll skip
// script-src restrictions completely.
QUnit[ /\bedge\/|iphone os [789]|android 4\./i.test( navigator.userAgent ) ? "skip" : "test" ]
);

testIframe(
"jQuery.globalEval supports nonce",
"mock.php?action=cspNonce&test=globaleval",

0 comments on commit 0050403

Please sign in to comment.
You can’t perform that action at this time.