Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update snakeyaml dependency to resolve CVEs #480

Merged
merged 6 commits into from
Sep 25, 2022
Merged

Update snakeyaml dependency to resolve CVEs #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3065bd3
upgrade snakeyaml-api plugin version
Sep 22, 2022
c4c8664
Adding snakeyaml dependency
Sep 22, 2022
a0d7361
Add TODO for future snakeyaml dependency removal
MarkEWaite Sep 23, 2022
ec27c39
Move snakeyaml dependency into library
MarkEWaite Sep 23, 2022
04cfb26
Remove root pom change
MarkEWaite Sep 23, 2022
6239603
Add snakeyaml 1.32 dependency until jackson is updated
MarkEWaite Sep 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions plugin-management-library/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,12 @@
<artifactId>jackson-dataformat-yaml</artifactId>
<version>2.13.4</version>
</dependency>
<!-- TODO: Remove when jackson dataformat snakeyaml dependency is at least 1.32 -->
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.32</version>
</dependency>
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ...brary/src/test/java/io/jenkins/tools/pluginmanager/impl/PluginManagerIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ public void verifyDownloads_smoke() throws Exception {

// Second cycle, with plugin update and new plugin installation
Plugin trileadAPI = new Plugin("trilead-api", "1.0.13", null, null);
Plugin snakeYamlAPI = new Plugin("snakeyaml-api", "1.27.0", null, null);
Plugin snakeYamlAPI = new Plugin("snakeyaml-api", "1.31-84.ve43da_fb_49d0b", null, null);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this setting can be retained to continue testing that behavior remains compatible even for older releases.

Suggested change
Plugin snakeYamlAPI = new Plugin("snakeyaml-api", "1.31-84.ve43da_fb_49d0b", null, null);
Plugin snakeYamlAPI = new Plugin("snakeyaml-api", "1.27.0", null, null);

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think fine to update some firewalls may get angry at vulnerable deps getting downloaded although could also be left

List<Plugin> requestedPlugins_2 = Arrays.asList(trileadAPI, snakeYamlAPI);
PluginManager pluginManager2 = initPluginManager(
configBuilder -> configBuilder.withPlugins(requestedPlugins_2).withDoDownload(true));
Expand Down
2 changes: 1 addition & 1 deletion plugin-management-library/src/test/resources/io/jenkins/tools/pluginmanager/impl/plugins.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ role-strategy:2.16
run-condition:1.3
scm-api:2.6.3
security-inspector:0.5
snakeyaml-api:1.26.4
snakeyaml-api:1.31-84.ve43da_fb_49d0b
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this data value can be retained to continue testing that behavior remains compatible even for older releases.

Suggested change
snakeyaml-api:1.31-84.ve43da_fb_49d0b
snakeyaml-api:1.26.4

ssh-credentials:1.18.1
timestamper:1.11.3
token-macro:2.12
Expand Down