Skip to content

Commit b1ba339

Browse files
authored
Webspark 1.66 (Wisconsin)
Please review the changes to this release in your site's /profiles/openasu/CHANGELOG.txt file.
2 parents 31d88f6 + 2daac75 commit b1ba339

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+321
-93
lines changed

CHANGELOG.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
Drupal 7.xx, xxxx-xx-xx (development version)
22
-----------------------
33

4+
Drupal 7.66, 2019-04-17
5+
-----------------------
6+
- Fixed security issues:
7+
- SA-CORE-2019-006
8+
49
Drupal 7.65, 2019-03-20
510
-----------------------
611
- Fixed security issues:

includes/bootstrap.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* The current system version.
1010
*/
11-
define('VERSION', '7.65');
11+
define('VERSION', '7.66');
1212

1313
/**
1414
* Core API compatibility.

misc/jquery-extend-3.4.0.js

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
/**
2+
* For jQuery versions less than 3.4.0, this replaces the jQuery.extend
3+
* function with the one from jQuery 3.4.0, slightly modified (documented
4+
* below) to be compatible with older jQuery versions and browsers.
5+
*
6+
* This provides the Object.prototype pollution vulnerability fix to Drupal
7+
* installations running older jQuery versions, including the versions shipped
8+
* with Drupal core and https://www.drupal.org/project/jquery_update.
9+
*
10+
* @see https://github.com/jquery/jquery/pull/4333
11+
*/
12+
13+
(function (jQuery) {
14+
15+
// Do not override jQuery.extend() if the jQuery version is already >=3.4.0.
16+
var versionParts = jQuery.fn.jquery.split('.');
17+
var majorVersion = parseInt(versionParts[0]);
18+
var minorVersion = parseInt(versionParts[1]);
19+
var patchVersion = parseInt(versionParts[2]);
20+
var isPreReleaseVersion = (patchVersion.toString() !== versionParts[2]);
21+
if (
22+
(majorVersion > 3) ||
23+
(majorVersion === 3 && minorVersion > 4) ||
24+
(majorVersion === 3 && minorVersion === 4 && patchVersion > 0) ||
25+
(majorVersion === 3 && minorVersion === 4 && patchVersion === 0 && !isPreReleaseVersion)
26+
) {
27+
return;
28+
}
29+
30+
/**
31+
* This is almost verbatim copied from jQuery 3.4.0.
32+
*
33+
* Only two minor changes have been made:
34+
* - The call to isFunction() is changed to jQuery.isFunction().
35+
* - The two calls to Array.isArray() is changed to jQuery.isArray().
36+
*
37+
* The above two changes ensure compatibility with all older jQuery versions
38+
* (1.4.4 - 3.3.1) and older browser versions (e.g., IE8).
39+
*/
40+
jQuery.extend = jQuery.fn.extend = function() {
41+
var options, name, src, copy, copyIsArray, clone,
42+
target = arguments[ 0 ] || {},
43+
i = 1,
44+
length = arguments.length,
45+
deep = false;
46+
47+
// Handle a deep copy situation
48+
if ( typeof target === "boolean" ) {
49+
deep = target;
50+
51+
// Skip the boolean and the target
52+
target = arguments[ i ] || {};
53+
i++;
54+
}
55+
56+
// Handle case when target is a string or something (possible in deep copy)
57+
if ( typeof target !== "object" && !jQuery.isFunction( target ) ) {
58+
target = {};
59+
}
60+
61+
// Extend jQuery itself if only one argument is passed
62+
if ( i === length ) {
63+
target = this;
64+
i--;
65+
}
66+
67+
for ( ; i < length; i++ ) {
68+
69+
// Only deal with non-null/undefined values
70+
if ( ( options = arguments[ i ] ) != null ) {
71+
72+
// Extend the base object
73+
for ( name in options ) {
74+
copy = options[ name ];
75+
76+
// Prevent Object.prototype pollution
77+
// Prevent never-ending loop
78+
if ( name === "__proto__" || target === copy ) {
79+
continue;
80+
}
81+
82+
// Recurse if we're merging plain objects or arrays
83+
if ( deep && copy && ( jQuery.isPlainObject( copy ) ||
84+
( copyIsArray = jQuery.isArray( copy ) ) ) ) {
85+
src = target[ name ];
86+
87+
// Ensure proper type for the source value
88+
if ( copyIsArray && !jQuery.isArray( src ) ) {
89+
clone = [];
90+
} else if ( !copyIsArray && !jQuery.isPlainObject( src ) ) {
91+
clone = {};
92+
} else {
93+
clone = src;
94+
}
95+
copyIsArray = false;
96+
97+
// Never move original objects, clone them
98+
target[ name ] = jQuery.extend( deep, clone, copy );
99+
100+
// Don't bring in undefined values
101+
} else if ( copy !== undefined ) {
102+
target[ name ] = copy;
103+
}
104+
}
105+
}
106+
}
107+
108+
// Return the modified object
109+
return target;
110+
};
111+
112+
})(jQuery);

modules/system/system.install

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3300,6 +3300,13 @@ function system_update_7081() {
33003300
->execute();
33013301
}
33023302

