Skip to content

MONIT-34093 - Upgrade to snakeyaml 2.0 for CVE-2022-1471 #839

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

Merged
merged 3 commits into from
Apr 4, 2023
Merged

MONIT-34093 - Upgrade to snakeyaml 2.0 for CVE-2022-1471 #839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
875e868
MONIT-34093 - Upgrade to snakeyaml 2.0 for CVE-2022-1471
ajackson Apr 4, 2023
da20d9c
MONIT-34093 - Upgrade to snakeyaml 2.0 for CVE-2022-1471
ajackson Apr 4, 2023
70faa80
MONIT-34093 - Upgrade to snakeyaml 2.0 for CVE-2022-1471
ajackson Apr 4, 2023
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
5 changes: 5 additions & 0 deletions proxy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,11 @@
<artifactId>proto-google-common-protos</artifactId>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>2.0</version>
</dependency>
</dependencies>

<profiles>
Expand Down
29 changes: 24 additions & 5 deletions proxy/src/test/java/com/wavefront/agent/logsharvesting/LogsIngesterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,23 @@
package com.wavefront.agent.logsharvesting;

import static org.easymock.EasyMock.*;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.reset;
import static org.easymock.EasyMock.verify;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.*;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.emptyIterable;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.lessThan;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
import com.fasterxml.jackson.dataformat.yaml.YAMLFactoryBuilder;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
Expand Down Expand Up @@ -41,21 +52,29 @@
import org.junit.After;
import org.junit.Test;
import org.logstash.beats.Message;
import org.yaml.snakeyaml.LoaderOptions;
import wavefront.report.Histogram;
import wavefront.report.ReportPoint;

/** @author Mori Bellamy ([email protected]) */
public class LogsIngesterTest {
private final AtomicLong now;
private final AtomicLong nanos;
private final ObjectMapper objectMapper;
private LogsIngestionConfig logsIngestionConfig;
private LogsIngester logsIngesterUnderTest;
private FilebeatIngester filebeatIngesterUnderTest;
private RawLogsIngesterPortUnificationHandler rawLogsIngesterUnderTest;
private ReportableEntityHandlerFactory mockFactory;
private ReportableEntityHandler<ReportPoint, String> mockPointHandler;
private ReportableEntityHandler<ReportPoint, String> mockHistogramHandler;
private AtomicLong now = new AtomicLong((System.currentTimeMillis() / 60000) * 60000);
private AtomicLong nanos = new AtomicLong(System.nanoTime());
private ObjectMapper objectMapper = new ObjectMapper(new YAMLFactory());

public LogsIngesterTest() {
this.now = new AtomicLong((System.currentTimeMillis() / 60000) * 60000);
this.nanos = new AtomicLong(System.nanoTime());
YAMLFactoryBuilder factory = new YAMLFactoryBuilder(new YAMLFactory());
this.objectMapper = new ObjectMapper(factory.loaderOptions(new LoaderOptions()).build());
}

private LogsIngestionConfig parseConfigFile(String configPath) throws IOException {
File configFile =
Expand Down