diff --git a/core/assets/vendor/jquery/jquery-extend-3.4.0.js b/core/assets/vendor/jquery/jquery-extend-3.4.0.js new file mode 100644 index 0000000000000000000000000000000000000000..763cde72058f6a8c7d81903c9e6170fa34ea796f --- /dev/null +++ b/core/assets/vendor/jquery/jquery-extend-3.4.0.js @@ -0,0 +1,111 @@ +/** + * For jQuery versions less than 3.4.0, this replaces the jQuery.extend + * function with the one from jQuery 3.4.0, slightly modified (documented + * below) to be compatible with older jQuery versions. + * + * This provides the Object.prototype pollution vulnerability fix to Drupal + * installations running older jQuery versions, including the version (3.2.1) + * shipped with Drupal core. + * + * @see https://github.com/jquery/jquery/pull/4333 + */ + +(function (jQuery) { + +// Do not override jQuery.extend() if the jQuery version is already >=3.4.0. +var versionParts = jQuery.fn.jquery.split('.'); +var majorVersion = parseInt(versionParts[0]); +var minorVersion = parseInt(versionParts[1]); +var patchVersion = parseInt(versionParts[2]); +var isPreReleaseVersion = (patchVersion.toString() !== versionParts[2]); +if ( + (majorVersion > 3) || + (majorVersion === 3 && minorVersion > 4) || + (majorVersion === 3 && minorVersion === 4 && patchVersion > 0) || + (majorVersion === 3 && minorVersion === 4 && patchVersion === 0 && !isPreReleaseVersion) +) { + return; +} + +/** + * This is almost verbatim copied from jQuery 3.4.0. + * + * Only one minor change has been made: + * - The call to isFunction() is changed to jQuery.isFunction(). + * + * The above change ensures compatibility with older jQuery versions, + * including 3.2.1 which is shipped with Drupal core. + */ +jQuery.extend = jQuery.fn.extend = function() { + var options, name, src, copy, copyIsArray, clone, + target = arguments[ 0 ] || {}, + i = 1, + length = arguments.length, + deep = false; + + // Handle a deep copy situation + if ( typeof target === "boolean" ) { + deep = target; + + // Skip the boolean and the target + target = arguments[ i ] || {}; + i++; + } + + // Handle case when target is a string or something (possible in deep copy) + if ( typeof target !== "object" && !jQuery.isFunction( target ) ) { + target = {}; + } + + // Extend jQuery itself if only one argument is passed + if ( i === length ) { + target = this; + i--; + } + + for ( ; i < length; i++ ) { + + // Only deal with non-null/undefined values + if ( ( options = arguments[ i ] ) != null ) { + + // Extend the base object + for ( name in options ) { + copy = options[ name ]; + + // Prevent Object.prototype pollution + // Prevent never-ending loop + if ( name === "__proto__" || target === copy ) { + continue; + } + + // Recurse if we're merging plain objects or arrays + if ( deep && copy && ( jQuery.isPlainObject( copy ) || + ( copyIsArray = Array.isArray( copy ) ) ) ) { + src = target[ name ]; + + // Ensure proper type for the source value + if ( copyIsArray && !Array.isArray( src ) ) { + clone = []; + } else if ( !copyIsArray && !jQuery.isPlainObject( src ) ) { + clone = {}; + } else { + clone = src; + } + copyIsArray = false; + + // Never move original objects, clone them + target[ name ] = jQuery.extend( deep, clone, copy ); + + // Don't bring in undefined values + } else if ( copy !== undefined ) { + target[ name ] = copy; + } + } + } + } + + // Return the modified object + return target; +}; + +})(jQuery); diff --git a/core/core.libraries.yml b/core/core.libraries.yml index 8e6f021b0dd2c6cdf2987977cffef65c327be26b..523559f8f2c88580e7cf26295e4579bf5449e769 100644 --- a/core/core.libraries.yml +++ b/core/core.libraries.yml @@ -356,6 +356,9 @@ jquery: gpl-compatible: true js: assets/vendor/jquery/jquery.min.js: { minified: true, weight: -20 } + # This includes a security fix, so assign a weight that makes this load as + # soon after jquery.min.js is loaded as possible. + assets/vendor/jquery/jquery-extend-3.4.0.js: { weight: -19 } jquery.cookie: remote: https://github.com/carhartl/jquery-cookie diff --git a/core/modules/system/system.post_update.php b/core/modules/system/system.post_update.php index 980cbcb5e316d58c38b04aac92d8d08c7d69499a..11f72ecfebb43fa3384b6bc7026f0c28ca8b9b08 100644 --- a/core/modules/system/system.post_update.php +++ b/core/modules/system/system.post_update.php @@ -90,6 +90,13 @@ function system_post_update_field_formatter_entity_schema() { // Empty post-update hook. } +/** + * Clear the library cache and ensure aggregate files are regenerated. + */ +function system_post_update_fix_jquery_extend() { + // Empty post-update hook. +} + /** * Change plugin IDs of actions. */