3303+
/**
3304+
* Add 'jquery-extend-3.4.0.js' to the 'jquery' library.
3305+
*/
3306+
function system_update_7082() {
3307+
// Empty update to force a rebuild of hook_library() and JS aggregates.
3308+
}
3309+
33033310
/**
33043311
* @} End of "defgroup updates-7.x-extra".
33053312
* The next series of updates should start at 8000.

modules/system/system.module

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1182,6 +1182,9 @@ function system_library() {
11821182
'version' => '1.4.4',
11831183
'js' => array(
11841184
'misc/jquery.js' => array('group' => JS_LIBRARY, 'weight' => -20),
1185+
// This includes a security fix, so assign a weight that makes this load
1186+
// as soon after jquery.js is loaded as possible.
1187+
'misc/jquery-extend-3.4.0.js' => array('group' => JS_LIBRARY, 'weight' => -19),
11851188
),
11861189
);
11871190

pantheon.upstream.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
# Override the defaults specified here in a site-specific `pantheon.yml` file.
44
# For more information see: https://pantheon.io/docs/pantheon-upstream-yml
55
api_version: 1
6-
php_version: 5.6
6+
php_version: 7.0
77
drush_version: 8

profiles/openasu/CHANGELOG.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
Webspark 1.66 (Wisconsin), 2019-04-18
2+
-------------------------------------
3+
- Webspark core
4+
5+
* Drupal - v7.66
6+
* This release fixes security vulnerabilities. See https://www.drupal.org/project/drupal/releases/7.66 for more details.
7+
* Panopoly - v1.66
8+
* Multiple Panopoly releases (1.65-1.66) rolled into one update; Includes updates to contrib modules. See https://www.drupal.org/project/panopoly/releases/7.x-1.66 for more info.
9+
10+
- Contrib module updates
11+
12+
- Managed by Panopoly
13+
14+
* Module Filter (module_filter) - v2.2
15+
* Tablefield (tablefield) - v3.4
16+
117
Webspark 1.64.1 (San Diego), 2019-04-05
218
---------------------------------------
319
- Web standards components in Webspark

profiles/openasu/modules/contrib/module_filter/js/module_filter_tab.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Drupal.behaviors.moduleFilterTabs = {
5757
// Build tabs from package title rows.
5858
var tabs = '<ul>';
5959
for (var i in Drupal.settings.moduleFilter.packageIDs) {
60-
var id = Drupal.settings.moduleFilter.packageIDs[i];
60+
var id = Drupal.checkPlain(Drupal.settings.moduleFilter.packageIDs[i]);
6161

6262
var name = id;
6363
var tabClass = 'project-tab';
@@ -85,8 +85,8 @@ Drupal.behaviors.moduleFilterTabs = {
8585
}
8686
break;
8787
default:
88-
var $row = $('#' + id + '-package');
89-
name = $.trim($row.text());
88+
var $row = $('#' + id + '-package', this);
89+
name = Drupal.checkPlain($.trim($row.text()));
9090
$row.remove();
9191
break;
9292
}
@@ -233,8 +233,8 @@ Drupal.behaviors.moduleFilterTabs = {
233233
}
234234

235235
if (Drupal.settings.moduleFilter.useSwitch) {
236-
$('td.checkbox div.form-item').hide();
237-
$('td.checkbox').each(function(i) {
236+
$('td.checkbox div.form-item', table).hide();
237+
$('td.checkbox', table).each(function(i) {
238238
var $cell = $(this);
239239
var $checkbox = $(':checkbox', $cell);
240240
var $switch = $('.toggle-enable', $cell);
@@ -517,7 +517,7 @@ Drupal.ModuleFilter.updateVisualAid = function(type, $row) {
517517
}
518518

519519
var tab = Drupal.ModuleFilter.tabs[id];
520-
var name = $('td:nth(1) strong', $row).text();
520+
var name = Drupal.checkPlain($('td:nth(1) strong', $row).text());
521521
switch (type) {
522522
case 'enable':
523523
if (Drupal.ModuleFilter.disabling[id + name] != undefined) {

profiles/openasu/modules/contrib/module_filter/module_filter.info

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ files[] = js/module_filter_tab.js
1616

1717
configure = admin/config/user-interface/modulefilter
1818

19-
; Information added by Drupal.org packaging script on 2017-06-09
20-
version = "7.x-2.1"
19+
; Information added by Drupal.org packaging script on 2019-03-27
20+
version = "7.x-2.2"
2121
core = "7.x"
2222
project = "module_filter"
23-
datestamp = "1497029349"
24-
23+
datestamp = "1553698385"

profiles/openasu/modules/contrib/tablefield/tablefield.info

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ package = Fields
77
dependencies[] = field
88
configure = admin/config/content/tablefield
99

10-
; Information added by Drupal.org packaging script on 2018-12-08
11-
version = "7.x-3.2"
10+
; Information added by Drupal.org packaging script on 2019-04-16
11+
version = "7.x-3.4"
1212
core = "7.x"
1313
project = "tablefield"
14-
datestamp = "1544293992"
14+
datestamp = "1555444847"

0 commit comments

Comments
 (0)