forked from apache/spark
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ODP-2169|[SPARK-39740][UI] Upgrade vis timeline to 7.7.2 to fix CVE-2…
…020-28487 ### What changes were proposed in this pull request? Upgrade vis timeline to 7.7.2 Have to add xss option with whitelisting to make the timeline work after the xss protection was added in vis-timeline. (Refer to visjs/vis-timeline#1010) ### Why are the changes needed? To remediate CVE-2020-28487 GHSA-9mrv-456v-pf22 ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? Manually by running spark-shell and checking History Server UI. Timeline rendered successfully and no change in style. Even after following operation: (1 to 1000).foreach(_ => sc.parallelize(1 to 10).collect) UI loaded in 3 seconds faster than it loaded with 4.21. Closes apache#41613 from shrprasa/upgrade_vis. Authored-by: Shrikant Prasad <shrprasa@visa.com> Signed-off-by: Sean Owen <srowen@gmail.com> (cherry picked from commit a8ea35f)
- Loading branch information
Showing
8 changed files
with
100 additions
and
62 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
core/src/main/resources/org/apache/spark/ui/static/vis-timeline-graph2d.min.css
Large diffs are not rendered by default.
Oops, something went wrong.
1 change: 1 addition & 0 deletions
1
core/src/main/resources/org/apache/spark/ui/static/vis-timeline-graph2d.min.css.map
Large diffs are not rendered by default.
Oops, something went wrong.
57 changes: 37 additions & 20 deletions
57
core/src/main/resources/org/apache/spark/ui/static/vis-timeline-graph2d.min.js
Large diffs are not rendered by default.
Oops, something went wrong.
1 change: 1 addition & 0 deletions
1
core/src/main/resources/org/apache/spark/ui/static/vis-timeline-graph2d.min.js.map
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,23 @@ | ||
vis.js | ||
https://github.com/almende/vis | ||
vis-timeline | ||
https://visjs.github.io/vis-timeline/ | ||
|
||
A dynamic, browser-based visualization library. | ||
Create a fully customizable, interactive timeline with items and ranges. | ||
|
||
@version 4.20.1-SNAPSHOT | ||
@date 2017-10-12 | ||
@version 7.7.2 | ||
@date 2023-03-22T11:14:31.874Z | ||
|
||
@license | ||
Copyright (C) 2011-2017 Almende B.V, http://almende.com | ||
@copyright (c) 2011-2017 Almende B.V, http://almende.com | ||
@copyright (c) 2017-2019 visjs contributors, https://github.com/visjs | ||
|
||
Vis.js is dual licensed under both | ||
@license | ||
vis.js is dual licensed under both | ||
|
||
* The Apache 2.0 License | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
1. The Apache 2.0 License | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
and | ||
and | ||
|
||
* The MIT License | ||
http://opensource.org/licenses/MIT | ||
2. The MIT License | ||
http://opensource.org/licenses/MIT | ||
|
||
Vis.js may be distributed under either license. | ||
vis.js may be distributed under either license. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,23 @@ | ||
vis.js | ||
https://github.com/almende/vis | ||
vis-timeline | ||
https://visjs.github.io/vis-timeline/ | ||
|
||
A dynamic, browser-based visualization library. | ||
Create a fully customizable, interactive timeline with items and ranges. | ||
|
||
@version 4.20.1-SNAPSHOT | ||
@date 2017-10-12 | ||
@version 7.7.2 | ||
@date 2023-03-22T11:14:31.874Z | ||
|
||
@license | ||
Copyright (C) 2011-2017 Almende B.V, http://almende.com | ||
@copyright (c) 2011-2017 Almende B.V, http://almende.com | ||
@copyright (c) 2017-2019 visjs contributors, https://github.com/visjs | ||
|
||
Vis.js is dual licensed under both | ||
@license | ||
vis.js is dual licensed under both | ||
|
||
* The Apache 2.0 License | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
1. The Apache 2.0 License | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
and | ||
and | ||
|
||
* The MIT License | ||
http://opensource.org/licenses/MIT | ||
2. The MIT License | ||
http://opensource.org/licenses/MIT | ||
|
||
Vis.js may be distributed under either license. | ||
vis.js may be distributed under either license. |